| Message ID | 20190221002107.22625-2-willy@infradead.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Convert the Infiniband subsystem to XArray | expand |
On Wed, Feb 20, 2019 at 04:20:36PM -0800, Matthew Wilcox wrote: > Adjust the locking to not disable interrupts; this isn't needed. > > Signed-off-by: Matthew Wilcox <willy@infradead.org> > drivers/infiniband/hw/mlx4/cq.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c > index 43512347b4f0..ba66ef09bc7c 100644 > +++ b/drivers/infiniband/hw/mlx4/cq.c > @@ -738,7 +738,7 @@ static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq, > u32 srq_num; > g_mlpath_rqpn = be32_to_cpu(cqe->g_mlpath_rqpn); > srq_num = g_mlpath_rqpn & 0xffffff; > - /* SRQ is also in the radix tree */ > + /* SRQ is also in the xarray */ > msrq = mlx4_srq_lookup(to_mdev(cq->ibcq.device)->dev, > srq_num); > } I feel like this hunk should be merged with some other patch, and the commit desc isn't accurate Jason
On Thu, Feb 21, 2019 at 10:44:36AM -0700, Jason Gunthorpe wrote: > On Wed, Feb 20, 2019 at 04:20:36PM -0800, Matthew Wilcox wrote: > > Adjust the locking to not disable interrupts; this isn't needed. > > > > Signed-off-by: Matthew Wilcox <willy@infradead.org> > > drivers/infiniband/hw/mlx4/cq.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > I feel like this hunk should be merged with some other patch, and the > commit desc isn't accurate It turns out that git format-patch drivers/infiniband does not (as I thought) select all commits which touch drivers/infiniband and format them. Instead, it selects the portions of all commits which touch drivers/infiniband. That left this patch, in particular, hanging badly because most of the patch actually touched drivers/net/ethernet/mellanox/mlx4. Here's the patch that should have been sent; patch 3 is also affected and I'll send a followup mail to that patch too. From c059f3559eecb44321b515780bf988735be15371 Mon Sep 17 00:00:00 2001 From: Matthew Wilcox <willy@infradead.org> Date: Wed, 24 Oct 2018 08:26:12 -0400 Subject: [PATCH 01/32] mlx4: Convert srq_table->tree to XArray To: linux-rdma@vger.kernel.org Adjust the locking to not disable interrupts; this isn't needed. Signed-off-by: Matthew Wilcox <willy@infradead.org> --- drivers/infiniband/hw/mlx4/cq.c | 2 +- drivers/net/ethernet/mellanox/mlx4/mlx4.h | 3 +-- drivers/net/ethernet/mellanox/mlx4/srq.c | 33 +++++++---------------- 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c index 43512347b4f0..ba66ef09bc7c 100644 --- a/drivers/infiniband/hw/mlx4/cq.c +++ b/drivers/infiniband/hw/mlx4/cq.c @@ -738,7 +738,7 @@ static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq, u32 srq_num; g_mlpath_rqpn = be32_to_cpu(cqe->g_mlpath_rqpn); srq_num = g_mlpath_rqpn & 0xffffff; - /* SRQ is also in the radix tree */ + /* SRQ is also in the xarray */ msrq = mlx4_srq_lookup(to_mdev(cq->ibcq.device)->dev, srq_num); } diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h index 23f1b5b512c2..ff94da2ffd67 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h @@ -699,8 +699,7 @@ struct mlx4_eq_table { struct mlx4_srq_table { struct mlx4_bitmap bitmap; - spinlock_t lock; - struct radix_tree_root tree; + struct xarray array; struct mlx4_icm_table table; struct mlx4_icm_table cmpt_table; }; diff --git a/drivers/net/ethernet/mellanox/mlx4/srq.c b/drivers/net/ethernet/mellanox/mlx4/srq.c index cbe4d9746ddf..a9fe7a4ee8b0 100644 --- a/drivers/net/ethernet/mellanox/mlx4/srq.c +++ b/drivers/net/ethernet/mellanox/mlx4/srq.c @@ -45,9 +45,7 @@ void mlx4_srq_event(struct mlx4_dev *dev, u32 srqn, int event_type) struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table; struct mlx4_srq *srq; - rcu_read_lock(); - srq = radix_tree_lookup(&srq_table->tree, srqn & (dev->caps.num_srqs - 1)); - rcu_read_unlock(); + srq = xa_load(&srq_table->array, srqn & (dev->caps.num_srqs - 1)); if (srq) refcount_inc(&srq->refcount); else { @@ -172,16 +170,14 @@ int mlx4_srq_alloc(struct mlx4_dev *dev, u32 pdn, u32 cqn, u16 xrcd, if (err) return err; - spin_lock_irq(&srq_table->lock); - err = radix_tree_insert(&srq_table->tree, srq->srqn, srq); - spin_unlock_irq(&srq_table->lock); + err = xa_insert(&srq_table->array, srq->srqn, srq, GFP_KERNEL); if (err) goto err_icm; mailbox = mlx4_alloc_cmd_mailbox(dev); if (IS_ERR(mailbox)) { err = PTR_ERR(mailbox); - goto err_radix; + goto err_xa; } srq_context = mailbox->buf; @@ -201,17 +197,15 @@ int mlx4_srq_alloc(struct mlx4_dev *dev, u32 pdn, u32 cqn, u16 xrcd, err = mlx4_SW2HW_SRQ(dev, mailbox, srq->srqn); mlx4_free_cmd_mailbox(dev, mailbox); if (err) - goto err_radix; + goto err_xa; refcount_set(&srq->refcount, 1); init_completion(&srq->free); return 0; -err_radix: - spin_lock_irq(&srq_table->lock); - radix_tree_delete(&srq_table->tree, srq->srqn); - spin_unlock_irq(&srq_table->lock); +err_xa: + xa_erase(&srq_table->array, srq->srqn); err_icm: mlx4_srq_free_icm(dev, srq->srqn); @@ -228,9 +222,7 @@ void mlx4_srq_free(struct mlx4_dev *dev, struct mlx4_srq *srq) if (err) mlx4_warn(dev, "HW2SW_SRQ failed (%d) for SRQN %06x\n", err, srq->srqn); - spin_lock_irq(&srq_table->lock); - radix_tree_delete(&srq_table->tree, srq->srqn); - spin_unlock_irq(&srq_table->lock); + xa_erase(&srq_table->array, srq->srqn); if (refcount_dec_and_test(&srq->refcount)) complete(&srq->free); @@ -274,8 +266,7 @@ int mlx4_init_srq_table(struct mlx4_dev *dev) struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table; int err; - spin_lock_init(&srq_table->lock); - INIT_RADIX_TREE(&srq_table->tree, GFP_ATOMIC); + xa_init(&srq_table->array); if (mlx4_is_slave(dev)) return 0; @@ -297,13 +288,7 @@ void mlx4_cleanup_srq_table(struct mlx4_dev *dev) struct mlx4_srq *mlx4_srq_lookup(struct mlx4_dev *dev, u32 srqn) { struct mlx4_srq_table *srq_table = &mlx4_priv(dev)->srq_table; - struct mlx4_srq *srq; - - rcu_read_lock(); - srq = radix_tree_lookup(&srq_table->tree, - srqn & (dev->caps.num_srqs - 1)); - rcu_read_unlock(); - return srq; + return xa_load(&srq_table->array, srqn & (dev->caps.num_srqs - 1)); } EXPORT_SYMBOL_GPL(mlx4_srq_lookup);
On Thu, Feb 21, 2019 at 10:16:19AM -0800, Matthew Wilcox wrote: > On Thu, Feb 21, 2019 at 10:44:36AM -0700, Jason Gunthorpe wrote: > > On Wed, Feb 20, 2019 at 04:20:36PM -0800, Matthew Wilcox wrote: > > > Adjust the locking to not disable interrupts; this isn't needed. > > > > > > Signed-off-by: Matthew Wilcox <willy@infradead.org> > > > drivers/infiniband/hw/mlx4/cq.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > I feel like this hunk should be merged with some other patch, and the > > commit desc isn't accurate > > It turns out that git format-patch drivers/infiniband does not (as > I thought) select all commits which touch drivers/infiniband and > format them. Instead, it selects the portions of all commits which > touch drivers/infiniband. That left this patch, in particular, > hanging badly because most of the patch actually touched > drivers/net/ethernet/mellanox/mlx4. > > Here's the patch that should have been sent; patch 3 is also affected > and I'll send a followup mail to that patch too. You'll have to send this patch to DaveM Jason
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c index 43512347b4f0..ba66ef09bc7c 100644 --- a/drivers/infiniband/hw/mlx4/cq.c +++ b/drivers/infiniband/hw/mlx4/cq.c @@ -738,7 +738,7 @@ static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq, u32 srq_num; g_mlpath_rqpn = be32_to_cpu(cqe->g_mlpath_rqpn); srq_num = g_mlpath_rqpn & 0xffffff; - /* SRQ is also in the radix tree */ + /* SRQ is also in the xarray */ msrq = mlx4_srq_lookup(to_mdev(cq->ibcq.device)->dev, srq_num); }
Adjust the locking to not disable interrupts; this isn't needed. Signed-off-by: Matthew Wilcox <willy@infradead.org> --- drivers/infiniband/hw/mlx4/cq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)