[net,v2,4/6] net: dsa: microchip: ksz8: ksz8_fdb_dump: avoid extracting ghost entry from empty dynamic MAC table.
| Message ID | 20230324080608.3428714-5-o.rempel@pengutronix.de |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp463224vqo;
Fri, 24 Mar 2023 01:32:36 -0700 (PDT)
X-Google-Smtp-Source:
AKy350ZlVTnm4T3yPP/olCICLPtY0Mkc6gjcnqA/QPAw4O8unk6WhS/QcwSko5/N3M5XXyXeTKQ3
X-Received: by 2002:a17:902:c943:b0:1a1:b748:f33f with SMTP id
i3-20020a170902c94300b001a1b748f33fmr1761200pla.69.1679646756252;
Fri, 24 Mar 2023 01:32:36 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1679646756; cv=none;
d=google.com; s=arc-20160816;
b=c2/TEJ8AWy5QuObFTA/cIsp05XMeZD0PL+lh4XuNDDZyoSVVpTc4YOeW75u9yDmBPm
ht4EuAqPUmAVr2JPdcV2y+Uka4HLzaiBzk3WzuXViZMZJfkqMfF6lO/XXifsixJMe9hb
/hHnKT9/KE8hZv0ZaylA2/xdIK9Teb8rCP9eSkfFUTIJB/XLYAR401Y3molM4+80IHW6
PmHjZMrXzCBG1aEtAWPuPux88kpLtIta3aJSlHKYZhdnhEuGreefjxXA+hT1HgZSh43W
OMytNvcN7zXlHcgJzRnxktdGHshSGzqNx0t+Oly/atZqZrv3ldnaxSXGATym0NC3A4GC
Mo7g==
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=3xNC40IG4to9Gkb3hZWy65Ic2B7B2Q6R36vCfsUTT/8=;
b=XvsLrj69cUdT3xHtQTwoCtZJYFtYK14ipaEm9VQsECpeXzoQc89cTBhSy4/JcWqqcd
dOnl7BwysG43UFajBqNE5FWFpPQfBf7fAyxv3ZZZ8OoefDDY26ojyZi03p0gbP9fNDO9
891eqNJwvmVmf0tay5zigLGT9HVf8LXm9b0hAxo44i5cQlC+hmFX9ZUszKpXcMSXBUcM
KZlPovnuSngoAuINcCUGqM7THG2WsKyf9mdq9/VsE+/uIK7LQHRgolwC1lOJrrQ98zoS
rWGhzfKYvhgcGyptFZ3gx9lbTrk1khYxoy/QiV0Qw1/YYnkrjh1g1enCt+aizaazoy2x
LoYw==
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
g24-20020a63fa58000000b004dacaa17ecbsi20499860pgk.559.2023.03.24.01.32.23;
Fri, 24 Mar 2023 01:32:36 -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 S231861AbjCXIGq (ORCPT <rfc822;ezelljr.billy@gmail.com>
+ 99 others); Fri, 24 Mar 2023 04:06:46 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50352 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S231527AbjCXIGX (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Fri, 24 Mar 2023 04:06:23 -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 885002387F
for <linux-kernel@vger.kernel.org>;
Fri, 24 Mar 2023 01:06:21 -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 1pfcRB-00077R-IS; Fri, 24 Mar 2023 09:06:13 +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 1pfcR8-006KcO-TU; Fri, 24 Mar 2023 09:06:10 +0100
Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2)
(envelope-from <ore@pengutronix.de>)
id 1pfcR7-00ENzP-Iu; Fri, 24 Mar 2023 09:06:09 +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>,
Arun Ramadoss <arun.ramadoss@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 v2 4/6] net: dsa: microchip: ksz8: ksz8_fdb_dump: avoid
extracting ghost entry from empty dynamic MAC table.
Date: Fri, 24 Mar 2023 09:06:06 +0100
Message-Id: <20230324080608.3428714-5-o.rempel@pengutronix.de>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20230324080608.3428714-1-o.rempel@pengutronix.de>
References: <20230324080608.3428714-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?1761237277175127255?=
X-GMAIL-MSGID: =?utf-8?q?1761237277175127255?=
|
| Series |
net: dsa: microchip: ksz8: fixes for stable
|
|
Commit Message
Oleksij Rempel
March 24, 2023, 8:06 a.m. UTC
If the dynamic MAC table is empty, we will still extract one outdated
entry. Fix it by using correct bit offset.
Fixes: 4b20a07e103f ("net: dsa: microchip: ksz8795: add support for ksz88xx chips")
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Acked-by: Arun Ramadoss <arun.ramadoss@microchip.com>
---
drivers/net/dsa/microchip/ksz_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 3/24/23 01:06, Oleksij Rempel wrote: > If the dynamic MAC table is empty, we will still extract one outdated > entry. Fix it by using correct bit offset. > > Fixes: 4b20a07e103f ("net: dsa: microchip: ksz8795: add support for ksz88xx chips") > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > Acked-by: Arun Ramadoss <arun.ramadoss@microchip.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
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),