From patchwork Tue Oct 17 23:35:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 13426207 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 23E88CDB474 for ; Tue, 17 Oct 2023 23:36:22 +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=hkrAXZc3dx6Sv3wvGuQ/vBkdBy1jKhkEWzroO89X+m4=; b=nt2Se9uq0DOzXBM5aTG5XyezIf Yp/cisVyrwTKgiq6zIXL/SZdGBM/Cb+Yd4xhdVtzBudZI0TMte5KttdBJssbj8xflr8B7BUgSXF4a 1yRs8zi7QC9/wwZxtHEPy49tnl12VgI5t9KMrd8pvWmPlArB6bQCLhLdbYe9mLr0NWa9GEbIxwM4y 2wDU9THpRkH4Z47iZEQI3ZBJ+61xmccuhiTP+zEvOLaMnt7Xqf4CbIJ5Pb6nszBVcA8SA6Yh9UmzY lLqymjt/JleeTgYiYgXH6CwP6Ktl1+2ToarqOllQkQmkA4FqhKrXVGNZelNg/KeV9jI6sM7Abko8Z g7w4YDXw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qstbL-00DQS7-3B; Tue, 17 Oct 2023 23:35:51 +0000 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qstbE-00DQQM-32 for linux-arm-kernel@lists.infradead.org; Tue, 17 Oct 2023 23:35:46 +0000 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1c434c33ec0so41704515ad.3 for ; Tue, 17 Oct 2023 16:35:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1697585744; x=1698190544; 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=HqfLs/7Acwg0Jm6+KIf0DSxRYSRMaFUEOFahz4h3dTs=; b=GEQgc8LZ7HVNOtAfEnUc92H2F2q3gLoFHhpf0Pkt4gx9KX2pDssT5hTBwKiXY9mFZT k/B2rwtSl8Aa81oQOHSv4iQyoIrItGtWKx0XfJlrYtfoC+mmk8eYYj3zD7cKmVK3epYX dIallZFOdjtJGmEcrqGc1VAIauWH7lc5cWDOI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697585744; x=1698190544; 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=HqfLs/7Acwg0Jm6+KIf0DSxRYSRMaFUEOFahz4h3dTs=; b=TS4rnSazJWciUFu1RoAwSHYdjR7K+LRVeVptE7qYSfD/+py/UtHW601f3uERYaneOG OVTOudkET78K7pss8LRImd/1FiF/3Y63Mm2i+oG2WUnWIL1lx9zobbB0zqmb19JInDVq 5BEXEQEkAdJgF6fFmvfs/pbvyq5roWX4AFVnhTPq4JU9VOKCcmtSApHdgQKQolzYJp9e wWlwuOEodnkR5dzp/8Q1U9fvSX5OERkl6jp00EAv9TOdUunFHDfXCmNxywG5mKAj16kJ 5+v/g9LPr5PoVJ/9VvAtQxopMjMB6CqAcBz+MaHVLIEx4/6Qo1rgKH+p1H9pBkZd5L03 KEFw== X-Gm-Message-State: AOJu0YxrgX4zmB533lAqWXt67sFO/zmtmfwiWEAvPINMNFnqX5z6QtFV sa2vj06BidKMcDHrNeWfO4EBEA== X-Google-Smtp-Source: AGHT+IGqJJEies6TlvM0faqQow6M/BsIPoxPmS8m45I5Lxt490jZrkvMrro1g+2sQPDbuKDhldxGOA== X-Received: by 2002:a17:903:1103:b0:1c9:c968:4ce with SMTP id n3-20020a170903110300b001c9c96804cemr4697436plh.33.1697585744382; Tue, 17 Oct 2023 16:35:44 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id g14-20020a1709029f8e00b001bc18e579aesm2139458plq.101.2023.10.17.16.35.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 16:35:43 -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 , 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 v5 2/2] net: dsa: Rename IFLA_DSA_MASTER to IFLA_DSA_CONDUIT Date: Tue, 17 Oct 2023 16:35:36 -0700 Message-Id: <20231017233536.426704-3-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231017233536.426704-1-florian.fainelli@broadcom.com> References: <20231017233536.426704-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-20231017_163544_984751_9C4C3DD7 X-CRM114-Status: GOOD ( 21.81 ) 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 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 fac351a93aed..30ef80aff033 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -1392,7 +1392,9 @@ enum { enum { IFLA_DSA_UNSPEC, - IFLA_DSA_MASTER, + IFLA_DSA_CONDUIT, + /* Deprecated, use IFLA_DSA_CONDUIT insted */ + 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;