From: Jason Wang <jasowang@redhat.com> To: Zhu Lingshan <lingshan.zhu@intel.com> Cc: mst@redhat.com, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, kvm@vger.kernel.org Subject: Re: [PATCH V2 RESEND 2/6] vDPA: only report driver features if FEATURES_OK is set Date: Tue, 27 Sep 2022 12:37:32 +0800 [thread overview] Message-ID: <CACGkMEsioquc=hVe0D87UjZkaZ1m3B-g1hXAAyq6bHD=Fc0uFQ@mail.gmail.com> (raw) In-Reply-To: <20220927030117.5635-3-lingshan.zhu@intel.com> On Tue, Sep 27, 2022 at 11:09 AM Zhu Lingshan <lingshan.zhu@intel.com> wrote: > > This commit reports driver features to user space > only after FEATURES_OK is features negotiation is done. > > Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com> > --- > drivers/vdpa/vdpa.c | 22 ++++++++++++++++------ > 1 file changed, 16 insertions(+), 6 deletions(-) > > diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c > index 2035700d6fc8..e7765953307f 100644 > --- a/drivers/vdpa/vdpa.c > +++ b/drivers/vdpa/vdpa.c > @@ -816,7 +816,7 @@ static int vdpa_dev_net_mq_config_fill(struct vdpa_device *vdev, > static int vdpa_dev_net_config_fill(struct vdpa_device *vdev, struct sk_buff *msg) > { > struct virtio_net_config config = {}; > - u64 features_device, features_driver; > + u64 features_device; > u16 val_u16; > > vdev->config->get_config(vdev, 0, &config, sizeof(config)); > @@ -833,11 +833,6 @@ static int vdpa_dev_net_config_fill(struct vdpa_device *vdev, struct sk_buff *ms > if (nla_put_u16(msg, VDPA_ATTR_DEV_NET_CFG_MTU, val_u16)) > return -EMSGSIZE; > > - features_driver = vdev->config->get_driver_features(vdev); > - if (nla_put_u64_64bit(msg, VDPA_ATTR_DEV_NEGOTIATED_FEATURES, features_driver, > - VDPA_ATTR_PAD)) > - return -EMSGSIZE; > - > features_device = vdev->config->get_device_features(vdev); > > if (nla_put_u64_64bit(msg, VDPA_ATTR_VDPA_DEV_SUPPORTED_FEATURES, features_device, > @@ -851,6 +846,8 @@ static int > vdpa_dev_config_fill(struct vdpa_device *vdev, struct sk_buff *msg, u32 portid, u32 seq, > int flags, struct netlink_ext_ack *extack) > { > + u64 features_driver; > + u8 status = 0; > u32 device_id; > void *hdr; > int err; > @@ -874,6 +871,19 @@ vdpa_dev_config_fill(struct vdpa_device *vdev, struct sk_buff *msg, u32 portid, > goto msg_err; > } > > + /* only read driver features after the feature negotiation is done */ > + if (vdev->config->get_status) > + status = vdev->config->get_status(vdev); get_status is mandatory, so I think we can remove this check. Or if you want a strict check on the config operations, we need to do that in __vdpa_alloc_device(). Thanks > + > + if (status & VIRTIO_CONFIG_S_FEATURES_OK) { > + features_driver = vdev->config->get_driver_features(vdev); > + if (nla_put_u64_64bit(msg, VDPA_ATTR_DEV_NEGOTIATED_FEATURES, features_driver, > + VDPA_ATTR_PAD)) { > + err = -EMSGSIZE; > + goto msg_err; > + } > + } > + > switch (device_id) { > case VIRTIO_ID_NET: > err = vdpa_dev_net_config_fill(vdev, msg); > -- > 2.31.1 >
WARNING: multiple messages have this Message-ID (diff)
From: Jason Wang <jasowang@redhat.com> To: Zhu Lingshan <lingshan.zhu@intel.com> Cc: netdev@vger.kernel.org, virtualization@lists.linux-foundation.org, kvm@vger.kernel.org, mst@redhat.com Subject: Re: [PATCH V2 RESEND 2/6] vDPA: only report driver features if FEATURES_OK is set Date: Tue, 27 Sep 2022 12:37:32 +0800 [thread overview] Message-ID: <CACGkMEsioquc=hVe0D87UjZkaZ1m3B-g1hXAAyq6bHD=Fc0uFQ@mail.gmail.com> (raw) In-Reply-To: <20220927030117.5635-3-lingshan.zhu@intel.com> On Tue, Sep 27, 2022 at 11:09 AM Zhu Lingshan <lingshan.zhu@intel.com> wrote: > > This commit reports driver features to user space > only after FEATURES_OK is features negotiation is done. > > Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com> > --- > drivers/vdpa/vdpa.c | 22 ++++++++++++++++------ > 1 file changed, 16 insertions(+), 6 deletions(-) > > diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c > index 2035700d6fc8..e7765953307f 100644 > --- a/drivers/vdpa/vdpa.c > +++ b/drivers/vdpa/vdpa.c > @@ -816,7 +816,7 @@ static int vdpa_dev_net_mq_config_fill(struct vdpa_device *vdev, > static int vdpa_dev_net_config_fill(struct vdpa_device *vdev, struct sk_buff *msg) > { > struct virtio_net_config config = {}; > - u64 features_device, features_driver; > + u64 features_device; > u16 val_u16; > > vdev->config->get_config(vdev, 0, &config, sizeof(config)); > @@ -833,11 +833,6 @@ static int vdpa_dev_net_config_fill(struct vdpa_device *vdev, struct sk_buff *ms > if (nla_put_u16(msg, VDPA_ATTR_DEV_NET_CFG_MTU, val_u16)) > return -EMSGSIZE; > > - features_driver = vdev->config->get_driver_features(vdev); > - if (nla_put_u64_64bit(msg, VDPA_ATTR_DEV_NEGOTIATED_FEATURES, features_driver, > - VDPA_ATTR_PAD)) > - return -EMSGSIZE; > - > features_device = vdev->config->get_device_features(vdev); > > if (nla_put_u64_64bit(msg, VDPA_ATTR_VDPA_DEV_SUPPORTED_FEATURES, features_device, > @@ -851,6 +846,8 @@ static int > vdpa_dev_config_fill(struct vdpa_device *vdev, struct sk_buff *msg, u32 portid, u32 seq, > int flags, struct netlink_ext_ack *extack) > { > + u64 features_driver; > + u8 status = 0; > u32 device_id; > void *hdr; > int err; > @@ -874,6 +871,19 @@ vdpa_dev_config_fill(struct vdpa_device *vdev, struct sk_buff *msg, u32 portid, > goto msg_err; > } > > + /* only read driver features after the feature negotiation is done */ > + if (vdev->config->get_status) > + status = vdev->config->get_status(vdev); get_status is mandatory, so I think we can remove this check. Or if you want a strict check on the config operations, we need to do that in __vdpa_alloc_device(). Thanks > + > + if (status & VIRTIO_CONFIG_S_FEATURES_OK) { > + features_driver = vdev->config->get_driver_features(vdev); > + if (nla_put_u64_64bit(msg, VDPA_ATTR_DEV_NEGOTIATED_FEATURES, features_driver, > + VDPA_ATTR_PAD)) { > + err = -EMSGSIZE; > + goto msg_err; > + } > + } > + > switch (device_id) { > case VIRTIO_ID_NET: > err = vdpa_dev_net_config_fill(vdev, msg); > -- > 2.31.1 > _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
next prev parent reply other threads:[~2022-09-27 4:37 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-09-27 3:01 [PATCH V2 RESEND 0/6] Conditionally read fields in dev cfg space Zhu Lingshan 2022-09-27 3:01 ` [PATCH V2 RESEND 1/6] vDPA: allow userspace to query features of a vDPA device Zhu Lingshan 2022-09-27 4:36 ` Jason Wang 2022-09-27 4:36 ` Jason Wang 2022-09-27 10:02 ` Zhu, Lingshan 2022-09-27 3:01 ` [PATCH V2 RESEND 2/6] vDPA: only report driver features if FEATURES_OK is set Zhu Lingshan 2022-09-27 4:37 ` Jason Wang [this message] 2022-09-27 4:37 ` Jason Wang 2022-09-27 10:02 ` Zhu, Lingshan 2022-09-27 3:01 ` [PATCH V2 RESEND 3/6] vDPA: check VIRTIO_NET_F_RSS for max_virtqueue_paris's presence Zhu Lingshan 2022-09-27 4:38 ` Jason Wang 2022-09-27 4:38 ` Jason Wang 2022-09-27 3:01 ` [PATCH V2 RESEND 4/6] vDPA: check virtio device features to detect MQ Zhu Lingshan 2022-09-27 4:38 ` Jason Wang 2022-09-27 4:38 ` Jason Wang 2022-09-27 3:01 ` [PATCH V2 RESEND 5/6] vDPA: fix spars cast warning in vdpa_dev_net_mq_config_fill Zhu Lingshan 2022-09-27 4:38 ` Jason Wang 2022-09-27 4:38 ` Jason Wang 2022-09-27 3:01 ` [PATCH V2 RESEND 6/6] vDPA: conditionally read MTU and MAC in dev cfg space Zhu Lingshan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='CACGkMEsioquc=hVe0D87UjZkaZ1m3B-g1hXAAyq6bHD=Fc0uFQ@mail.gmail.com' \ --to=jasowang@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=lingshan.zhu@intel.com \ --cc=mst@redhat.com \ --cc=netdev@vger.kernel.org \ --cc=virtualization@lists.linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.