From nobody Sun Nov 24 17:56:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1721092461; cv=none; d=zohomail.com; s=zohoarc; b=dE+pOx/ImlgllP1qScLAT8oLUPSxTc13Psy2n2VNtE2cKS3hn61vuhiWKjlYeGhdbmkfYXsBpCMUysfXZ/Az8Un0WefZWyWKDofkjbEU1kBp/9AXsw0sHgCUyyyYbqddG0ZzsEAkD4EIoNO9AGAkVXwy/A4vlrV7pOHP9UCU4xk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1721092461; h=Content-Transfer-Encoding:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=SHlgMgT9UBt4PrV/SgTuYZQey7Svi/OASjw1leV6MUM=; b=fXgC+A9jn2NvTOqthYOuJT1pzIANtE49jtnpOmOwtyDLCmEMgrXmPFlnO/5aHb5g0iURNS0o150k0TfW0jTnA1iyhMbDLOa8i6HmJZ9ky9KxTDTy12h3/jB+nCooZ2S+tK3Ku0yRRiZxHdHtM1kduVUYCdxWeQmrNxB8fAgO9TQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1721092461372328.4457246733093; Mon, 15 Jul 2024 18:14:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sTWla-0003ql-PU; Mon, 15 Jul 2024 21:14:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sTWlZ-0003qA-Jt for qemu-devel@nongnu.org; Mon, 15 Jul 2024 21:14:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sTWlY-0004yi-2V for qemu-devel@nongnu.org; Mon, 15 Jul 2024 21:14:05 -0400 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-587-iVi_21hKO0ersLd0W02VyA-1; Mon, 15 Jul 2024 21:13:59 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 343171955D42; Tue, 16 Jul 2024 01:13:58 +0000 (UTC) Received: from server.redhat.com (unknown [10.72.112.9]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0E45219560B2; Tue, 16 Jul 2024 01:13:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721092441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=SHlgMgT9UBt4PrV/SgTuYZQey7Svi/OASjw1leV6MUM=; b=Vv5nPbQYKZQrvCMCWHprzlqZVza37ArdFOj1GA3Ib3NdzJCIFLCLqzJ0n+XTMMahVYjBla RQLnYoHTwHZa5zjClP5D1ZMCqIIZlzOoCMTJoGJxMwV8tqIwDkHoKjKzd1LfxGU7nLKV5g tb8NWdiP9Q4ZRtVC1auoGH//XvrjjZ8= X-MC-Unique: iVi_21hKO0ersLd0W02VyA-1 From: Cindy Lu To: lulu@redhat.com, dtatulea@nvidia.com, mst@redhat.com, jasowang@redhat.com, parav@nvidia.com, netdev@vger.kernel.org, qemu-devel@nongnu.org Subject: [RFC v2] virtio-net: check the mac address for vdpa device Date: Tue, 16 Jul 2024 09:13:49 +0800 Message-ID: <20240716011349.821777-1-lulu@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=lulu@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1721092462608116600 Content-Type: text/plain; charset="utf-8" When using a VDPA device, it is important to ensure that the MAC address in the hardware matches the MAC address from the QEMU command line. There are only two acceptable situations: 1. The hardware MAC address is the same as the MAC address specified in the= QEMU command line, and both MAC addresses are not 0. 2. The hardware MAC address is not 0, and the MAC address in the QEMU comma= nd line is 0. In this situation, the hardware MAC address will overwrite the QEMU command= line address. Signed-off-by: Cindy Lu --- hw/net/virtio-net.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 9c7e85caea..8f79785f59 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -178,8 +178,8 @@ static void virtio_net_get_config(VirtIODevice *vdev, u= int8_t *config) * correctly elsewhere - just not reported by the device. */ if (memcmp(&netcfg.mac, &zero, sizeof(zero)) =3D=3D 0) { - info_report("Zero hardware mac address detected. Ignoring."); - memcpy(netcfg.mac, n->mac, ETH_ALEN); + error_report("Zero hardware mac address detected in vdpa device.= " + "please check the vdpa device!"); } =20 netcfg.status |=3D virtio_tswap16(vdev, @@ -3579,12 +3579,42 @@ static bool failover_hide_primary_device(DeviceList= ener *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 =3D {}; + static const MACAddr zero =3D {.a =3D {0, 0, 0, 0, 0, 0}}; =20 + vhost_net_get_config(get_vhost_net(nc->peer), (uint8_t *)&hwcfg, ETH_ALE= N); + + /* For VDPA device: Only two situations are acceptable: + * 1.The hardware MAC address is the same as the QEMU command line MAC + * address, and both of them are not 0. + * 2.The hardware MAC address is NOT 0, and the QEMU command line MAC ad= dress + * is 0. In this situation, the hardware MAC address will overwrite th= e QEMU + * command line address. + */ + + if (memcmp(&hwcfg.mac, &zero, sizeof(MACAddr)) !=3D 0) { + if ((memcmp(&hwcfg.mac, cmdline_mac, sizeof(MACAddr)) =3D=3D 0) || + (memcmp(cmdline_mac, &zero, sizeof(MACAddr)) =3D=3D 0)) { + /* overwrite the mac address with hardware address*/ + memcpy(&n->mac[0], &hwcfg.mac, sizeof(n->mac)); + memcpy(&n->nic_conf.macaddr, &hwcfg.mac, sizeof(n->mac)); + + return true; + } + } + error_setg(errp, "vdpa hardware mac !=3D the mac address from " + "qemu cmdline, please check the the vdpa device's setti= ng."); + + return false; +} static void virtio_net_device_realize(DeviceState *dev, Error **errp) { VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); VirtIONet *n =3D VIRTIO_NET(dev); NetClientState *nc; + MACAddr macaddr_cmdline; int i; =20 if (n->net_conf.mtu) { @@ -3692,6 +3722,7 @@ static void virtio_net_device_realize(DeviceState *de= v, Error **errp) virtio_net_add_queue(n, 0); =20 n->ctrl_vq =3D 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 =3D VIRTIO_NET_S_LINK_UP; @@ -3739,10 +3770,10 @@ static void virtio_net_device_realize(DeviceState *= dev, Error **errp) nc->rxfilter_notify_enabled =3D 1; =20 if (nc->peer && nc->peer->info->type =3D=3D NET_CLIENT_DRIVER_VHOST_VDP= A) { - struct virtio_net_config netcfg =3D {}; - 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_FRONTEN= D); + if (!virtio_net_check_vdpa_mac(nc, n, &macaddr_cmdline, errp)) { + virtio_cleanup(vdev); + return; + } } QTAILQ_INIT(&n->rsc_chains); n->qdev =3D dev; --=20 2.45.0