From patchwork Tue Oct 10 21:39:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 13416192 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 93D75CD98C0 for ; Tue, 10 Oct 2023 21:40:36 +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-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date :Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=HxQEN6O1M/+YwGYwZorkKSGDBNkBE+1mMjm2Os5NQTU=; b=pMFSw3tf90o9GrZlPeuwhsSjmj 05/Byilp9gwWbf+Qe8TuriCIrDISKcIn50fgPIYkAAdK7W9T9BUZngjmHkODWrxJ9s7cxUwhviiTz Aq96MOoVj5wQbgnZRya6VlNF/aN8J9MhACw5kxvPhIDIr14QnYF/L+2+EyA6CAAxBUY79lovj0/SH 8TyuO9yoB/UMUJzD9Dj1mj3uxQplNOZqpsuYDR2YDQG49RHCqxMbFOevxJGXVrkLi1owSaJ7PCXme uUmXrKzRiagraT/cjGUZS/iO/uu/4ZWa86gC5v0GlxtdQWzsS5qzgNUO8de5pvs/ZSDuBCPlVi8Be 1MZ+mUsw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qqKSN-00ECQh-1W; Tue, 10 Oct 2023 21:39:59 +0000 Received: from mail-vk1-xa2b.google.com ([2607:f8b0:4864:20::a2b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qqKSI-00ECMa-34 for linux-arm-kernel@lists.infradead.org; Tue, 10 Oct 2023 21:39:57 +0000 Received: by mail-vk1-xa2b.google.com with SMTP id 71dfb90a1353d-49d6bd360f8so2291634e0c.2 for ; Tue, 10 Oct 2023 14:39:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1696973993; x=1697578793; darn=lists.infradead.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=l4U0MWJbexyA2v05Fy3EktIY4z8uDzSykp568i7Jbw8=; b=HK6TrvL8hUKDyUwdiesGnRTwdS/7iBb5MyJVBqI13Jd0H8XMm6pQwXfWr2YD6R0vEL 04P/yU48XEvTqSxK8AYND4KaL6cgaIGeZfd+fIwMJjpjJUEfo0iYrSm1VSi3lAeIWP0Q qeB3OiSV3xVZRCIXIt4OfG8QcC11DVktc7B4E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696973993; x=1697578793; h=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=l4U0MWJbexyA2v05Fy3EktIY4z8uDzSykp568i7Jbw8=; b=M15G8tgx1npmDYopIegHmsnRsfTLD2QdF1bpjsaQB/iwwRVBUKlaOlAFa12f5HYycF q8Nr8z/68SBT0gEV7xsfgiLvVSqFQk7kL+pOlYHD5iwpkLy9iYV9R3CpsqPZQ7G51h1C 5k2lbyn9ZY6KIKNfL7TPR1tRtpdmHeNskaFqjtsaznFFWQ9hSWwg9VH/OldQdIuCkd+D V0Ym41B7gUkjS/55U9coNqHMuHy0pIS0gvEguNOI/vEfUIV4w3OYkKtZF/cMzNVTJJPs +v5/mH11qsmf6QyEIVPlrUTpacoSotIt817ijvAcPKfwTBglx22igT9bRp6pkMKPDfs+ tKSA== X-Gm-Message-State: AOJu0YwRL40BoNu7kzfVkV0LW4AIAmIXO/tQtI83N8SV8VpoFOwE6EQW wyLWvNjxA+xAVROiEmXXpItOaw== X-Google-Smtp-Source: AGHT+IFy2yBDp4KDYLQIIoAlwTEPfwN9FrBF5N55wJwFsmLmyZgigmGBt1x70L1JQ1G+aRQR7I9lxA== X-Received: by 2002:a05:6122:1d47:b0:49d:eeed:3ed5 with SMTP id gd7-20020a0561221d4700b0049deeed3ed5mr14513658vkb.14.1696973993395; Tue, 10 Oct 2023 14:39:53 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bb36-20020a05622a1b2400b00403ad6ec2e8sm4804797qtb.26.2023.10.10.14.39.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 14:39:52 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list:ARM/Mediatek SoC support), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Mediatek SoC support), linux-mediatek@lists.infradead.org (moderated list:ARM/Mediatek SoC support), linux-doc@vger.kernel.org (open list:DOCUMENTATION), linux-renesas-soc@vger.kernel.org (open list:RENESAS RZ/N1 A5PSW SWITCH DRIVER) Subject: [PATCH net-next 2/2] net: dsa: Rename IFLA_DSA_MASTER to IFLA_DSA_CONDUIT Date: Tue, 10 Oct 2023 14:39:42 -0700 Message-Id: <20231010213942.3633407-3-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231010213942.3633407-1-florian.fainelli@broadcom.com> References: <20231010213942.3633407-1-florian.fainelli@broadcom.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231010_143954_996109_AE7F1E79 X-CRM114-Status: GOOD ( 21.19 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This preserves the existing IFLA_DSA_MASTER which is part of the uAPI and creates an alias named IFLA_DSA_CONDUIT. Signed-off-by: Florian Fainelli --- Documentation/networking/dsa/configuration.rst | 4 ++-- include/uapi/linux/if_link.h | 3 ++- net/dsa/netlink.c | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Documentation/networking/dsa/configuration.rst b/Documentation/networking/dsa/configuration.rst index a5a38c31736d..7148fb7c7fe1 100644 --- a/Documentation/networking/dsa/configuration.rst +++ b/Documentation/networking/dsa/configuration.rst @@ -393,7 +393,7 @@ description which has an ``ethernet`` property. It is up to the user to configure the system for the switch to use other conduits. DSA uses the ``rtnl_link_ops`` mechanism (with a "dsa" ``kind``) to allow -changing the DSA conduit of a user port. The ``IFLA_DSA_MASTER`` u32 netlink +changing the DSA conduit of a user port. The ``IFLA_DSA_CONDUIT`` u32 netlink attribute contains the ifindex of the conduit device that handles each user device. The DSA conduit must be a valid candidate based on firmware node information, or a LAG interface which contains only users which are valid @@ -435,7 +435,7 @@ Using iproute2, the following manipulations are possible: dsa master bond0 Notice that in the case of CPU ports under a LAG, the use of the -``IFLA_DSA_MASTER`` netlink attribute is not strictly needed, but rather, DSA +``IFLA_DSA_CONDUIT`` netlink attribute is not strictly needed, but rather, DSA reacts to the ``IFLA_MASTER`` attribute change of its present conduit (``eth0``) and migrates all user ports to the new upper of ``eth0``, ``bond0``. Similarly, when ``bond0`` is destroyed using ``RTM_DELLINK``, DSA migrates the user ports diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index fac351a93aed..16f0669e8bdc 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -1392,7 +1392,8 @@ enum { enum { IFLA_DSA_UNSPEC, - IFLA_DSA_MASTER, + IFLA_DSA_MASTER, /* Deprecated, use IFLA_DSA_CONDUIT instead */ + IFLA_DSA_CONDUIT = IFLA_DSA_MASTER, __IFLA_DSA_MAX, }; diff --git a/net/dsa/netlink.c b/net/dsa/netlink.c index f56f90a25b99..1332e56349e5 100644 --- a/net/dsa/netlink.c +++ b/net/dsa/netlink.c @@ -8,7 +8,7 @@ #include "user.h" static const struct nla_policy dsa_policy[IFLA_DSA_MAX + 1] = { - [IFLA_DSA_MASTER] = { .type = NLA_U32 }, + [IFLA_DSA_CONDUIT] = { .type = NLA_U32 }, }; static int dsa_changelink(struct net_device *dev, struct nlattr *tb[], @@ -20,8 +20,8 @@ static int dsa_changelink(struct net_device *dev, struct nlattr *tb[], if (!data) return 0; - if (data[IFLA_DSA_MASTER]) { - u32 ifindex = nla_get_u32(data[IFLA_DSA_MASTER]); + if (data[IFLA_DSA_CONDUIT]) { + u32 ifindex = nla_get_u32(data[IFLA_DSA_CONDUIT]); struct net_device *conduit; conduit = __dev_get_by_index(dev_net(dev), ifindex); @@ -38,7 +38,7 @@ static int dsa_changelink(struct net_device *dev, struct nlattr *tb[], static size_t dsa_get_size(const struct net_device *dev) { - return nla_total_size(sizeof(u32)) + /* IFLA_DSA_MASTER */ + return nla_total_size(sizeof(u32)) + /* IFLA_DSA_CONDUIT */ 0; } @@ -46,7 +46,7 @@ static int dsa_fill_info(struct sk_buff *skb, const struct net_device *dev) { struct net_device *conduit = dsa_user_to_conduit(dev); - if (nla_put_u32(skb, IFLA_DSA_MASTER, conduit->ifindex)) + if (nla_put_u32(skb, IFLA_DSA_CONDUIT, conduit->ifindex)) return -EMSGSIZE; return 0;