From nobody Sun Feb 8 01:52:09 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9985A3064AF for ; Mon, 26 Jan 2026 09:49:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769420948; cv=none; b=R7JKRTYIK3AhUVLcbOXbApfT2L6j6t4bM/uRiTAL9Qtn3pIy/b0UCoyLszL337Ks3YtIx58tpGDUTOJHM+gJRRIijmIKCedmP5uw8PJCUvv3tfRj8VamKSWO0/nyQO08H9X8KfmjhQWdvq4951RVcjIZyisQz2UGDB8xWBKgon4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769420948; c=relaxed/simple; bh=tu5SYZ4sBijOnmwN3BXLwTM84gyNVhByLrMaj3fLiQs=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t1rFxY3VMgXKiCPYLk1MSldvuZgSkKH7DGTzCZhZEazj0VndEjWFbmQ5J4kYLt6i+LXdO3hpOHqvssNlxPCBn7PVhtXHj/moVqk226twm+/qZYMW8FHE6pUFBpl6ScVR+yrExipLzTl3DN++o9BryZ+7mlzab5pqxGL2LaCbKQA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=BMMhNc75; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BMMhNc75" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1769420946; 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: in-reply-to:in-reply-to:references:references; bh=34z1K+d6LyulR8yKYD3uyl4l7F9JoQvdVoW4oBdiuc0=; b=BMMhNc75NC+gjUolp6SjLetcnxYyOAzdxOw2VyH06vEuYsI2uJRCUgsuMjlqxhkLBn7MZ/ mbt2MIk4tw35ggVxYHyJP5LX/fKi1hvqZz0lCFcbVv8GfTCOivihGqJvgRFPvcV0RktUON H4jKNTx1juYdf4+KJIkd3wimP9ernx8= Received: from mx-prod-mc-05.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-120-QIZ-x6qHNwOV-9qF82R1qQ-1; Mon, 26 Jan 2026 04:49:03 -0500 X-MC-Unique: QIZ-x6qHNwOV-9qF82R1qQ-1 X-Mimecast-MFC-AGG-ID: QIZ-x6qHNwOV-9qF82R1qQ_1769420941 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8DE691977642; Mon, 26 Jan 2026 09:49:01 +0000 (UTC) Received: from S2.redhat.com (unknown [10.72.112.82]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D7374180066A; Mon, 26 Jan 2026 09:48:57 +0000 (UTC) From: Cindy Lu To: lulu@redhat.com, dtatulea@nvidia.com, mst@redhat.com, jasowang@redhat.com, netdev@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH v4 1/3] vdpa/mlx5: update mlx_features with driver state check Date: Mon, 26 Jan 2026 17:45:36 +0800 Message-ID: <20260126094848.9601-2-lulu@redhat.com> In-Reply-To: <20260126094848.9601-1-lulu@redhat.com> References: <20260126094848.9601-1-lulu@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" Add logic in mlx5_vdpa_set_attr() to ensure the VIRTIO_NET_F_MAC feature bit is properly set only when the device is not yet in the DRIVER_OK (running) state. This makes the MAC address visible in the output of: vdpa dev config show -jp when the device is created without an initial MAC address. Signed-off-by: Cindy Lu Reviewed-by: Dragos Tatulea --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5= _vnet.c index ddaa1366704b..6e42bae7c9a1 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -4049,7 +4049,7 @@ static int mlx5_vdpa_set_attr(struct vdpa_mgmt_dev *v= _mdev, struct vdpa_device * struct mlx5_vdpa_dev *mvdev; struct mlx5_vdpa_net *ndev; struct mlx5_core_dev *mdev; - int err =3D -EOPNOTSUPP; + int err =3D 0; =20 mvdev =3D to_mvdev(dev); ndev =3D to_mlx5_vdpa_ndev(mvdev); @@ -4057,13 +4057,22 @@ static int mlx5_vdpa_set_attr(struct vdpa_mgmt_dev = *v_mdev, struct vdpa_device * config =3D &ndev->config; =20 down_write(&ndev->reslock); - if (add_config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) { + + if (add_config->mask & BIT_ULL(VDPA_ATTR_DEV_NET_CFG_MACADDR)) { + if (!(ndev->mvdev.status & VIRTIO_CONFIG_S_DRIVER_OK)) { + ndev->mvdev.mlx_features |=3D BIT_ULL(VIRTIO_NET_F_MAC); + } else { + mlx5_vdpa_warn(mvdev, "device running, skip updating MAC\n"); + err =3D -EBUSY; + goto out; + } pfmdev =3D pci_get_drvdata(pci_physfn(mdev->pdev)); err =3D mlx5_mpfs_add_mac(pfmdev, config->mac); if (!err) ether_addr_copy(config->mac, add_config->net.mac); } =20 +out: up_write(&ndev->reslock); return err; } --=20 2.51.0 From nobody Sun Feb 8 01:52:09 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BADD432D0FA for ; Mon, 26 Jan 2026 09:49:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769420959; cv=none; b=OTLMikeNbGHkIXg3cuP+z9/HxDhJFPfSLP2jLrPVba4NcY6S6+MzRUgBCWWfltTf42lC/am17gqKuxP9HT1CjDveUtQqMaeV2jNzM5tILtygMWhtzBCxqUzsFZ61UNohfcpdXnfjdtt+aDeO5VOikos0ZEf9yqQSOo3m0a9qCjM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769420959; c=relaxed/simple; bh=SCfbIDBZ0i8ji2Il2O+CBn4hTNVv8fyBRR1E4OC8jIk=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IKtdGroH1NASOSpmPipmA4EVWO9JrfIa7XYYcPV5ZHQb60cX77qOFyPJS3+JpZwfICKVvg+7bgVyM1xoi+pCJRWLlGEjYrrXQRicPT0MprAxGZCPMXodSC9Xcj9ewtHI/KRXROXr7ZLtsVcqWsdnkKOVQptDWormB+zxltEkZnU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=QYUxYjqO; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QYUxYjqO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1769420956; 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: in-reply-to:in-reply-to:references:references; bh=95rlxJBn2msZ3au3wfm2bXPdC8+xLSko1wIOaCjjM/M=; b=QYUxYjqOvyw7Y7dbcPYX3bkmC3koTcCSD1cPNnhTCt83Hlpe+C7BdEgIte5ajIt0z3sNZE 6/2LpbvEcvLx/Cxb9lajqMrsAkXNN/QZBVgas/h5iAHsEmeo0E9W3q8/s3NvpWCsU+3T3p nP5mPIlbuVvIof9zcJ5n/FIqPPfxghY= Received: from mx-prod-mc-01.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-611-Wi9pjlujN9a4MFgG7eoDRA-1; Mon, 26 Jan 2026 04:49:08 -0500 X-MC-Unique: Wi9pjlujN9a4MFgG7eoDRA-1 X-Mimecast-MFC-AGG-ID: Wi9pjlujN9a4MFgG7eoDRA_1769420947 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2E5BA1944EA8; Mon, 26 Jan 2026 09:49:07 +0000 (UTC) Received: from S2.redhat.com (unknown [10.72.112.82]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8F19618001D5; Mon, 26 Jan 2026 09:49:01 +0000 (UTC) From: Cindy Lu To: lulu@redhat.com, dtatulea@nvidia.com, mst@redhat.com, jasowang@redhat.com, netdev@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH v4 2/3] vdpa/mlx5: reuse common function for MAC address updates Date: Mon, 26 Jan 2026 17:45:37 +0800 Message-ID: <20260126094848.9601-3-lulu@redhat.com> In-Reply-To: <20260126094848.9601-1-lulu@redhat.com> References: <20260126094848.9601-1-lulu@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" Factor out MAC address update logic and reuse it from handle_ctrl_mac(). This ensures that old MAC entries are removed from the MPFS table before adding a new one and that the forwarding rules are updated accordingly. If updating the flow table fails, the original MAC and rules are restored as much as possible to keep the software and hardware state consistent. Signed-off-by: Cindy Lu Reviewed-by: Dragos Tatulea --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 131 ++++++++++++++++-------------- 1 file changed, 71 insertions(+), 60 deletions(-) diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5= _vnet.c index 6e42bae7c9a1..78a4b80d1ce2 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -2125,86 +2125,97 @@ static void teardown_steering(struct mlx5_vdpa_net = *ndev) mlx5_destroy_flow_table(ndev->rxft); } =20 -static virtio_net_ctrl_ack handle_ctrl_mac(struct mlx5_vdpa_dev *mvdev, u8= cmd) +static int mlx5_vdpa_change_mac(struct mlx5_vdpa_net *ndev, + struct mlx5_core_dev *pfmdev, + const u8 *new_mac) { - struct mlx5_vdpa_net *ndev =3D to_mlx5_vdpa_ndev(mvdev); - struct mlx5_control_vq *cvq =3D &mvdev->cvq; - virtio_net_ctrl_ack status =3D VIRTIO_NET_ERR; - struct mlx5_core_dev *pfmdev; - size_t read; - u8 mac[ETH_ALEN], mac_back[ETH_ALEN]; + struct mlx5_vdpa_dev *mvdev =3D &ndev->mvdev; + u8 old_mac[ETH_ALEN]; =20 - pfmdev =3D pci_get_drvdata(pci_physfn(mvdev->mdev->pdev)); - switch (cmd) { - case VIRTIO_NET_CTRL_MAC_ADDR_SET: - read =3D vringh_iov_pull_iotlb(&cvq->vring, &cvq->riov, (void *)mac, ETH= _ALEN); - if (read !=3D ETH_ALEN) - break; + if (is_zero_ether_addr(new_mac)) + return -EINVAL; =20 - if (!memcmp(ndev->config.mac, mac, 6)) { - status =3D VIRTIO_NET_OK; - break; + if (!is_zero_ether_addr(ndev->config.mac)) { + if (mlx5_mpfs_del_mac(pfmdev, ndev->config.mac)) { + mlx5_vdpa_warn(mvdev, "failed to delete old MAC %pM from MPFS table\n", + ndev->config.mac); + return -EIO; } + } =20 - if (is_zero_ether_addr(mac)) - break; + if (mlx5_mpfs_add_mac(pfmdev, (u8 *)new_mac)) { + mlx5_vdpa_warn(mvdev, "failed to insert new MAC %pM into MPFS table\n", + new_mac); + return -EIO; + } =20 - if (!is_zero_ether_addr(ndev->config.mac)) { - if (mlx5_mpfs_del_mac(pfmdev, ndev->config.mac)) { - mlx5_vdpa_warn(mvdev, "failed to delete old MAC %pM from MPFS table\n", - ndev->config.mac); - break; - } - } + /* backup the original mac address so that if failed to add the forward r= ules + * we could restore it + */ + ether_addr_copy(old_mac, ndev->config.mac); =20 - if (mlx5_mpfs_add_mac(pfmdev, mac)) { - mlx5_vdpa_warn(mvdev, "failed to insert new MAC %pM into MPFS table\n", - mac); - break; - } + ether_addr_copy(ndev->config.mac, new_mac); =20 - /* backup the original mac address so that if failed to add the forward = rules - * we could restore it - */ - memcpy(mac_back, ndev->config.mac, ETH_ALEN); + /* Need recreate the flow table entry, so that the packet could forward b= ack + */ + mac_vlan_del(ndev, old_mac, 0, false); =20 - memcpy(ndev->config.mac, mac, ETH_ALEN); + if (mac_vlan_add(ndev, ndev->config.mac, 0, false)) { + mlx5_vdpa_warn(mvdev, "failed to insert forward rules, try to restore\n"= ); =20 - /* Need recreate the flow table entry, so that the packet could forward = back + /* Although it hardly run here, we still need double check */ + if (is_zero_ether_addr(old_mac)) { + mlx5_vdpa_warn(mvdev, "restore mac failed: Original MAC is zero\n"); + return -EIO; + } + + /* Try to restore original mac address to MFPS table, and try to restore + * the forward rule entry. */ - mac_vlan_del(ndev, mac_back, 0, false); + if (mlx5_mpfs_del_mac(pfmdev, ndev->config.mac)) { + mlx5_vdpa_warn(mvdev, "restore mac failed: delete MAC %pM from MPFS tab= le failed\n", + ndev->config.mac); + } =20 - if (mac_vlan_add(ndev, ndev->config.mac, 0, false)) { - mlx5_vdpa_warn(mvdev, "failed to insert forward rules, try to restore\n= "); + if (mlx5_mpfs_add_mac(pfmdev, old_mac)) { + mlx5_vdpa_warn(mvdev, "restore mac failed: insert old MAC %pM into MPFS= table failed\n", + old_mac); + } =20 - /* Although it hardly run here, we still need double check */ - if (is_zero_ether_addr(mac_back)) { - mlx5_vdpa_warn(mvdev, "restore mac failed: Original MAC is zero\n"); - break; - } + ether_addr_copy(ndev->config.mac, old_mac); =20 - /* Try to restore original mac address to MFPS table, and try to restore - * the forward rule entry. - */ - if (mlx5_mpfs_del_mac(pfmdev, ndev->config.mac)) { - mlx5_vdpa_warn(mvdev, "restore mac failed: delete MAC %pM from MPFS ta= ble failed\n", - ndev->config.mac); - } + if (mac_vlan_add(ndev, ndev->config.mac, 0, false)) + mlx5_vdpa_warn(mvdev, "restore forward rules failed: insert forward rul= es failed\n"); =20 - if (mlx5_mpfs_add_mac(pfmdev, mac_back)) { - mlx5_vdpa_warn(mvdev, "restore mac failed: insert old MAC %pM into MPF= S table failed\n", - mac_back); - } + return -EIO; + } =20 - memcpy(ndev->config.mac, mac_back, ETH_ALEN); + return 0; +} =20 - if (mac_vlan_add(ndev, ndev->config.mac, 0, false)) - mlx5_vdpa_warn(mvdev, "restore forward rules failed: insert forward ru= les failed\n"); +static virtio_net_ctrl_ack handle_ctrl_mac(struct mlx5_vdpa_dev *mvdev, u8= cmd) +{ + struct mlx5_vdpa_net *ndev =3D to_mlx5_vdpa_ndev(mvdev); + struct mlx5_control_vq *cvq =3D &mvdev->cvq; + virtio_net_ctrl_ack status =3D VIRTIO_NET_ERR; + struct mlx5_core_dev *pfmdev; + size_t read; + u8 mac[ETH_ALEN]; =20 + pfmdev =3D pci_get_drvdata(pci_physfn(mvdev->mdev->pdev)); + switch (cmd) { + case VIRTIO_NET_CTRL_MAC_ADDR_SET: + read =3D vringh_iov_pull_iotlb(&cvq->vring, &cvq->riov, + (void *)mac, ETH_ALEN); + if (read !=3D ETH_ALEN) break; - } =20 - status =3D VIRTIO_NET_OK; + if (!memcmp(ndev->config.mac, mac, 6)) { + status =3D VIRTIO_NET_OK; + break; + } + status =3D mlx5_vdpa_change_mac(ndev, pfmdev, mac) ? VIRTIO_NET_ERR : + VIRTIO_NET_OK; break; =20 default: --=20 2.51.0 From nobody Sun Feb 8 01:52:09 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DAE232D42A for ; Mon, 26 Jan 2026 09:49:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769420957; cv=none; b=S3fh3zqIMlylIGA8E5fu4PgrI7TZz34Haou3UhnUSGqv2tDX5rZcLd7Cck3RijJ+GnuUp1iddxyPAEolAm4Q6Xa5J6oUnEGIdiQavbtDBwwiUnDtjkW0ATJpN5Np9Wz4f0Uf2knUPYXOlVxFImX9u4dg2z2cA3ghvLfPeVyPuGs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769420957; c=relaxed/simple; bh=sQG0ulPjyoMU2mXqCzKt0fj8BMgAfnG4+oOFmOhKhfo=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QcSiGH1TbF0Rhd6sCBlMZO8lCZrO1sfuijBNEcsWbe+vF7u+nfD0v7EQU/aXJfupE2wubkw1cwo8+l+aKb7JHHMgGjF65wXqpgkUmot5DGd4n7NDhPOKDfAokrWSHw9+UY6uvrrrRpq5pji0EX60r+gGdBz6NBmxP58fcTBAD0M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=FKNikyjY; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FKNikyjY" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1769420954; 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: in-reply-to:in-reply-to:references:references; bh=ItKIv+h2/RtsA3PNwbq9GoAOv0lsdKDp+oWdKyES3kM=; b=FKNikyjYo15qN+Pi/5JAjedAX+4KBWzVbut6bX2XMhTNEICOTVhwm/b7UscfQm6qS9FJ3i i4dDuWkhqVds9D+o8WbVmYYGTD2IW2NvMG06NhibBPc85GmGMdRkQRDCAY+Tz5K/07anBN /AqaoUezM1V4KxGYQ0dnEMSSA1Y368Q= Received: from mx-prod-mc-05.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-695-XxBIQ1eWMfSKmDIbSAM0Sg-1; Mon, 26 Jan 2026 04:49:12 -0500 X-MC-Unique: XxBIQ1eWMfSKmDIbSAM0Sg-1 X-Mimecast-MFC-AGG-ID: XxBIQ1eWMfSKmDIbSAM0Sg_1769420951 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8E9811956094; Mon, 26 Jan 2026 09:49:11 +0000 (UTC) Received: from S2.redhat.com (unknown [10.72.112.82]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D7E71180066A; Mon, 26 Jan 2026 09:49:07 +0000 (UTC) From: Cindy Lu To: lulu@redhat.com, dtatulea@nvidia.com, mst@redhat.com, jasowang@redhat.com, netdev@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH v4 3/3] vdpa/mlx5: update MAC address handling in mlx5_vdpa_set_attr() Date: Mon, 26 Jan 2026 17:45:38 +0800 Message-ID: <20260126094848.9601-4-lulu@redhat.com> In-Reply-To: <20260126094848.9601-1-lulu@redhat.com> References: <20260126094848.9601-1-lulu@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" Improve MAC address handling in mlx5_vdpa_set_attr() to ensure that old MAC entries are properly removed from the MPFS table before adding a new one. The new MAC address is then added to both the MPFS and VLAN tables. This change fixes an issue where the updated MAC address would not take effect until QEMU was rebooted. Signed-off-by: Cindy Lu Reviewed-by: Dragos Tatulea --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5= _vnet.c index 78a4b80d1ce2..517edd7da019 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -4055,17 +4055,15 @@ static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev = *v_mdev, struct vdpa_device * static int mlx5_vdpa_set_attr(struct vdpa_mgmt_dev *v_mdev, struct vdpa_de= vice *dev, const struct vdpa_dev_set_config *add_config) { - struct virtio_net_config *config; struct mlx5_core_dev *pfmdev; struct mlx5_vdpa_dev *mvdev; struct mlx5_vdpa_net *ndev; struct mlx5_core_dev *mdev; - int err =3D 0; + int err =3D -EOPNOTSUPP; =20 mvdev =3D to_mvdev(dev); ndev =3D to_mlx5_vdpa_ndev(mvdev); mdev =3D mvdev->mdev; - config =3D &ndev->config; =20 down_write(&ndev->reslock); =20 @@ -4078,9 +4076,8 @@ static int mlx5_vdpa_set_attr(struct vdpa_mgmt_dev *v= _mdev, struct vdpa_device * goto out; } pfmdev =3D pci_get_drvdata(pci_physfn(mdev->pdev)); - err =3D mlx5_mpfs_add_mac(pfmdev, config->mac); - if (!err) - ether_addr_copy(config->mac, add_config->net.mac); + err =3D mlx5_vdpa_change_mac(ndev, pfmdev, + (u8 *)add_config->net.mac); } =20 out: --=20 2.51.0