Jason Wang
2022-Dec-21 03:23 UTC
[PATCH] vhost_vdpa: fix the compile issue in commit 881ac7d2314f
On Tue, Dec 20, 2022 at 10:02 PM Cindy Lu <lulu at redhat.com> wrote:> > The input of vhost_vdpa_iotlb_unmap() was changed in 881ac7d2314f, > But some function was not changed while calling this function. > Add this change > > Cc: stable at vger.kernel.org > Fixes: 881ac7d2314f ("vhost_vdpa: fix the crash in unmap a large memory")Is this commit merged into Linus tree? Btw, Michael, I'd expect there's a respin of the patch so maybe Cindy can squash the fix into the new version? Thanks> Reported-by: kernel test robot <lkp at intel.com> > Signed-off-by: Cindy Lu <lulu at redhat.com> > --- > 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 46ce35bea705..ec32f785dfde 100644 > --- a/drivers/vhost/vdpa.c > +++ b/drivers/vhost/vdpa.c > @@ -66,8 +66,8 @@ static DEFINE_IDA(vhost_vdpa_ida); > static dev_t vhost_vdpa_major; > > static void vhost_vdpa_iotlb_unmap(struct vhost_vdpa *v, > - struct vhost_iotlb *iotlb, > - u64 start, u64 last); > + struct vhost_iotlb *iotlb, u64 start, > + u64 last, u32 asid); > > static inline u32 iotlb_to_asid(struct vhost_iotlb *iotlb) > { > @@ -139,7 +139,7 @@ static int vhost_vdpa_remove_as(struct vhost_vdpa *v, u32 asid) > return -EINVAL; > > hlist_del(&as->hash_link); > - vhost_vdpa_iotlb_unmap(v, &as->iotlb, 0ULL, 0ULL - 1); > + vhost_vdpa_iotlb_unmap(v, &as->iotlb, 0ULL, 0ULL - 1, asid); > kfree(as); > > return 0; > -- > 2.34.3 >
Michael S. Tsirkin
2022-Dec-21 06:35 UTC
[PATCH] vhost_vdpa: fix the compile issue in commit 881ac7d2314f
On Wed, Dec 21, 2022 at 11:23:09AM +0800, Jason Wang wrote:> On Tue, Dec 20, 2022 at 10:02 PM Cindy Lu <lulu at redhat.com> wrote: > > > > The input of vhost_vdpa_iotlb_unmap() was changed in 881ac7d2314f, > > But some function was not changed while calling this function. > > Add this change > > > > Cc: stable at vger.kernel.org > > Fixes: 881ac7d2314f ("vhost_vdpa: fix the crash in unmap a large memory") > > Is this commit merged into Linus tree? > > Btw, Michael, I'd expect there's a respin of the patch so maybe Cindy > can squash the fix into the new version? > > ThanksThanks, I fixed it myself already. Why do you want a respin? That will mean trouble as the fixed patch is now being tested.> > Reported-by: kernel test robot <lkp at intel.com> > > Signed-off-by: Cindy Lu <lulu at redhat.com> > > --- > > 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 46ce35bea705..ec32f785dfde 100644 > > --- a/drivers/vhost/vdpa.c > > +++ b/drivers/vhost/vdpa.c > > @@ -66,8 +66,8 @@ static DEFINE_IDA(vhost_vdpa_ida); > > static dev_t vhost_vdpa_major; > > > > static void vhost_vdpa_iotlb_unmap(struct vhost_vdpa *v, > > - struct vhost_iotlb *iotlb, > > - u64 start, u64 last); > > + struct vhost_iotlb *iotlb, u64 start, > > + u64 last, u32 asid); > > > > static inline u32 iotlb_to_asid(struct vhost_iotlb *iotlb) > > { > > @@ -139,7 +139,7 @@ static int vhost_vdpa_remove_as(struct vhost_vdpa *v, u32 asid) > > return -EINVAL; > > > > hlist_del(&as->hash_link); > > - vhost_vdpa_iotlb_unmap(v, &as->iotlb, 0ULL, 0ULL - 1); > > + vhost_vdpa_iotlb_unmap(v, &as->iotlb, 0ULL, 0ULL - 1, asid); > > kfree(as); > > > > return 0; > > -- > > 2.34.3 > >