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

Commit bccb3025 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: Get rid of SWITCHDEV_ATTR_ID_PORT_PARENT_ID 



Now that we have a dedicated NDO for getting a port's parent ID, get rid
of SWITCHDEV_ATTR_ID_PORT_PARENT_ID and convert all callers to use the
NDO exclusively. This is a preliminary change to getting rid of
switchdev_ops eventually.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 929d6c14

include/net/switchdev.h

+0 −11
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ static inline bool switchdev_trans_ph_commit(struct switchdev_trans *trans) 


enum switchdev_attr_id {

	SWITCHDEV_ATTR_ID_UNDEFINED,

	SWITCHDEV_ATTR_ID_PORT_PARENT_ID,

	SWITCHDEV_ATTR_ID_PORT_STP_STATE,

	SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS,

	SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT,
@@ -61,7 +60,6 @@ struct switchdev_attr { 
	void *complete_priv;

	void (*complete)(struct net_device *dev, int err, void *priv);

	union {

		struct netdev_phys_item_id ppid;	/* PORT_PARENT_ID */

		u8 stp_state;				/* PORT_STP_STATE */

		unsigned long brport_flags;		/* PORT_BRIDGE_FLAGS */

		unsigned long brport_flags_support;	/* PORT_BRIDGE_FLAGS_SUPPORT */
@@ -208,9 +206,6 @@ void switchdev_port_fwd_mark_set(struct net_device *dev, 
				 struct net_device *group_dev,

				 bool joining);



bool switchdev_port_same_parent_id(struct net_device *a,

				   struct net_device *b);



int switchdev_handle_port_obj_add(struct net_device *dev,

			struct switchdev_notifier_port_obj_info *port_obj_info,

			bool (*check_cb)(const struct net_device *dev),
@@ -295,12 +290,6 @@ call_switchdev_blocking_notifiers(unsigned long val, 
	return NOTIFY_DONE;

}



static inline bool switchdev_port_same_parent_id(struct net_device *a,

						 struct net_device *b)

{

	return false;

}



static inline int

switchdev_handle_port_obj_add(struct net_device *dev,

			struct switchdev_notifier_port_obj_info *port_obj_info,

net/bridge/br_switchdev.c

+3 −11
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ static int br_switchdev_mark_get(struct net_bridge *br, struct net_device *dev) 


	/* dev is yet to be added to the port list. */

	list_for_each_entry(p, &br->port_list, list) {

		if (netdev_port_same_parent_id(dev, p->dev) ||

		    switchdev_port_same_parent_id(dev, p->dev))

		if (netdev_port_same_parent_id(dev, p->dev))

			return p->offload_fwd_mark;

	}
@@ -24,19 +23,12 @@ static int br_switchdev_mark_get(struct net_bridge *br, struct net_device *dev) 


int nbp_switchdev_mark_set(struct net_bridge_port *p)

{

	const struct net_device_ops *ops = p->dev->netdev_ops;

	struct switchdev_attr attr = {

		.orig_dev = p->dev,

		.id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,

	};

	struct netdev_phys_item_id ppid = { };

	int err;



	ASSERT_RTNL();



	if (ops->ndo_get_port_parent_id)

		err = dev_get_port_parent_id(p->dev, &attr.u.ppid, true);

	else

		err = switchdev_port_attr_get(p->dev, &attr);

	err = dev_get_port_parent_id(p->dev, &ppid, true);

	if (err) {

		if (err == -EOPNOTSUPP)

			return 0;

net/core/net-sysfs.c

+4 −15
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/capability.h>

#include <linux/kernel.h>

#include <linux/netdevice.h>

#include <net/switchdev.h>

#include <linux/if_arp.h>

#include <linux/slab.h>

#include <linux/sched/signal.h>
@@ -495,27 +494,17 @@ static ssize_t phys_switch_id_show(struct device *dev, 
				   struct device_attribute *attr, char *buf)

{

	struct net_device *netdev = to_net_dev(dev);

	const struct net_device_ops *ops = netdev->netdev_ops;

	ssize_t ret = -EINVAL;



	if (!rtnl_trylock())

		return restart_syscall();



	if (dev_isalive(netdev)) {

		struct switchdev_attr attr = {

			.orig_dev = netdev,

			.id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,

			.flags = SWITCHDEV_F_NO_RECURSE,

		};

		struct netdev_phys_item_id ppid = { };



		if (ops->ndo_get_port_parent_id)

			ret = dev_get_port_parent_id(netdev, &attr.u.ppid,

						     false);

		else

			ret = switchdev_port_attr_get(netdev, &attr);

		ret = dev_get_port_parent_id(netdev, &ppid, false);

		if (!ret)

			ret = sprintf(buf, "%*phN\n", attr.u.ppid.id_len,

				      attr.u.ppid.id);

			ret = sprintf(buf, "%*phN\n", ppid.id_len, ppid.id);

	}

	rtnl_unlock();

net/core/rtnetlink.c

+3 −13
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 


#include <linux/inet.h>

#include <linux/netdevice.h>

#include <net/switchdev.h>

#include <net/ip.h>

#include <net/protocol.h>

#include <net/arp.h>
@@ -1146,26 +1145,17 @@ static int rtnl_phys_port_name_fill(struct sk_buff *skb, struct net_device *dev) 


static int rtnl_phys_switch_id_fill(struct sk_buff *skb, struct net_device *dev)

{

	const struct net_device_ops *ops = dev->netdev_ops;

	struct netdev_phys_item_id ppid = { };

	int err;

	struct switchdev_attr attr = {

		.orig_dev = dev,

		.id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,

		.flags = SWITCHDEV_F_NO_RECURSE,

	};



	if (ops->ndo_get_port_parent_id)

		err = dev_get_port_parent_id(dev, &attr.u.ppid, false);

	else

		err = switchdev_port_attr_get(dev, &attr);

	err = dev_get_port_parent_id(dev, &ppid, false);

	if (err) {

		if (err == -EOPNOTSUPP)

			return 0;

		return err;

	}



	if (nla_put(skb, IFLA_PHYS_SWITCH_ID, attr.u.ppid.id_len,

		    attr.u.ppid.id))

	if (nla_put(skb, IFLA_PHYS_SWITCH_ID, ppid.id_len, ppid.id))

		return -EMSGSIZE;



	return 0;

net/ipv4/ipmr.c

+5 −14
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ 
#include <net/fib_rules.h>

#include <linux/netconf.h>

#include <net/nexthop.h>

#include <net/switchdev.h>



#include <linux/nospec.h>
@@ -837,11 +836,8 @@ static void ipmr_update_thresholds(struct mr_table *mrt, struct mr_mfc *cache, 
static int vif_add(struct net *net, struct mr_table *mrt,

		   struct vifctl *vifc, int mrtsock)

{

	const struct net_device_ops *ops;

	struct netdev_phys_item_id ppid = { };

	int vifi = vifc->vifc_vifi;

	struct switchdev_attr attr = {

		.id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,

	};

	struct vif_device *v = &mrt->vif_table[vifi];

	struct net_device *dev;

	struct in_device *in_dev;
@@ -920,15 +916,10 @@ static int vif_add(struct net *net, struct mr_table *mrt, 
			vifc->vifc_flags | (!mrtsock ? VIFF_STATIC : 0),

			(VIFF_TUNNEL | VIFF_REGISTER));



	attr.orig_dev = dev;

	ops = dev->netdev_ops;

	if (ops->ndo_get_port_parent_id &&

	    !dev_get_port_parent_id(dev, &attr.u.ppid, true)) {

		memcpy(v->dev_parent_id.id, attr.u.ppid.id, attr.u.ppid.id_len);

		v->dev_parent_id.id_len = attr.u.ppid.id_len;

	} else if (!switchdev_port_attr_get(dev, &attr)) {

		memcpy(v->dev_parent_id.id, attr.u.ppid.id, attr.u.ppid.id_len);

		v->dev_parent_id.id_len = attr.u.ppid.id_len;

	err = dev_get_port_parent_id(dev, &ppid, true);

	if (err == 0) {

		memcpy(v->dev_parent_id.id, ppid.id, ppid.id_len);

		v->dev_parent_id.id_len = ppid.id_len;

	} else {

		v->dev_parent_id.id_len = 0;

	}