From patchwork Wed Jan 27 01:00:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 12049089 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A77B6C433DB for ; Wed, 27 Jan 2021 07:02:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 65AE82072E for ; Wed, 27 Jan 2021 07:02:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232742AbhA0HBs (ORCPT ); Wed, 27 Jan 2021 02:01:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S316920AbhA0BBZ (ORCPT ); Tue, 26 Jan 2021 20:01:25 -0500 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C30DC061574 for ; Tue, 26 Jan 2021 17:00:44 -0800 (PST) Received: by mail-ed1-x529.google.com with SMTP id j13so359718edp.2 for ; Tue, 26 Jan 2021 17:00:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Rmce2OFbDqlp87QXq6O7QiMgUnESbP7sSv496Tlc0gQ=; b=FKRw3VFxDnFOSL/phKvdo8U78UhOKgcjvLObDYoB7JigP4D1xOCcE5TUZgZ/b3pgGF wu2+4SMN4RUliU9KKGPtk47ADeETDtIdp35KJIJLHTpM4G1NF7rcrgwHF3ZyfXJczFyO qPKYGOU7OEOmgrNINV4emWJ8gQHDjPFi0M2h6kpyTkuABp97b5chsTha4fK9Ciap9+0q B3zc3P/HlVDoR1Be3OYL9gzoYA0H9olH4r5rb9XOgXfH4C5sddWJiQKwXu0LNuAQl+ri cFKe/y03pZGlgImDz+10n6TcvbPX6LkyDeYHz20or4LN/TClQn6dSt3lbT2VtE9Fhled nYcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Rmce2OFbDqlp87QXq6O7QiMgUnESbP7sSv496Tlc0gQ=; b=bnXX3TLEymLOKepm3NRy8uOjDCFUTCngIz4/R6OoFqC1gIDyFY59bgjKysncPjFSAG fz1twc15UvPRxW1H7qyrDGNXbF3xpiX4ujLwAxZDqyLluCHVZPdy2kouPJyHi9Rvq2v/ FheZpQEsY5ogDCGgnAmER5itAg/Nc5Nw2BbMEFgKTc7uFevVJO6oh8a3eGrlmk4Lc+Bb q7Pojo7GLDmmjTdcuCqNho2UaMQ2+tWyWWR1YzS+1zGpEJ3e0Vw1I3R+o9LVWKwQhSvw uZ6zMZPfxfdlB/9jiTSHvNzdfMiCf+sfy2/jAbb8i5tprQ6Ql9aDUJDmUdZnRThVH+5C Neaw== X-Gm-Message-State: AOAM533LWFwrbwKSySX9/Qj2hkdaQyUMo6zx2XRhjbWF0s0G0/phmVL6 emGiJ4ZNfTiFpjc0CG1Q0gU= X-Google-Smtp-Source: ABdhPJyjuKBURfjmRGLxOuo2FZt2mPZsrLUzymLIqrJwwW1W4jIibl0CEjREP3TqYrIDhpPsGQpiXA== X-Received: by 2002:a05:6402:1819:: with SMTP id g25mr6351115edy.46.1611709243092; Tue, 26 Jan 2021 17:00:43 -0800 (PST) Received: from localhost.localdomain (5-12-227-87.residential.rdsnet.ro. [5.12.227.87]) by smtp.gmail.com with ESMTPSA id ko23sm115897ejc.35.2021.01.26.17.00.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 17:00:42 -0800 (PST) From: Vladimir Oltean To: "David S . Miller" , Jakub Kicinski , netdev@vger.kernel.org Cc: Andrew Lunn , Florian Fainelli , Vivien Didelot , Hideaki YOSHIFUJI Subject: [PATCH net-next 1/4] net: dsa: automatically bring up DSA master when opening user port Date: Wed, 27 Jan 2021 03:00:25 +0200 Message-Id: <20210127010028.1619443-2-olteanv@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210127010028.1619443-1-olteanv@gmail.com> References: <20210127010028.1619443-1-olteanv@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Vladimir Oltean DSA wants the master interface to be open before the user port is due to historical reasons. The promiscuity of interfaces that are down used to have issues, as referenced Lennert Buytenhek in commit df02c6ff2e39 ("dsa: fix master interface allmulti/promisc handling"). The bugfix mentioned there, commit b6c40d68ff64 ("net: only invoke dev->change_rx_flags when device is UP"), was basically a "don't do that" approach to working around the promiscuity while down issue. Further work done by Vlad Yasevich in commit d2615bf45069 ("net: core: Always propagate flag changes to interfaces") has resolved the underlying issue, and it is strictly up to the DSA and 8021q drivers now, it is no longer mandated by the networking core that the master interface must be up when changing its promiscuity. From DSA's point of view, deciding to error out in dsa_slave_open because the master isn't up is (a) a bad user experience and (b) missing the forest for the trees. Even if there still was an issue with promiscuity while down, DSA could still do this and avoid it: open the DSA master manually, then do whatever. Voila, the DSA master is now up, no need to error out. Doing it this way has the additional benefit that user space can now remove DSA-specific workarounds, like systemd-networkd with BindCarrier: https://github.com/systemd/systemd/issues/7478 And we can finally remove one of the 2 bullets in the "Common pitfalls using DSA setups" chapter. Signed-off-by: Vladimir Oltean Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- Documentation/networking/dsa/dsa.rst | 4 ---- net/dsa/slave.c | 10 ++++++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Documentation/networking/dsa/dsa.rst b/Documentation/networking/dsa/dsa.rst index a8d15dd2b42b..e9517af5fe02 100644 --- a/Documentation/networking/dsa/dsa.rst +++ b/Documentation/networking/dsa/dsa.rst @@ -273,10 +273,6 @@ will not make us go through the switch tagging protocol transmit function, so the Ethernet switch on the other end, expecting a tag will typically drop this frame. -Slave network devices check that the master network device is UP before allowing -you to administratively bring UP these slave network devices. A common -configuration mistake is forgetting to bring UP the master network device first. - Interactions with other subsystems ================================== diff --git a/net/dsa/slave.c b/net/dsa/slave.c index f2fb433f3828..393294a53834 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -68,8 +68,14 @@ static int dsa_slave_open(struct net_device *dev) struct dsa_port *dp = dsa_slave_to_port(dev); int err; - if (!(master->flags & IFF_UP)) - return -ENETDOWN; + if (!(master->flags & IFF_UP)) { + err = dev_change_flags(master, master->flags | IFF_UP, NULL); + if (err < 0) { + netdev_err(dev, "failed to open master %s\n", + master->name); + goto out; + } + } if (!ether_addr_equal(dev->dev_addr, master->dev_addr)) { err = dev_uc_add(master, dev->dev_addr); From patchwork Wed Jan 27 01:00:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 12049091 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6253CC433DB for ; Wed, 27 Jan 2021 07:02:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 31ABA2072E for ; Wed, 27 Jan 2021 07:02:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232788AbhA0HB5 (ORCPT ); Wed, 27 Jan 2021 02:01:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S316521AbhA0BBZ (ORCPT ); Tue, 26 Jan 2021 20:01:25 -0500 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 875A7C06174A for ; Tue, 26 Jan 2021 17:00:45 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id ox12so327766ejb.2 for ; Tue, 26 Jan 2021 17:00:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iQWVmXkvm0fkYg8H3/g3PhO4iUSVaG1NDc0ObhDfgzE=; b=c8aR/EcMc3dHLNuIiJuwkbxXx2LfW6+YCJUyeUdD5zVaXRnnhCMlt1WPrT06LFPS8m 81zpFHS/WLJgECadSyU2uxkSdVgV/tolzwseStaPo0e2nehEGrsXaDsnbMvqYa5F+m1a +52GtfvBYvIJg1JSbARxRTIsYR4bSEf7Q6H3o9SKRdK/FWWef2Us7guzxVo3HnPmyNSQ KD/vut9klgy1cKuE+8RdBspwv0uP3Ru1LQ1EoMNJ8PYcuCfDNHVHc0R7FrpP54tllfh5 h6RkUMMSUNcdGT2m5uTBx2hLUaiD3kC4Hc1Nsdeb6fVJWR3jWozcoqgVom7PIOYh6RuR +p0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iQWVmXkvm0fkYg8H3/g3PhO4iUSVaG1NDc0ObhDfgzE=; b=jdUpa24Az004pJkqK8EffDQbTskShNA7+sOZYYJmf9OLv5b5JU8wZpdsmIiyorwLYO M+vpR+HqhY9n03aNwR48uEhFLqnrlg+i9LsFdyQ2wYaXdEaVINFW2jwgxNxBwMcI5KCr NvVLfo3e135p0+wHrSthcDHpnLOKlbwmc7nU/eao5cuEatLA+QMpNZKzJyvNRF3FQoqd /qN1MIt0E5oEDCSSO8uQwTtW6W67tL6J75oVzltH4HfhXxN8ZJDXm3iBe5wFWkUpiCJ2 88eOyekJ+DSY85eUJuRvyolm5KshvYiRMy//gS6MvoI54olcW+xS8hg4O+rd4Il82zc/ +k8Q== X-Gm-Message-State: AOAM531VwJXVWhH87Y/RRbQu+eXZG8t2yt9UHxTi5dJ1zF9BR99x+Upe GNu1MpDK4GaDlMAG3AVIXS8eEV5knUk= X-Google-Smtp-Source: ABdhPJzP7onk6tkTATpteRXbFAzMbP6t6zbYXwUgk4VjgPFQ5CulXngYDIQjSWVtH2T3J0sO3V4Anw== X-Received: by 2002:a17:906:d98:: with SMTP id m24mr4927869eji.428.1611709244316; Tue, 26 Jan 2021 17:00:44 -0800 (PST) Received: from localhost.localdomain (5-12-227-87.residential.rdsnet.ro. [5.12.227.87]) by smtp.gmail.com with ESMTPSA id ko23sm115897ejc.35.2021.01.26.17.00.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 17:00:43 -0800 (PST) From: Vladimir Oltean To: "David S . Miller" , Jakub Kicinski , netdev@vger.kernel.org Cc: Andrew Lunn , Florian Fainelli , Vivien Didelot , Hideaki YOSHIFUJI Subject: [PATCH net-next 2/4] net: dsa: automatically bring user ports down when master goes down Date: Wed, 27 Jan 2021 03:00:26 +0200 Message-Id: <20210127010028.1619443-3-olteanv@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210127010028.1619443-1-olteanv@gmail.com> References: <20210127010028.1619443-1-olteanv@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Vladimir Oltean This is not fixing any actual bug that I know of, but having a DSA interface that is up even when its lower (master) interface is down is one of those things that just do not sound right. Yes, DSA checks if the master is up before actually bringing the user interface up, but nobody prevents bringing the master interface down immediately afterwards... Then the user ports would attempt dev_queue_xmit on an interface that is down, and wonder what's wrong. This patch prevents that from happening. NETDEV_GOING_DOWN is the notification emitted _before_ the master actually goes down, and we are protected by the rtnl_mutex, so all is well. $ ip link set eno2 down [ 763.672211] mscc_felix 0000:00:00.5 swp0: Link is Down [ 763.880137] mscc_felix 0000:00:00.5 swp1: Link is Down [ 764.078773] mscc_felix 0000:00:00.5 swp2: Link is Down [ 764.197106] mscc_felix 0000:00:00.5 swp3: Link is Down [ 764.299384] fsl_enetc 0000:00:00.2 eno2: Link is Down For those of you reading this because you were doing switch testing such as latency measurements for autonomously forwarded traffic, and you needed a controlled environment with no extra packets sent by the network stack, this patch breaks that, because now the user ports go down too, which may shut down the PHY etc. But please don't do it like that, just do instead: tc qdisc add dev eno2 clsact tc filter add dev eno2 egress flower action drop Signed-off-by: Vladimir Oltean Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- net/dsa/slave.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 393294a53834..5e5798b46f34 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -2073,6 +2073,36 @@ static int dsa_slave_netdevice_event(struct notifier_block *nb, err = dsa_port_lag_change(dp, info->lower_state_info); return notifier_from_errno(err); } + case NETDEV_GOING_DOWN: { + struct dsa_port *dp, *cpu_dp; + struct dsa_switch_tree *dst; + int err = 0; + + if (!netdev_uses_dsa(dev)) + return NOTIFY_DONE; + + cpu_dp = dev->dsa_ptr; + dst = cpu_dp->ds->dst; + + list_for_each_entry(dp, &dst->ports, list) { + if (!dsa_is_user_port(dp->ds, dp->index)) { + struct net_device *slave = dp->slave; + + if (!(slave->flags & IFF_UP)) + continue; + + err = dev_change_flags(slave, + slave->flags & ~IFF_UP, + NULL); + if (err) + break; + } + } + + return notifier_from_errno(err); + } + default: + break; } return NOTIFY_DONE; From patchwork Wed Jan 27 01:00:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 12049083 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0C6CC43381 for ; Wed, 27 Jan 2021 07:01:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9BCB22072C for ; Wed, 27 Jan 2021 07:01:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232689AbhA0HBf (ORCPT ); Wed, 27 Jan 2021 02:01:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S317061AbhA0BB2 (ORCPT ); Tue, 26 Jan 2021 20:01:28 -0500 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93E90C061756 for ; Tue, 26 Jan 2021 17:00:46 -0800 (PST) Received: by mail-ej1-x62d.google.com with SMTP id l9so322231ejx.3 for ; Tue, 26 Jan 2021 17:00:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0Am7SMgb71ydMP2EFwNgiIs4H5+omxj5hpCIEUTUG4s=; b=kjPLS3dmyXsv9Or6TCttKONkMhwbmLThaZD4705DkPfomBze7rafkfZBZo8FxXLDXG VKbxAzsjfbrHmYyEgVZz0PVrgMHPUiquOWb0EO3L7HfPysxOJRibLyobleAz/Ogk3f31 J7nmHyeiktehnO5A8jLpiRrRlEMyafyMzA26Um0RCwDa4T8aCuGzXZ3UparEnLF2DPUW X+/B795Sv6OZwTPwJ9P5xfw8nkPJSIUDvsVYiWwAdkSP1ClDUqHn0n0w/tf1UKXu+yih Qt26JFcLqnmEHwynDI1ZpjCmQdQaDg09+y2cLFqW5UDJ2lHpE2UL589jiqBldpqE+ZsS 40/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0Am7SMgb71ydMP2EFwNgiIs4H5+omxj5hpCIEUTUG4s=; b=dzoItyU9Pli0P+GwxeSzGHqiNWik46uGx4H6CD4B2/UQUQbq3895qwPIrJA/hGHqTg jLdTkUZFnAEGjKBTvvXWPoxFxFuSMJEsDbcU6XRTsI3lHWMYQNgFYvcESm+mMwuiS+pI TFnsF2emtqWClKHIPssy/0RPaYK4aHO0vayOl8X6bt8P+3cIdTSP7RrAf3NLICyHB702 g/hOiyW+TDa7fY7TDSa2e1m7Wt9UhBO4FgB8DDQNqcLIb6G77IKhEFdVkFyBB8XTuW/+ GklKCiN5lGHz/Q8ADACGvhN1VWL1/OzrUDfDVqGyei2hVXmjYg9U0bkqo55MB7q4BCPs cFnw== X-Gm-Message-State: AOAM530p1tjuvZrHhfY3V2wdQQqIzHrZbMCtueaE7SAuLYHsxvFCntZy r9RIVZFlMrxgVzbNz6d61YM= X-Google-Smtp-Source: ABdhPJxLdopwA1NqJIVc0amYlhERcHI/FCLUvlMYGhI8qi/A7ZS1oRe3iZPW/5NlB8816kvKL4bFxA== X-Received: by 2002:a17:906:2a42:: with SMTP id k2mr4989797eje.118.1611709245387; Tue, 26 Jan 2021 17:00:45 -0800 (PST) Received: from localhost.localdomain (5-12-227-87.residential.rdsnet.ro. [5.12.227.87]) by smtp.gmail.com with ESMTPSA id ko23sm115897ejc.35.2021.01.26.17.00.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 17:00:44 -0800 (PST) From: Vladimir Oltean To: "David S . Miller" , Jakub Kicinski , netdev@vger.kernel.org Cc: Andrew Lunn , Florian Fainelli , Vivien Didelot , Hideaki YOSHIFUJI Subject: [PATCH net-next 3/4] Revert "net: Have netpoll bring-up DSA management interface" Date: Wed, 27 Jan 2021 03:00:27 +0200 Message-Id: <20210127010028.1619443-4-olteanv@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210127010028.1619443-1-olteanv@gmail.com> References: <20210127010028.1619443-1-olteanv@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Vladimir Oltean This reverts commit 1532b9778478577152201adbafa7738b1e844868. The above commit is good and it works, however it was meant as a bugfix for stable kernels and now we have more self-contained ways in DSA to handle the situation where the DSA master must be brought up. Signed-off-by: Vladimir Oltean Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- net/core/netpoll.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 960948290001..c310c7c1cef7 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -658,15 +657,15 @@ EXPORT_SYMBOL_GPL(__netpoll_setup); int netpoll_setup(struct netpoll *np) { - struct net_device *ndev = NULL, *dev = NULL; - struct net *net = current->nsproxy->net_ns; + struct net_device *ndev = NULL; struct in_device *in_dev; int err; rtnl_lock(); - if (np->dev_name[0]) + if (np->dev_name[0]) { + struct net *net = current->nsproxy->net_ns; ndev = __dev_get_by_name(net, np->dev_name); - + } if (!ndev) { np_err(np, "%s doesn't exist, aborting\n", np->dev_name); err = -ENODEV; @@ -674,19 +673,6 @@ int netpoll_setup(struct netpoll *np) } dev_hold(ndev); - /* bring up DSA management network devices up first */ - for_each_netdev(net, dev) { - if (!netdev_uses_dsa(dev)) - continue; - - err = dev_change_flags(dev, dev->flags | IFF_UP, NULL); - if (err < 0) { - np_err(np, "%s failed to open %s\n", - np->dev_name, dev->name); - goto put; - } - } - if (netdev_master_upper_dev_get(ndev)) { np_err(np, "%s is a slave device, aborting\n", np->dev_name); err = -EBUSY; From patchwork Wed Jan 27 01:00:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 12049085 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADFE2C433E6 for ; Wed, 27 Jan 2021 07:01:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 792A420731 for ; Wed, 27 Jan 2021 07:01:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232650AbhA0HBc (ORCPT ); Wed, 27 Jan 2021 02:01:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S316708AbhA0BB3 (ORCPT ); Tue, 26 Jan 2021 20:01:29 -0500 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6D0BC0613D6 for ; Tue, 26 Jan 2021 17:00:47 -0800 (PST) Received: by mail-ed1-x52c.google.com with SMTP id j13so359855edp.2 for ; Tue, 26 Jan 2021 17:00:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=swhzvgRyfTFsfcIf2iaoUHYyeygicMmWLMTLivkDnQs=; b=IpoLkefzSiUC7QRlOn063fqbE8tE5CnVKAdtYj1jResEHp06FfjcymxNVkbHN/YYaP q046sg5h96U3izzn6uYkj+tI+5wDTjnOGZkGGWZaFAVFsQyhGwoPa5XOmEcTbKnSCL5k DALn/P8n52NGwF7OWDWV7pcctC5J1Z4ztFg83uVlFandMsfZS+e3YHElVTQ+/NJpHL+6 2P5iR8Kc3xpyRPQPcFDEKedCm+KK/xqP7WcbZ8wAWkKQdCSvgqlY65j8u1nmVaIPaGnO AevwXYazWWncXccbmVOTBLU3C0aTnmuBDzOfuevowcalAkE/WkztuDoGnlThZ2fcFrX8 ueMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=swhzvgRyfTFsfcIf2iaoUHYyeygicMmWLMTLivkDnQs=; b=EfXtiPjMhioM6viEI653KP0TKcKDbSRBXes0dVyZu7NjRJvHnMY/dv75tWpP/hKvuR Xuc9Qlvln+ou4C2a5xHq84MucFEL789i9ye9ULbuaFCHIbn+7po16hywVIXcpd5tybwn k5BByobtOEc5wbQWn/eabNCrg6BFlz4n+E9YvDl9uVTRzzA4I3FTLFsqCFobyyF3XbAc 6kO+ylSUH1uGumCu67bFak7iSO+3sqbMGUpOOecegPoYOZ9k8zJsXTaITrQOoEMyO2Q5 5vf9eV8wXPJqZAtrI+RfSTlYSsRkENrHXVqrwXqYmvJ35RC1aGMyND2HtoR2aVsnW+Jx uRIg== X-Gm-Message-State: AOAM532+r7SiZgn/c7NiUBp3tdKPKdQ4UakX9QhrcnmAa9VWsmJcmSCk K/gagBxML0EH98Ug4Du73Ww= X-Google-Smtp-Source: ABdhPJxd0hUbvklt535FLb/TRG/F1ETCkgn+Rx93JIRxWSOnsTO3vQovsyr+KD/a6vNfqPLoD81j7A== X-Received: by 2002:a50:9dc9:: with SMTP id l9mr6637630edk.377.1611709246483; Tue, 26 Jan 2021 17:00:46 -0800 (PST) Received: from localhost.localdomain (5-12-227-87.residential.rdsnet.ro. [5.12.227.87]) by smtp.gmail.com with ESMTPSA id ko23sm115897ejc.35.2021.01.26.17.00.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 17:00:45 -0800 (PST) From: Vladimir Oltean To: "David S . Miller" , Jakub Kicinski , netdev@vger.kernel.org Cc: Andrew Lunn , Florian Fainelli , Vivien Didelot , Hideaki YOSHIFUJI Subject: [PATCH net-next 4/4] Revert "net: ipv4: handle DSA enabled master network devices" Date: Wed, 27 Jan 2021 03:00:28 +0200 Message-Id: <20210127010028.1619443-5-olteanv@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210127010028.1619443-1-olteanv@gmail.com> References: <20210127010028.1619443-1-olteanv@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Vladimir Oltean This reverts commit 728c02089a0e3eefb02e9927bfae50490f40e72e. Since 2015 DSA has gained more integration with the network stack, we can now have the same functionality without explicitly open-coding for it: - It now opens the DSA master netdevice automatically whenever a user netdevice is opened. - The master and switch interfaces are coupled in an upper/lower hierarchy using the netdev adjacency lists. In the nfsroot example below, the interface chosen by autoconfig was swp3, and every interface except that and the DSA master, eth1, was brought down afterwards: [ 8.714215] mscc_felix 0000:00:00.5 swp0 (uninitialized): PHY [0000:00:00.3:10] driver [Microsemi GE VSC8514 SyncE] (irq=POLL) [ 8.978041] mscc_felix 0000:00:00.5 swp1 (uninitialized): PHY [0000:00:00.3:11] driver [Microsemi GE VSC8514 SyncE] (irq=POLL) [ 9.246134] mscc_felix 0000:00:00.5 swp2 (uninitialized): PHY [0000:00:00.3:12] driver [Microsemi GE VSC8514 SyncE] (irq=POLL) [ 9.486203] mscc_felix 0000:00:00.5 swp3 (uninitialized): PHY [0000:00:00.3:13] driver [Microsemi GE VSC8514 SyncE] (irq=POLL) [ 9.512827] mscc_felix 0000:00:00.5: configuring for fixed/internal link mode [ 9.521047] mscc_felix 0000:00:00.5: Link is Up - 2.5Gbps/Full - flow control off [ 9.530382] device eth1 entered promiscuous mode [ 9.535452] DSA: tree 0 setup [ 9.539777] printk: console [netcon0] enabled [ 9.544504] netconsole: network logging started [ 9.555047] fsl_enetc 0000:00:00.2 eth1: configuring for fixed/internal link mode [ 9.562790] fsl_enetc 0000:00:00.2 eth1: Link is Up - 1Gbps/Full - flow control off [ 9.564661] 8021q: adding VLAN 0 to HW filter on device bond0 [ 9.637681] fsl_enetc 0000:00:00.0 eth0: PHY [0000:00:00.0:02] driver [Qualcomm Atheros AR8031/AR8033] (irq=POLL) [ 9.655679] fsl_enetc 0000:00:00.0 eth0: configuring for inband/sgmii link mode [ 9.666611] mscc_felix 0000:00:00.5 swp0: configuring for inband/qsgmii link mode [ 9.676216] 8021q: adding VLAN 0 to HW filter on device swp0 [ 9.682086] mscc_felix 0000:00:00.5 swp1: configuring for inband/qsgmii link mode [ 9.690700] 8021q: adding VLAN 0 to HW filter on device swp1 [ 9.696538] mscc_felix 0000:00:00.5 swp2: configuring for inband/qsgmii link mode [ 9.705131] 8021q: adding VLAN 0 to HW filter on device swp2 [ 9.710964] mscc_felix 0000:00:00.5 swp3: configuring for inband/qsgmii link mode [ 9.719548] 8021q: adding VLAN 0 to HW filter on device swp3 [ 9.747811] Sending DHCP requests .. [ 12.742899] mscc_felix 0000:00:00.5 swp1: Link is Up - 1Gbps/Full - flow control rx/tx [ 12.743828] mscc_felix 0000:00:00.5 swp0: Link is Up - 1Gbps/Full - flow control off [ 12.747062] IPv6: ADDRCONF(NETDEV_CHANGE): swp1: link becomes ready [ 12.755216] fsl_enetc 0000:00:00.0 eth0: Link is Up - 1Gbps/Full - flow control rx/tx [ 12.766603] IPv6: ADDRCONF(NETDEV_CHANGE): swp0: link becomes ready [ 12.783188] mscc_felix 0000:00:00.5 swp2: Link is Up - 1Gbps/Full - flow control rx/tx [ 12.785354] IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready [ 12.799535] IPv6: ADDRCONF(NETDEV_CHANGE): swp2: link becomes ready [ 13.803141] mscc_felix 0000:00:00.5 swp3: Link is Up - 1Gbps/Full - flow control rx/tx [ 13.811646] IPv6: ADDRCONF(NETDEV_CHANGE): swp3: link becomes ready [ 15.452018] ., OK [ 15.470336] IP-Config: Got DHCP answer from 10.0.0.1, my address is 10.0.0.39 [ 15.477887] IP-Config: Complete: [ 15.481330] device=swp3, hwaddr=00:04:9f:05:de:0a, ipaddr=10.0.0.39, mask=255.255.255.0, gw=10.0.0.1 [ 15.491846] host=10.0.0.39, domain=(none), nis-domain=(none) [ 15.498429] bootserver=10.0.0.1, rootserver=10.0.0.1, rootpath= [ 15.498481] nameserver0=8.8.8.8 [ 15.627542] fsl_enetc 0000:00:00.0 eth0: Link is Down [ 15.690903] mscc_felix 0000:00:00.5 swp0: Link is Down [ 15.745216] mscc_felix 0000:00:00.5 swp1: Link is Down [ 15.800498] mscc_felix 0000:00:00.5 swp2: Link is Down [ 15.858143] ALSA device list: [ 15.861420] No soundcards found. Signed-off-by: Vladimir Oltean Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- net/ipv4/ipconfig.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index 3cd13e1bc6a7..f9ab1fb219ec 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include @@ -218,9 +217,9 @@ static int __init ic_open_devs(void) last = &ic_first_dev; rtnl_lock(); - /* bring loopback and DSA master network devices up first */ + /* bring loopback device up first */ for_each_netdev(&init_net, dev) { - if (!(dev->flags & IFF_LOOPBACK) && !netdev_uses_dsa(dev)) + if (!(dev->flags & IFF_LOOPBACK)) continue; if (dev_change_flags(dev, dev->flags | IFF_UP, NULL) < 0) pr_err("IP-Config: Failed to open %s\n", dev->name); @@ -305,6 +304,9 @@ static int __init ic_open_devs(void) return 0; } +/* Close all network interfaces except the one we've autoconfigured, and its + * lowers, in case it's a stacked virtual interface. + */ static void __init ic_close_devs(void) { struct ic_device *d, *next; @@ -313,9 +315,20 @@ static void __init ic_close_devs(void) rtnl_lock(); next = ic_first_dev; while ((d = next)) { + bool bring_down = (d != ic_dev); + struct net_device *lower_dev; + struct list_head *iter; + next = d->next; dev = d->dev; - if (d != ic_dev && !netdev_uses_dsa(dev)) { + + netdev_for_each_lower_dev(ic_dev->dev, lower_dev, iter) { + if (dev == lower_dev) { + bring_down = false; + break; + } + } + if (bring_down) { pr_debug("IP-Config: Downing %s\n", dev->name); dev_change_flags(dev, d->flags, NULL); }