virtio-net: check the mac address for vdpa device
RFC 1/1 virtio-net: check the mac address for vdpa device
When using VDPA device, we should verify whether the MAC address in the hardware matches the MAC address from the QEMU command line. If not, we will need to update the related information.
--- hw/net/virtio-net.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
hw/net/virtio-net.c +11 -4
@@ -3739,10 +3739,17 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) nc->rxfilter_notify_enabled =1 ;if (nc->peer && nc->peer->info->type ==NET_CLIENT_DRIVER_VHOST_VDPA ) { -struct virtio_net_config netcfg = {}; -memcpy (&netcfg.mac, &n->nic_conf.macaddr,ETH_ALEN ); -vhost_net_set_config (get_vhost_net (nc->peer), - (uint8_t *)&netcfg,0 ,ETH_ALEN ,VHOST_SET_CONFIG_TYPE_FRONTEND ); +struct virtio_net_config netcfg = {}; +static const MACAddr zero = {.a = {0 ,0 ,0 ,0 ,0 ,0 }}; +vhost_net_get_config (get_vhost_net (nc->peer), (uint8_t *)&netcfg, +ETH_ALEN ); +if ((memcmp (&netcfg.mac, &n->nic_conf.macaddr,sizeof (MACAddr)) !=0 ) && +memcmp (&netcfg.mac, &zero,sizeof (zero) !=0 )) { +memcpy (&n->nic_conf.macaddr, &netcfg.mac,sizeof (MACAddr)); +memcpy (&n->mac[0 ], &netcfg.mac,sizeof (MACAddr)); + } +vhost_net_set_config (get_vhost_net (nc->peer), (uint8_t *)&netcfg,0 , +ETH_ALEN ,VHOST_SET_CONFIG_TYPE_FRONTEND ); }QTAILQ_INIT (&n->rsc_chains); n->qdev = dev;
Signature · 1 line
2.45.0
Quoted 6 lines · Cindy Lu
When using VDPA device, we should verify whether the MAC address in the hardware matches the MAC address from the QEMU command line. If not, we will need to update the related information.
Signed-off-by Cindy Lu <[email protected]>
This seems to be a workaround, for example it means the mac address set from the qemu command line has the higher priority compared to the one that is provisioned by the host?
At least we need to have a warning here?
Thanks
Quoted 33 lines
--- hw/net/virtio-net.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)hw/net/virtio-net.c +11
-5@@ -3739,10 +3739,17 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) nc->rxfilter_notify_enabled =1 ;if (nc->peer && nc->peer->info->type ==NET_CLIENT_DRIVER_VHOST_VDPA ) { -struct virtio_net_config netcfg = {}; -memcpy (&netcfg.mac, &n->nic_conf.macaddr,ETH_ALEN ); -vhost_net_set_config (get_vhost_net (nc->peer), - (uint8_t *)&netcfg,0 ,ETH_ALEN ,VHOST_SET_CONFIG_TYPE_FRONTEND ); +struct virtio_net_config netcfg = {}; +static const MACAddr zero = {.a = {0 ,0 ,0 ,0 ,0 ,0 }}; +vhost_net_get_config (get_vhost_net (nc->peer), (uint8_t *)&netcfg, +ETH_ALEN ); +if ((memcmp (&netcfg.mac, &n->nic_conf.macaddr,sizeof (MACAddr)) !=0 ) && +memcmp (&netcfg.mac, &zero,sizeof (zero) !=0 )) { +memcpy (&n->nic_conf.macaddr, &netcfg.mac,sizeof (MACAddr)); +memcpy (&n->mac[0 ], &netcfg.mac,sizeof (MACAddr)); + } +vhost_net_set_config (get_vhost_net (nc->peer), (uint8_t *)&netcfg,0 , +ETH_ALEN ,VHOST_SET_CONFIG_TYPE_FRONTEND ); }QTAILQ_INIT (&n->rsc_chains); n->qdev = dev; --2.45.0
Quoted 7 lines · Jason Wang
Quoted 5 lines · Cindy Lu
When using VDPA device, we should verify whether the MAC address in the hardware matches the MAC address from the QEMU command line. If not, we will need to update the related information.
Quoted 8 lines
Quoted 1 line
Signed-off-by Cindy Lu <[email protected]>This seems to be a workaround, for example it means the mac address set from the qemu command line has the higher priority compared to the one that is provisioned by the host?
At least we need to have a warning here?
In this design, the MAC address from the host will take higher priority over the MAC address from the command line. I'm not sure if this is acceptable?
sure, will add some warning here
Quoted 36 lines
Thanks
Quoted 33 lines
--- hw/net/virtio-net.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)hw/net/virtio-net.c +11
-5@@ -3739,10 +3739,17 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) nc->rxfilter_notify_enabled =1 ;if (nc->peer && nc->peer->info->type ==NET_CLIENT_DRIVER_VHOST_VDPA ) { -struct virtio_net_config netcfg = {}; -memcpy (&netcfg.mac, &n->nic_conf.macaddr,ETH_ALEN ); -vhost_net_set_config (get_vhost_net (nc->peer), - (uint8_t *)&netcfg,0 ,ETH_ALEN ,VHOST_SET_CONFIG_TYPE_FRONTEND ); +struct virtio_net_config netcfg = {}; +static const MACAddr zero = {.a = {0 ,0 ,0 ,0 ,0 ,0 }}; +vhost_net_get_config (get_vhost_net (nc->peer), (uint8_t *)&netcfg, +ETH_ALEN ); +if ((memcmp (&netcfg.mac, &n->nic_conf.macaddr,sizeof (MACAddr)) !=0 ) && +memcmp (&netcfg.mac, &zero,sizeof (zero) !=0 )) { +memcpy (&n->nic_conf.macaddr, &netcfg.mac,sizeof (MACAddr)); +memcpy (&n->mac[0 ], &netcfg.mac,sizeof (MACAddr)); + } +vhost_net_set_config (get_vhost_net (nc->peer), (uint8_t *)&netcfg,0 , +ETH_ALEN ,VHOST_SET_CONFIG_TYPE_FRONTEND ); }QTAILQ_INIT (&n->rsc_chains); n->qdev = dev; --2.45.0
Quoted 15 lines · Cindy Lu
Quoted 13 lines · Jason Wang
Quoted 6 lines · Cindy Lu
When using VDPA device, we should verify whether the MAC address in the hardware matches the MAC address from the QEMU command line. If not, we will need to update the related information.
Signed-off-by Cindy Lu <[email protected]>This seems to be a workaround, for example it means the mac address set from the qemu command line has the higher priority compared to the one that is provisioned by the host?
Quoted 5 lines
Quoted 2 lines
At least we need to have a warning here?
In this design, the MAC address from the host will take higher priority over the MAC address from the command line. I'm not sure if this is acceptable?
That's fine but it seems not what I read for this patch?
As you try to set config, or anything I missed here?
Thanks
Quoted 38 lines
sure, will add some warning here
Quoted 36 lines
Thanks
Quoted 33 lines
--- hw/net/virtio-net.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)hw/net/virtio-net.c +11
-5@@ -3739,10 +3739,17 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) nc->rxfilter_notify_enabled =1 ;if (nc->peer && nc->peer->info->type ==NET_CLIENT_DRIVER_VHOST_VDPA ) { -struct virtio_net_config netcfg = {}; -memcpy (&netcfg.mac, &n->nic_conf.macaddr,ETH_ALEN ); -vhost_net_set_config (get_vhost_net (nc->peer), - (uint8_t *)&netcfg,0 ,ETH_ALEN ,VHOST_SET_CONFIG_TYPE_FRONTEND ); +struct virtio_net_config netcfg = {}; +static const MACAddr zero = {.a = {0 ,0 ,0 ,0 ,0 ,0 }}; +vhost_net_get_config (get_vhost_net (nc->peer), (uint8_t *)&netcfg, +ETH_ALEN ); +if ((memcmp (&netcfg.mac, &n->nic_conf.macaddr,sizeof (MACAddr)) !=0 ) && +memcmp (&netcfg.mac, &zero,sizeof (zero) !=0 )) { +memcpy (&n->nic_conf.macaddr, &netcfg.mac,sizeof (MACAddr)); +memcpy (&n->mac[0 ], &netcfg.mac,sizeof (MACAddr)); + } +vhost_net_set_config (get_vhost_net (nc->peer), (uint8_t *)&netcfg,0 , +ETH_ALEN ,VHOST_SET_CONFIG_TYPE_FRONTEND ); }QTAILQ_INIT (&n->rsc_chains); n->qdev = dev; --2.45.0
Quoted 23 lines · Jason Wang
Quoted 15 lines · Cindy Lu
Quoted 13 lines · Jason Wang
Quoted 6 lines · Cindy Lu
When using VDPA device, we should verify whether the MAC address in the hardware matches the MAC address from the QEMU command line. If not, we will need to update the related information.
Signed-off-by Cindy Lu <[email protected]>This seems to be a workaround, for example it means the mac address set from the qemu command line has the higher priority compared to the one that is provisioned by the host?
Quoted 5 lines
Quoted 2 lines
At least we need to have a warning here?
In this design, the MAC address from the host will take higher priority over the MAC address from the command line. I'm not sure if this is acceptable?
Quoted 6 lines
That's fine but it seems not what I read for this patch?
As you try to set config, or anything I missed here?
Thanks
yes I use vhost_net_get_config(get_vhost_net(nc->peer), (uint8_t *)&netcfg,
ETH_ALEN); to get the mac from hardware and copy it
to n->nic_conf.macaddr and n->mac
memcpy(&n->nic_conf.macaddr, &netcfg.mac, sizeof(MACAddr)); memcpy(&n->mac[0], &netcfg.mac, sizeof(MACAddr));
qemu will use this information for the following steps
Thanks
cindy
Quoted 39 lines
Quoted 38 lines
sure, will add some warning here
Quoted 36 lines
Thanks
Quoted 33 lines
--- hw/net/virtio-net.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)hw/net/virtio-net.c +11
-5@@ -3739,10 +3739,17 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) nc->rxfilter_notify_enabled =1 ;if (nc->peer && nc->peer->info->type ==NET_CLIENT_DRIVER_VHOST_VDPA ) { -struct virtio_net_config netcfg = {}; -memcpy (&netcfg.mac, &n->nic_conf.macaddr,ETH_ALEN ); -vhost_net_set_config (get_vhost_net (nc->peer), - (uint8_t *)&netcfg,0 ,ETH_ALEN ,VHOST_SET_CONFIG_TYPE_FRONTEND ); +struct virtio_net_config netcfg = {}; +static const MACAddr zero = {.a = {0 ,0 ,0 ,0 ,0 ,0 }}; +vhost_net_get_config (get_vhost_net (nc->peer), (uint8_t *)&netcfg, +ETH_ALEN ); +if ((memcmp (&netcfg.mac, &n->nic_conf.macaddr,sizeof (MACAddr)) !=0 ) && +memcmp (&netcfg.mac, &zero,sizeof (zero) !=0 )) { +memcpy (&n->nic_conf.macaddr, &netcfg.mac,sizeof (MACAddr)); +memcpy (&n->mac[0 ], &netcfg.mac,sizeof (MACAddr)); + } +vhost_net_set_config (get_vhost_net (nc->peer), (uint8_t *)&netcfg,0 , +ETH_ALEN ,VHOST_SET_CONFIG_TYPE_FRONTEND ); }QTAILQ_INIT (&n->rsc_chains); n->qdev = dev; --2.45.0
Quoted 29 lines · Cindy Lu
Quoted 27 lines · Jason Wang
Quoted 15 lines · Cindy Lu
Quoted 13 lines · Jason Wang
Quoted 6 lines · Cindy Lu
When using VDPA device, we should verify whether the MAC address in the hardware matches the MAC address from the QEMU command line. If not, we will need to update the related information.
Signed-off-by Cindy Lu <[email protected]>This seems to be a workaround, for example it means the mac address set from the qemu command line has the higher priority compared to the one that is provisioned by the host?
Quoted 5 lines
Quoted 2 lines
At least we need to have a warning here?
In this design, the MAC address from the host will take higher priority over the MAC address from the command line. I'm not sure if this is acceptable?
That's fine but it seems not what I read for this patch?
As you try to set config, or anything I missed here?
Quoted 8 lines
Quoted 2 lines
Thanks
yes I use vhost_net_get_config(get_vhost_net(nc->peer), (
uint8_t*)&netcfg,
ETH_ALEN); to get the mac from hardware and copy it
ton->nic_conf.macaddrandn->mac
memcpy(&n->nic_conf.macaddr, &netcfg.mac, sizeof(MACAddr));memcpy(&n->mac[0], &netcfg.mac, sizeof(MACAddr));
qemu will use this information for the following steps
I think we need to explain:
1) why do we need a get_config in realization, or what happens if we don't do that. (AFAIK we will call get_config when a guest is trying to read the config space).
2) why do we need a set_config, what happens if we don't do that.
Thanks
Quoted 44 lines
Thanks
cindyQuoted 39 lines
Quoted 38 lines
sure, will add some warning here
Quoted 36 lines
Thanks
Quoted 33 lines
--- hw/net/virtio-net.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)hw/net/virtio-net.c +11
-5@@ -3739,10 +3739,17 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) nc->rxfilter_notify_enabled =1 ;if (nc->peer && nc->peer->info->type ==NET_CLIENT_DRIVER_VHOST_VDPA ) { -struct virtio_net_config netcfg = {}; -memcpy (&netcfg.mac, &n->nic_conf.macaddr,ETH_ALEN ); -vhost_net_set_config (get_vhost_net (nc->peer), - (uint8_t *)&netcfg,0 ,ETH_ALEN ,VHOST_SET_CONFIG_TYPE_FRONTEND ); +struct virtio_net_config netcfg = {}; +static const MACAddr zero = {.a = {0 ,0 ,0 ,0 ,0 ,0 }}; +vhost_net_get_config (get_vhost_net (nc->peer), (uint8_t *)&netcfg, +ETH_ALEN ); +if ((memcmp (&netcfg.mac, &n->nic_conf.macaddr,sizeof (MACAddr)) !=0 ) && +memcmp (&netcfg.mac, &zero,sizeof (zero) !=0 )) { +memcpy (&n->nic_conf.macaddr, &netcfg.mac,sizeof (MACAddr)); +memcpy (&n->mac[0 ], &netcfg.mac,sizeof (MACAddr)); + } +vhost_net_set_config (get_vhost_net (nc->peer), (uint8_t *)&netcfg,0 , +ETH_ALEN ,VHOST_SET_CONFIG_TYPE_FRONTEND ); }QTAILQ_INIT (&n->rsc_chains); n->qdev = dev; --2.45.0