search for: virtnet_fail_on

...e changed, 37 insertions(+) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index ec2a8b4..b0bc8ea 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1673,6 +1673,40 @@ static const struct attribute_group virtio_net_mrg_rx_group = { }; #endif +static bool virtnet_fail_on_feature(struct virtio_device *vdev, + unsigned int fbit, + const char *fname, const char *dname) +{ + if (!virtio_has_feature(vdev, fbit)) + return false; + + dev_err(&vdev->dev, "device advertises feature %s but not %s", + fname, dname); + + return true; +} + +#def...

...e changed, 37 insertions(+) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index ec2a8b4..b0bc8ea 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1673,6 +1673,40 @@ static const struct attribute_group virtio_net_mrg_rx_group = { }; #endif +static bool virtnet_fail_on_feature(struct virtio_device *vdev, + unsigned int fbit, + const char *fname, const char *dname) +{ + if (!virtio_has_feature(vdev, fbit)) + return false; + + dev_err(&vdev->dev, "device advertises feature %s but not %s", + fname, dname); + + return true; +} + +#def...

...e changed, 37 insertions(+) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index ec2a8b4..a6bcfce 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1673,6 +1673,40 @@ static const struct attribute_group virtio_net_mrg_rx_group = { }; #endif +static bool virtnet_fail_on_feature(struct virtio_device *vdev, + unsigned int fbit, + const char *fname, const char *dname) +{ + if (!virtio_has_feature(vdev, fbit)) + return false; + + dev_err(&vdev->dev, "Hypervisor bug: advertise feature %s but not %s", + fname, dname); + + return true; +}...

...e changed, 37 insertions(+) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index ec2a8b4..a6bcfce 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1673,6 +1673,40 @@ static const struct attribute_group virtio_net_mrg_rx_group = { }; #endif +static bool virtnet_fail_on_feature(struct virtio_device *vdev, + unsigned int fbit, + const char *fname, const char *dname) +{ + if (!virtio_has_feature(vdev, fbit)) + return false; + + dev_err(&vdev->dev, "Hypervisor bug: advertise feature %s but not %s", + fname, dname); + + return true; +}...

...-git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 26e1330..7a7d1a3 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -1673,6 +1673,21 @@ static const struct attribute_group virtio_net_mrg_rx_group = { > }; > #endif > > +bool __virtnet_fail_on_feature(struct virtio_device *vdev, unsigned int fbit, > + const char *fname) > +{ > + if (!virtio_has_feature(vdev, fbit)) > + return false; > + > + dev_err(&dev->dev, "missing requirements for feature bit %d: %s\n", > + fbit, fname); > +...

...-git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 26e1330..7a7d1a3 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -1673,6 +1673,21 @@ static const struct attribute_group virtio_net_mrg_rx_group = { > }; > #endif > > +bool __virtnet_fail_on_feature(struct virtio_device *vdev, unsigned int fbit, > + const char *fname) > +{ > + if (!virtio_has_feature(vdev, fbit)) > + return false; > + > + dev_err(&dev->dev, "missing requirements for feature bit %d: %s\n", > + fbit, fname); > +...

...s/net/virtio_net.c > > index 26e1330..7a7d1a3 100644 > > --- a/drivers/net/virtio_net.c > > +++ b/drivers/net/virtio_net.c > > @@ -1673,6 +1673,21 @@ static const struct attribute_group virtio_net_mrg_rx_group = { > > }; > > #endif > > > > +bool __virtnet_fail_on_feature(struct virtio_device *vdev, unsigned int fbit, > > + const char *fname) > > +{ > > + if (!virtio_has_feature(vdev, fbit)) > > + return false; > > + > > + dev_err(&dev->dev, "missing requirements for feature bit %d: %s\n",...

...a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index ec2a8b4..a6bcfce 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -1673,6 +1673,40 @@ static const struct attribute_group virtio_net_mrg_rx_group = { > }; > #endif > > +static bool virtnet_fail_on_feature(struct virtio_device *vdev, > + unsigned int fbit, > + const char *fname, const char *dname) > +{ > + if (!virtio_has_feature(vdev, fbit)) > + return false; > + > + dev_err(&vdev->dev, "Hypervisor bug: advertise feature %s but not %s", W...

...e changed, 37 insertions(+) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index ec2a8b4..cc53ff1 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1673,6 +1673,40 @@ static const struct attribute_group virtio_net_mrg_rx_group = { }; #endif +static bool virtnet_fail_on_feature(struct virtio_device *vdev, + unsigned int fbit, + const char *fname, const char *dname) +{ + if (!virtio_has_feature(vdev, fbit)) + return false; + + dev_err(&vdev->dev, "advertise feature %s but not %s", + fname, dname); + + return true; +} + +#define VIRT...

...e changed, 37 insertions(+) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index ec2a8b4..cc53ff1 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1673,6 +1673,40 @@ static const struct attribute_group virtio_net_mrg_rx_group = { }; #endif +static bool virtnet_fail_on_feature(struct virtio_device *vdev, + unsigned int fbit, + const char *fname, const char *dname) +{ + if (!virtio_has_feature(vdev, fbit)) + return false; + + dev_err(&vdev->dev, "advertise feature %s but not %s", + fname, dname); + + return true; +} + +#define VIRT...

This patch validates feature dependencies during probe and fail the probing if a dependency is missed. This fixes the issues of hitting BUG() when qemu fails to advertise features correctly. One example is booting guest with ctrl_vq=off through qemu. Cc: Rusty Russell <rusty at rustcorp.com.au> Cc: Michael S. Tsirkin <mst at redhat.com> Cc: Cornelia Huck <cornelia.huck at

This patch validates feature dependencies during probe and fail the probing if a dependency is missed. This fixes the issues of hitting BUG() when qemu fails to advertise features correctly. One example is booting guest with ctrl_vq=off through qemu. Cc: Rusty Russell <rusty at rustcorp.com.au> Cc: Michael S. Tsirkin <mst at redhat.com> Cc: Cornelia Huck <cornelia.huck at

...u.com> > Signed-off-by: Michael S. Tsirkin <mst at redhat.com> > Signed-off-by: Jason Wang <jasowang at redhat.com> > +static bool virtnet_validate_features(struct virtio_device *vdev) > +{ > + if (!virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_VQ) && > + (VIRTNET_FAIL_ON(vdev, VIRTIO_NET_F_CTRL_RX, > + "VIRTIO_NET_F_CTRL_VQ") || > + VIRTNET_FAIL_ON(vdev, VIRTIO_NET_F_CTRL_VLAN, > + "VIRTIO_NET_F_CTRL_VQ") || > + VIRTNET_FAIL_ON(vdev, VIRTIO_NET_F_GUEST_ANNOUNCE, > + "VIRTIO_NET_F_CTRL_VQ")...

...n <mst at redhat.com> --- diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 26e1330..7a7d1a3 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1673,6 +1673,21 @@ static const struct attribute_group virtio_net_mrg_rx_group = { }; #endif +bool __virtnet_fail_on_feature(struct virtio_device *vdev, unsigned int fbit, + const char *fname) +{ + if (!virtio_has_feature(vdev, fbit)) + return false; + + dev_err(&dev->dev, "missing requirements for feature bit %d: %s\n", + fbit, fname); + + return true; +} + +#define VIRTNET_FAI...