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: <20190201220657.30170-8-f.fainelli@gmail.com> Date: Fri, 1 Feb 2019 14:06:51 -0800 From: Florian Fainelli <f.fainelli@...il.com> To: netdev@...r.kernel.org Cc: Florian Fainelli <f.fainelli@...il.com>, Michael Chan <michael.chan@...adcom.com>, "David S. Miller" <davem@...emloft.net>, Derek Chickles <dchickles@...vell.com>, Satanand Burla <sburla@...vell.com>, Felix Manlunas <fmanlunas@...vell.com>, Saeed Mahameed <saeedm@...lanox.com>, Leon Romanovsky <leon@...nel.org>, Jiri Pirko <jiri@...lanox.com>, Ido Schimmel <idosch@...lanox.com>, Alexandre Belloni <alexandre.belloni@...tlin.com>, Microchip Linux Driver Support <UNGLinuxDriver@...rochip.com>, Jakub Kicinski <jakub.kicinski@...ronome.com>, Ioana Radulescu <ruxandra.radulescu@....com>, Ioana Ciornei <ioana.ciornei@....com>, Greg Kroah-Hartman <gregkh@...uxfoundation.org>, Ivan Vecera <ivecera@...hat.com>, Andrew Lunn <andrew@...n.ch>, Vivien Didelot <vivien.didelot@...il.com>, Dirk van der Merwe <dirk.vandermerwe@...ronome.com>, "Francois H. Theron" <francois.theron@...ronome.com>, Simon Horman <simon.horman@...ronome.com>, Quentin Monnet <quentin.monnet@...ronome.com>, Daniel Borkmann <daniel@...earbox.net>, Eric Dumazet <edumazet@...gle.com>, John Hurley <john.hurley@...ronome.com>, Edwin Peer <edwin.peer@...ronome.com>, linux-kernel@...r.kernel.org (open list), linux-rdma@...r.kernel.org (open list:MELLANOX MLX5 core VPI driver), oss-drivers@...ronome.com (open list:NETRONOME ETHERNET DRIVERS), devel@...verdev.osuosl.org (open list:STAGING SUBSYSTEM) Subject: [RFC net-next 07/13] bnxt: Handle SWITCHDEV_PORT_ATTR_GET event Following patches will change the way we communicate getting or setting a port's attribute and use a blocking notifier to perform those tasks. Prepare bnxt to support receiving notifier events targeting SWITCHDEV_PORT_ATTR_GET and simply translate that into the existing switchdev_ops::switchdev_port_attr_get operation. We register a single blocking switchdev notifier for the entire driver instance and we differentiate a PF from a VF by comparing the network device's netdev_ops with the ones that this driver manages. Signed-off-by: Florian Fainelli <f.fainelli@...il.com> --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 58 ++++++++++++++++++- drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 4 +- drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h | 8 +++ 3 files changed, 67 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 6a512871176b..c3178ca4a004 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -10045,6 +10045,45 @@ static const struct net_device_ops bnxt_netdev_ops = { .ndo_get_phys_port_name = bnxt_get_phys_port_name }; +static int bnxt_swdev_port_attr_event(unsigned long event, + struct net_device *dev, + struct switchdev_notifier_port_attr_info *port_attr_info) +{ + int rc; + + if (event != SWITCHDEV_PORT_ATTR_GET) + return NOTIFY_DONE; + + if (bnxt_dev_is_vf_rep(dev)) + rc = bnxt_vf_rep_port_attr_get(dev, port_attr_info->attr); + else + rc = bnxt_port_attr_get(netdev_priv(dev), port_attr_info->attr); + + port_attr_info->handled = true; + return notifier_from_errno(rc); +} + +static int bnxt_switchdev_blocking_event(struct notifier_block *nb, + unsigned long event, void *ptr) +{ + struct net_device *dev = switchdev_notifier_info_to_dev(ptr); + + if (dev->netdev_ops != &bnxt_netdev_ops && + !bnxt_dev_is_vf_rep(dev)) + return NOTIFY_DONE; + + switch (event) { + case SWITCHDEV_PORT_ATTR_GET: + return bnxt_swdev_port_attr_event(event, dev, ptr); + } + + return NOTIFY_DONE; +} + +static struct notifier_block bnxt_swdev_blocking_nb = { + .notifier_call = bnxt_switchdev_blocking_event, +}; + static void bnxt_remove_one(struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata(pdev); @@ -10817,8 +10856,24 @@ static struct pci_driver bnxt_pci_driver = { static int __init bnxt_init(void) { + int rc; + bnxt_debug_init(); - return pci_register_driver(&bnxt_pci_driver); + rc = register_switchdev_blocking_notifier(&bnxt_swdev_blocking_nb); + if (rc) + goto err_debug; + + rc = pci_register_driver(&bnxt_pci_driver); + if (rc) + goto err_unreg_notifier; + + return rc; + +err_unreg_notifier: + unregister_switchdev_notifier(&bnxt_swdev_blocking_nb); +err_debug: + bnxt_debug_exit(); + return rc; } static void __exit bnxt_exit(void) @@ -10826,6 +10881,7 @@ static void __exit bnxt_exit(void) pci_unregister_driver(&bnxt_pci_driver); if (bnxt_pf_wq) destroy_workqueue(bnxt_pf_wq); + unregister_switchdev_notifier(&bnxt_swdev_blocking_nb); bnxt_debug_exit(); } diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c index 9a25c05aa571..a06f93b49dd5 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c @@ -237,8 +237,8 @@ static void bnxt_vf_rep_get_drvinfo(struct net_device *dev, strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version)); } -static int bnxt_vf_rep_port_attr_get(struct net_device *dev, - struct switchdev_attr *attr) +int bnxt_vf_rep_port_attr_get(struct net_device *dev, + struct switchdev_attr *attr) { struct bnxt_vf_rep *vf_rep = netdev_priv(dev); diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h b/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h index d7287651422f..ba24ac222182 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h @@ -32,6 +32,8 @@ bool bnxt_dev_is_vf_rep(struct net_device *dev); int bnxt_dl_eswitch_mode_get(struct devlink *devlink, u16 *mode); int bnxt_dl_eswitch_mode_set(struct devlink *devlink, u16 mode, struct netlink_ext_ack *extack); +int bnxt_vf_rep_port_attr_get(struct net_device *dev, + struct switchdev_attr *attr); #else @@ -61,5 +63,11 @@ static inline bool bnxt_dev_is_vf_rep(struct net_device *dev) { return false; } + +static inline int bnxt_vf_rep_port_attr_get(struct net_device *dev, + struct switchdev_attr *attr) +{ + return -EOPNOTSUPP; +} #endif /* CONFIG_BNXT_SRIOV */ #endif /* BNXT_VFR_H */ -- 2.17.1
Powered by blists - more mailing lists