[PATCH for-next v1 0/4] RDMA/rxe: Cleanups and improvements

[PATCH for-next v1 0/4] RDMA/rxe: Cleanups and improvements

[Kamal Heib]

These series include few cleanup patches to the rxe driver.

V1:
- patch #4: Fix commit message.

Kamal Heib (4):
  RDMA/rxe: Drop pointless checks in rxe_init_ports
  RDMA/rxe: Return void from rxe_init_port_param()
  RDMA/rxe: Return void from rxe_mem_init_dma()
  RDMA/rxe: Remove rxe_link_layer()

 drivers/infiniband/sw/rxe/rxe.c       |  7 +------
 drivers/infiniband/sw/rxe/rxe_loc.h   |  5 ++---
 drivers/infiniband/sw/rxe/rxe_mr.c    |  6 ++----
 drivers/infiniband/sw/rxe/rxe_net.c   |  5 -----
 drivers/infiniband/sw/rxe/rxe_verbs.c | 24 ++++--------------------
 5 files changed, 9 insertions(+), 38 deletions(-)

-- 
2.25.4

[PATCH for-next v1 1/4] RDMA/rxe: Drop pointless checks in rxe_init_ports

[Kamal Heib]

Both pkey_tbl_len and gid_tbl_len are set in rxe_init_port_param() - so
no need to check if they aren't set.

Fixes: 8700e3e7c485 ("Soft RoCE driver")
Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
---
 drivers/infiniband/sw/rxe/rxe.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c
index 5642eefb4ba1..c7191b5e04a5 100644
--- a/drivers/infiniband/sw/rxe/rxe.c
+++ b/drivers/infiniband/sw/rxe/rxe.c
@@ -147,9 +147,6 @@ static int rxe_init_ports(struct rxe_dev *rxe)
 
 	rxe_init_port_param(port);
 
-	if (!port->attr.pkey_tbl_len || !port->attr.gid_tbl_len)
-		return -EINVAL;
-
 	port->pkey_tbl = kcalloc(port->attr.pkey_tbl_len,
 			sizeof(*port->pkey_tbl), GFP_KERNEL);
 
-- 
2.25.4

Re: [PATCH for-next v1 1/4] RDMA/rxe: Drop pointless checks in rxe_init_ports

[Leon Romanovsky]

On Sun, Jul 05, 2020 at 01:43:10PM +0300, Kamal Heib wrote:
> Both pkey_tbl_len and gid_tbl_len are set in rxe_init_port_param() - so
> no need to check if they aren't set.
>
> Fixes: 8700e3e7c485 ("Soft RoCE driver")
> Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
> ---
>  drivers/infiniband/sw/rxe/rxe.c | 3 ---
>  1 file changed, 3 deletions(-)
>

Thanks,
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>

[PATCH for-next v1 2/4] RDMA/rxe: Return void from rxe_init_port_param()

[Kamal Heib]

The return value from rxe_init_port_param() is always 0 - change it to
be void.

Fixes: 8700e3e7c485 ("Soft RoCE driver")
Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
---
 drivers/infiniband/sw/rxe/rxe.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c
index c7191b5e04a5..efcb72c92be6 100644
--- a/drivers/infiniband/sw/rxe/rxe.c
+++ b/drivers/infiniband/sw/rxe/rxe.c
@@ -111,7 +111,7 @@ static void rxe_init_device_param(struct rxe_dev *rxe)
 }
 
 /* initialize port attributes */
-static int rxe_init_port_param(struct rxe_port *port)
+static void rxe_init_port_param(struct rxe_port *port)
 {
 	port->attr.state		= IB_PORT_DOWN;
 	port->attr.max_mtu		= IB_MTU_4096;
@@ -134,8 +134,6 @@ static int rxe_init_port_param(struct rxe_port *port)
 	port->attr.phys_state		= RXE_PORT_PHYS_STATE;
 	port->mtu_cap			= ib_mtu_enum_to_int(IB_MTU_256);
 	port->subnet_prefix		= cpu_to_be64(RXE_PORT_SUBNET_PREFIX);
-
-	return 0;
 }
 
 /* initialize port state, note IB convention that HCA ports are always
-- 
2.25.4

Re: [PATCH for-next v1 2/4] RDMA/rxe: Return void from rxe_init_port_param()

[Leon Romanovsky]

On Sun, Jul 05, 2020 at 01:43:11PM +0300, Kamal Heib wrote:
> The return value from rxe_init_port_param() is always 0 - change it to
> be void.
>
> Fixes: 8700e3e7c485 ("Soft RoCE driver")
> Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
> ---
>  drivers/infiniband/sw/rxe/rxe.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>

Thanks,
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>

[PATCH for-next v1 3/4] RDMA/rxe: Return void from rxe_mem_init_dma()

[Kamal Heib]

The return value from rxe_mem_init_dma() is always 0 - change it to be
void and fix the callers accordingly.

Fixes: 8700e3e7c485 ("Soft RoCE driver")
Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
---
 drivers/infiniband/sw/rxe/rxe_loc.h   |  4 ++--
 drivers/infiniband/sw/rxe/rxe_mr.c    |  6 ++----
 drivers/infiniband/sw/rxe/rxe_verbs.c | 20 +++-----------------
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h
index 238d6a357aac..0688928cf2b1 100644
--- a/drivers/infiniband/sw/rxe/rxe_loc.h
+++ b/drivers/infiniband/sw/rxe/rxe_loc.h
@@ -103,8 +103,8 @@ enum copy_direction {
 	from_mem_obj,
 };
 
-int rxe_mem_init_dma(struct rxe_pd *pd,
-		     int access, struct rxe_mem *mem);
+void rxe_mem_init_dma(struct rxe_pd *pd,
+		      int access, struct rxe_mem *mem);
 
 int rxe_mem_init_user(struct rxe_pd *pd, u64 start,
 		      u64 length, u64 iova, int access, struct ib_udata *udata,
diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
index a63cb5fac01f..cdd811a45120 100644
--- a/drivers/infiniband/sw/rxe/rxe_mr.c
+++ b/drivers/infiniband/sw/rxe/rxe_mr.c
@@ -144,8 +144,8 @@ static int rxe_mem_alloc(struct rxe_mem *mem, int num_buf)
 	return -ENOMEM;
 }
 
-int rxe_mem_init_dma(struct rxe_pd *pd,
-		     int access, struct rxe_mem *mem)
+void rxe_mem_init_dma(struct rxe_pd *pd,
+		      int access, struct rxe_mem *mem)
 {
 	rxe_mem_init(access, mem);
 
@@ -153,8 +153,6 @@ int rxe_mem_init_dma(struct rxe_pd *pd,
 	mem->access		= access;
 	mem->state		= RXE_MEM_STATE_VALID;
 	mem->type		= RXE_MEM_TYPE_DMA;
-
-	return 0;
 }
 
 int rxe_mem_init_user(struct rxe_pd *pd, u64 start,
diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
index b8a22af724e8..ee80b8862db8 100644
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@ -901,30 +901,16 @@ static struct ib_mr *rxe_get_dma_mr(struct ib_pd *ibpd, int access)
 	struct rxe_dev *rxe = to_rdev(ibpd->device);
 	struct rxe_pd *pd = to_rpd(ibpd);
 	struct rxe_mem *mr;
-	int err;
 
 	mr = rxe_alloc(&rxe->mr_pool);
-	if (!mr) {
-		err = -ENOMEM;
-		goto err1;
-	}
+	if (!mr)
+		return ERR_PTR(-ENOMEM);
 
 	rxe_add_index(mr);
-
 	rxe_add_ref(pd);
-
-	err = rxe_mem_init_dma(pd, access, mr);
-	if (err)
-		goto err2;
+	rxe_mem_init_dma(pd, access, mr);
 
 	return &mr->ibmr;
-
-err2:
-	rxe_drop_ref(pd);
-	rxe_drop_index(mr);
-	rxe_drop_ref(mr);
-err1:
-	return ERR_PTR(err);
 }
 
 static struct ib_mr *rxe_reg_user_mr(struct ib_pd *ibpd,
-- 
2.25.4

Re: [PATCH for-next v1 3/4] RDMA/rxe: Return void from rxe_mem_init_dma()

[Leon Romanovsky]

On Sun, Jul 05, 2020 at 01:43:12PM +0300, Kamal Heib wrote:
> The return value from rxe_mem_init_dma() is always 0 - change it to be
> void and fix the callers accordingly.
>
> Fixes: 8700e3e7c485 ("Soft RoCE driver")
> Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
> ---
>  drivers/infiniband/sw/rxe/rxe_loc.h   |  4 ++--
>  drivers/infiniband/sw/rxe/rxe_mr.c    |  6 ++----
>  drivers/infiniband/sw/rxe/rxe_verbs.c | 20 +++-----------------
>  3 files changed, 7 insertions(+), 23 deletions(-)
>

Thanks,
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>

[PATCH for-next v1 4/4] RDMA/rxe: Remove rxe_link_layer()

[Kamal Heib]

Instead of returning IB_LINK_LAYER_ETHERNET from rxe_link_layer, return it
directly from get_link_layer callback and remove rxe_link_layer().

Fixes: 8700e3e7c485 ("Soft RoCE driver")
Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
---
 drivers/infiniband/sw/rxe/rxe_loc.h   | 1 -
 drivers/infiniband/sw/rxe/rxe_net.c   | 5 -----
 drivers/infiniband/sw/rxe/rxe_verbs.c | 4 +---
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h
index 0688928cf2b1..39dc3bfa5d5d 100644
--- a/drivers/infiniband/sw/rxe/rxe_loc.h
+++ b/drivers/infiniband/sw/rxe/rxe_loc.h
@@ -142,7 +142,6 @@ int rxe_send(struct rxe_pkt_info *pkt, struct sk_buff *skb);
 struct sk_buff *rxe_init_packet(struct rxe_dev *rxe, struct rxe_av *av,
 				int paylen, struct rxe_pkt_info *pkt);
 int rxe_prepare(struct rxe_pkt_info *pkt, struct sk_buff *skb, u32 *crc);
-enum rdma_link_layer rxe_link_layer(struct rxe_dev *rxe, unsigned int port_num);
 const char *rxe_parent_name(struct rxe_dev *rxe, unsigned int port_num);
 struct device *rxe_dma_device(struct rxe_dev *rxe);
 int rxe_mcast_add(struct rxe_dev *rxe, union ib_gid *mgid);
diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
index 312c2fc961c0..0c3808611f95 100644
--- a/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@ -520,11 +520,6 @@ const char *rxe_parent_name(struct rxe_dev *rxe, unsigned int port_num)
 	return rxe->ndev->name;
 }
 
-enum rdma_link_layer rxe_link_layer(struct rxe_dev *rxe, unsigned int port_num)
-{
-	return IB_LINK_LAYER_ETHERNET;
-}
-
 int rxe_net_add(const char *ibdev_name, struct net_device *ndev)
 {
 	int err;
diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
index ee80b8862db8..a3cf9bbe818d 100644
--- a/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@ -141,9 +141,7 @@ static int rxe_modify_port(struct ib_device *dev,
 static enum rdma_link_layer rxe_get_link_layer(struct ib_device *dev,
 					       u8 port_num)
 {
-	struct rxe_dev *rxe = to_rdev(dev);
-
-	return rxe_link_layer(rxe, port_num);
+	return IB_LINK_LAYER_ETHERNET;
 }
 
 static int rxe_alloc_ucontext(struct ib_ucontext *uctx, struct ib_udata *udata)
-- 
2.25.4

Re: [PATCH for-next v1 4/4] RDMA/rxe: Remove rxe_link_layer()

[Zhu Yanjun]

On Sun, Jul 5, 2020 at 6:45 PM Kamal Heib <kamalheib1@gmail.com> wrote:
>
> Instead of returning IB_LINK_LAYER_ETHERNET from rxe_link_layer, return it
> directly from get_link_layer callback and remove rxe_link_layer().
>

I am fine.

Thanks a lot.
Zhu Yanjun

> Fixes: 8700e3e7c485 ("Soft RoCE driver")
> Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
> ---
>  drivers/infiniband/sw/rxe/rxe_loc.h   | 1 -
>  drivers/infiniband/sw/rxe/rxe_net.c   | 5 -----
>  drivers/infiniband/sw/rxe/rxe_verbs.c | 4 +---
>  3 files changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/drivers/infiniband/sw/rxe/rxe_loc.h b/drivers/infiniband/sw/rxe/rxe_loc.h
> index 0688928cf2b1..39dc3bfa5d5d 100644
> --- a/drivers/infiniband/sw/rxe/rxe_loc.h
> +++ b/drivers/infiniband/sw/rxe/rxe_loc.h
> @@ -142,7 +142,6 @@ int rxe_send(struct rxe_pkt_info *pkt, struct sk_buff *skb);
>  struct sk_buff *rxe_init_packet(struct rxe_dev *rxe, struct rxe_av *av,
>                                 int paylen, struct rxe_pkt_info *pkt);
>  int rxe_prepare(struct rxe_pkt_info *pkt, struct sk_buff *skb, u32 *crc);
> -enum rdma_link_layer rxe_link_layer(struct rxe_dev *rxe, unsigned int port_num);
>  const char *rxe_parent_name(struct rxe_dev *rxe, unsigned int port_num);
>  struct device *rxe_dma_device(struct rxe_dev *rxe);
>  int rxe_mcast_add(struct rxe_dev *rxe, union ib_gid *mgid);
> diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
> index 312c2fc961c0..0c3808611f95 100644
> --- a/drivers/infiniband/sw/rxe/rxe_net.c
> +++ b/drivers/infiniband/sw/rxe/rxe_net.c
> @@ -520,11 +520,6 @@ const char *rxe_parent_name(struct rxe_dev *rxe, unsigned int port_num)
>         return rxe->ndev->name;
>  }
>
> -enum rdma_link_layer rxe_link_layer(struct rxe_dev *rxe, unsigned int port_num)
> -{
> -       return IB_LINK_LAYER_ETHERNET;
> -}
> -
>  int rxe_net_add(const char *ibdev_name, struct net_device *ndev)
>  {
>         int err;
> diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c
> index ee80b8862db8..a3cf9bbe818d 100644
> --- a/drivers/infiniband/sw/rxe/rxe_verbs.c
> +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
> @@ -141,9 +141,7 @@ static int rxe_modify_port(struct ib_device *dev,
>  static enum rdma_link_layer rxe_get_link_layer(struct ib_device *dev,
>                                                u8 port_num)
>  {
> -       struct rxe_dev *rxe = to_rdev(dev);
> -
> -       return rxe_link_layer(rxe, port_num);
> +       return IB_LINK_LAYER_ETHERNET;
>  }
>
>  static int rxe_alloc_ucontext(struct ib_ucontext *uctx, struct ib_udata *udata)
> --
> 2.25.4
>

Re: [PATCH for-next v1 4/4] RDMA/rxe: Remove rxe_link_layer()

[Leon Romanovsky]

On Sun, Jul 05, 2020 at 01:43:13PM +0300, Kamal Heib wrote:
> Instead of returning IB_LINK_LAYER_ETHERNET from rxe_link_layer, return it
> directly from get_link_layer callback and remove rxe_link_layer().
>
> Fixes: 8700e3e7c485 ("Soft RoCE driver")
> Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
> ---
>  drivers/infiniband/sw/rxe/rxe_loc.h   | 1 -
>  drivers/infiniband/sw/rxe/rxe_net.c   | 5 -----
>  drivers/infiniband/sw/rxe/rxe_verbs.c | 4 +---
>  3 files changed, 1 insertion(+), 9 deletions(-)
>

Thanks,
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>

Re: [PATCH for-next v1 0/4] RDMA/rxe: Cleanups and improvements

[Kamal Heib]

On Sun, Jul 05, 2020 at 01:43:09PM +0300, Kamal Heib wrote:
> These series include few cleanup patches to the rxe driver.
> 
> V1:
> - patch #4: Fix commit message.
> 
> Kamal Heib (4):
>   RDMA/rxe: Drop pointless checks in rxe_init_ports
>   RDMA/rxe: Return void from rxe_init_port_param()
>   RDMA/rxe: Return void from rxe_mem_init_dma()
>   RDMA/rxe: Remove rxe_link_layer()
> 
>  drivers/infiniband/sw/rxe/rxe.c       |  7 +------
>  drivers/infiniband/sw/rxe/rxe_loc.h   |  5 ++---
>  drivers/infiniband/sw/rxe/rxe_mr.c    |  6 ++----
>  drivers/infiniband/sw/rxe/rxe_net.c   |  5 -----
>  drivers/infiniband/sw/rxe/rxe_verbs.c | 24 ++++--------------------
>  5 files changed, 9 insertions(+), 38 deletions(-)
> 
> -- 
> 2.25.4
>

Hi Jason,

Could you please tell me if there is something blocking this patch set from
getting merged?

Thanks,
Kamal

Re: [PATCH for-next v1 0/4] RDMA/rxe: Cleanups and improvements

[Jason Gunthorpe]

On Tue, Jul 14, 2020 at 11:14:33AM +0300, Kamal Heib wrote:
> On Sun, Jul 05, 2020 at 01:43:09PM +0300, Kamal Heib wrote:
> > These series include few cleanup patches to the rxe driver.
> > 
> > V1:
> > - patch #4: Fix commit message.
> > 
> > Kamal Heib (4):
> >   RDMA/rxe: Drop pointless checks in rxe_init_ports
> >   RDMA/rxe: Return void from rxe_init_port_param()
> >   RDMA/rxe: Return void from rxe_mem_init_dma()
> >   RDMA/rxe: Remove rxe_link_layer()
> > 
> >  drivers/infiniband/sw/rxe/rxe.c       |  7 +------
> >  drivers/infiniband/sw/rxe/rxe_loc.h   |  5 ++---
> >  drivers/infiniband/sw/rxe/rxe_mr.c    |  6 ++----
> >  drivers/infiniband/sw/rxe/rxe_net.c   |  5 -----
> >  drivers/infiniband/sw/rxe/rxe_verbs.c | 24 ++++--------------------
> >  5 files changed, 9 insertions(+), 38 deletions(-)
> > 
> >
> 
> Hi Jason,
> 
> Could you please tell me if there is something blocking this patch set from
> getting merged?

Just hasn't reached the bottom of the patchworks yet, follow along
here:

https://patchwork.kernel.org/project/linux-rdma/list/

Mostly stuff goes bottom up except for trivial, rc and resend of
things I already reviewed..

So for instance you could answer Zhu here:

https://patchwork.kernel.org/patch/11585485/#23417655

To clear out that patch..

Jason

Re: [PATCH for-next v1 0/4] RDMA/rxe: Cleanups and improvements

[Kamal Heib]

On Tue, Jul 14, 2020 at 04:56:06PM -0300, Jason Gunthorpe wrote:
> On Tue, Jul 14, 2020 at 11:14:33AM +0300, Kamal Heib wrote:
> > On Sun, Jul 05, 2020 at 01:43:09PM +0300, Kamal Heib wrote:
> > > These series include few cleanup patches to the rxe driver.
> > > 
> > > V1:
> > > - patch #4: Fix commit message.
> > > 
> > > Kamal Heib (4):
> > >   RDMA/rxe: Drop pointless checks in rxe_init_ports
> > >   RDMA/rxe: Return void from rxe_init_port_param()
> > >   RDMA/rxe: Return void from rxe_mem_init_dma()
> > >   RDMA/rxe: Remove rxe_link_layer()
> > > 
> > >  drivers/infiniband/sw/rxe/rxe.c       |  7 +------
> > >  drivers/infiniband/sw/rxe/rxe_loc.h   |  5 ++---
> > >  drivers/infiniband/sw/rxe/rxe_mr.c    |  6 ++----
> > >  drivers/infiniband/sw/rxe/rxe_net.c   |  5 -----
> > >  drivers/infiniband/sw/rxe/rxe_verbs.c | 24 ++++--------------------
> > >  5 files changed, 9 insertions(+), 38 deletions(-)
> > > 
> > >
> > 
> > Hi Jason,
> > 
> > Could you please tell me if there is something blocking this patch set from
> > getting merged?
> 
> Just hasn't reached the bottom of the patchworks yet, follow along
> here:
> 
> https://patchwork.kernel.org/project/linux-rdma/list/
> 
> Mostly stuff goes bottom up except for trivial, rc and resend of
> things I already reviewed..
> 
> So for instance you could answer Zhu here:
> 
> https://patchwork.kernel.org/patch/11585485/#23417655
> 
> To clear out that patch..
> 
> Jason

Thanks for your reply.

Sorry, I've missed Zhu's question, I'll reply soon.

Thanks,
Kamal

Re: [PATCH for-next v1 0/4] RDMA/rxe: Cleanups and improvements

[Jason Gunthorpe]

On Sun, Jul 05, 2020 at 01:43:09PM +0300, Kamal Heib wrote:
> These series include few cleanup patches to the rxe driver.
> 
> V1:
> - patch #4: Fix commit message.
> 
> Kamal Heib (4):
>   RDMA/rxe: Drop pointless checks in rxe_init_ports
>   RDMA/rxe: Return void from rxe_init_port_param()
>   RDMA/rxe: Return void from rxe_mem_init_dma()
>   RDMA/rxe: Remove rxe_link_layer()

Applied to for-next, thanks

Jason