RDMA/core: Move ODP capability definitions to uapi

The bits are used from both kernel space and userland, so they should be
placed in UAPI.

Signed-off-by: Daisuke Matsuda <matsuda-daisuke@fujitsu.com>
Link: https://patch.msgid.link/20250418051345.1022339-2-matsuda-daisuke@fujitsu.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 0a7ccd08b3659a7d5a63a2cee1c60829cb68c211..b06a0ed81bdd310f3cf49145024f70f065f3f150 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -314,19 +314,19 @@ enum ib_atomic_cap {
 };
 
 enum ib_odp_general_cap_bits {
-       IB_ODP_SUPPORT          = 1 << 0,
-       IB_ODP_SUPPORT_IMPLICIT = 1 << 1,
+       IB_ODP_SUPPORT          = IB_UVERBS_ODP_SUPPORT,
+       IB_ODP_SUPPORT_IMPLICIT = IB_UVERBS_ODP_SUPPORT_IMPLICIT,
 };
 
 enum ib_odp_transport_cap_bits {
-       IB_ODP_SUPPORT_SEND     = 1 << 0,
-       IB_ODP_SUPPORT_RECV     = 1 << 1,
-       IB_ODP_SUPPORT_WRITE    = 1 << 2,
-       IB_ODP_SUPPORT_READ     = 1 << 3,
-       IB_ODP_SUPPORT_ATOMIC   = 1 << 4,
-       IB_ODP_SUPPORT_SRQ_RECV = 1 << 5,
-       IB_ODP_SUPPORT_FLUSH    = 1 << 6,
-       IB_ODP_SUPPORT_ATOMIC_WRITE     = 1 << 7,
+       IB_ODP_SUPPORT_SEND     = IB_UVERBS_ODP_SUPPORT_SEND,
+       IB_ODP_SUPPORT_RECV     = IB_UVERBS_ODP_SUPPORT_RECV,
+       IB_ODP_SUPPORT_WRITE    = IB_UVERBS_ODP_SUPPORT_WRITE,
+       IB_ODP_SUPPORT_READ     = IB_UVERBS_ODP_SUPPORT_READ,
+       IB_ODP_SUPPORT_ATOMIC   = IB_UVERBS_ODP_SUPPORT_ATOMIC,
+       IB_ODP_SUPPORT_SRQ_RECV = IB_UVERBS_ODP_SUPPORT_SRQ_RECV,
+       IB_ODP_SUPPORT_FLUSH    = IB_UVERBS_ODP_SUPPORT_FLUSH,
+       IB_ODP_SUPPORT_ATOMIC_WRITE     = IB_UVERBS_ODP_SUPPORT_ATOMIC_WRITE,
 };
 
 struct ib_odp_caps {

diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h
index e16650f0c85dd6223222afc027e9107067b500fc..3b7bd99813e9526ead3f9fb124835a0b17e4d2a6 100644 (file)
--- a/include/uapi/rdma/ib_user_verbs.h
+++ b/include/uapi/rdma/ib_user_verbs.h
@@ -233,6 +233,22 @@ struct ib_uverbs_ex_query_device {
        __u32 reserved;
 };
 
+enum ib_uverbs_odp_general_cap_bits {
+       IB_UVERBS_ODP_SUPPORT          = 1 << 0,
+       IB_UVERBS_ODP_SUPPORT_IMPLICIT = 1 << 1,
+};
+
+enum ib_uverbs_odp_transport_cap_bits {
+       IB_UVERBS_ODP_SUPPORT_SEND     = 1 << 0,
+       IB_UVERBS_ODP_SUPPORT_RECV     = 1 << 1,
+       IB_UVERBS_ODP_SUPPORT_WRITE    = 1 << 2,
+       IB_UVERBS_ODP_SUPPORT_READ     = 1 << 3,
+       IB_UVERBS_ODP_SUPPORT_ATOMIC   = 1 << 4,
+       IB_UVERBS_ODP_SUPPORT_SRQ_RECV = 1 << 5,
+       IB_UVERBS_ODP_SUPPORT_FLUSH    = 1 << 6,
+       IB_UVERBS_ODP_SUPPORT_ATOMIC_WRITE     = 1 << 7,
+};
+
 struct ib_uverbs_odp_caps {
        __aligned_u64 general_caps;
        struct {