From: Matthew Wilcox <willy@infradead.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Doug Ledford <dledford@redhat.com>,
Jason Gunthorpe <jgg@mellanox.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the xarray tree
Date: Tue, 12 Feb 2019 08:15:28 -0800 [thread overview]
Message-ID: <20190212161528.GN12668@bombadil.infradead.org> (raw)
In-Reply-To: <20190212162003.1aa1ffbd@canb.auug.org.au>
On Tue, Feb 12, 2019 at 04:20:03PM +1100, Stephen Rothwell wrote:
> Caused by commit
>
> a3e4d3f97ec8 ("XArray: Redesign xa_alloc API")
>
> interacting with commits
>
> e59178d895af ("RDMA/devices: Use xarray to store the clients")
> 0df91bb67334 ("RDMA/devices: Use xarray to store the client_data")
>
> from the rdma tree.
>
> Its a bit of a pain modifying a published API like this :-(
Yes, it is. I wasn't expecting people to actually start using it ;-)
Seriously, there are several defects in the published API which do
warrant a change. The most severe one is that it's really easy to
forget to initialise the start index. And while I'm making that change,
I should fix smaller things like the errno at the same time.
> I have added the following merge fixup patch for today (I assume some
> of the assignments are also now redundant).
I think the first of these should be using the alloc_cyclic API, like this:
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 283ecc2aee89..d0b56c70a553 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -586,20 +586,8 @@ static int assign_name(struct ib_device *device, const char *name)
}
strlcpy(device->name, dev_name(&device->dev), IB_DEVICE_NAME_MAX);
- /* Cyclically allocate a user visible ID for the device */
- device->index = last_id;
- ret = xa_alloc(&devices, &device->index, device,
- XA_LIMIT(last_id, INT_MAX), GFP_KERNEL);
- if (ret == -ENOSPC) {
- device->index = 0;
- ret = xa_alloc(&devices, &device->index, device,
- XA_LIMIT(0, INT_MAX), GFP_KERNEL);
- }
- if (ret)
- goto out;
- last_id = device->index + 1;
-
- ret = 0;
+ ret = xa_alloc_cyclic(&devices, &device->index, device, xa_limit_31b,
+ &last_id, GFP_KERNEL);
out:
up_write(&devices_rwsem);
@@ -750,7 +738,7 @@ int ib_register_device(struct ib_device *device, const char *name)
int ret;
ret = assign_name(device, name);
- if (ret)
+ if (ret < 0)
return ret;
ret = setup_device(device);
next prev parent reply other threads:[~2019-02-12 16:15 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-12 5:20 linux-next: build failure after merge of the xarray tree Stephen Rothwell
2019-02-12 16:15 ` Matthew Wilcox [this message]
2019-02-12 16:23 ` Jason Gunthorpe
2019-02-13 21:26 ` Matthew Wilcox
2019-02-13 22:09 ` Jason Gunthorpe
2019-02-21 12:47 ` Stephen Rothwell
2019-02-21 17:40 ` Jason Gunthorpe
-- strict thread matches above, loose matches on Subject: below --
2020-10-08 6:55 Stephen Rothwell
2020-10-08 14:09 ` Matthew Wilcox
2020-10-08 6:50 Stephen Rothwell
2019-02-21 6:13 Stephen Rothwell
2019-02-21 12:34 ` Leon Romanovsky
2019-02-21 12:48 ` Stephen Rothwell
2019-02-21 13:16 ` Leon Romanovsky
2019-02-21 13:23 ` Stephen Rothwell
2019-03-11 2:44 ` Matthew Wilcox
2019-03-11 12:13 ` Jason Gunthorpe
2019-03-11 12:31 ` Matthew Wilcox
2019-03-11 14:12 ` Jason Gunthorpe
2019-03-11 12:46 ` Leon Romanovsky
2018-06-18 3:27 Stephen Rothwell
2018-06-18 16:50 ` Dan Williams
2018-06-18 17:09 ` Matthew Wilcox
2018-06-27 3:09 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190212161528.GN12668@bombadil.infradead.org \
--to=willy@infradead.org \
--cc=dledford@redhat.com \
--cc=jgg@mellanox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).