| Message ID | 20230117105308.1337120-1-eperezma@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | vdpa: fix VHOST_BACKEND_F_IOTLB_ASID flag check | expand |
On 1/17/23 11:53, Eugenio Pérez wrote: > VHOST_BACKEND_F_IOTLB_ASID is the feature bit, not the bitmask. Since > the device under test also provided VHOST_BACKEND_F_IOTLB_MSG_V2 and > VHOST_BACKEND_F_IOTLB_BATCH, this went unnoticed. > > Fixes: c1a1008685 ("vdpa: always start CVQ in SVQ mode if possible") > Signed-off-by: Eugenio Pérez <eperezma@redhat.com> > Acked-by: Jason Wang <jasowang@redhat.com> > --- > Originally on SUSPEND series, but it is a fix that it is worth to send > and apply individually: > https://lists.nongnu.org/archive/html/qemu-devel/2023-01/msg02574.html > > --- > net/vhost-vdpa.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c > index 1a13a34d35..de5ed8ff22 100644 > --- a/net/vhost-vdpa.c > +++ b/net/vhost-vdpa.c > @@ -384,7 +384,7 @@ static int vhost_vdpa_net_cvq_start(NetClientState *nc) > g_strerror(errno), errno); > return -1; > } > - if (!(backend_features & VHOST_BACKEND_F_IOTLB_ASID) || > + if (!(backend_features & BIT_ULL(VHOST_BACKEND_F_IOTLB_ASID)) || > !vhost_vdpa_net_valid_svq_features(v->dev->features, NULL)) { > return 0; > } > -- > 2.31.1 Reviewed-by: Laurent Vivier <lvivier@redhat.com>
On Tue, Jan 17, 2023 at 11:53:08AM +0100, Eugenio Pérez wrote: > VHOST_BACKEND_F_IOTLB_ASID is the feature bit, not the bitmask. Since > the device under test also provided VHOST_BACKEND_F_IOTLB_MSG_V2 and > VHOST_BACKEND_F_IOTLB_BATCH, this went unnoticed. > > Fixes: c1a1008685 ("vdpa: always start CVQ in SVQ mode if possible") > Signed-off-by: Eugenio Pérez <eperezma@redhat.com> > Acked-by: Jason Wang <jasowang@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Jason are you merging this? > --- > Originally on SUSPEND series, but it is a fix that it is worth to send > and apply individually: > https://lists.nongnu.org/archive/html/qemu-devel/2023-01/msg02574.html > > --- > net/vhost-vdpa.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c > index 1a13a34d35..de5ed8ff22 100644 > --- a/net/vhost-vdpa.c > +++ b/net/vhost-vdpa.c > @@ -384,7 +384,7 @@ static int vhost_vdpa_net_cvq_start(NetClientState *nc) > g_strerror(errno), errno); > return -1; > } > - if (!(backend_features & VHOST_BACKEND_F_IOTLB_ASID) || > + if (!(backend_features & BIT_ULL(VHOST_BACKEND_F_IOTLB_ASID)) || > !vhost_vdpa_net_valid_svq_features(v->dev->features, NULL)) { > return 0; > } > -- > 2.31.1
On Mon, Jan 23, 2023 at 10:39 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > On Tue, Jan 17, 2023 at 11:53:08AM +0100, Eugenio Pérez wrote: > > VHOST_BACKEND_F_IOTLB_ASID is the feature bit, not the bitmask. Since > > the device under test also provided VHOST_BACKEND_F_IOTLB_MSG_V2 and > > VHOST_BACKEND_F_IOTLB_BATCH, this went unnoticed. > > > > Fixes: c1a1008685 ("vdpa: always start CVQ in SVQ mode if possible") > > Signed-off-by: Eugenio Pérez <eperezma@redhat.com> > > Acked-by: Jason Wang <jasowang@redhat.com> > > Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > > Jason are you merging this? Queued. Thanks > > > --- > > Originally on SUSPEND series, but it is a fix that it is worth to send > > and apply individually: > > https://lists.nongnu.org/archive/html/qemu-devel/2023-01/msg02574.html > > > > --- > > net/vhost-vdpa.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c > > index 1a13a34d35..de5ed8ff22 100644 > > --- a/net/vhost-vdpa.c > > +++ b/net/vhost-vdpa.c > > @@ -384,7 +384,7 @@ static int vhost_vdpa_net_cvq_start(NetClientState *nc) > > g_strerror(errno), errno); > > return -1; > > } > > - if (!(backend_features & VHOST_BACKEND_F_IOTLB_ASID) || > > + if (!(backend_features & BIT_ULL(VHOST_BACKEND_F_IOTLB_ASID)) || > > !vhost_vdpa_net_valid_svq_features(v->dev->features, NULL)) { > > return 0; > > } > > -- > > 2.31.1 >
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 1a13a34d35..de5ed8ff22 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -384,7 +384,7 @@ static int vhost_vdpa_net_cvq_start(NetClientState *nc) g_strerror(errno), errno); return -1; } - if (!(backend_features & VHOST_BACKEND_F_IOTLB_ASID) || + if (!(backend_features & BIT_ULL(VHOST_BACKEND_F_IOTLB_ASID)) || !vhost_vdpa_net_valid_svq_features(v->dev->features, NULL)) { return 0; }
VHOST_BACKEND_F_IOTLB_ASID is the feature bit, not the bitmask. Since the device under test also provided VHOST_BACKEND_F_IOTLB_MSG_V2 and VHOST_BACKEND_F_IOTLB_BATCH, this went unnoticed. Fixes: c1a1008685 ("vdpa: always start CVQ in SVQ mode if possible") Signed-off-by: Eugenio Pérez <eperezma@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com> --- Originally on SUSPEND series, but it is a fix that it is worth to send and apply individually: https://lists.nongnu.org/archive/html/qemu-devel/2023-01/msg02574.html --- net/vhost-vdpa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.31.1