On 11/20/2014 04:27 PM, Jason Wang wrote: > We currently trigger BUG when VIRTIO_NET_F_CTRL_VQ > is not set but one of features depending on it is. > That's not a friendly way to report errors to > hypervisors. > Let's check, and fail probe instead. > > Cc: Rusty Russell <[email protected]> > Cc: Cornelia Huck <[email protected]> > Cc: Wanlong Gao <[email protected]> > Signed-off-by: Michael S. Tsirkin <[email protected]> > Signed-off-by: Jason Wang <[email protected]> > --- > Changes from V1: > - Drop NETIF_F_*_UFO from checklist > Changes from V2: > - only check the features for ctrl vq (this fix the real bug) > - better error message and simplify API > Changes from V3: > - pass dbit directly and even better error message > - typo fix > --- > drivers/net/virtio_net.c | 37 +++++++++++++++++++++++++++++++++++++ > 1 file 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; > +} > +
Michael suggest adding "device" before "advertise", will post V5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
