RDMA: Remove kernel private defines and reference to header from UAPI

Remove references to private kernel header and defines from exported ib_user_verb.h file.

The code snippet below is used to reproduce the issue:

#include <stdio.h>
#include <rdma/ib_user_verb.h>

int main(void)

 {
        printf("IB_USER_VERBS_ABI_VERSION = %d\n", IB_USER_VERBS_ABI_VERSION);
        return 0;

}

It fails during compilation phase with an error:
➜ /tmp gcc main.c
main.c:2:31: fatal error: rdma/ib_user_verb.h: No such file or directory

 #include <rdma/ib_user_verb.h>
                               ^

compilation terminated.

Fixes 189aba99e700 ("IB/uverbs: Extend modify_qp and support packet pacing")

CC Bodong Wang <bodong-VPRAkNaXOzVWk0Htik3J/[email protected]>

CC Matan Barak <matanb-VPRAkNaXOzVWk0Htik3J/[email protected]>

Reported-by Slava Shwartsman <slavash-VPRAkNaXOzVWk0Htik3J/[email protected]>

Signed-off-by Leon Romanovsky <[email protected]>

---
 include/uapi/rdma/ib_user_verbs.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

include/uapi/rdma/ib_user_verbs.h +2 -4

index dfdfe4e92d31..c56f525b041d 100644
@@ -37,7 +37,6 @@
 #define IB_USER_VERBS_H
 
 #include <linux/types.h>
-#include <rdma/ib_verbs.h>
 
 /*
  * Increment this value if any changes that break userspace ABI

@@ -548,11 +547,11 @@ enum {
 };
 
 enum {
-       IB_USER_LEGACY_LAST_QP_ATTR_MASK = IB_QP_DEST_QPN
+       IB_USER_LEGACY_LAST_QP_ATTR_MASK = 1ULL << 20,
 };
 
 enum {
-       IB_USER_LAST_QP_ATTR_MASK = IB_QP_RATE_LIMIT
+       IB_USER_LAST_QP_ATTR_MASK = 1ULL << 25,
 };
 
 struct ib_uverbs_ex_create_qp {
--

2.11.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#include <linux/types.h>

include/uapi/rdma/ib_user_verbs.h +0 -1

-#include <rdma/ib_verbs.h>
 
 /*
  * Increment this value if any changes that break userspace ABI

Quoted 13 lines

#include <linux/types.h>

include/uapi/rdma/ib_user_verbs.h +1 -2

-#include <rdma/ib_verbs.h>
 
 /*
  * Increment this value if any changes that break userspace ABI

@@ -548,11 +547,11 @@ enum {
 };
 
 enum {
-	IB_USER_LEGACY_LAST_QP_ATTR_MASK = IB_QP_DEST_QPN
+	IB_USER_LEGACY_LAST_QP_ATTR_MASK = 1ULL << 20,
 };
 

include/uapi/rdma/ib_user_verbs.h enum { · line 554

Quoted 3 lines

include/uapi/rdma/ib_user_verbs.h +1 -1

 enum {
-	IB_USER_LAST_QP_ATTR_MASK = IB_QP_RATE_LIMIT
+	IB_USER_LAST_QP_ATTR_MASK = 1ULL << 25,

I disagree with the upendcoding. These constant should be moved to the user verbs header instead.

These constants are part of much larger enum ib_qp_attr_mask. IMHO copy two values from that enum isn't good, but copy whole enum (mostly not needed for the users) is bad either. So I decided to open code it as a fix for -rc7.

Quoted 4 lines · Leon Romanovsky

These constants are part of much larger enum ib_qp_attr_mask. IMHO copy two values from that enum isn't good, but copy whole enum (mostly not needed for the users) is bad either. So I decided to open code it as a fix for -rc7.

At least add comments mentioning the proper symbolic values then.

Quoted 13 lines · Christoph Hellwig

Quoted 13 lines

#include <linux/types.h>

include/uapi/rdma/ib_user_verbs.h +1 -2

-#include <rdma/ib_verbs.h>
 
 /*
  * Increment this value if any changes that break userspace ABI

@@ -548,11 +547,11 @@ enum {
 };
 
 enum {
-	IB_USER_LEGACY_LAST_QP_ATTR_MASK = IB_QP_DEST_QPN
+	IB_USER_LEGACY_LAST_QP_ATTR_MASK = 1ULL << 20,
 };
 

Quoted 6 lines

include/uapi/rdma/ib_user_verbs.h enum { · line 554

Quoted 3 lines

include/uapi/rdma/ib_user_verbs.h +1 -1

 enum {
-	IB_USER_LAST_QP_ATTR_MASK = IB_QP_RATE_LIMIT
+	IB_USER_LAST_QP_ATTR_MASK = 1ULL << 25,

I disagree with the upendcoding. These constant should be moved to the user verbs header instead.

These constants are part of much larger enum ib_qp_attr_mask. IMHO copy two values from that enum isn't good, but copy whole enum (mostly not needed for the users) is bad either. So I decided to open code it as a fix for -rc7.

Thanks