From: Alexandre Belloni <alexandre.belloni@bootlin•com>
To: Vladimir Oltean <vladimir.oltean@nxp•com>
Cc: Tobias Waldekranz <tobias@waldekranz•com>,
"David S . Miller" <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>,
netdev@vger•kernel.org, UNGLinuxDriver@microchip•com,
Andrew Lunn <andrew@lunn•ch>,
Florian Fainelli <f.fainelli@gmail•com>,
Vivien Didelot <vivien.didelot@gmail•com>,
Claudiu Manoil <claudiu.manoil@nxp•com>
Subject: Re: [RFC PATCH net-next 04/16] net: mscc: ocelot: use a switch-case statement in ocelot_netdevice_event
Date: Tue, 15 Dec 2020 16:56:17 +0100 [thread overview]
Message-ID: <20201215155617.GH1781038@piout.net> (raw)
In-Reply-To: <20201215155225.GG1781038@piout.net>
On 15/12/2020 16:52:26+0100, Alexandre Belloni wrote:
> On 08/12/2020 14:07:50+0200, Vladimir Oltean wrote:
> > Make ocelot's net device event handler more streamlined by structuring
> > it in a similar way with others. The inspiration here was
> > dsa_slave_netdevice_event.
> >
> > Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp•com>
> > ---
> > drivers/net/ethernet/mscc/ocelot_net.c | 68 +++++++++++++++++---------
> > 1 file changed, 45 insertions(+), 23 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/mscc/ocelot_net.c b/drivers/net/ethernet/mscc/ocelot_net.c
> > index 50765a3b1c44..47b620967156 100644
> > --- a/drivers/net/ethernet/mscc/ocelot_net.c
> > +++ b/drivers/net/ethernet/mscc/ocelot_net.c
> > @@ -1030,49 +1030,71 @@ static int ocelot_netdevice_changeupper(struct net_device *dev,
> > info->upper_dev);
> > }
> >
> > - return err;
> > + return notifier_from_errno(err);
> > +}
> > +
> > +static int
> > +ocelot_netdevice_lag_changeupper(struct net_device *dev,
> > + struct netdev_notifier_changeupper_info *info)
> > +{
> > + struct net_device *lower;
> > + struct list_head *iter;
> > + int err = NOTIFY_DONE;
> > +
> > + netdev_for_each_lower_dev(dev, lower, iter) {
> > + err = ocelot_netdevice_changeupper(lower, info);
> > + if (err)
> > + return notifier_from_errno(err);
> > + }
> > +
> > + return NOTIFY_DONE;
> > }
> >
> > static int ocelot_netdevice_event(struct notifier_block *unused,
> > unsigned long event, void *ptr)
> > {
> > - struct netdev_notifier_changeupper_info *info = ptr;
> > struct net_device *dev = netdev_notifier_info_to_dev(ptr);
> > - int ret = 0;
> >
> > - if (event == NETDEV_PRECHANGEUPPER &&
> > - ocelot_netdevice_dev_check(dev) &&
> > - netif_is_lag_master(info->upper_dev)) {
> > - struct netdev_lag_upper_info *lag_upper_info = info->upper_info;
> > + switch (event) {
> > + case NETDEV_PRECHANGEUPPER: {
> > + struct netdev_notifier_changeupper_info *info = ptr;
> > + struct netdev_lag_upper_info *lag_upper_info;
> > struct netlink_ext_ack *extack;
> >
> > + if (!ocelot_netdevice_dev_check(dev))
> > + break;
> > +
> > + if (!netif_is_lag_master(info->upper_dev))
> > + break;
> > +
> > + lag_upper_info = info->upper_info;
> > +
> > if (lag_upper_info &&
> > lag_upper_info->tx_type != NETDEV_LAG_TX_TYPE_HASH) {
> > extack = netdev_notifier_info_to_extack(&info->info);
> > NL_SET_ERR_MSG_MOD(extack, "LAG device using unsupported Tx type");
> >
> > - ret = -EINVAL;
> > - goto notify;
> > + return NOTIFY_BAD;
>
> This changes the return value in case of error, I'm not sure how
> important this is.
>
Ok, this is removed anyway, so
Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin•com>
> > }
> > +
> > + break;
> > }
> > + case NETDEV_CHANGEUPPER: {
> > + struct netdev_notifier_changeupper_info *info = ptr;
> >
> > - if (event == NETDEV_CHANGEUPPER) {
> > - if (netif_is_lag_master(dev)) {
> > - struct net_device *slave;
> > - struct list_head *iter;
> > + if (ocelot_netdevice_dev_check(dev))
> > + return ocelot_netdevice_changeupper(dev, info);
> >
> > - netdev_for_each_lower_dev(dev, slave, iter) {
> > - ret = ocelot_netdevice_changeupper(slave, event, info);
> > - if (ret)
> > - goto notify;
> > - }
> > - } else {
> > - ret = ocelot_netdevice_changeupper(dev, event, info);
> > - }
> > + if (netif_is_lag_master(dev))
> > + return ocelot_netdevice_lag_changeupper(dev, info);
> > +
> > + break;
> > + }
> > + default:
> > + break;
> > }
> >
> > -notify:
> > - return notifier_from_errno(ret);
> > + return NOTIFY_DONE;
>
> This changes the return value from NOTIFY_OK to NOTIFY_DONE but this is
> probably what we want.
>
> > }
> >
> > struct notifier_block ocelot_netdevice_nb __read_mostly = {
> > --
> > 2.25.1
> >
>
> --
> Alexandre Belloni, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2020-12-15 15:57 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 12:07 [RFC PATCH net-next 00/16] LAG offload for Ocelot DSA switches Vladimir Oltean
2020-12-08 12:07 ` [RFC PATCH net-next 01/16] net: mscc: ocelot: offload bridge port flags to device Vladimir Oltean
2020-12-15 14:37 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 02/16] net: mscc: ocelot: allow offloading of bridge on top of LAG Vladimir Oltean
2020-12-15 14:43 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 03/16] net: mscc: ocelot: rename ocelot_netdevice_port_event to ocelot_netdevice_changeupper Vladimir Oltean
2020-12-15 15:01 ` Alexandre Belloni
2020-12-15 15:27 ` Vladimir Oltean
2020-12-08 12:07 ` [RFC PATCH net-next 04/16] net: mscc: ocelot: use a switch-case statement in ocelot_netdevice_event Vladimir Oltean
2020-12-15 15:52 ` Alexandre Belloni
2020-12-15 15:56 ` Alexandre Belloni [this message]
2020-12-08 12:07 ` [RFC PATCH net-next 05/16] net: mscc: ocelot: don't refuse bonding interfaces we can't offload Vladimir Oltean
2020-12-15 15:56 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 06/16] net: mscc: ocelot: use ipv6 in the aggregation code Vladimir Oltean
2020-12-15 16:03 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 07/16] net: mscc: ocelot: set up the bonding mask in a way that avoids a net_device Vladimir Oltean
2020-12-15 16:36 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 08/16] net: mscc: ocelot: avoid unneeded "lp" variable in LAG join Vladimir Oltean
2020-12-15 16:47 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 09/16] net: mscc: ocelot: use "lag" variable name in ocelot_bridge_stp_state_set Vladimir Oltean
2020-12-15 16:49 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 10/16] net: mscc: ocelot: reapply bridge forwarding mask on bonding join/leave Vladimir Oltean
2020-12-16 12:29 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 11/16] net: mscc: ocelot: set up logical port IDs centrally Vladimir Oltean
2020-12-16 20:15 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 12/16] net: mscc: ocelot: drop the use of the "lags" array Vladimir Oltean
2020-12-16 21:29 ` Alexandre Belloni
2021-01-15 11:05 ` Vladimir Oltean
2021-01-15 12:02 ` Alexandre Belloni
2020-12-08 12:07 ` [RFC PATCH net-next 13/16] net: mscc: ocelot: rename aggr_count to num_ports_in_lag Vladimir Oltean
2020-12-16 21:31 ` Alexandre Belloni
2020-12-08 12:08 ` [RFC PATCH net-next 14/16] net: mscc: ocelot: rebalance LAGs on link up/down events Vladimir Oltean
2020-12-16 21:32 ` Alexandre Belloni
2020-12-08 12:08 ` [RFC PATCH net-next 15/16] net: dsa: felix: propagate the LAG offload ops towards the ocelot lib Vladimir Oltean
2020-12-08 12:08 ` [RFC PATCH net-next 16/16] net: dsa: ocelot: tell DSA that we can offload link aggregation Vladimir Oltean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201215155617.GH1781038@piout.net \
--to=alexandre.belloni@bootlin$(echo .)com \
--cc=UNGLinuxDriver@microchip$(echo .)com \
--cc=andrew@lunn$(echo .)ch \
--cc=claudiu.manoil@nxp$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=f.fainelli@gmail$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=tobias@waldekranz$(echo .)com \
--cc=vivien.didelot@gmail$(echo .)com \
--cc=vladimir.oltean@nxp$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox