On Tue, May 26, 2020 at 02:36:28PM +0300, Leon Romanovsky wrote:
> On Tue, May 26, 2020 at 01:33:04PM +0300, Leon Romanovsky wrote:
> > From: Leon Romanovsky <leonro@xxxxxxxxxxxx>
> >
> > IBTA declares "vendor option not supported" reject reason in REJ
> > messages if passive side doesn't want to accept proposed ECE options.
> >
> > Due to the fact that ECE is managed by userspace, there is a need to let
> > users to provide such rejected reason.
> >
> > Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx>
> > ---
> > drivers/infiniband/core/cma.c | 9 ++++-----
> > drivers/infiniband/core/ucma.c | 15 ++++++++++++++-
> > drivers/infiniband/ulp/isert/ib_isert.c | 4 ++--
> > drivers/infiniband/ulp/rtrs/rtrs-srv.c | 2 +-
> > drivers/infiniband/ulp/srpt/ib_srpt.c | 3 ++-
> > drivers/nvme/target/rdma.c | 3 ++-
> > include/rdma/rdma_cm.h | 2 +-
> > include/uapi/rdma/rdma_user_cm.h | 3 ++-
> > net/rds/ib_cm.c | 4 +++-
> > 9 files changed, 31 insertions(+), 14 deletions(-)
>
> For some reason didn't get the failure in CI, this small fixup is
> needed.
>
> commit af02a4a50ec0d18fe9bfb86b96411dfb42054f97 (HEAD -> rdma-next)
> Author: Leon Romanovsky <leon@xxxxxxxxxx>
> Date: Tue May 26 14:34:34 2020 +0300
>
> fixup! RDMA/cma: Provide ECE reject reason
>
> Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx>
>
> diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
> index 30a0a9adaddd..d84765f66d49 100644
> --- a/drivers/nvme/target/rdma.c
> +++ b/drivers/nvme/target/rdma.c
> @@ -18,6 +18,7 @@
> #include <asm/unaligned.h>
>
> #include <rdma/ib_verbs.h>
> +#include <rdma/ib_cm.h>
> #include <rdma/rdma_cm.h>
> #include <rdma/rw.h>
>
and this one:
commit 4c489c296115d1c795f24cd4aad741058671fe50 (HEAD -> rdma-next)
Author: Leon Romanovsky <leon@xxxxxxxxxx>
Date: Tue May 26 15:01:19 2020 +0300
fixup! RDMA/cma: Provide ECE reject reason
Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx>
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 7bc598d7a15c..b7df38ee8ae0 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -15,6 +15,7 @@
#include <linux/in.h>
#include <linux/in6.h>
#include <rdma/ib_verbs.h>
+#include <rdma/ib_cm.h>
#include <rdma/rdma_cm.h>
#include <target/target_core_base.h>
#include <target/target_core_fabric.h>
diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
index 67d164ff5aaa..0d9241f5d9e6 100644
--- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c
@@ -15,6 +15,7 @@
#include "rtrs-srv.h"
#include "rtrs-log.h"
+#include <rdma/ib_cm.h>
MODULE_DESCRIPTION("RDMA Transport Server");
MODULE_LICENSE("GPL");
(END)
