[net,v1,4/6] net: dsa: microchip: ksz8: ksz8_fdb_dump: avoid extracting ghost entry from empty dynamic MAC table.
| Message ID | 20230322143130.1432106-5-o.rempel@pengutronix.de |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2386220wrt;
Wed, 22 Mar 2023 07:59:00 -0700 (PDT)
X-Google-Smtp-Source:
AK7set9eI9sA+7yIsHMBc6Il+hRg37hxFeJQXVKrVk14l5DuGTNw8aM6l9eSN6RRuZYWQfFhVrEG
X-Received: by 2002:a62:4e8f:0:b0:625:cc63:642b with SMTP id
c137-20020a624e8f000000b00625cc63642bmr2846268pfb.14.1679497140332;
Wed, 22 Mar 2023 07:59:00 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1679497140; cv=none;
d=google.com; s=arc-20160816;
b=HUqgZt9mCpLs+SrZPmN3bkVc6GT3tw58rXPljdUCi6C+MqHwAaKQnoXue8HCvg71iX
Si/y2UNNTtKRyMytSkLu5/x+jNJss2Y1SFkXvJM1eGl7o5QIrGCfGu9zLzJdZ7S7vG7T
glt72HNdA0eiWqsQmzShhXP8n2lVfx0JlhKcvDlMIsydSppqFF9x0Cj9bMrSr+Gflm0h
PsiTkcz0FF3KtQtQWe7SQEBste3bsIkCZiGVLz440gC/NNlCamO5jELeLCtnur8pnWcX
rGJTH/MKC79G2DFlWQ2+lR5Yu3QPD4OhaimS4L0Kr/iOS7UR66asepMCUeGbfwH5F2U1
wFMg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:references:in-reply-to:message-id:date:subject:cc:to:from;
bh=4WFugXcRop/JhBfW0Fo0osjYXMermoBlK4nMj1okSCw=;
b=hHFuBFMWEdnYGpnR2Pgo4RK1+EbR/D1nrGVr28zRCnM3s4zB/FHNikSWEvYTGGGNHm
ZsFsU6M9pdra0cgYinbZ27KN/FEoer9TeUF5eLQHwPL+dLbcqzq/n1iyYrTgaEEkIAQr
AQGRGHyHg3bT+d32tymWnPWzrnsh177EbcnWLcYv5grhc2ZDz6IklwN4QwpGxf31eBfb
hcAk+UnbgdyLH/2mSZt97Fc/kZ0GbfijNu6lnWS23XeNM1LAZRGB5v7noW98ZYamYwws
4l3DYSnag2WHjVeXGjsiGSN1ZEEXaAfjP2nDbgRk20phCxmAoVX+hv02J3BfR3Qj/Fa7
+3cQ==
ARC-Authentication-Results: i=1; mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
x26-20020a63171a000000b005004b2acf6dsi16069633pgl.810.2023.03.22.07.58.47;
Wed, 22 Mar 2023 07:59:00 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S231564AbjCVOb6 (ORCPT <rfc822;pusanteemu@gmail.com> + 99 others);
Wed, 22 Mar 2023 10:31:58 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48564 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S231472AbjCVObq (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 22 Mar 2023 10:31:46 -0400
Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de
[IPv6:2001:67c:670:201:290:27ff:fe1d:cc33])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9158562B73
for <linux-kernel@vger.kernel.org>;
Wed, 22 Mar 2023 07:31:45 -0700 (PDT)
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
by metis.ext.pengutronix.de with esmtps
(TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.92)
(envelope-from <ore@pengutronix.de>)
id 1pezV1-0003Op-Ar; Wed, 22 Mar 2023 15:31:35 +0100
Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de)
by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2)
(envelope-from <ore@pengutronix.de>)
id 1pezUy-005wW6-7e; Wed, 22 Mar 2023 15:31:32 +0100
Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2)
(envelope-from <ore@pengutronix.de>)
id 1pezUx-0060a3-45; Wed, 22 Mar 2023 15:31:31 +0100
From: Oleksij Rempel <o.rempel@pengutronix.de>
To: "David S. Miller" <davem@davemloft.net>,
Andrew Lunn <andrew@lunn.ch>,
Eric Dumazet <edumazet@google.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>,
Vladimir Oltean <olteanv@gmail.com>,
Woojung Huh <woojung.huh@microchip.com>
Cc: Oleksij Rempel <o.rempel@pengutronix.de>, kernel@pengutronix.de,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
UNGLinuxDriver@microchip.com
Subject: [PATCH net v1 4/6] net: dsa: microchip: ksz8: ksz8_fdb_dump: avoid
extracting ghost entry from empty dynamic MAC table.
Date: Wed, 22 Mar 2023 15:31:28 +0100
Message-Id: <20230322143130.1432106-5-o.rempel@pengutronix.de>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20230322143130.1432106-1-o.rempel@pengutronix.de>
References: <20230322143130.1432106-1-o.rempel@pengutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2
X-SA-Exim-Mail-From: ore@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de);
SAEximRunCond expanded to false
X-PTX-Original-Recipient: linux-kernel@vger.kernel.org
X-Spam-Status: No, score=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED,
SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1761080393799900522?=
X-GMAIL-MSGID: =?utf-8?q?1761080393799900522?=
|
| Series |
net: dsa: microchip: ksz8: fixes for stable
|
|
Commit Message
Oleksij Rempel
March 22, 2023, 2:31 p.m. UTC
If the dynamic MAC table is empty, we will still extract one outdated
entry. Fix it by using correct bit offset.
Fixes: d23a5e18606c ("net: dsa: microchip: move ksz8->masks to ksz_common")
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
drivers/net/dsa/microchip/ksz_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
Hi Oleksij, On Wed, 2023-03-22 at 15:31 +0100, Oleksij Rempel wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you > know the content is safe > > If the dynamic MAC table is empty, we will still extract one outdated > entry. Fix it by using correct bit offset. > > Fixes: d23a5e18606c ("net: dsa: microchip: move ksz8->masks to > ksz_common") > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > --- > drivers/net/dsa/microchip/ksz_common.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/dsa/microchip/ksz_common.c > b/drivers/net/dsa/microchip/ksz_common.c > index c914449645ca..4929fb29ed06 100644 > --- a/drivers/net/dsa/microchip/ksz_common.c > +++ b/drivers/net/dsa/microchip/ksz_common.c > @@ -408,7 +408,7 @@ static const u32 ksz8863_masks[] = { > [STATIC_MAC_TABLE_OVERRIDE] = BIT(20), > [STATIC_MAC_TABLE_FWD_PORTS] = GENMASK(18, 16), > [DYNAMIC_MAC_TABLE_ENTRIES_H] = GENMASK(1, 0), > - [DYNAMIC_MAC_TABLE_MAC_EMPTY] = BIT(7), > + [DYNAMIC_MAC_TABLE_MAC_EMPTY] = BIT(2), Cross verified the bit mask with datasheet. Patch Looks good to me. Acked-by: Arun Ramadoss <arun.ramadoss@microchip.com> > [DYNAMIC_MAC_TABLE_NOT_READY] = BIT(7), > [DYNAMIC_MAC_TABLE_ENTRIES] = GENMASK(31, 24), > [DYNAMIC_MAC_TABLE_FID] = GENMASK(19, 16), > -- > 2.30.2 >
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index c914449645ca..4929fb29ed06 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -408,7 +408,7 @@ static const u32 ksz8863_masks[] = { [STATIC_MAC_TABLE_OVERRIDE] = BIT(20), [STATIC_MAC_TABLE_FWD_PORTS] = GENMASK(18, 16), [DYNAMIC_MAC_TABLE_ENTRIES_H] = GENMASK(1, 0), - [DYNAMIC_MAC_TABLE_MAC_EMPTY] = BIT(7), + [DYNAMIC_MAC_TABLE_MAC_EMPTY] = BIT(2), [DYNAMIC_MAC_TABLE_NOT_READY] = BIT(7), [DYNAMIC_MAC_TABLE_ENTRIES] = GENMASK(31, 24), [DYNAMIC_MAC_TABLE_FID] = GENMASK(19, 16),