lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <20231013172659.27cea145@hermes.local> Date: Fri, 13 Oct 2023 17:26:59 -0700 From: Stephen Hemminger <stephen@...workplumber.org> To: Florian Fainelli <florian.fainelli@...adcom.com> Cc: netdev@...r.kernel.org, Andrew Lunn <andrew@...n.ch>, Florian Fainelli <f.fainelli@...il.com>, Vladimir Oltean <olteanv@...il.com>, "David S. Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, Broadcom internal kernel review list <bcm-kernel-feedback-list@...adcom.com>, linux-kernel@...r.kernel.org (open list:ARM/Mediatek SoC support), linux-arm-kernel@...ts.infradead.org (moderated list:ARM/Mediatek SoC support) Subject: Re: [PATCH net-next v3 0/2] Switch DSA to inclusive terminology On Fri, 13 Oct 2023 14:52:49 -0700 Florian Fainelli <florian.fainelli@...adcom.com> wrote: > 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 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 | 156 +- > 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 | 16 +- > drivers/net/dsa/mv88e6xxx/chip.c | 2 +- > 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 | 2 +- > 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/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 | 222 +-- > 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 | 18 +- > net/dsa/switch.h | 4 +- > 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} | 1462 ++++++++--------- > net/dsa/user.h | 69 + > 74 files changed, 1539 insertions(+), 1537 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 After applying both patches, Ran script to check for non-inclusive naming. net/dsa/conduit.c: if (netif_is_lag_master(dev)) net/dsa/conduit.c: if (netif_is_lag_master(dev)) net/dsa/conduit.c: if (!netif_is_lag_master(dev)) { net/dsa/dsa.c: dsa_tree_notify(dst, DSA_NOTIFIER_MASTER_STATE_CHANGE, &info); net/dsa/dsa.c: if (netif_is_lag_master(conduit)) net/dsa/dsa.c: if (netif_is_lag_master(conduit)) net/dsa/port.c: bridge_dev = netdev_master_upper_dev_get(lag_dev); net/dsa/port.c: if (!bridge_dev || !netif_is_bridge_master(bridge_dev)) net/dsa/port.c: dp->cpu_port_in_lag = netif_is_lag_master(conduit); net/dsa/switch.c: case DSA_NOTIFIER_MASTER_STATE_CHANGE: net/dsa/switch.h: DSA_NOTIFIER_MASTER_STATE_CHANGE, net/dsa/switch.h:/* DSA_NOTIFIER_MASTER_STATE_CHANGE */ net/dsa/user.c: if (netif_is_bridge_master(upper)) net/dsa/user.c: if (netif_is_bridge_master(info->upper_dev)) { net/dsa/user.c: } else if (netif_is_lag_master(info->upper_dev)) { net/dsa/user.c: } else if (is_hsr_master(info->upper_dev)) { net/dsa/user.c: if (netif_is_bridge_master(info->upper_dev) && !info->linking) net/dsa/user.c: else if (netif_is_lag_master(info->upper_dev) && !info->linking) net/dsa/user.c: if (!netif_is_lag_master(dev)) net/dsa/user.c: if (!netif_is_lag_master(dev)) net/dsa/user.c: netif_is_bridge_master(info->upper_dev) && info->linking) { net/dsa/user.c: if (netif_is_bridge_master(info->upper_dev)) net/dsa/user.c: if (netif_is_lag_master(info->upper_dev)) net/dsa/user.c: if (!netdev_uses_dsa(lag_dev) || !netif_is_lag_master(lag_dev)) net/dsa/user.c: if (!netif_is_bridge_master(br)) net/dsa/user.c: if (netif_is_lag_master(info->upper_dev)) { net/dsa/user.c: if (netif_is_bridge_master(foreign_dev)) So most of the remaining problem is due to bridge and lag. Still should change the NOTIFIER since it is not in public API.
Powered by blists - more mailing lists