netdev - [PATCH net-next] net: dsa: mv88e6xxx: Allow hwstamping on the master port

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Thu, 10 Nov 2022 09:43:45 -0300
From:   Fabio Estevam <festevam@...il.com>
To:     kuba@...nel.org
Cc:     andrew@...n.ch, olteanv@...il.com, netdev@...r.kernel.org,
        Steffen Bätz <steffen@...osonix.de>,
        Fabio Estevam <festevam@...x.de>
Subject: [PATCH net-next] net: dsa: mv88e6xxx: Allow hwstamping on the master port

From: Steffen Bätz <steffen@...osonix.de>

Currently, it is not possible to run SIOCGHWTSTAMP or SIOCSHWTSTAMP
ioctls on the dsa master interface if the port_hwtstamp_set/get()
hooks are present, as implemented in net/dsa/master.c:

static int dsa_master_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
...
	case SIOCGHWTSTAMP:
	case SIOCSHWTSTAMP:
		/* Deny PTP operations on master if there is at least one
		 * switch in the tree that is PTP capable.
		 */
		list_for_each_entry(dp, &dst->ports, list)
			if (dp->ds->ops->port_hwtstamp_get ||
			    dp->ds->ops->port_hwtstamp_set)
				return -EBUSY;
		break;
	}

Even if the hwtstamping functionality is disabled in the mv88e6xxx driver
by not setting CONFIG_NET_DSA_MV88E6XXX_PTP, the functions port_hwtstamp_set()
port_hwtstamp_get() are still present due to their stub declarations.

Fix this problem, by removing the stub declarations and guarding these
functions wih CONFIG_NET_DSA_MV88E6XXX_PTP.

Without this change:

 # hwstamp_ctl -i eth0
SIOCGHWTSTAMP failed: Device or resource busy

With the change applied, it is possible to set and get the timestamping
options:

 # hwstamp_ctl -i eth0
current settings:
tx_type 0
rx_filter 0

 # hwstamp_ctl -i eth0 -r 1 -t 1
current settings:
tx_type 0
rx_filter 0
new settings:
tx_type 1
rx_filter 1

Tested on a custom i.MX8MN board with a 88E6320 switch.

Signed-off-by: Steffen Bätz <steffen@...osonix.de>
Signed-off-by: Fabio Estevam <festevam@...x.de>
---
 drivers/net/dsa/mv88e6xxx/chip.c     |  2 ++
 drivers/net/dsa/mv88e6xxx/hwtstamp.h | 12 ------------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index bf34c942db99..cfa0168cab03 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -6925,8 +6925,10 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = {
 	.port_mirror_del	= mv88e6xxx_port_mirror_del,
 	.crosschip_bridge_join	= mv88e6xxx_crosschip_bridge_join,
 	.crosschip_bridge_leave	= mv88e6xxx_crosschip_bridge_leave,
+#ifdef CONFIG_NET_DSA_MV88E6XXX_PTP
 	.port_hwtstamp_set	= mv88e6xxx_port_hwtstamp_set,
 	.port_hwtstamp_get	= mv88e6xxx_port_hwtstamp_get,
+#endif
 	.port_txtstamp		= mv88e6xxx_port_txtstamp,
 	.port_rxtstamp		= mv88e6xxx_port_rxtstamp,
 	.get_ts_info		= mv88e6xxx_get_ts_info,
diff --git a/drivers/net/dsa/mv88e6xxx/hwtstamp.h b/drivers/net/dsa/mv88e6xxx/hwtstamp.h
index cf7fb6d660b1..86c6213c2ae8 100644
--- a/drivers/net/dsa/mv88e6xxx/hwtstamp.h
+++ b/drivers/net/dsa/mv88e6xxx/hwtstamp.h
@@ -132,18 +132,6 @@ int mv88e6165_global_disable(struct mv88e6xxx_chip *chip);
 
 #else /* !CONFIG_NET_DSA_MV88E6XXX_PTP */
 
-static inline int mv88e6xxx_port_hwtstamp_set(struct dsa_switch *ds,
-					      int port, struct ifreq *ifr)
-{
-	return -EOPNOTSUPP;
-}
-
-static inline int mv88e6xxx_port_hwtstamp_get(struct dsa_switch *ds,
-					      int port, struct ifreq *ifr)
-{
-	return -EOPNOTSUPP;
-}
-
 static inline bool mv88e6xxx_port_rxtstamp(struct dsa_switch *ds, int port,
 					   struct sk_buff *clone,
 					   unsigned int type)
-- 
2.25.1