From: Roopa Prabhu <roopa@cumulusnetworks•com>
To: Jiri Pirko <jiri@resnulli•us>
Cc: netdev@vger•kernel.org, davem@davemloft•net,
nhorman@tuxdriver•com, andy@greyhouse•net, tgraf@suug•ch,
dborkman@redhat•com, ogerlitz@mellanox•com, jesse@nicira•com,
pshelar@nicira•com, azhou@nicira•com, ben@decadent•org.uk,
stephen@networkplumber•org, jeffrey.t.kirsher@intel•com,
vyasevic@redhat•com, xiyou.wangcong@gmail•com,
john.r.fastabend@intel•com, edumazet@google•com,
jhs@mojatatu•com, sfeldma@gmail•com, f.fainelli@gmail•com,
linville@tuxdriver•com, jasowang@redhat•com,
ebiederm@xmission•com, nicolas.dichtel@6wind•com,
ryazanov.s.a@gmail•com, buytenh@wantstofly•org,
aviadr@mellanox•com, nbd@openwrt•org,
alexei.starovoitov@gmail•com, Neil.Jerram@metaswitch•com,
ronye@mellanox•com, simon.horman@netronome•com,
alexander.h.duyck@redhat•com, john.ronciak@intel•com,
mleitner@redhat•com, shrijeet@gmail•com,
gospo@cumulusnetworks•com, bcrl@kvack•org
Subject: Re: [patch net-next v3 08/17] bridge: call netdev_sw_port_stp_update when bridge port STP status changes
Date: Tue, 25 Nov 2014 14:48:30 -0800 [thread overview]
Message-ID: <5475073E.70503@cumulusnetworks.com> (raw)
In-Reply-To: <1416911328-10979-9-git-send-email-jiri@resnulli.us>
On 11/25/14, 2:28 AM, Jiri Pirko wrote:
> From: Scott Feldman <sfeldma@gmail•com>
>
> To notify switch driver of change in STP state of bridge port, add new
> .ndo op and provide switchdev wrapper func to call ndo op. Use it in bridge
> code then.
>
> Signed-off-by: Scott Feldman <sfeldma@gmail•com>
> Signed-off-by: Jiri Pirko <jiri@resnulli•us>
> ---
> v2->v3:
> -changed "sw" string to "switch" to avoid confusion
> v1->v2:
> -no change
> ---
> include/linux/netdevice.h | 5 +++++
> include/net/switchdev.h | 7 +++++++
> net/bridge/br_stp.c | 2 ++
> net/switchdev/switchdev.c | 19 +++++++++++++++++++
> 4 files changed, 33 insertions(+)
>
> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> index ce096dc..66cb64e 100644
> --- a/include/linux/netdevice.h
> +++ b/include/linux/netdevice.h
> @@ -1024,6 +1024,9 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,
> * Called to get an ID of the switch chip this port is part of.
> * If driver implements this, it indicates that it represents a port
> * of a switch chip.
> + * int (*ndo_switch_port_stp_update)(struct net_device *dev, u8 state);
> + * Called to notify switch device port of bridge port STP
> + * state change.
> */
> struct net_device_ops {
> int (*ndo_init)(struct net_device *dev);
> @@ -1180,6 +1183,8 @@ struct net_device_ops {
> #ifdef CONFIG_NET_SWITCHDEV
> int (*ndo_switch_parent_id_get)(struct net_device *dev,
> struct netdev_phys_item_id *psid);
> + int (*ndo_switch_port_stp_update)(struct net_device *dev,
> + u8 state);
> #endif
> };
>
> diff --git a/include/net/switchdev.h b/include/net/switchdev.h
> index 7a52360..8a6d164 100644
> --- a/include/net/switchdev.h
> +++ b/include/net/switchdev.h
> @@ -16,6 +16,7 @@
>
> int netdev_switch_parent_id_get(struct net_device *dev,
> struct netdev_phys_item_id *psid);
> +int netdev_switch_port_stp_update(struct net_device *dev, u8 state);
>
> #else
>
> @@ -25,6 +26,12 @@ static inline int netdev_switch_parent_id_get(struct net_device *dev,
> return -EOPNOTSUPP;
> }
>
> +static inline int netdev_switch_port_stp_update(struct net_device *dev,
> + u8 state)
> +{
> + return -EOPNOTSUPP;
> +}
> +
> #endif
>
> #endif /* _LINUX_SWITCHDEV_H_ */
> diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
> index 2b047bc..35e016c 100644
> --- a/net/bridge/br_stp.c
> +++ b/net/bridge/br_stp.c
> @@ -12,6 +12,7 @@
> */
> #include <linux/kernel.h>
> #include <linux/rculist.h>
> +#include <net/switchdev.h>
>
> #include "br_private.h"
> #include "br_private_stp.h"
> @@ -39,6 +40,7 @@ void br_log_state(const struct net_bridge_port *p)
> void br_set_state(struct net_bridge_port *p, unsigned int state)
> {
> p->state = state;
> + netdev_switch_port_stp_update(p->dev, state);
> }
>
> /* called under bridge lock */
> diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
> index 66973de..d162b21 100644
> --- a/net/switchdev/switchdev.c
> +++ b/net/switchdev/switchdev.c
> @@ -31,3 +31,22 @@ int netdev_switch_parent_id_get(struct net_device *dev,
> return ops->ndo_switch_parent_id_get(dev, psid);
> }
> EXPORT_SYMBOL(netdev_switch_parent_id_get);
> +
> +/**
> + * netdev_switch_port_stp_update - Notify switch device port of STP
> + * state change
> + * @dev: port device
> + * @state: port STP state
> + *
> + * Notify switch device port of bridge port STP state change.
> + */
> +int netdev_switch_port_stp_update(struct net_device *dev, u8 state)
> +{
> + const struct net_device_ops *ops = dev->netdev_ops;
> +
> + if (!ops->ndo_switch_port_stp_update)
> + return -EOPNOTSUPP;
> + WARN_ON(!ops->ndo_switch_parent_id_get);
> + return ops->ndo_switch_port_stp_update(dev, state);
> +}
> +EXPORT_SYMBOL(netdev_switch_port_stp_update);
This should also check if offload is enabled on the bridge/port ?
next prev parent reply other threads:[~2014-11-25 22:48 UTC|newest]
Thread overview: 148+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-25 10:28 [patch net-next v3 00/17] introduce rocker switch driver with hardware accelerated datapath api - phase 1: bridge fdb offload Jiri Pirko
2014-11-25 10:28 ` [patch net-next v3 01/17] bridge: rename fdb_*_hw to fdb_*_hw_addr to avoid confusion Jiri Pirko
2014-11-25 15:03 ` Andy Gospodarek
2014-11-25 15:26 ` Jamal Hadi Salim
2014-11-25 22:11 ` Thomas Graf
2014-11-25 22:33 ` Florian Fainelli
2014-11-25 10:28 ` [patch net-next v3 02/17] net: make vid as a parameter for ndo_fdb_add/ndo_fdb_del Jiri Pirko
2014-11-25 15:13 ` Andy Gospodarek
2014-11-25 15:18 ` Jiri Pirko
2014-11-25 15:43 ` John Fastabend
2014-11-25 16:38 ` Jiri Pirko
2014-12-09 11:57 ` Or Gerlitz
2014-11-25 15:38 ` Jamal Hadi Salim
2014-11-25 16:01 ` John Fastabend
2014-11-25 16:18 ` Jamal Hadi Salim
2014-11-25 16:30 ` John Fastabend
2014-11-25 16:50 ` Jamal Hadi Salim
2014-11-26 1:44 ` Simon Horman
2014-11-26 2:36 ` Scott Feldman
2014-11-26 3:19 ` Jamal Hadi Salim
2014-11-26 3:59 ` Scott Feldman
2014-11-26 11:28 ` Jamal Hadi Salim
2014-11-26 11:40 ` Jiri Pirko
2014-11-26 11:54 ` Jamal Hadi Salim
2014-11-26 12:06 ` Jamal Hadi Salim
2014-11-27 6:50 ` Scott Feldman
2014-11-27 12:14 ` Jamal Hadi Salim
2014-11-27 20:59 ` Scott Feldman
2014-11-27 21:55 ` Jiri Pirko
2014-11-28 12:57 ` Jamal Hadi Salim
2014-11-28 10:14 ` Roopa Prabhu
2014-11-28 10:33 ` Scott Feldman
2014-11-25 16:19 ` Roopa Prabhu
2014-11-25 16:33 ` John Fastabend
2014-11-25 16:57 ` Jamal Hadi Salim
2014-11-25 16:43 ` Jiri Pirko
2014-11-25 18:53 ` Samudrala, Sridhar
2014-11-25 20:40 ` Jiri Pirko
2014-11-25 22:14 ` Thomas Graf
2014-11-25 22:39 ` Florian Fainelli
2014-11-25 23:11 ` Thomas Graf
2014-11-26 7:54 ` Jiri Pirko
2014-11-25 10:28 ` [patch net-next v3 03/17] net: rename netdev_phys_port_id to more generic name Jiri Pirko
2014-11-25 15:15 ` Andy Gospodarek
2014-11-25 15:44 ` Jamal Hadi Salim
2014-11-25 10:28 ` [patch net-next v3 04/17] net: introduce generic switch devices support Jiri Pirko
2014-11-25 15:02 ` Andy Gospodarek
2014-11-25 15:51 ` Jamal Hadi Salim
2014-11-25 16:49 ` Jiri Pirko
2014-11-25 17:08 ` Jamal Hadi Salim
2014-11-25 21:54 ` Thomas Graf
2014-11-26 3:33 ` Jamal Hadi Salim
2014-11-26 4:18 ` Scott Feldman
2014-11-26 11:36 ` Jamal Hadi Salim
2014-11-26 16:08 ` Thomas Graf
2014-11-26 17:09 ` Jamal Hadi Salim
2014-11-26 17:59 ` Jiri Pirko
2014-11-26 21:50 ` Thomas Graf
2014-11-26 23:32 ` Jamal Hadi Salim
2014-11-27 13:03 ` Thomas Graf
2014-11-27 13:32 ` Jamal Hadi Salim
2014-11-27 13:50 ` Jiri Pirko
2014-11-28 13:13 ` Jamal Hadi Salim
2014-11-27 5:58 ` Scott Feldman
2014-11-27 12:46 ` Jamal Hadi Salim
2014-11-27 3:13 ` Simon Horman
2014-11-27 12:35 ` Jamal Hadi Salim
2014-11-25 16:07 ` Roopa Prabhu
2014-11-25 16:50 ` Jiri Pirko
2014-11-25 10:28 ` [patch net-next v3 05/17] rtnl: expose physical switch id for particular device Jiri Pirko
2014-11-25 15:16 ` Andy Gospodarek
2014-11-25 10:28 ` [patch net-next v3 06/17] net-sysfs: " Jiri Pirko
2014-11-25 15:28 ` Andy Gospodarek
2014-11-25 15:53 ` Jamal Hadi Salim
2014-11-25 22:27 ` Florian Fainelli
2014-11-25 10:28 ` [patch net-next v3 07/17] rocker: introduce rocker switch driver Jiri Pirko
2014-11-25 15:57 ` Jamal Hadi Salim
2014-11-25 16:57 ` Jiri Pirko
2014-11-25 17:10 ` David Miller
2014-11-25 17:15 ` Jiri Pirko
2014-11-25 17:15 ` Jamal Hadi Salim
2014-11-25 17:51 ` Andy Gospodarek
2014-11-25 16:13 ` David Laight
2014-11-25 19:19 ` Scott Feldman
2014-11-25 21:57 ` tgraf
2014-11-25 10:28 ` [patch net-next v3 08/17] bridge: call netdev_sw_port_stp_update when bridge port STP status changes Jiri Pirko
2014-11-25 15:58 ` Andy Gospodarek
2014-11-25 16:53 ` Jiri Pirko
2014-11-25 22:18 ` Thomas Graf
2014-11-25 22:20 ` Florian Fainelli
2014-11-25 22:48 ` Roopa Prabhu [this message]
2014-11-26 1:35 ` Scott Feldman
2014-11-28 10:05 ` Roopa Prabhu
2014-11-28 10:51 ` Scott Feldman
2014-11-28 13:17 ` Jamal Hadi Salim
2014-11-28 13:27 ` Jiri Pirko
2014-11-28 16:23 ` Roopa Prabhu
2014-11-25 10:28 ` [patch net-next v3 09/17] bridge: add API to notify bridge driver of learned FBD on offloaded device Jiri Pirko
2014-11-25 16:01 ` Jamal Hadi Salim
2014-11-25 16:38 ` Andy Gospodarek
2014-11-25 22:36 ` Thomas Graf
2014-11-26 1:48 ` Scott Feldman
2014-11-26 10:26 ` Jiri Pirko
2014-11-25 22:44 ` Florian Fainelli
2014-11-26 2:03 ` Scott Feldman
2014-11-26 2:34 ` Florian Fainelli
2014-11-26 2:40 ` Scott Feldman
2014-11-26 8:16 ` Jiri Pirko
2014-11-26 3:22 ` Jamal Hadi Salim
2014-11-25 10:28 ` [patch net-next v3 10/17] rocker: implement rocker ofdpa flow table manipulation Jiri Pirko
2014-11-25 16:03 ` Jamal Hadi Salim
2014-11-25 10:28 ` [patch net-next v3 11/17] rocker: implement L2 bridge offloading Jiri Pirko
2014-11-25 16:04 ` Jamal Hadi Salim
2014-11-25 17:11 ` David Miller
2014-11-25 10:28 ` [patch net-next v3 12/17] rocker: implement ndo_fdb_dump Jiri Pirko
2014-11-25 16:04 ` Jamal Hadi Salim
2014-11-25 10:28 ` [patch net-next v3 13/17] bridge: move private brport flags to if_bridge.h so port drivers can use flags Jiri Pirko
2014-11-25 16:01 ` Andy Gospodarek
2014-11-25 16:05 ` Jamal Hadi Salim
2014-11-25 22:20 ` Florian Fainelli
2014-11-25 22:48 ` Thomas Graf
2014-11-26 12:12 ` Jiri Pirko
2014-11-25 10:28 ` [patch net-next v3 14/17] bridge: add new brport flag LEARNING_SYNC Jiri Pirko
2014-11-25 16:05 ` Roopa Prabhu
2014-11-25 16:06 ` Jamal Hadi Salim
2014-11-25 16:40 ` Andy Gospodarek
2014-11-25 10:28 ` [patch net-next v3 15/17] bridge: add new hwmode swdev Jiri Pirko
2014-11-25 16:03 ` Roopa Prabhu
2014-11-25 16:17 ` Andy Gospodarek
2014-11-25 22:56 ` Thomas Graf
2014-11-25 16:07 ` Jamal Hadi Salim
2014-11-25 23:00 ` Thomas Graf
2014-11-25 10:28 ` [patch net-next v3 16/17] bridge: add brport flags to dflt bridge_getlink Jiri Pirko
2014-11-25 16:08 ` Jamal Hadi Salim
2014-11-25 17:02 ` Scott Feldman
2014-11-25 17:48 ` Andy Gospodarek
2014-11-25 22:07 ` Thomas Graf
2014-11-26 9:25 ` Jiri Pirko
2014-11-26 10:48 ` Thomas Graf
2014-11-25 10:28 ` [patch net-next v3 17/17] rocker: add ndo_bridge_setlnk/getlink support for learning policy Jiri Pirko
2014-11-25 16:09 ` Jamal Hadi Salim
2014-11-25 18:55 ` Scott Feldman
2014-11-25 19:00 ` Jamal Hadi Salim
2014-11-25 20:42 ` Jiri Pirko
2014-11-26 11:07 ` Thomas Graf
2014-11-26 11:27 ` Jiri Pirko
2014-11-26 11:30 ` Thomas Graf
2014-11-26 11:42 ` Jiri Pirko
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=5475073E.70503@cumulusnetworks.com \
--to=roopa@cumulusnetworks$(echo .)com \
--cc=Neil.Jerram@metaswitch$(echo .)com \
--cc=alexander.h.duyck@redhat$(echo .)com \
--cc=alexei.starovoitov@gmail$(echo .)com \
--cc=andy@greyhouse$(echo .)net \
--cc=aviadr@mellanox$(echo .)com \
--cc=azhou@nicira$(echo .)com \
--cc=bcrl@kvack$(echo .)org \
--cc=ben@decadent$(echo .)org.uk \
--cc=buytenh@wantstofly$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=dborkman@redhat$(echo .)com \
--cc=ebiederm@xmission$(echo .)com \
--cc=edumazet@google$(echo .)com \
--cc=f.fainelli@gmail$(echo .)com \
--cc=gospo@cumulusnetworks$(echo .)com \
--cc=jasowang@redhat$(echo .)com \
--cc=jeffrey.t.kirsher@intel$(echo .)com \
--cc=jesse@nicira$(echo .)com \
--cc=jhs@mojatatu$(echo .)com \
--cc=jiri@resnulli$(echo .)us \
--cc=john.r.fastabend@intel$(echo .)com \
--cc=john.ronciak@intel$(echo .)com \
--cc=linville@tuxdriver$(echo .)com \
--cc=mleitner@redhat$(echo .)com \
--cc=nbd@openwrt$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nhorman@tuxdriver$(echo .)com \
--cc=nicolas.dichtel@6wind$(echo .)com \
--cc=ogerlitz@mellanox$(echo .)com \
--cc=pshelar@nicira$(echo .)com \
--cc=ronye@mellanox$(echo .)com \
--cc=ryazanov.s.a@gmail$(echo .)com \
--cc=sfeldma@gmail$(echo .)com \
--cc=shrijeet@gmail$(echo .)com \
--cc=simon.horman@netronome$(echo .)com \
--cc=stephen@networkplumber$(echo .)org \
--cc=tgraf@suug$(echo .)ch \
--cc=vyasevic@redhat$(echo .)com \
--cc=xiyou.wangcong@gmail$(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