From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 320CAC433F5 for ; Fri, 8 Apr 2022 13:06:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5o4zpYd9nIs+5IASOwEf12nWPCVEwKqxZ59Cs8uhGd8=; b=e2JU/zKG86zT9X u1B7hp55pJswEsv1kGQnAa8E5EOcPpu6t7QPp/7ePlHRDRDMl8GFkcjYTBeeMVVvdyJgkCXY4fCS4 X205AII2quB5GqROi9yYrikSUVeYh6RY0xSPgYrN245SKvcJVy+bbDvXMQAkYngoYvK0EEo6U4gzv CSkKolA2whDcmHENRUw6pt7vlqLeh93qPwN7oNRTcIlNUcQu1RmL2dmOPzZU7aPopzkwVW4zMKDF1 4J0q1nTundFMEMJ54SnmOPC37g/ufZ4YfdD+QQ5mMb+VFzEE0UswziQuDAHi2lsKapvt1Dk5I60eq BPF7E5ynbJ5pUd99Bbnw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ncoI4-00HFNL-Kn; Fri, 08 Apr 2022 13:04:41 +0000 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ncnld-00H12Q-2P for linux-arm-kernel@lists.infradead.org; Fri, 08 Apr 2022 12:31:11 +0000 Received: by mail-ed1-x52a.google.com with SMTP id k2so9861134edj.9 for ; Fri, 08 Apr 2022 05:31:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=MdB4ANwvghcG4fkQozdLA8gRjmcacHbkquFwAsn8CRc=; b=DiZ9jvoKF93GbRCqokSIJWSa1Cgz/AAF7qnZXRgs26kl2t5t/RnDVPs+M1q6PNMbRx HPeTZEHveI4zWPG8wAK5IGmRrvLHNXG7uhwya4CpBOWeDH6HVCFW4quBofsxSwCaYHsU zGUq+ETYq/9PuZF0oCFJPBVyL0du9IY5LGiM6mPebPK8DLte4lamuL//mpS90Qto0ldD bwIMw4MHHNRsImr51cp2Jsw4tTJnDoQ0ekoCIeoYZHigcEhcfJXSW3qDVnSDy5l8UrO4 XKqBOGz8DWnUVdEtAxFi7bNJP6Y+xFAmLkn9uGSZWeA9A7r7vXseb56pXiLvAHR2+ZeK HXfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=MdB4ANwvghcG4fkQozdLA8gRjmcacHbkquFwAsn8CRc=; b=DkXEMFqyK6E6ijUf2F5kVO0KsDmr1X9t9ZjU+hyMToPFOFHx4PMGTfL91fA6Yl/6Ik IG927sfYOL6L2M7M9Dj3vjs6a0ey7Sxe+blMvHE9KBYwWMHznoJBjF9lQKt5fwBeLyB+ s6tv2qdaIBh8pPQzBGVeXJIY2adEg22iboeHQn8RbsROBn+ffvxVRuC6nG9W4dgolmgu gF/gSc+FyFBs8M6WErCF6hlUKzc68DEoqUS276RDbjSOBEOSqROjV9FXQ748vFIlL2vn nrXmSjGyjLI7+krD6UNj4DIbzI1nqhvTz6AQdwv8HiDp8KLC2FhHOVfYU1aARmzvYwUo xwIw== X-Gm-Message-State: AOAM5307V9LFHZo9N9cpY/5jK1eC7h1sn6K+EglnMeYf6OiznX1H0bmm eIXzI2TIDKxT8rlqy8W2t5U= X-Google-Smtp-Source: ABdhPJyAZrneojIBn7WVn8l4/2ymdhQ3RO+ob3K825lN5od6g+iFNxw2mpyIJef4bqmid+dNV8h1ug== X-Received: by 2002:a05:6402:289f:b0:41c:d9af:ce39 with SMTP id eg31-20020a056402289f00b0041cd9afce39mr19631558edb.415.1649421064812; Fri, 08 Apr 2022 05:31:04 -0700 (PDT) Received: from skbuf ([188.26.57.45]) by smtp.gmail.com with ESMTPSA id o22-20020a170906289600b006e44a0c1105sm8703503ejd.46.2022.04.08.05.31.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 05:31:04 -0700 (PDT) Date: Fri, 8 Apr 2022 15:31:01 +0300 From: Vladimir Oltean To: Jakob Koschel Cc: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Andrew Lunn , Vivien Didelot , Florian Fainelli , Lars Povlsen , Steen Hegelund , UNGLinuxDriver@microchip.com, Ariel Elior , Manish Chopra , Edward Cree , Martin Habets , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Jiri Pirko , Casper Andersson , Bjarni Jonasson , Colin Ian King , Michael Walle , Christophe JAILLET , Arnd Bergmann , Eric Dumazet , Di Zhu , Xu Wang , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, Mike Rapoport , Brian Johannesmeyer , Cristiano Giuffrida , "Bos, H.J." Subject: Re: [PATCH net-next 03/15] net: dsa: mv88e6xxx: Replace usage of found with dedicated iterator Message-ID: <20220408123101.p33jpynhqo67hebe@skbuf> References: <20220407102900.3086255-1-jakobkoschel@gmail.com> <20220407102900.3086255-4-jakobkoschel@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220407102900.3086255-4-jakobkoschel@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220408_053109_210151_9953E53D X-CRM114-Status: GOOD ( 45.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Jakob, On Thu, Apr 07, 2022 at 12:28:48PM +0200, Jakob Koschel wrote: > To move the list iterator variable into the list_for_each_entry_*() > macro in the future it should be avoided to use the list iterator > variable after the loop body. > > To *never* use the list iterator variable after the loop it was > concluded to use a separate iterator variable instead of a > found boolean [1]. > > This removes the need to use a found variable and simply checking if > the variable was set, can determine if the break/goto was hit. > > Link: https://lore.kernel.org/all/CAHk-=wgRr_D8CB-D9Kg-c=EHreAsk5SqXPwr9Y7k9sA6cWXJ6w@mail.gmail.com/ [1] > Signed-off-by: Jakob Koschel > --- > drivers/net/dsa/mv88e6xxx/chip.c | 21 ++++++++++----------- > 1 file changed, 10 insertions(+), 11 deletions(-) > > diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c > index 64f4fdd02902..f254f537c357 100644 > --- a/drivers/net/dsa/mv88e6xxx/chip.c > +++ b/drivers/net/dsa/mv88e6xxx/chip.c > @@ -1381,28 +1381,27 @@ static int mv88e6xxx_set_mac_eee(struct dsa_switch *ds, int port, > /* Mask of the local ports allowed to receive frames from a given fabric port */ > static u16 mv88e6xxx_port_vlan(struct mv88e6xxx_chip *chip, int dev, int port) > { > + struct dsa_port *dp = NULL, *iter, *other_dp; > struct dsa_switch *ds = chip->ds; > struct dsa_switch_tree *dst = ds->dst; > - struct dsa_port *dp, *other_dp; > - bool found = false; > u16 pvlan; > > /* dev is a physical switch */ > if (dev <= dst->last_switch) { > - list_for_each_entry(dp, &dst->ports, list) { > - if (dp->ds->index == dev && dp->index == port) { > - /* dp might be a DSA link or a user port, so it > + list_for_each_entry(iter, &dst->ports, list) { > + if (iter->ds->index == dev && iter->index == port) { > + /* iter might be a DSA link or a user port, so it > * might or might not have a bridge. > - * Use the "found" variable for both cases. > + * Set the "dp" variable for both cases. > */ > - found = true; > + dp = iter; > break; > } > } > /* dev is a virtual bridge */ > } else { > - list_for_each_entry(dp, &dst->ports, list) { > - unsigned int bridge_num = dsa_port_bridge_num_get(dp); > + list_for_each_entry(iter, &dst->ports, list) { > + unsigned int bridge_num = dsa_port_bridge_num_get(iter); > > if (!bridge_num) > continue; > @@ -1410,13 +1409,13 @@ static u16 mv88e6xxx_port_vlan(struct mv88e6xxx_chip *chip, int dev, int port) > if (bridge_num + dst->last_switch != dev) > continue; > > - found = true; > + dp = iter; > break; > } > } > > /* Prevent frames from unknown switch or virtual bridge */ > - if (!found) > + if (!dp) > return 0; > > /* Frames from DSA links and CPU ports can egress any local port */ > -- > 2.25.1 > Let's try to not make convoluted code worse. Do the following 2 patches achieve what you are looking for? Originally I had a single patch (what is now 2/2) but I figured it would be cleaner to break out the unrelated change into what is now 1/2. If you want I can submit these changes separately. -----------------------------[ cut here ]----------------------------- >From 2d84ecd87566b1535a04526b4ebb2764e764625f Mon Sep 17 00:00:00 2001 From: Vladimir Oltean Date: Fri, 8 Apr 2022 15:15:30 +0300 Subject: [PATCH 1/2] net: dsa: mv88e6xxx: remove redundant check in mv88e6xxx_port_vlan() We know that "dev > dst->last_switch" in the "else" block. In other words, that "dev - dst->last_switch" is > 0. dsa_port_bridge_num_get(dp) can be 0, but the check "if (bridge_num + dst->last_switch != dev) continue", rewritten as "if (bridge_num != dev - dst->last_switch) continue", aka "if (bridge_num != something which cannot be 0) continue", makes it redundant to have the extra "if (!bridge_num) continue" logic, since a bridge_num of zero would have been skipped anyway. Signed-off-by: Vladimir Oltean --- drivers/net/dsa/mv88e6xxx/chip.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 64f4fdd02902..b3aa0e5bc842 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -1404,9 +1404,6 @@ static u16 mv88e6xxx_port_vlan(struct mv88e6xxx_chip *chip, int dev, int port) list_for_each_entry(dp, &dst->ports, list) { unsigned int bridge_num = dsa_port_bridge_num_get(dp); - if (!bridge_num) - continue; - if (bridge_num + dst->last_switch != dev) continue; -----------------------------[ cut here ]----------------------------- -----------------------------[ cut here ]----------------------------- >From dabafdbe38b408f7c563ad91fc6e57791055fed7 Mon Sep 17 00:00:00 2001 From: Vladimir Oltean Date: Fri, 8 Apr 2022 14:57:45 +0300 Subject: [PATCH 2/2] net: dsa: mv88e6xxx: refactor mv88e6xxx_port_vlan() To avoid bugs and speculative execution exploits due to type-confused pointers at the end of a list_for_each_entry() loop, one measure is to restrict code to not use the iterator variable outside the loop block. In the case of mv88e6xxx_port_vlan(), this isn't a problem, as we never let the loops exit through "natural causes" anyway, by using a "found" variable and then using the last "dp" iterator prior to the break, which is a safe thing to do. Nonetheless, with the expected new syntax, this pattern will no longer be possible. Profit off of the occasion and break the two port finding methods into smaller sub-functions. Somehow, returning a copy of the iterator pointer is still accepted. This change makes it redundant to have a "bool found", since the "dp" from mv88e6xxx_port_vlan() now holds NULL if we haven't found what we were looking for. Signed-off-by: Vladimir Oltean --- drivers/net/dsa/mv88e6xxx/chip.c | 54 ++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index b3aa0e5bc842..1f35e89053e6 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -1378,42 +1378,50 @@ static int mv88e6xxx_set_mac_eee(struct dsa_switch *ds, int port, return 0; } +static struct dsa_port *mv88e6xxx_find_port(struct dsa_switch_tree *dst, + int sw_index, int port) +{ + struct dsa_port *dp; + + list_for_each_entry(dp, &dst->ports, list) + if (dp->ds->index == sw_index && dp->index == port) + return dp; + + return NULL; +} + +static struct dsa_port * +mv88e6xxx_find_port_by_bridge_num(struct dsa_switch_tree *dst, + unsigned int bridge_num) +{ + struct dsa_port *dp; + + list_for_each_entry(dp, &dst->ports, list) + if (dsa_port_bridge_num_get(dp) == bridge_num) + return dp; + + return NULL; +} + /* Mask of the local ports allowed to receive frames from a given fabric port */ static u16 mv88e6xxx_port_vlan(struct mv88e6xxx_chip *chip, int dev, int port) { struct dsa_switch *ds = chip->ds; struct dsa_switch_tree *dst = ds->dst; struct dsa_port *dp, *other_dp; - bool found = false; u16 pvlan; - /* dev is a physical switch */ if (dev <= dst->last_switch) { - list_for_each_entry(dp, &dst->ports, list) { - if (dp->ds->index == dev && dp->index == port) { - /* dp might be a DSA link or a user port, so it - * might or might not have a bridge. - * Use the "found" variable for both cases. - */ - found = true; - break; - } - } - /* dev is a virtual bridge */ + /* dev is a physical switch */ + dp = mv88e6xxx_find_port(dst, dev, port); } else { - list_for_each_entry(dp, &dst->ports, list) { - unsigned int bridge_num = dsa_port_bridge_num_get(dp); - - if (bridge_num + dst->last_switch != dev) - continue; - - found = true; - break; - } + /* dev is a virtual bridge */ + dp = mv88e6xxx_find_port_by_bridge_num(dst, + dev - dst->last_switch); } /* Prevent frames from unknown switch or virtual bridge */ - if (!found) + if (!dp) return 0; /* Frames from DSA links and CPU ports can egress any local port */ -----------------------------[ cut here ]----------------------------- _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel