From 147a96f89b7ea5e5f708ab323c41fb81a99855aa Mon Sep 17 00:00:00 2001 From: Noa Osherovich Date: Tue, 15 Nov 2016 11:15:43 +0200 Subject: [PATCH rdma-core 2/6] ibverbs: Allow creation and modification of WQ with cvlan offload Enable WQ creation and modification with cvlan stripping offload. This includes: - Adding flags and flags mask fields to ibv_wq_init_attr. - Similarly extend ibv_wq_attr to allow setting and unsetting this offload during ibv_modify_wq. Creation of a WQ with cvlan offload is done by setting the following fields of the ibv_wq_init_attr struct: - Setting the IBV_WQ_FLAGS_CVLAN_STRIPPING bit of the create_flags field. - Setting the IBV_WQ_INIT_ATTR_FLAGS bit of the comp_mask field. Modification of the cvlan stripping property is done by setting the following fields of the ibv_wq_attr struct: - Setting IBV_WQ_ATTR_FLAGS bit of the attr_mask field. - Setting the IBV_RAW_PACKET_CAP_CVLAN_STRIPPING bit of the flags_mask field. - Setting or unsetting the IBV_RAW_PACKET_CAP_CVLAN_STRIPPING bit of the flags field. Signed-off-by: Noa Osherovich Reviewed-by: Maor Gottlieb Reviewed-by: Yishai Hadas --- libibverbs/cmd.c | 18 ++++++++++++++++++ libibverbs/kern-abi.h | 4 ++++ libibverbs/man/ibv_create_wq.3 | 11 +++++++++++ libibverbs/man/ibv_modify_wq.3 | 2 ++ libibverbs/verbs.h | 14 ++++++++++++-- 5 files changed, 47 insertions(+), 2 deletions(-) diff --git a/libibverbs/cmd.c b/libibverbs/cmd.c index 4aebbb51..b8fe76df 100644 --- a/libibverbs/cmd.c +++ b/libibverbs/cmd.c @@ -1894,6 +1894,15 @@ int ibv_cmd_create_wq(struct ibv_context *context, cmd->max_wr = wq_init_attr->max_wr; cmd->comp_mask = 0; + if (cmd_core_size >= offsetof(struct ibv_create_wq, create_flags) + + sizeof(cmd->create_flags)) { + if (wq_init_attr->comp_mask & IBV_WQ_INIT_ATTR_FLAGS) { + if (wq_init_attr->create_flags & ~(IBV_WQ_FLAGS_RESERVED - 1)) + return EOPNOTSUPP; + cmd->create_flags = wq_init_attr->create_flags; + } + } + err = write(context->cmd_fd, cmd, cmd_size); if (err != cmd_size) return errno; @@ -1927,6 +1936,15 @@ int ibv_cmd_modify_wq(struct ibv_wq *wq, struct ibv_wq_attr *attr, cmd->curr_wq_state = attr->curr_wq_state; cmd->wq_state = attr->wq_state; + if (cmd_core_size >= offsetof(struct ibv_modify_wq, flags_mask) + + sizeof(cmd->flags_mask)) { + if (attr->attr_mask & IBV_WQ_ATTR_FLAGS) { + if (attr->flags_mask & ~(IBV_WQ_FLAGS_RESERVED - 1)) + return EOPNOTSUPP; + cmd->flags = attr->flags; + cmd->flags_mask = attr->flags_mask; + } + } cmd->wq_handle = wq->handle; cmd->attr_mask = attr->attr_mask; diff --git a/libibverbs/kern-abi.h b/libibverbs/kern-abi.h index 3958f0c1..72a16b67 100644 --- a/libibverbs/kern-abi.h +++ b/libibverbs/kern-abi.h @@ -1249,6 +1249,8 @@ struct ibv_create_wq { __u32 cq_handle; __u32 max_wr; __u32 max_sge; + __u32 create_flags; + __u32 reserved; }; struct ibv_create_wq_resp { @@ -1279,6 +1281,8 @@ struct ibv_modify_wq { __u32 wq_handle; __u32 wq_state; __u32 curr_wq_state; + __u32 flags; + __u32 flags_mask; }; struct ibv_create_rwq_ind_table { diff --git a/libibverbs/man/ibv_create_wq.3 b/libibverbs/man/ibv_create_wq.3 index aad67416..9a541fea 100644 --- a/libibverbs/man/ibv_create_wq.3 +++ b/libibverbs/man/ibv_create_wq.3 @@ -31,8 +31,19 @@ uint32_t max_sge; /* Requested max number of scatter/gat struct ibv_pd *pd; /* PD to be associated with the WQ */ struct ibv_cq *cq; /* CQ to be associated with the WQ */ uint32_t comp_mask; /* Identifies valid fields. Use ibv_wq_init_attr_mask */ +uint32_t create_flags /* Creation flags for this WQ, use enum ibv_wq_flags */ .in -8 }; + +.sp +.nf +enum ibv_wq_flags { +.in +8 +IBV_WQ_FLAGS_CVLAN_STRIPPING = 1 << 0, /* CVLAN field will be stripped from incoming packets */ +IBV_WQ_FLAGS_RESERVED = 1 << 1, +.in -8 +}; +.nf .fi .PP The function diff --git a/libibverbs/man/ibv_modify_wq.3 b/libibverbs/man/ibv_modify_wq.3 index f17faedf..1972ec2a 100644 --- a/libibverbs/man/ibv_modify_wq.3 +++ b/libibverbs/man/ibv_modify_wq.3 @@ -26,6 +26,8 @@ struct ibv_wq_attr { uint32_t attr_mask; /* Use enum ibv_wq_attr_mask */ enum ibv_wq_state wq_state; /* Move to this state */ enum ibv_wq_state curr_wq_state; /* Assume this is the current state */ +uint32_t flags; /* Flags values to modify, use enum ibv_wq_flags */ +uint32_t flags_mask; /* Which flags to modify, use enum ibv_wq_flags */ .in -8 }; .fi diff --git a/libibverbs/verbs.h b/libibverbs/verbs.h index 604b09e8..33985666 100644 --- a/libibverbs/verbs.h +++ b/libibverbs/verbs.h @@ -667,7 +667,13 @@ enum ibv_wq_type { }; enum ibv_wq_init_attr_mask { - IBV_WQ_INIT_ATTR_RESERVED = 1 << 0, + IBV_WQ_INIT_ATTR_FLAGS = 1 << 0, + IBV_WQ_INIT_ATTR_RESERVED = 1 << 1, +}; + +enum ibv_wq_flags { + IBV_WQ_FLAGS_CVLAN_STRIPPING = 1 << 0, + IBV_WQ_FLAGS_RESERVED = 1 << 1, }; struct ibv_wq_init_attr { @@ -678,6 +684,7 @@ struct ibv_wq_init_attr { struct ibv_pd *pd; struct ibv_cq *cq; uint32_t comp_mask; + uint32_t create_flags; /* use ibv_wq_flags */ }; enum ibv_wq_state { @@ -690,7 +697,8 @@ enum ibv_wq_state { enum ibv_wq_attr_mask { IBV_WQ_ATTR_STATE = 1 << 0, IBV_WQ_ATTR_CURR_STATE = 1 << 1, - IBV_WQ_ATTR_RESERVED = 1 << 2 + IBV_WQ_ATTR_FLAGS = 1 << 2, + IBV_WQ_ATTR_RESERVED = 1 << 3, }; struct ibv_wq_attr { @@ -700,6 +708,8 @@ struct ibv_wq_attr { enum ibv_wq_state wq_state; /* Assume this is the current WQ state */ enum ibv_wq_state curr_wq_state; + uint32_t flags; /* Use ibv_wq_flags */ + uint32_t flags_mask; /* Use ibv_wq_flags */ }; /* -- 2.12.1