[1/2] IB/uverbs: Move enum ib_raw_packet_caps to uapi

Commit Message

Xiao Yang March 19, 2022, 5:03 p.m. UTC

This enum are used by ibv_query_device_ex(3) so it should be defined
in include/uapi/rdma/ib_user_verbs.h.

Signed-off-by: Xiao Yang <[e-mail]>
---
 include/rdma/ib_verbs.h           | 22 +++++++++++++++-------
 include/uapi/rdma/ib_user_verbs.h |  7 +++++++
 2 files changed, 22 insertions(+), 7 deletions(-)

Comments

Jason Gunthorpe March 21, 2022, 1:14 p.m. UTC | #1

On Sun, Mar 20, 2022 at 01:03:50AM +0800, Xiao Yang wrote:
> diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h
> index 7ee73a0652f1..0660405ca2cb 100644
> +++ b/include/uapi/rdma/ib_user_verbs.h
> @@ -1298,4 +1298,11 @@ struct ib_uverbs_ex_modify_cq {
>  
>  #define IB_DEVICE_NAME_MAX 64
>  
> +enum ib_uverbs_raw_packet_caps {
> +	IB_UVERBS_RAW_PACKET_CAP_CVLAN_STRIPPING	= (1 << 0),
> +	IB_UVERBS_RAW_PACKET_CAP_SCATTER_FCS		= (1 << 1),
> +	IB_UVERBS_RAW_PACKET_CAP_IP_CSUM		= (1 << 2),
> +	IB_UVERBS_RAW_PACKET_CAP_DELAY_DROP		= (1 << 3),
> +};

Doesn't need the () but it is OK otheriwse

Thanks,
Jason

Patch

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 69d883f7fb41..e5455f6e0d82 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -1620,20 +1620,28 @@  struct ib_srq {
 	struct rdma_restrack_entry res;
 };
 
+/* This enum is shared with userspace */
 enum ib_raw_packet_caps {
-	/* Strip cvlan from incoming packet and report it in the matching work
+	/*
+	 * Strip cvlan from incoming packet and report it in the matching work
 	 * completion is supported.
 	 */
-	IB_RAW_PACKET_CAP_CVLAN_STRIPPING	= (1 << 0),
-	/* Scatter FCS field of an incoming packet to host memory is supported.
+	IB_RAW_PACKET_CAP_CVLAN_STRIPPING	=
+		IB_UVERBS_RAW_PACKET_CAP_CVLAN_STRIPPING,
+	/*
+	 * Scatter FCS field of an incoming packet to host memory is supported.
 	 */
-	IB_RAW_PACKET_CAP_SCATTER_FCS		= (1 << 1),
+	IB_RAW_PACKET_CAP_SCATTER_FCS		=
+		IB_UVERBS_RAW_PACKET_CAP_SCATTER_FCS,
 	/* Checksum offloads are supported (for both send and receive). */
-	IB_RAW_PACKET_CAP_IP_CSUM		= (1 << 2),
-	/* When a packet is received for an RQ with no receive WQEs, the
+	IB_RAW_PACKET_CAP_IP_CSUM		=
+		IB_UVERBS_RAW_PACKET_CAP_IP_CSUM,
+	/*
+	 * When a packet is received for an RQ with no receive WQEs, the
 	 * packet processing is delayed.
 	 */
-	IB_RAW_PACKET_CAP_DELAY_DROP		= (1 << 3),
+	IB_RAW_PACKET_CAP_DELAY_DROP		=
+		IB_UVERBS_RAW_PACKET_CAP_DELAY_DROP,
 };
 
 enum ib_wq_type {
diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h
index 7ee73a0652f1..0660405ca2cb 100644
--- a/include/uapi/rdma/ib_user_verbs.h
+++ b/include/uapi/rdma/ib_user_verbs.h
@@ -1298,4 +1298,11 @@  struct ib_uverbs_ex_modify_cq {
 
 #define IB_DEVICE_NAME_MAX 64
 
+enum ib_uverbs_raw_packet_caps {
+	IB_UVERBS_RAW_PACKET_CAP_CVLAN_STRIPPING	= (1 << 0),
+	IB_UVERBS_RAW_PACKET_CAP_SCATTER_FCS		= (1 << 1),
+	IB_UVERBS_RAW_PACKET_CAP_IP_CSUM		= (1 << 2),
+	IB_UVERBS_RAW_PACKET_CAP_DELAY_DROP		= (1 << 3),
+};
+
 #endif /* IB_USER_VERBS_H */