From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Jiri Pirko <jiri@mellanox.com>,
Eric Dumazet <edumazet@google.com>,
Taehee Yoo <ap420073@gmail.com>,
Cong Wang <xiyou.wangcong@gmail.com>,
Maxim Mikityanskiy <maximmi@mellanox.com>,
Richard Cochran <richardcochran@gmail.com>,
Michal Kubecek <mkubecek@suse.cz>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH net-next 2/4] net: dsa: Add wrappers for overloaded ndo_ops
Date: Fri, 17 Jul 2020 20:05:31 -0700 [thread overview]
Message-ID: <20200718030533.171556-3-f.fainelli@gmail.com> (raw)
In-Reply-To: <20200718030533.171556-1-f.fainelli@gmail.com>
Add definitions for the dsa_netdevice_ops structure which is a subset of
the net_device_ops structure for the specific operations that we care
about overlaying on top of the DSA CPU port net_device and provide
inline stubs that take core managing whether DSA code is reachable.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
include/net/dsa.h | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/include/net/dsa.h b/include/net/dsa.h
index 6fa418ff1175..681ba2752514 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -86,6 +86,18 @@ struct dsa_device_ops {
enum dsa_tag_protocol proto;
};
+/* This structure defines the control interfaces that are overlayed by the
+ * DSA layer on top of the DSA CPU/management net_device instance. This is
+ * used by the core net_device layer while calling various net_device_ops
+ * function pointers.
+ */
+struct dsa_netdevice_ops {
+ int (*ndo_do_ioctl)(struct net_device *dev, struct ifreq *ifr,
+ int cmd);
+ int (*ndo_get_phys_port_name)(struct net_device *dev, char *name,
+ size_t len);
+};
+
#define DSA_TAG_DRIVER_ALIAS "dsa_tag-"
#define MODULE_ALIAS_DSA_TAG_DRIVER(__proto) \
MODULE_ALIAS(DSA_TAG_DRIVER_ALIAS __stringify(__proto##_VALUE))
@@ -217,6 +229,7 @@ struct dsa_port {
/*
* Original copy of the master netdev net_device_ops
*/
+ const struct dsa_netdevice_ops *netdev_ops;
const struct net_device_ops *orig_ndo_ops;
bool setup;
@@ -679,6 +692,34 @@ static inline bool dsa_can_decode(const struct sk_buff *skb,
return false;
}
+#if IS_ENABLED(CONFIG_NET_DSA)
+#define dsa_build_ndo_op(name, arg1_type, arg1_name, arg2_type, arg2_name) \
+static int inline dsa_##name(struct net_device *dev, arg1_type arg1_name, \
+ arg2_type arg2_name) \
+{ \
+ const struct dsa_netdevice_ops *ops; \
+ int err = -EOPNOTSUPP; \
+ \
+ if (!dev->dsa_ptr) \
+ return err; \
+ \
+ ops = dev->dsa_ptr->netdev_ops; \
+ if (!ops || !ops->name) \
+ return err; \
+ \
+ return ops->name(dev, arg1_name, arg2_name); \
+}
+#else
+#define dsa_build_ndo_op(name, ...) \
+static inline int dsa_##name(struct net_device *dev, ...) \
+{ \
+ return -EOPNOTSUPP; \
+}
+#endif
+
+dsa_build_ndo_op(ndo_do_ioctl, struct ifreq *, ifr, int, cmd);
+dsa_build_ndo_op(ndo_get_phys_port_name, char *, name, size_t, len);
+
void dsa_unregister_switch(struct dsa_switch *ds);
int dsa_register_switch(struct dsa_switch *ds);
struct dsa_switch *dsa_switch_find(int tree_index, int sw_index);
--
2.25.1
next prev parent reply other threads:[~2020-07-18 3:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-18 3:05 [PATCH net-next 0/4] net: dsa: Setup dsa_netdev_ops Florian Fainelli
2020-07-18 3:05 ` [PATCH net-next 1/4] net: Wrap ndo_do_ioctl() to prepare for DSA stacked ops Florian Fainelli
2020-07-18 20:30 ` Vladimir Oltean
2020-07-18 20:36 ` Florian Fainelli
2020-07-18 20:44 ` Vladimir Oltean
2020-07-19 15:31 ` Andrew Lunn
2020-07-18 3:05 ` Florian Fainelli [this message]
2020-07-19 15:40 ` [PATCH net-next 2/4] net: dsa: Add wrappers for overloaded ndo_ops Andrew Lunn
2020-07-19 16:10 ` Florian Fainelli
2020-07-18 3:05 ` [PATCH net-next 3/4] net: Call into DSA netdevice_ops wrappers Florian Fainelli
2020-07-18 21:18 ` Vladimir Oltean
2020-07-18 21:53 ` Florian Fainelli
2020-07-19 16:04 ` Andrew Lunn
2020-07-19 16:08 ` Florian Fainelli
2020-07-18 3:05 ` [PATCH net-next 4/4] net: dsa: Setup dsa_netdev_ops Florian Fainelli
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=20200718030533.171556-3-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=andrew@lunn.ch \
--cc=ap420073@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jiri@mellanox.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maximmi@mellanox.com \
--cc=mkubecek@suse.cz \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.com \
--cc=vivien.didelot@gmail.com \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).