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

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
...@@ -43,7 +43,6 @@ static inline bool switchdev_trans_ph_commit(struct switchdev_trans *trans) ...@@ -43,7 +43,6 @@ static inline bool switchdev_trans_ph_commit(struct switchdev_trans *trans)
enum switchdev_attr_id { enum switchdev_attr_id {
SWITCHDEV_ATTR_ID_UNDEFINED, SWITCHDEV_ATTR_ID_UNDEFINED,
SWITCHDEV_ATTR_ID_PORT_PARENT_ID,
SWITCHDEV_ATTR_ID_PORT_STP_STATE, SWITCHDEV_ATTR_ID_PORT_STP_STATE,
SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS, SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS,
SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT, SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT,
...@@ -61,7 +60,6 @@ struct switchdev_attr { ...@@ -61,7 +60,6 @@ struct switchdev_attr {
void *complete_priv; void *complete_priv;
void (*complete)(struct net_device *dev, int err, void *priv); void (*complete)(struct net_device *dev, int err, void *priv);
union { union {
struct netdev_phys_item_id ppid; /* PORT_PARENT_ID */
u8 stp_state; /* PORT_STP_STATE */ u8 stp_state; /* PORT_STP_STATE */
unsigned long brport_flags; /* PORT_BRIDGE_FLAGS */ unsigned long brport_flags; /* PORT_BRIDGE_FLAGS */
unsigned long brport_flags_support; /* PORT_BRIDGE_FLAGS_SUPPORT */ unsigned long brport_flags_support; /* PORT_BRIDGE_FLAGS_SUPPORT */
...@@ -208,9 +206,6 @@ void switchdev_port_fwd_mark_set(struct net_device *dev, ...@@ -208,9 +206,6 @@ void switchdev_port_fwd_mark_set(struct net_device *dev,
struct net_device *group_dev, struct net_device *group_dev,
bool joining); 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, int switchdev_handle_port_obj_add(struct net_device *dev,
struct switchdev_notifier_port_obj_info *port_obj_info, struct switchdev_notifier_port_obj_info *port_obj_info,
bool (*check_cb)(const struct net_device *dev), bool (*check_cb)(const struct net_device *dev),
...@@ -295,12 +290,6 @@ call_switchdev_blocking_notifiers(unsigned long val, ...@@ -295,12 +290,6 @@ call_switchdev_blocking_notifiers(unsigned long val,
return NOTIFY_DONE; return NOTIFY_DONE;
} }
static inline bool switchdev_port_same_parent_id(struct net_device *a,
struct net_device *b)
{
return false;
}
static inline int static inline int
switchdev_handle_port_obj_add(struct net_device *dev, switchdev_handle_port_obj_add(struct net_device *dev,
struct switchdev_notifier_port_obj_info *port_obj_info, struct switchdev_notifier_port_obj_info *port_obj_info,
......
...@@ -14,8 +14,7 @@ static int br_switchdev_mark_get(struct net_bridge *br, struct net_device *dev) ...@@ -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. */ /* dev is yet to be added to the port list. */
list_for_each_entry(p, &br->port_list, list) { list_for_each_entry(p, &br->port_list, list) {
if (netdev_port_same_parent_id(dev, p->dev) || if (netdev_port_same_parent_id(dev, p->dev))
switchdev_port_same_parent_id(dev, p->dev))
return p->offload_fwd_mark; return p->offload_fwd_mark;
} }
...@@ -24,19 +23,12 @@ static int br_switchdev_mark_get(struct net_bridge *br, struct net_device *dev) ...@@ -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) int nbp_switchdev_mark_set(struct net_bridge_port *p)
{ {
const struct net_device_ops *ops = p->dev->netdev_ops; struct netdev_phys_item_id ppid = { };
struct switchdev_attr attr = {
.orig_dev = p->dev,
.id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,
};
int err; int err;
ASSERT_RTNL(); ASSERT_RTNL();
if (ops->ndo_get_port_parent_id) err = dev_get_port_parent_id(p->dev, &ppid, true);
err = dev_get_port_parent_id(p->dev, &attr.u.ppid, true);
else
err = switchdev_port_attr_get(p->dev, &attr);
if (err) { if (err) {
if (err == -EOPNOTSUPP) if (err == -EOPNOTSUPP)
return 0; return 0;
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include <linux/capability.h> #include <linux/capability.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <net/switchdev.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/sched/signal.h> #include <linux/sched/signal.h>
...@@ -495,27 +494,17 @@ static ssize_t phys_switch_id_show(struct device *dev, ...@@ -495,27 +494,17 @@ static ssize_t phys_switch_id_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct net_device *netdev = to_net_dev(dev); struct net_device *netdev = to_net_dev(dev);
const struct net_device_ops *ops = netdev->netdev_ops;
ssize_t ret = -EINVAL; ssize_t ret = -EINVAL;
if (!rtnl_trylock()) if (!rtnl_trylock())
return restart_syscall(); return restart_syscall();
if (dev_isalive(netdev)) { if (dev_isalive(netdev)) {
struct switchdev_attr attr = { struct netdev_phys_item_id ppid = { };
.orig_dev = netdev,
.id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID, ret = dev_get_port_parent_id(netdev, &ppid, false);
.flags = SWITCHDEV_F_NO_RECURSE,
};
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);
if (!ret) if (!ret)
ret = sprintf(buf, "%*phN\n", attr.u.ppid.id_len, ret = sprintf(buf, "%*phN\n", ppid.id_len, ppid.id);
attr.u.ppid.id);
} }
rtnl_unlock(); rtnl_unlock();
......
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <linux/inet.h> #include <linux/inet.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <net/switchdev.h>
#include <net/ip.h> #include <net/ip.h>
#include <net/protocol.h> #include <net/protocol.h>
#include <net/arp.h> #include <net/arp.h>
...@@ -1146,26 +1145,17 @@ static int rtnl_phys_port_name_fill(struct sk_buff *skb, struct net_device *dev) ...@@ -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) 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; 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, &ppid, false);
err = dev_get_port_parent_id(dev, &attr.u.ppid, false);
else
err = switchdev_port_attr_get(dev, &attr);
if (err) { if (err) {
if (err == -EOPNOTSUPP) if (err == -EOPNOTSUPP)
return 0; return 0;
return err; return err;
} }
if (nla_put(skb, IFLA_PHYS_SWITCH_ID, attr.u.ppid.id_len, if (nla_put(skb, IFLA_PHYS_SWITCH_ID, ppid.id_len, ppid.id))
attr.u.ppid.id))
return -EMSGSIZE; return -EMSGSIZE;
return 0; return 0;
......
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
#include <net/fib_rules.h> #include <net/fib_rules.h>
#include <linux/netconf.h> #include <linux/netconf.h>
#include <net/nexthop.h> #include <net/nexthop.h>
#include <net/switchdev.h>
#include <linux/nospec.h> #include <linux/nospec.h>
...@@ -837,11 +836,8 @@ static void ipmr_update_thresholds(struct mr_table *mrt, struct mr_mfc *cache, ...@@ -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, static int vif_add(struct net *net, struct mr_table *mrt,
struct vifctl *vifc, int mrtsock) struct vifctl *vifc, int mrtsock)
{ {
const struct net_device_ops *ops; struct netdev_phys_item_id ppid = { };
int vifi = vifc->vifc_vifi; 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 vif_device *v = &mrt->vif_table[vifi];
struct net_device *dev; struct net_device *dev;
struct in_device *in_dev; struct in_device *in_dev;
...@@ -920,15 +916,10 @@ static int vif_add(struct net *net, struct mr_table *mrt, ...@@ -920,15 +916,10 @@ static int vif_add(struct net *net, struct mr_table *mrt,
vifc->vifc_flags | (!mrtsock ? VIFF_STATIC : 0), vifc->vifc_flags | (!mrtsock ? VIFF_STATIC : 0),
(VIFF_TUNNEL | VIFF_REGISTER)); (VIFF_TUNNEL | VIFF_REGISTER));
attr.orig_dev = dev; err = dev_get_port_parent_id(dev, &ppid, true);
ops = dev->netdev_ops; if (err == 0) {
if (ops->ndo_get_port_parent_id && memcpy(v->dev_parent_id.id, ppid.id, ppid.id_len);
!dev_get_port_parent_id(dev, &attr.u.ppid, true)) { v->dev_parent_id.id_len = ppid.id_len;
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;
} else { } else {
v->dev_parent_id.id_len = 0; v->dev_parent_id.id_len = 0;
} }
......
...@@ -592,26 +592,6 @@ int call_switchdev_blocking_notifiers(unsigned long val, struct net_device *dev, ...@@ -592,26 +592,6 @@ int call_switchdev_blocking_notifiers(unsigned long val, struct net_device *dev,
} }
EXPORT_SYMBOL_GPL(call_switchdev_blocking_notifiers); EXPORT_SYMBOL_GPL(call_switchdev_blocking_notifiers);
bool switchdev_port_same_parent_id(struct net_device *a,
struct net_device *b)
{
struct switchdev_attr a_attr = {
.orig_dev = a,
.id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,
};
struct switchdev_attr b_attr = {
.orig_dev = b,
.id = SWITCHDEV_ATTR_ID_PORT_PARENT_ID,
};
if (switchdev_port_attr_get(a, &a_attr) ||
switchdev_port_attr_get(b, &b_attr))
return false;
return netdev_phys_item_id_same(&a_attr.u.ppid, &b_attr.u.ppid);
}
EXPORT_SYMBOL_GPL(switchdev_port_same_parent_id);
static int __switchdev_handle_port_obj_add(struct net_device *dev, static int __switchdev_handle_port_obj_add(struct net_device *dev,
struct switchdev_notifier_port_obj_info *port_obj_info, struct switchdev_notifier_port_obj_info *port_obj_info,
bool (*check_cb)(const struct net_device *dev), bool (*check_cb)(const struct net_device *dev),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment