* [PATCH net-next v6 0/2] Switch DSA to inclusive terminology
@ 2023-10-18 17:58 Florian Fainelli
2023-10-18 17:58 ` [PATCH net-next v6 2/2] net: dsa: Rename IFLA_DSA_MASTER to IFLA_DSA_CONDUIT Florian Fainelli
[not found] ` <20231018175820.455893-2-florian.fainelli@broadcom.com>
0 siblings, 2 replies; 5+ messages in thread
From: Florian Fainelli @ 2023-10-18 17:58 UTC (permalink / raw)
To: netdev
Cc: Florian Fainelli, Andrew Lunn, Florian Fainelli, Vladimir Oltean,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Broadcom internal kernel review list,
open list:ARM/Mediatek SoC support,
moderated list:ARM/Mediatek SoC support
[-- Attachment #1.1: Type: text/plain, Size: 5730 bytes --]
One of the action items following Netconf'23 is to switch subsystems to
use inclusive terminology. DSA has been making extensive use of the
"master" and "slave" words which are now replaced by "conduit" and
"user" respectively.
Changes in v6:
- fixed typo in if_link.h (insted vs. instead)
Changes in v5:
- actually collected Rob's acked-by tag
- added Stephen's Acked-by tag
- fixed the stray references spotted by Vladimir
Changes in v4:
- added clarification that we used "master" and "slave" terms for a
while
- fixed include guard names in user.h
- fixed some improper subtitutions
- renamed STATE_CHANGE notifier
- added Rob's ack on the DT patches from the first review
Changes in v3:
- properly align arguments with the changed function names
- ensure markup delimiters lengths are corrected to the name word length
- maintain the existing wording about LAG devices
Changes in v2:
- addressed kbuild test robots reports
- preserve capitalization where relevant
- fixed build error in mtk_ppe_offload.c
Florian Fainelli (2):
net: dsa: Use conduit and user terms
net: dsa: Rename IFLA_DSA_MASTER to IFLA_DSA_CONDUIT
.../bindings/net/dsa/mediatek,mt7530.yaml | 2 +-
Documentation/networking/dsa/b53.rst | 14 +-
Documentation/networking/dsa/bcm_sf2.rst | 2 +-
.../networking/dsa/configuration.rst | 102 +-
Documentation/networking/dsa/dsa.rst | 162 +-
Documentation/networking/dsa/lan9303.rst | 2 +-
Documentation/networking/dsa/sja1105.rst | 6 +-
.../dts/marvell/armada-3720-espressobin.dtsi | 2 +-
drivers/net/dsa/b53/b53_common.c | 4 +-
drivers/net/dsa/b53/b53_mdio.c | 2 +-
drivers/net/dsa/bcm_sf2.c | 36 +-
drivers/net/dsa/bcm_sf2.h | 2 +-
drivers/net/dsa/bcm_sf2_cfp.c | 4 +-
drivers/net/dsa/lan9303-core.c | 4 +-
drivers/net/dsa/lantiq_gswip.c | 34 +-
drivers/net/dsa/microchip/ksz9477.c | 6 +-
drivers/net/dsa/microchip/ksz_common.c | 20 +-
drivers/net/dsa/microchip/ksz_ptp.c | 2 +-
drivers/net/dsa/mt7530.c | 18 +-
drivers/net/dsa/mv88e6xxx/chip.c | 4 +-
drivers/net/dsa/ocelot/felix.c | 68 +-
drivers/net/dsa/ocelot/felix.h | 6 +-
drivers/net/dsa/qca/qca8k-8xxx.c | 50 +-
drivers/net/dsa/qca/qca8k-common.c | 4 +-
drivers/net/dsa/qca/qca8k-leds.c | 6 +-
drivers/net/dsa/qca/qca8k.h | 2 +-
drivers/net/dsa/realtek/realtek-smi.c | 28 +-
drivers/net/dsa/realtek/realtek.h | 2 +-
drivers/net/dsa/realtek/rtl8365mb.c | 2 +-
drivers/net/dsa/sja1105/sja1105_main.c | 4 +-
drivers/net/dsa/xrs700x/xrs700x.c | 12 +-
drivers/net/ethernet/broadcom/bcmsysport.c | 2 +-
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +-
.../net/ethernet/mediatek/mtk_ppe_offload.c | 2 +-
include/linux/dsa/sja1105.h | 2 +-
include/net/dsa.h | 56 +-
include/net/dsa_stubs.h | 22 +-
include/uapi/linux/if_link.h | 4 +-
net/core/dev_ioctl.c | 2 +-
net/dsa/Makefile | 6 +-
net/dsa/{master.c => conduit.c} | 118 +-
net/dsa/conduit.h | 22 +
net/dsa/dsa.c | 224 +--
net/dsa/dsa.h | 12 +-
net/dsa/master.h | 22 -
net/dsa/netlink.c | 22 +-
net/dsa/port.c | 124 +-
net/dsa/port.h | 4 +-
net/dsa/slave.h | 69 -
net/dsa/switch.c | 20 +-
net/dsa/switch.h | 8 +-
net/dsa/tag.c | 10 +-
net/dsa/tag.h | 26 +-
net/dsa/tag_8021q.c | 22 +-
net/dsa/tag_8021q.h | 2 +-
net/dsa/tag_ar9331.c | 4 +-
net/dsa/tag_brcm.c | 14 +-
net/dsa/tag_dsa.c | 6 +-
net/dsa/tag_gswip.c | 4 +-
net/dsa/tag_hellcreek.c | 4 +-
net/dsa/tag_ksz.c | 12 +-
net/dsa/tag_lan9303.c | 4 +-
net/dsa/tag_mtk.c | 4 +-
net/dsa/tag_none.c | 6 +-
net/dsa/tag_ocelot.c | 22 +-
net/dsa/tag_ocelot_8021q.c | 12 +-
net/dsa/tag_qca.c | 6 +-
net/dsa/tag_rtl4_a.c | 6 +-
net/dsa/tag_rtl8_4.c | 6 +-
net/dsa/tag_rzn1_a5psw.c | 4 +-
net/dsa/tag_sja1105.c | 30 +-
net/dsa/tag_trailer.c | 4 +-
net/dsa/tag_xrs700x.c | 4 +-
net/dsa/{slave.c => user.c} | 1464 ++++++++---------
net/dsa/user.h | 69 +
75 files changed, 1553 insertions(+), 1547 deletions(-)
rename net/dsa/{master.c => conduit.c} (76%)
create mode 100644 net/dsa/conduit.h
delete mode 100644 net/dsa/master.h
delete mode 100644 net/dsa/slave.h
rename net/dsa/{slave.c => user.c} (62%)
create mode 100644 net/dsa/user.h
--
2.34.1
[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4221 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net-next v6 2/2] net: dsa: Rename IFLA_DSA_MASTER to IFLA_DSA_CONDUIT
2023-10-18 17:58 [PATCH net-next v6 0/2] Switch DSA to inclusive terminology Florian Fainelli
@ 2023-10-18 17:58 ` Florian Fainelli
2023-10-19 0:42 ` Vladimir Oltean
[not found] ` <20231018175820.455893-2-florian.fainelli@broadcom.com>
1 sibling, 1 reply; 5+ messages in thread
From: Florian Fainelli @ 2023-10-18 17:58 UTC (permalink / raw)
To: netdev
Cc: Florian Fainelli, Andrew Lunn, Florian Fainelli, Vladimir Oltean,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Broadcom internal kernel review list,
open list:ARM/Mediatek SoC support,
moderated list:ARM/Mediatek SoC support
[-- Attachment #1.1: Type: text/plain, Size: 3689 bytes --]
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 <andrew@lunn.ch>
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
---
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;
--
2.34.1
[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4221 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net-next v6 1/2] net: dsa: Use conduit and user terms
[not found] ` <20231018175820.455893-2-florian.fainelli@broadcom.com>
@ 2023-10-19 0:39 ` Vladimir Oltean
2023-10-21 0:21 ` Jakub Kicinski
1 sibling, 0 replies; 5+ messages in thread
From: Vladimir Oltean @ 2023-10-19 0:39 UTC (permalink / raw)
To: Florian Fainelli
Cc: netdev, Rob Herring, Stephen Hemminger, Andrew Lunn,
Florian Fainelli, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Broadcom internal kernel review list,
open list:ARM/Mediatek SoC support,
moderated list:ARM/Mediatek SoC support
On Wed, Oct 18, 2023 at 10:58:19AM -0700, Florian Fainelli wrote:
> Use more inclusive terms throughout the DSA subsystem by moving away
> from "master" which is replaced by "conduit" and "slave" which is
> replaced by "user". No functional changes.
>
> Acked-by: Rob Herring <robh@kernel.org>
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
> Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
> ---
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next v6 2/2] net: dsa: Rename IFLA_DSA_MASTER to IFLA_DSA_CONDUIT
2023-10-18 17:58 ` [PATCH net-next v6 2/2] net: dsa: Rename IFLA_DSA_MASTER to IFLA_DSA_CONDUIT Florian Fainelli
@ 2023-10-19 0:42 ` Vladimir Oltean
0 siblings, 0 replies; 5+ messages in thread
From: Vladimir Oltean @ 2023-10-19 0:42 UTC (permalink / raw)
To: Florian Fainelli
Cc: netdev, Andrew Lunn, Florian Fainelli, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Broadcom internal kernel review list,
open list:ARM/Mediatek SoC support,
moderated list:ARM/Mediatek SoC support
On Wed, Oct 18, 2023 at 10:58:20AM -0700, Florian Fainelli wrote:
> 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 <andrew@lunn.ch>
> Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
> ---
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next v6 1/2] net: dsa: Use conduit and user terms
[not found] ` <20231018175820.455893-2-florian.fainelli@broadcom.com>
2023-10-19 0:39 ` [PATCH net-next v6 1/2] net: dsa: Use conduit and user terms Vladimir Oltean
@ 2023-10-21 0:21 ` Jakub Kicinski
1 sibling, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2023-10-21 0:21 UTC (permalink / raw)
To: Florian Fainelli
Cc: netdev, Rob Herring, Stephen Hemminger, Andrew Lunn,
Florian Fainelli, Vladimir Oltean, David S. Miller, Eric Dumazet,
Paolo Abeni, Broadcom internal kernel review list,
open list:ARM/Mediatek SoC support,
moderated list:ARM/Mediatek SoC support
On Wed, 18 Oct 2023 10:58:19 -0700 Florian Fainelli wrote:
> Use more inclusive terms throughout the DSA subsystem by moving away
> from "master" which is replaced by "conduit" and "slave" which is
> replaced by "user". No functional changes.
>
> Acked-by: Rob Herring <robh@kernel.org>
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>
> Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
This got marked as Changes Requested, I think it no longer applies :S
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-10-21 0:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-18 17:58 [PATCH net-next v6 0/2] Switch DSA to inclusive terminology Florian Fainelli
2023-10-18 17:58 ` [PATCH net-next v6 2/2] net: dsa: Rename IFLA_DSA_MASTER to IFLA_DSA_CONDUIT Florian Fainelli
2023-10-19 0:42 ` Vladimir Oltean
[not found] ` <20231018175820.455893-2-florian.fainelli@broadcom.com>
2023-10-19 0:39 ` [PATCH net-next v6 1/2] net: dsa: Use conduit and user terms Vladimir Oltean
2023-10-21 0:21 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).