RDMA/rxe: Introduce rxe access supported flags

Introduce supported bit masks for setting the access attributes of MWs,
MRs, and QPs. Check these when attributes are set.

Link: https://lore.kernel.org/r/20230530221334.89432-5-rpearsonhpe@gmail.com
Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/sw/rxe/rxe_mw.c b/drivers/infiniband/sw/rxe/rxe_mw.c
index a7ec57a..d8a43d8 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_mw.c
+++ b/drivers/infiniband/sw/rxe/rxe_mw.c
@@ -197,6 +197,11 @@ int rxe_bind_mw(struct rxe_qp *qp, struct rxe_send_wqe *wqe)
                mr = NULL;
        }
 
+       if (access & ~RXE_ACCESS_SUPPORTED_MW) {
+               rxe_err_mw(mw, "access %#x not supported", access);
+               return -EOPNOTSUPP;
+       }
+
        spin_lock_bh(&mw->lock);
 
        ret = rxe_check_bind_mw(qp, wqe, mw, mr, access);

diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c
index c5451a4..95d4a67 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_qp.c
+++ b/drivers/infiniband/sw/rxe/rxe_qp.c
@@ -392,6 +392,13 @@ int rxe_qp_chk_attr(struct rxe_dev *rxe, struct rxe_qp *qp,
        if (mask & IB_QP_CAP && rxe_qp_chk_cap(rxe, &attr->cap, !!qp->srq))
                goto err1;
 
+       if (mask & IB_QP_ACCESS_FLAGS) {
+               if (!(qp_type(qp) == IB_QPT_RC || qp_type(qp) == IB_QPT_UC))
+                       goto err1;
+               if (attr->qp_access_flags & ~RXE_ACCESS_SUPPORTED_QP)
+                       goto err1;
+       }
+
        if (mask & IB_QP_AV && rxe_av_chk_attr(qp, &attr->ah_attr))
                goto err1;
 

diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
index dea605b..bb2b9d4 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@ -1260,6 +1260,12 @@ static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd, u64 start,
        struct rxe_mr *mr;
        int err, cleanup_err;
 
+       if (access & ~RXE_ACCESS_SUPPORTED_MR) {
+               rxe_err_pd(pd, "access = %#x not supported (%#x)", access,
+                               RXE_ACCESS_SUPPORTED_MR);
+               return ERR_PTR(-EOPNOTSUPP);
+       }
+
        mr = kzalloc(sizeof(*mr), GFP_KERNEL);
        if (!mr)
                return ERR_PTR(-ENOMEM);

diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.h b/drivers/infiniband/sw/rxe/rxe_verbs.h
index 0a2b734..2f2dc67 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_verbs.h
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.h
@@ -253,10 +253,19 @@ struct rxe_qp {
        struct execute_work     cleanup_work;
 };
 
-enum rxe_access {
-       RXE_ACCESS_REMOTE       = (IB_ACCESS_REMOTE_READ
+enum {
+       RXE_ACCESS_REMOTE       = IB_ACCESS_REMOTE_READ
                                | IB_ACCESS_REMOTE_WRITE
-                               | IB_ACCESS_REMOTE_ATOMIC),
+                               | IB_ACCESS_REMOTE_ATOMIC,
+       RXE_ACCESS_SUPPORTED_MR = RXE_ACCESS_REMOTE
+                               | IB_ACCESS_LOCAL_WRITE
+                               | IB_ACCESS_MW_BIND
+                               | IB_ACCESS_ON_DEMAND
+                               | IB_ACCESS_FLUSH_GLOBAL
+                               | IB_ACCESS_FLUSH_PERSISTENT,
+       RXE_ACCESS_SUPPORTED_QP = RXE_ACCESS_SUPPORTED_MR,
+       RXE_ACCESS_SUPPORTED_MW = RXE_ACCESS_SUPPORTED_MR
+                               | IB_ZERO_BASED,
 };
 
 enum rxe_mr_state {