From: Cindy Lu <lulu@redhat.com>
To: lulu@redhat.com, mst@redhat.com, jasowang@redhat.com,
qemu-devel@nongnu.org
Subject: [PATCH v3 2/4] virtio_net: Add the check for vdpa's mac address
Date: Sat, 26 Oct 2024 16:00:00 +0800 [thread overview]
Message-ID: <20241026080121.461781-3-lulu@redhat.com> (raw)
In-Reply-To: <20241026080121.461781-1-lulu@redhat.com>
When using a VDPA device, it is important to ensure that the MAC
address is correctly set. The MAC address in the hardware should
match the MAC address from the QEMU command line. This is a recommended
configuration and will allow the system to boot.
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
hw/net/virtio-net.c | 40 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index fb84d142ee..0b342d0cc2 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -3589,12 +3589,43 @@ static bool failover_hide_primary_device(DeviceListener *listener,
/* failover_primary_hidden is set during feature negotiation */
return qatomic_read(&n->failover_primary_hidden);
}
+static bool virtio_net_check_vdpa_mac(NetClientState *nc, VirtIONet *n,
+ MACAddr *cmdline_mac, Error **errp)
+{
+ struct virtio_net_config hwcfg = {};
+ static const MACAddr zero = { .a = { 0, 0, 0, 0, 0, 0 } };
+
+ vhost_net_get_config(get_vhost_net(nc->peer), (uint8_t *)&hwcfg, ETH_ALEN);
+
+ /*For VDPA device following situations are acceptable:*/
+
+ if (memcmp(&hwcfg.mac, &zero, sizeof(MACAddr)) != 0) {
+ /*
+ * 1.The hardware MAC address is the same as the QEMU command line MAC
+ * address, and both of them are not 0.
+ */
+ if ((memcmp(&hwcfg.mac, cmdline_mac, sizeof(MACAddr)) == 0)) {
+ return true;
+ }
+ }
+ error_setg(errp,
+ "vDPA device's mac %02x:%02x:%02x:%02x:%02x:%02x"
+ "not same with the cmdline's mac %02x:%02x:%02x:%02x:%02x:%02x,"
+ "Please check.",
+ hwcfg.mac[0], hwcfg.mac[1], hwcfg.mac[2], hwcfg.mac[3],
+ hwcfg.mac[4], hwcfg.mac[5], cmdline_mac->a[0], cmdline_mac->a[1],
+ cmdline_mac->a[2], cmdline_mac->a[3], cmdline_mac->a[4],
+ cmdline_mac->a[5]);
+
+ return false;
+}
static void virtio_net_device_realize(DeviceState *dev, Error **errp)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIONet *n = VIRTIO_NET(dev);
NetClientState *nc;
+ MACAddr macaddr_cmdline;
int i;
if (n->net_conf.mtu) {
@@ -3702,6 +3733,7 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
virtio_net_add_queue(n, 0);
n->ctrl_vq = virtio_add_queue(vdev, 64, virtio_net_handle_ctrl);
+ memcpy(&macaddr_cmdline, &n->nic_conf.macaddr, sizeof(n->mac));
qemu_macaddr_default_if_unset(&n->nic_conf.macaddr);
memcpy(&n->mac[0], &n->nic_conf.macaddr, sizeof(n->mac));
n->status = VIRTIO_NET_S_LINK_UP;
@@ -3748,7 +3780,13 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
nc = qemu_get_queue(n->nic);
nc->rxfilter_notify_enabled = 1;
- if (nc->peer && nc->peer->info->type == NET_CLIENT_DRIVER_VHOST_VDPA) {
+ if (nc->peer && (nc->peer->info->type == NET_CLIENT_DRIVER_VHOST_VDPA)) {
+ if (nc->peer->check_mac) {
+ if (!virtio_net_check_vdpa_mac(nc, n, &macaddr_cmdline, errp)) {
+ virtio_cleanup(vdev);
+ return;
+ }
+ }
struct virtio_net_config netcfg = {};
memcpy(&netcfg.mac, &n->nic_conf.macaddr, ETH_ALEN);
vhost_net_set_config(get_vhost_net(nc->peer),
--
2.45.0
next prev parent reply other threads:[~2024-10-26 8:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-26 7:59 [PATCH v3 0/4] virtio_net: Add the check for vdpa's mac address Cindy Lu
2024-10-26 7:59 ` [PATCH v3 1/4] vhost_vdpa : Add a new parameter to enable check " Cindy Lu
2024-11-06 9:25 ` Michael S. Tsirkin
2024-11-06 9:42 ` Cindy Lu
2024-10-26 8:00 ` Cindy Lu [this message]
2024-10-26 8:00 ` [PATCH v3 3/4] virtio_net: Add the 2rd acceptable situation for Mac setup Cindy Lu
2024-10-26 8:00 ` [PATCH v3 4/4] virtio_net: Add the 3rd " Cindy Lu
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=20241026080121.461781-3-lulu@redhat.com \
--to=lulu@redhat.com \
--cc=jasowang@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).