[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v8 11/12] vdpa: Add virtio-net mac address via CVQ at start
From: |
Eugenio Perez Martin |
Subject: |
Re: [PATCH v8 11/12] vdpa: Add virtio-net mac address via CVQ at start |
Date: |
Thu, 11 Aug 2022 08:52:14 +0200 |
On Wed, Aug 10, 2022 at 7:09 AM Jason Wang <jasowang@redhat.com> wrote:
>
> On Wed, Aug 10, 2022 at 1:40 AM Eugenio Pérez <eperezma@redhat.com> wrote:
> >
> > This is needed so the destination vdpa device see the same state a the
> > guest set in the source.
> >
> > Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
> > ---
> > v8:
> > * Delete unneeded copy from device's in buffer.
> >
> > v6:
> > * Map and unmap command buffers at the start and end of device usage.
> >
> > v5:
> > * Rename s/start/load/
> > * Use independent NetClientInfo to only add load callback on cvq.
> > ---
> > net/vhost-vdpa.c | 41 +++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 41 insertions(+)
> >
> > diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
> > index df85567cff..e775957952 100644
> > --- a/net/vhost-vdpa.c
> > +++ b/net/vhost-vdpa.c
> > @@ -363,11 +363,52 @@ static ssize_t vhost_vdpa_net_cvq_add(VhostVDPAState
> > *s, size_t out_len,
> > return vhost_svq_poll(svq);
> > }
> >
> > +static int vhost_vdpa_net_load(NetClientState *nc)
> > +{
> > + VhostVDPAState *s = DO_UPCAST(VhostVDPAState, nc, nc);
> > + struct vhost_vdpa *v = &s->vhost_vdpa;
> > + VirtIONet *n;
> > + uint64_t features;
> > +
> > + assert(nc->info->type == NET_CLIENT_DRIVER_VHOST_VDPA);
> > +
> > + if (!v->shadow_vqs_enabled) {
> > + return 0;
> > + }
> > +
> > + n = VIRTIO_NET(v->dev->vdev);
> > + features = v->dev->vdev->host_features;
> > + if (features & BIT_ULL(VIRTIO_NET_F_CTRL_MAC_ADDR)) {
> > + const struct virtio_net_ctrl_hdr ctrl = {
> > + .class = VIRTIO_NET_CTRL_MAC,
> > + .cmd = VIRTIO_NET_CTRL_MAC_ADDR_SET,
> > + };
> > + char *cursor = s->cvq_cmd_out_buffer;
> > + ssize_t dev_written;
> > +
> > + memcpy(cursor, &ctrl, sizeof(ctrl));
> > + cursor += sizeof(ctrl);
> > + memcpy(cursor, n->mac, sizeof(n->mac));
> > + cursor += sizeof(n->mac);
>
> I'd cast and initialize directly from the cmd_out_buff. But this could
> be done on top.
>
Actually you are right, that's valid for MAC. I think the compiler
should be able to omit the memcpy call if the direct write is safe,
but I haven't checked.
In a second review, either this last increment of the "cursor"
variable is useless and we can delete it or we could use it to
calculate the output size (cursor - s->cvq_cmd_out_buffer).
> So
>
> Acked-by: Jason Wang <jasowang@redhat.com>
>
>
> > +
> > + dev_written = vhost_vdpa_net_cvq_add(s, sizeof(ctrl) +
> > sizeof(n->mac),
> > + sizeof(virtio_net_ctrl_ack));
> > + if (unlikely(dev_written < 0)) {
> > + return dev_written;
> > + }
> > +
> > + return *((virtio_net_ctrl_ack *)s->cvq_cmd_in_buffer) !=
> > VIRTIO_NET_OK;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > static NetClientInfo net_vhost_vdpa_cvq_info = {
> > .type = NET_CLIENT_DRIVER_VHOST_VDPA,
> > .size = sizeof(VhostVDPAState),
> > .receive = vhost_vdpa_receive,
> > .start = vhost_vdpa_net_cvq_start,
> > + .load = vhost_vdpa_net_load,
> > .stop = vhost_vdpa_net_cvq_stop,
> > .cleanup = vhost_vdpa_cleanup,
> > .has_vnet_hdr = vhost_vdpa_has_vnet_hdr,
> > --
> > 2.31.1
> >
>
- Re: [PATCH v8 06/12] vhost_net: Add NetClientInfo stop callback, (continued)
- [PATCH v8 09/12] vdpa: extract vhost_vdpa_net_cvq_add from vhost_vdpa_net_handle_ctrl_avail, Eugenio Pérez, 2022/08/09
- [PATCH v8 08/12] vdpa: Move command buffers map to start of net device, Eugenio Pérez, 2022/08/09
- [PATCH v8 07/12] vdpa: add net_vhost_vdpa_cvq_info NetClientInfo, Eugenio Pérez, 2022/08/09
- [PATCH v8 10/12] vhost_net: add NetClientState->load() callback, Eugenio Pérez, 2022/08/09
- [PATCH v8 11/12] vdpa: Add virtio-net mac address via CVQ at start, Eugenio Pérez, 2022/08/09
- [PATCH v8 12/12] vdpa: Delete CVQ migration blocker, Eugenio Pérez, 2022/08/09
- Re: [PATCH v8 00/12] NIC vhost-vdpa state restore via Shadow CVQ, Eugenio Perez Martin, 2022/08/11