From patchwork Mon Oct 23 18:17:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 13433369 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 83F45C25B45 for ; Mon, 23 Oct 2023 18:18:17 +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=yFqS7e5r+c9YYWnFgYwbcJqLi8qIySCdpcsviyNX6IM=; b=4AakgIkgjbccFqntbmvhBdVd7c YOUQVLFdfDRzYyUEFKSMQQaONpHlf+WcS/UJiF9zrWV6Qcos2S2/S5eLTcFQE4zgvSvD/n43qYtq6 CwYoonZ6gflwFzVKDxIbmKnq+QgT/RNA1Rvyjl1wf/YjWiMTkyvd394d9xbiGClL+1Z43TBlLxpTZ NUVv7AxrJhf3ZbFGNL4IG3kT0AoLsiCDe/fKSEuqMextRHvPtfrw34EBgK4VleZLz5Iww2FesGnnd yMVRBc8PbHqgabNFC0cD+f0NSkO0pAvZSU3RYT8PpYrWmsJTipaDxObB91EDvSRKOHbI1TQV+6Sx1 TuYaZYLA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1quzUr-008429-0y; Mon, 23 Oct 2023 18:17:49 +0000 Received: from mail-qv1-xf2f.google.com ([2607:f8b0:4864:20::f2f]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1quzUn-0083yx-1o for linux-arm-kernel@lists.infradead.org; Mon, 23 Oct 2023 18:17:48 +0000 Received: by mail-qv1-xf2f.google.com with SMTP id 6a1803df08f44-66d0ceba445so19820506d6.0 for ; Mon, 23 Oct 2023 11:17:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1698085060; x=1698689860; 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=syaFwGcuFUOCSIfY9cCbfyb85UL7SvPlw6ijHW3Hj2Q=; b=Q6h8eGI29YGYMHhumWdEyCkxzm9TfgNr0uSve2MLNMJ0Xw7qTf2j5wA6KYESx6BPks idhtHbvWRXMCHQWQjw1EiutEkDNYkSPdmB65v23JyM4WW6wEv5wvAs7L+rP0I7TEJqp0 4T5i1dLOgOfPmMGq/FGQi8nu0pR6NHVpVoGe8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698085060; x=1698689860; 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=syaFwGcuFUOCSIfY9cCbfyb85UL7SvPlw6ijHW3Hj2Q=; b=Olfj5KmIXM9TY68qC8TCTSIeugJGh1Eslzm2SHg3cb6Btw2V16VwOEa+jRmrDUohHW qd83lf+tqAeJm8XH3Diq4106ofnpFuMlKtLnCDvwPekFnT3yz+hJ5T/jNCKPik6UjI/F LDE63RWqGA0wGsff/vuMGvxAINQlJFP5CNz5AiMAeNfDFu8wHvQO9iLIXjdvXvUpqu/P OMpZnJhzYykcewXUSr61StZE0qIMrxvRkFi1IsmgJBG8LVPq8xzkqhwL0y1B19DwHnlo 2FggOzcWvgrrcS3lSrni0Xq0UU7hqAHobrwHO73Oohml87PC5Xdud8QFiwz97Z2FveiO 7rqg== X-Gm-Message-State: AOJu0YxKULvRk++JQzwA0iYgB8kvr+HztMbeq/RIQJxBrAdcYjdRxwW9 gq9VbAGPN0mP9m9GgndbcdEMiQ== X-Google-Smtp-Source: AGHT+IFbNgzw/LdqTbZCMzWjV/CEqLPu7Gbo1JwvZU6zqbd8WwOsA+ykzRpyU3SKIqW/Ml7zPRnbJw== X-Received: by 2002:a05:6214:622:b0:66d:33c8:b83e with SMTP id a2-20020a056214062200b0066d33c8b83emr10827527qvx.26.1698085060627; Mon, 23 Oct 2023 11:17:40 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id ej17-20020ad45a51000000b0065b17ec4b49sm3054269qvb.46.2023.10.23.11.17.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 11:17:39 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Andrew Lunn , Vladimir Oltean , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Broadcom internal kernel review list , linux-kernel@vger.kernel.org (open list:ARM/Mediatek SoC support), linux-arm-kernel@lists.infradead.org (moderated list:ARM/Mediatek SoC support) Subject: [PATCH net-next v7 2/2] net: dsa: Rename IFLA_DSA_MASTER to IFLA_DSA_CONDUIT Date: Mon, 23 Oct 2023 11:17:29 -0700 Message-Id: <20231023181729.1191071-3-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231023181729.1191071-1-florian.fainelli@broadcom.com> References: <20231023181729.1191071-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-20231023_111745_617264_F648232B X-CRM114-Status: GOOD ( 20.57 ) 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. Reviewed-by: Andrew Lunn Reviewed-by: Vladimir Oltean Signed-off-by: Florian Fainelli --- Documentation/networking/dsa/configuration.rst | 4 ++-- include/uapi/linux/if_link.h | 4 +++- net/dsa/netlink.c | 10 +++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Documentation/networking/dsa/configuration.rst b/Documentation/networking/dsa/configuration.rst index e6c9719874b0..6cc4ded3cc23 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 slaves 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 9f8a3da0f14f..f4191be137a4 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -1394,7 +1394,9 @@ enum { enum { IFLA_DSA_UNSPEC, - IFLA_DSA_MASTER, + IFLA_DSA_CONDUIT, + /* Deprecated, use IFLA_DSA_CONDUIT instead */ + IFLA_DSA_MASTER = IFLA_DSA_CONDUIT, __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;