| Message ID | bd27d4066f7749997a75cf4111fbf51e11d5898d.1705350942.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | vhost-vdpa: Remove usage of the deprecated ida_simple_xx() API | expand |
On Mon, Jan 15, 2024 at 09:35:50PM +0100, Christophe JAILLET wrote: > ida_alloc() and ida_free() should be preferred to the deprecated > ida_simple_get() and ida_simple_remove(). > > Note that the upper limit of ida_simple_get() is exclusive, buInputt the one of > ida_alloc_max() is inclusive. So a -1 has been added when needed. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Simon Horman <horms@kernel.org>
Le 16/01/2024 à 15:57, Simon Horman a écrit : > On Mon, Jan 15, 2024 at 09:35:50PM +0100, Christophe JAILLET wrote: >> ida_alloc() and ida_free() should be preferred to the deprecated >> ida_simple_get() and ida_simple_remove(). >> >> Note that the upper limit of ida_simple_get() is exclusive, buInputt the one of >> ida_alloc_max() is inclusive. So a -1 has been added when needed. >> >> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > > Reviewed-by: Simon Horman <horms@kernel.org> > > > Hi, polite reminder ;-) CJ
On Mon, Jan 15, 2024 at 09:35:50PM +0100, Christophe JAILLET wrote: > ida_alloc() and ida_free() should be preferred to the deprecated > ida_simple_get() and ida_simple_remove(). > > Note that the upper limit of ida_simple_get() is exclusive, buInputt the one of What's buInputt? But? > ida_alloc_max() is inclusive. So a -1 has been added when needed. > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Jason, wanna ack? > --- > drivers/vhost/vdpa.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c > index bc4a51e4638b..849b9d2dd51f 100644 > --- a/drivers/vhost/vdpa.c > +++ b/drivers/vhost/vdpa.c > @@ -1534,7 +1534,7 @@ static void vhost_vdpa_release_dev(struct device *device) > struct vhost_vdpa *v = > container_of(device, struct vhost_vdpa, dev); > > - ida_simple_remove(&vhost_vdpa_ida, v->minor); > + ida_free(&vhost_vdpa_ida, v->minor); > kfree(v->vqs); > kfree(v); > } > @@ -1557,8 +1557,8 @@ static int vhost_vdpa_probe(struct vdpa_device *vdpa) > if (!v) > return -ENOMEM; > > - minor = ida_simple_get(&vhost_vdpa_ida, 0, > - VHOST_VDPA_DEV_MAX, GFP_KERNEL); > + minor = ida_alloc_max(&vhost_vdpa_ida, VHOST_VDPA_DEV_MAX - 1, > + GFP_KERNEL); > if (minor < 0) { > kfree(v); > return minor; > -- > 2.43.0
Le 14/04/2024 à 10:35, Michael S. Tsirkin a écrit : > On Mon, Jan 15, 2024 at 09:35:50PM +0100, Christophe JAILLET wrote: >> ida_alloc() and ida_free() should be preferred to the deprecated >> ida_simple_get() and ida_simple_remove(). >> >> Note that the upper limit of ida_simple_get() is exclusive, buInputt the one of > > What's buInputt? But? Yes, sorry. It is "but". Let me know if I should send a v2, or if it can be fixed when it is applied. CJ > >> ida_alloc_max() is inclusive. So a -1 has been added when needed. >> >> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > > > Jason, wanna ack? > >> --- >> drivers/vhost/vdpa.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c >> index bc4a51e4638b..849b9d2dd51f 100644 >> --- a/drivers/vhost/vdpa.c >> +++ b/drivers/vhost/vdpa.c >> @@ -1534,7 +1534,7 @@ static void vhost_vdpa_release_dev(struct device *device) >> struct vhost_vdpa *v = >> container_of(device, struct vhost_vdpa, dev); >> >> - ida_simple_remove(&vhost_vdpa_ida, v->minor); >> + ida_free(&vhost_vdpa_ida, v->minor); >> kfree(v->vqs); >> kfree(v); >> } >> @@ -1557,8 +1557,8 @@ static int vhost_vdpa_probe(struct vdpa_device *vdpa) >> if (!v) >> return -ENOMEM; >> >> - minor = ida_simple_get(&vhost_vdpa_ida, 0, >> - VHOST_VDPA_DEV_MAX, GFP_KERNEL); >> + minor = ida_alloc_max(&vhost_vdpa_ida, VHOST_VDPA_DEV_MAX - 1, >> + GFP_KERNEL); >> if (minor < 0) { >> kfree(v); >> return minor; >> -- >> 2.43.0 > > >
On Sun, Apr 14, 2024 at 10:59:06AM +0200, Christophe JAILLET wrote: > Le 14/04/2024 à 10:35, Michael S. Tsirkin a écrit : > > On Mon, Jan 15, 2024 at 09:35:50PM +0100, Christophe JAILLET wrote: > > > ida_alloc() and ida_free() should be preferred to the deprecated > > > ida_simple_get() and ida_simple_remove(). > > > > > > Note that the upper limit of ida_simple_get() is exclusive, buInputt the one of > > > > What's buInputt? But? > > Yes, sorry. It is "but". > > Let me know if I should send a v2, or if it can be fixed when it is applied. > > CJ Yes it's easier if you do. Thanks! > > > > > ida_alloc_max() is inclusive. So a -1 has been added when needed. > > > > > > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > > > > > > Jason, wanna ack? > > > > > --- > > > drivers/vhost/vdpa.c | 6 +++--- > > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > > > diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c > > > index bc4a51e4638b..849b9d2dd51f 100644 > > > --- a/drivers/vhost/vdpa.c > > > +++ b/drivers/vhost/vdpa.c > > > @@ -1534,7 +1534,7 @@ static void vhost_vdpa_release_dev(struct device *device) > > > struct vhost_vdpa *v = > > > container_of(device, struct vhost_vdpa, dev); > > > - ida_simple_remove(&vhost_vdpa_ida, v->minor); > > > + ida_free(&vhost_vdpa_ida, v->minor); > > > kfree(v->vqs); > > > kfree(v); > > > } > > > @@ -1557,8 +1557,8 @@ static int vhost_vdpa_probe(struct vdpa_device *vdpa) > > > if (!v) > > > return -ENOMEM; > > > - minor = ida_simple_get(&vhost_vdpa_ida, 0, > > > - VHOST_VDPA_DEV_MAX, GFP_KERNEL); > > > + minor = ida_alloc_max(&vhost_vdpa_ida, VHOST_VDPA_DEV_MAX - 1, > > > + GFP_KERNEL); > > > if (minor < 0) { > > > kfree(v); > > > return minor; > > > -- > > > 2.43.0 > > > > > >
diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index bc4a51e4638b..849b9d2dd51f 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -1534,7 +1534,7 @@ static void vhost_vdpa_release_dev(struct device *device) struct vhost_vdpa *v = container_of(device, struct vhost_vdpa, dev); - ida_simple_remove(&vhost_vdpa_ida, v->minor); + ida_free(&vhost_vdpa_ida, v->minor); kfree(v->vqs); kfree(v); } @@ -1557,8 +1557,8 @@ static int vhost_vdpa_probe(struct vdpa_device *vdpa) if (!v) return -ENOMEM; - minor = ida_simple_get(&vhost_vdpa_ida, 0, - VHOST_VDPA_DEV_MAX, GFP_KERNEL); + minor = ida_alloc_max(&vhost_vdpa_ida, VHOST_VDPA_DEV_MAX - 1, + GFP_KERNEL); if (minor < 0) { kfree(v); return minor;
ida_alloc() and ida_free() should be preferred to the deprecated ida_simple_get() and ida_simple_remove(). Note that the upper limit of ida_simple_get() is exclusive, buInputt the one of ida_alloc_max() is inclusive. So a -1 has been added when needed. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/vhost/vdpa.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)