Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 554c88ac authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-Introduce-ndo_get_port_parent_id' 



Florian Fainelli says:

====================
net: Introduce ndo_get_port_parent_id()

Based on discussion with Ido and feedback from Jakub there are clearly
two classes of users that implement SWITCHDEV_ATTR_ID_PORT_PARENT_ID:

- PF/VF drivers which typically only implement return the port's parent
  ID, yet have to implement switchdev_port_attr_get() just for that

- Ethernet switch drivers: mlxsw, ocelot, DSA, etc. which implement more
  attributes which we want to be able to eventually veto in the context
  of the caller, thus making them candidates for using a blocking notifier
  chain

Changes in v4:

- remove superfluous net/switchdev.h inclusions in a few files
- added Jiri's Acked-by where given
- removed err = -EOPNOTSUPP initializations
- changed according to Jiri's suggestion in net/ipv4/ipmr.c

Changes in v3:

- keep ethsw's switchdev_ops assignment
- remove inclusion of net/switchdev.h in netdevsim which is no longer
  necesary

Changes in v2:

- resolved build failures spotted by kbuild test robot
- added helpers functions into the core network device layer:
  dev_get_port_parent_id() and netdev_port_same_parent_id();
- added support for recursion to lower devices

Changes from RFC:

- introduce a ndo_get_port_parent_id() and convert all relevant drivers
  to use it

- get rid of SWITCHDEV_ATTR_ID_PORT_PARENT_ID

A subsequent set of patches will convert switchdev_port_attr_set() to
use a blocking notifier call, and still get rid of
switchdev_port_attr_get() altogether.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 47b98039 bccb3025

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+8 −20
Original line number Diff line number Diff line
@@ -9981,8 +9981,11 @@ static int bnxt_get_phys_port_name(struct net_device *dev, char *buf, 
	return 0;

}



int bnxt_port_attr_get(struct bnxt *bp, struct switchdev_attr *attr)

int bnxt_get_port_parent_id(struct net_device *dev,

			    struct netdev_phys_item_id *ppid)

{

	struct bnxt *bp = netdev_priv(dev);



	if (bp->eswitch_mode != DEVLINK_ESWITCH_MODE_SWITCHDEV)

		return -EOPNOTSUPP;
@@ -9990,27 +9993,12 @@ int bnxt_port_attr_get(struct bnxt *bp, struct switchdev_attr *attr) 
	if (!BNXT_PF(bp))

		return -EOPNOTSUPP;



	switch (attr->id) {

	case SWITCHDEV_ATTR_ID_PORT_PARENT_ID:

		attr->u.ppid.id_len = sizeof(bp->switch_id);

		memcpy(attr->u.ppid.id, bp->switch_id, attr->u.ppid.id_len);

		break;

	default:

		return -EOPNOTSUPP;

	}

	return 0;

}

	ppid->id_len = sizeof(bp->switch_id);

	memcpy(ppid->id, bp->switch_id, ppid->id_len);



static int bnxt_swdev_port_attr_get(struct net_device *dev,

				    struct switchdev_attr *attr)

{

	return bnxt_port_attr_get(netdev_priv(dev), attr);

	return 0;

}



static const struct switchdev_ops bnxt_switchdev_ops = {

	.switchdev_port_attr_get	= bnxt_swdev_port_attr_get

};



static const struct net_device_ops bnxt_netdev_ops = {

	.ndo_open		= bnxt_open,

	.ndo_start_xmit		= bnxt_start_xmit,
@@ -10042,6 +10030,7 @@ static const struct net_device_ops bnxt_netdev_ops = { 
	.ndo_bpf		= bnxt_xdp,

	.ndo_bridge_getlink	= bnxt_bridge_getlink,

	.ndo_bridge_setlink	= bnxt_bridge_setlink,

	.ndo_get_port_parent_id	= bnxt_get_port_parent_id,

	.ndo_get_phys_port_name = bnxt_get_phys_port_name

};
@@ -10400,7 +10389,6 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	dev->netdev_ops = &bnxt_netdev_ops;

	dev->watchdog_timeo = BNXT_TX_TIMEOUT;

	dev->ethtool_ops = &bnxt_ethtool_ops;

	SWITCHDEV_SET_OPS(dev, &bnxt_switchdev_ops);

	pci_set_drvdata(pdev, dev);



	rc = bnxt_alloc_hwrm_resources(bp);

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/rhashtable.h>

#include <net/devlink.h>

#include <net/dst_metadata.h>

#include <net/switchdev.h>

#include <net/xdp.h>

#include <linux/net_dim.h>
@@ -1795,7 +1794,8 @@ int bnxt_check_rings(struct bnxt *bp, int tx, int rx, bool sh, int tcs, 
int bnxt_setup_mq_tc(struct net_device *dev, u8 tc);

int bnxt_get_max_rings(struct bnxt *, int *, int *, bool);

int bnxt_restore_pf_fw_resources(struct bnxt *bp);

int bnxt_port_attr_get(struct bnxt *bp, struct switchdev_attr *attr);

int bnxt_get_port_parent_id(struct net_device *dev,

			    struct netdev_phys_item_id *ppid);

void bnxt_dim_work(struct work_struct *work);

int bnxt_hwrm_set_ring_coal(struct bnxt *bp, struct bnxt_napi *bnapi);

drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static u16 bnxt_flow_get_dst_fid(struct bnxt *pf_bp, struct net_device *dev) 
	struct bnxt *bp;



	/* check if dev belongs to the same switch */

	if (!switchdev_port_same_parent_id(pf_bp->dev, dev)) {

	if (!netdev_port_same_parent_id(pf_bp->dev, dev)) {

		netdev_info(pf_bp->dev, "dev(ifindex=%d) not on same switch",

			    dev->ifindex);

		return BNXT_FID_INVALID;

drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c

+4 −8
Original line number Diff line number Diff line
@@ -237,21 +237,17 @@ 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)

static int bnxt_vf_rep_get_port_parent_id(struct net_device *dev,

					  struct netdev_phys_item_id *ppid)

{

	struct bnxt_vf_rep *vf_rep = netdev_priv(dev);



	/* as only PORT_PARENT_ID is supported currently use common code

	 * between PF and VF-rep for now.

	 */

	return bnxt_port_attr_get(vf_rep->bp, attr);

	return bnxt_get_port_parent_id(vf_rep->bp->dev, ppid);

}



static const struct switchdev_ops bnxt_vf_rep_switchdev_ops = {

	.switchdev_port_attr_get	= bnxt_vf_rep_port_attr_get

};



static const struct ethtool_ops bnxt_vf_rep_ethtool_ops = {

	.get_drvinfo		= bnxt_vf_rep_get_drvinfo

};
@@ -262,6 +258,7 @@ static const struct net_device_ops bnxt_vf_rep_netdev_ops = { 
	.ndo_start_xmit		= bnxt_vf_rep_xmit,

	.ndo_get_stats64	= bnxt_vf_rep_get_stats64,

	.ndo_setup_tc		= bnxt_vf_rep_setup_tc,

	.ndo_get_port_parent_id	= bnxt_vf_rep_get_port_parent_id,

	.ndo_get_phys_port_name = bnxt_vf_rep_get_phys_port_name

};
@@ -392,7 +389,6 @@ static void bnxt_vf_rep_netdev_init(struct bnxt *bp, struct bnxt_vf_rep *vf_rep, 


	dev->netdev_ops = &bnxt_vf_rep_netdev_ops;

	dev->ethtool_ops = &bnxt_vf_rep_ethtool_ops;

	SWITCHDEV_SET_OPS(dev, &bnxt_vf_rep_switchdev_ops);

	/* Just inherit all the featues of the parent PF as the VF-R

	 * uses the RX/TX rings of the parent PF

	 */

drivers/net/ethernet/cavium/liquidio/lio_main.c

+5 −17
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/firmware.h>

#include <net/vxlan.h>

#include <linux/kthread.h>

#include <net/switchdev.h>

#include "liquidio_common.h"

#include "octeon_droq.h"

#include "octeon_iq.h"
@@ -3184,7 +3183,8 @@ static const struct devlink_ops liquidio_devlink_ops = { 
};



static int

lio_pf_switchdev_attr_get(struct net_device *dev, struct switchdev_attr *attr)

liquidio_get_port_parent_id(struct net_device *dev,

			    struct netdev_phys_item_id *ppid)

{

	struct lio *lio = GET_LIO(dev);

	struct octeon_device *oct = lio->oct_dev;
@@ -3192,24 +3192,12 @@ lio_pf_switchdev_attr_get(struct net_device *dev, struct switchdev_attr *attr) 
	if (oct->eswitch_mode != DEVLINK_ESWITCH_MODE_SWITCHDEV)

		return -EOPNOTSUPP;



	switch (attr->id) {

	case SWITCHDEV_ATTR_ID_PORT_PARENT_ID:

		attr->u.ppid.id_len = ETH_ALEN;

		ether_addr_copy(attr->u.ppid.id,

				(void *)&lio->linfo.hw_addr + 2);

		break;



	default:

		return -EOPNOTSUPP;

	}

	ppid->id_len = ETH_ALEN;

	ether_addr_copy(ppid->id, (void *)&lio->linfo.hw_addr + 2);



	return 0;

}



static const struct switchdev_ops lio_pf_switchdev_ops = {

	.switchdev_port_attr_get = lio_pf_switchdev_attr_get,

};



static int liquidio_get_vf_stats(struct net_device *netdev, int vfidx,

				 struct ifla_vf_stats *vf_stats)

{
@@ -3259,6 +3247,7 @@ static const struct net_device_ops lionetdevops = { 
	.ndo_set_vf_trust	= liquidio_set_vf_trust,

	.ndo_set_vf_link_state  = liquidio_set_vf_link_state,

	.ndo_get_vf_stats	= liquidio_get_vf_stats,

	.ndo_get_port_parent_id	= liquidio_get_port_parent_id,

};



/** \brief Entry point for the liquidio module
@@ -3534,7 +3523,6 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) 
		 * netdev tasks.

		 */

		netdev->netdev_ops = &lionetdevops;

		SWITCHDEV_SET_OPS(netdev, &lio_pf_switchdev_ops);



		retval = netif_set_real_num_rx_queues(netdev, num_oqueues);

		if (retval) {