From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5397F454E9 for ; Tue, 25 Jun 2024 02:01:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 40AA5410DC; Tue, 25 Jun 2024 02:01:46 +0200 (CEST) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mails.dpdk.org (Postfix) with ESMTP id D11EB40EDD for ; Tue, 25 Jun 2024 02:01:44 +0200 (CEST) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-363bbd51050so3903740f8f.0 for ; Mon, 24 Jun 2024 17:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273704; x=1719878504; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xwqtTPtpoPACazznkvLdJVyLcQ4JVQm3dAZit7kczUU=; b=ed1bsiNme3yRKJeVhO2WvdTShP7iHBOw91CkLep8DFOluPAL/P+E9FsAUCwrRhdWos EImMnQ+nE7qrfMnoQ68xhxZCSXt/SvPC8Q7ayCA2qWEWJdfE5Mr/X5LYswoX5tGHaiwg AFnGqXbv0pE4qhc3hrC9KfV/87eD3So9PTniOlOrHSanLKdUnq+QbFoMVXRTMQHeNsJ7 MaoCEQQ6v30FyWd23o+S3bKZVktt/OqUqIOl5L9jyOFK8eu2X3jj32e/xO7mbNOQPrxd MdWC4acpboBxKeCuPwLUS+Wf93+AeG0Bb/hhabYxUjRne3phwx6hTpDecriFZfUDEHmC t7FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273704; x=1719878504; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xwqtTPtpoPACazznkvLdJVyLcQ4JVQm3dAZit7kczUU=; b=knTwd/St2D9ORu/yHGyDXNUcCzCpr0ljha5UMUPKuXwHSQonQbpsmx0cAxTQWeMxqf 2O2iip+2kLDbMC9O0QTYkqAXG4pf/+G21uVMN06ODl02cjQAcmH7b8Cu/Lkg53rrd4d4 uz5Um3AcOdVivudTA56GPFRjWu0ADwjBI4TWMd8uRR/z2BPY//PSzAVN+J83Aw4fJUt+ 8m0TMjjlUY8AAUPMW5xXzVbVnL/+ZzlSwK9Ag9XC3Hw6kl4NbpQ4DVrq9+Zfhh7Knrps VwnoD0zH+l2Fug0FJ7UztMtJy10S0n1IkGnAZhuSlWlh/WrLdJDfnlpK/5y57+7YyQ7F Ft9A== X-Forwarded-Encrypted: i=1; AJvYcCW4n1R6qPQo2VZAy7C3Pxfw6lkVrmZSLpHLUPcAfc+slsSZDoF/oqnvDxMeHTxyZL0c33ZEa0jhriW4l5+hXT4= X-Gm-Message-State: AOJu0YwJVJA1ipQPM9uGhYC6VougDWVisLnSullZS2LKCBN8Dwxk/ZGB saGuCF2ggWrCSRyzEv4WjyEQ9EC41V1ovwUp8EZB0aQFEqJa9sov X-Google-Smtp-Source: AGHT+IE++acNaFdMAmqDr/TcsFjhNmcnTc7or8WZa6JYiW7Vqlp7le+ZTFxCPVS3tL8TQYisw1/T0Q== X-Received: by 2002:a05:6000:b0f:b0:360:91c2:56fd with SMTP id ffacd0b85a97d-366e4f00b78mr4597255f8f.49.1719273704336; Mon, 24 Jun 2024 17:01:44 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-366383f65easm11319622f8f.23.2024.06.24.17.01.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 17:01:44 -0700 (PDT) From: luca.boccassi@gmail.com To: Satha Rao Cc: Maxime Coquelin , dpdk stable Subject: patch 'net/virtio: fix MAC table update' has been queued to stable release 22.11.6 Date: Tue, 25 Jun 2024 00:58:32 +0100 Message-Id: <20240624235907.885628-46-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624235907.885628-1-luca.boccassi@gmail.com> References: <20240624235907.885628-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/48fb2f00d848ab9e9dc5ef15f3e343034c5bcf94 Thanks. Luca Boccassi --- >From 48fb2f00d848ab9e9dc5ef15f3e343034c5bcf94 Mon Sep 17 00:00:00 2001 From: Satha Rao Date: Thu, 30 May 2024 13:40:39 -0400 Subject: [PATCH] net/virtio: fix MAC table update [ upstream commit 7698e655516c54558a43b8aaed1bff69928d96fb ] Don't send NULL MAC addresses in MAC table update. Fixes: 1b306359e58c ("virtio: suport multiple MAC addresses") Signed-off-by: Satha Rao Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_ethdev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 073bbf482d..1d9a168f92 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1320,6 +1320,8 @@ virtio_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr, struct virtio_net_ctrl_mac *tbl = rte_is_multicast_ether_addr(addr) ? mc : uc; + if (rte_is_zero_ether_addr(addr)) + break; memcpy(&tbl->macs[tbl->entries++], addr, RTE_ETHER_ADDR_LEN); } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:16.288104719 +0100 +++ 0046-net-virtio-fix-MAC-table-update.patch 2024-06-25 00:22:13.177185486 +0100 @@ -1 +1 @@ -From 7698e655516c54558a43b8aaed1bff69928d96fb Mon Sep 17 00:00:00 2001 +From 48fb2f00d848ab9e9dc5ef15f3e343034c5bcf94 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7698e655516c54558a43b8aaed1bff69928d96fb ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 517585740e..70d4839def 100644 +index 073bbf482d..1d9a168f92 100644 @@ -21 +22 @@ -@@ -913,6 +913,8 @@ virtio_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr, +@@ -1320,6 +1320,8 @@ virtio_mac_addr_add(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr,