From patchwork Mon Oct 16 16:47: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: 13423786 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 3FF27CDB465 for ; Mon, 16 Oct 2023 16:48:29 +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=zpClOKk/bByxOTGSxcsanKRO2/565q+u2AOqxu8DxTc=; b=DD3DMSASQxj+THNQYuy6W+8YN4 xFiEfIc0Q77w8u80AsFS9SnpbcBebcxEiTWDu3S+xQD3wHVss8nRItMS4T1Y1OUxsaEnXaq+iR2bU VwPblQqRJaKzHz0R+3lEDjGkLj7s9uPsBLUxoKoBUG0svGOfFgXhfvRLRDXQljtIYVnqgmRm9rjxd aT+yIvyNaUfN2Gps6nKt/w3f8tjShwoP0fuQqzX6wIGKZF9w9i8NqJJXBp2lN56spof0aK1Bd6qkt +Dui72UzhVrmerRBGbrZ1wKmqmeRxSV3onXGZPhruWGkm4Siz60JSDarpxkDrbPSxoW+yOTyiPHrW 8iKow6JA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qsQl8-00AAYu-1X; Mon, 16 Oct 2023 16:48:02 +0000 Received: from mail-qv1-xf31.google.com ([2607:f8b0:4864:20::f31]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qsQl3-00AAXX-2V for linux-arm-kernel@lists.infradead.org; Mon, 16 Oct 2023 16:47:59 +0000 Received: by mail-qv1-xf31.google.com with SMTP id 6a1803df08f44-66d264e67d8so17082506d6.1 for ; Mon, 16 Oct 2023 09:47:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1697474874; x=1698079674; 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=wE+MJ5F/nuT0DbaVkWIiAwtnYmAVi9h03Fh4SeOz+Oc=; b=CIGS+uYZFpivxBC01ZkWGhGCvZ2hNiL8XOfs7lfBXMx9QcWwkEXc46tDEmpF+Y0EOp iNkOOTzXej1MSrleWEWMZ3T4QRM2eaDOlnPDpt/1j+nO2VU3gLbOVSYbIzNkptKelcjI ybcJ1jiwloC6QSt1Cb0cuLQU0U5akiXZW4KBU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697474874; x=1698079674; 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=wE+MJ5F/nuT0DbaVkWIiAwtnYmAVi9h03Fh4SeOz+Oc=; b=Ci525leOF+AityqUROeHU2m4EFn0pCKUm5Zdj+IL9fYa0PlpkXoP54Z8E8cyoOLini CDu4/o8nGORwmPfh3gWbi+B1ywtV2iD3VAex2kXfXsK/W/0kUFECc15z2N7/Lk1C7/bT UMkhcBI3HgIM6RzHIIxdGfgAL1LqVu2V5rsMUsO9ACzDcLMUpN1DFAvslSuEM+P3nVDG QjQFwP7qIvpVfXkO+K9ya3Fk9QmXQw5968zMYRPtwb4mgI+wNKhA7WdwQHtacHy3d0t3 DlUwUvNpJ3zaNjlEWDjJVWRtH1gQJnikQ064t0utmu49vm4sU+NqA7Qqksp6pXosHSGI qW7w== X-Gm-Message-State: AOJu0Yw52oEcAU7ouvnbbtMP9JQnfQENb/B+bbEaV/0LAnhUx/OpeRRr me9ZF3o/ozxrbMLLdsJftmkdcQ== X-Google-Smtp-Source: AGHT+IEEdSnREaTyTGmocta1p0JUU6G4xfZUXWASZ6ykrIRaB5w23NOW7XmampIgiN+/wkNp7/mC6Q== X-Received: by 2002:a0c:f80e:0:b0:647:406b:4b06 with SMTP id r14-20020a0cf80e000000b00647406b4b06mr31461480qvn.57.1697474874526; Mon, 16 Oct 2023 09:47:54 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id dr20-20020a05621408f400b006590d020260sm3570132qvb.98.2023.10.16.09.47.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 09:47:54 -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 v4 2/2] net: dsa: Rename IFLA_DSA_MASTER to IFLA_DSA_CONDUIT Date: Mon, 16 Oct 2023 09:47:42 -0700 Message-Id: <20231016164742.264613-3-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231016164742.264613-1-florian.fainelli@broadcom.com> References: <20231016164742.264613-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-20231016_094757_814685_A7B82C02 X-CRM114-Status: GOOD ( 21.03 ) 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;