From 6a96ec1ce7af0cee4d4101bcf65a9b7c3fa01886 Mon Sep 17 00:00:00 2001 From: Noa Osherovich Date: Sun, 4 Dec 2016 11:18:17 +0200 Subject: [PATCH rdma-core 5/6] mlx5: Add read_cvlan support When a WQ or a QP is created with cvlan stripping option, the cvlan is stripped from the packet by the hardware and included in the work completion. Implement ibv_cq_ex's member function read_cvlan to allow reading the cvlan from the work completion. Signed-off-by: Noa Osherovich Reviewed-by: Maor Gottlieb Reviewed-by: Yishai Hadas --- providers/mlx5/cq.c | 9 +++++++++ providers/mlx5/verbs.c | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/providers/mlx5/cq.c b/providers/mlx5/cq.c index 4ecd4828..85d0c339 100644 --- a/providers/mlx5/cq.c +++ b/providers/mlx5/cq.c @@ -1189,6 +1189,13 @@ static inline uint64_t mlx5_cq_read_wc_completion_ts(struct ibv_cq_ex *ibcq) return be64toh(cq->cqe64->timestamp); } +static inline uint16_t mlx5_cq_read_wc_cvlan(struct ibv_cq_ex *ibcq) +{ + struct mlx5_cq *cq = to_mcq(ibv_cq_ex_to_cq(ibcq)); + + return be16toh(cq->cqe64->vlan_info); +} + #define BIT(i) (1UL << (i)) #define SINGLE_THREADED BIT(0) @@ -1261,6 +1268,8 @@ void mlx5_cq_fill_pfns(struct mlx5_cq *cq, const struct ibv_cq_init_attr_ex *cq_ cq->ibv_cq.read_dlid_path_bits = mlx5_cq_read_wc_dlid_path_bits; if (cq_attr->wc_flags & IBV_WC_EX_WITH_COMPLETION_TIMESTAMP) cq->ibv_cq.read_completion_ts = mlx5_cq_read_wc_completion_ts; + if (cq_attr->wc_flags & IBV_WC_EX_WITH_CVLAN) + cq->ibv_cq.read_cvlan = mlx5_cq_read_wc_cvlan; } int mlx5_arm_cq(struct ibv_cq *ibvcq, int solicited) diff --git a/providers/mlx5/verbs.c b/providers/mlx5/verbs.c index 4d8f26ca..67f9748d 100644 --- a/providers/mlx5/verbs.c +++ b/providers/mlx5/verbs.c @@ -327,7 +327,8 @@ static int qp_sig_enabled(void) enum { CREATE_CQ_SUPPORTED_WC_FLAGS = IBV_WC_STANDARD_FLAGS | - IBV_WC_EX_WITH_COMPLETION_TIMESTAMP + IBV_WC_EX_WITH_COMPLETION_TIMESTAMP | + IBV_WC_EX_WITH_CVLAN }; enum { -- 2.12.1