Add ndo_hwtstamp_get/set support to vlan/maxvlan code path
Subsystems (2)
RFC PATCH v4 3/5 Add ndo_hwtstamp_get/set support to vlan/maxvlan code path
This patch makes VLAN and MAXVLAN drivers to use the newly introduced ndo_hwtstamp_get/set API to pass hw timestamp requests to underlying NIC drivers in case if these drivers implement ndo_hwtstamp_get/set functions. Otherwise VLAN subsystems falls back to calling ndo_eth_ioctl.
---
Notes:
Changes in v4:
- Moved hw timestamp get/set request processing logic from vlan_dev_ioctl() to .ndo_hwtstamp_get/set callbacks.
- Use the shared generic_hwtstamp_get/set_lower() functions to handle ndo_hwtstamp_get/set requests.
- Applay the same changes to macvlan driver.
--- drivers/net/macvlan.c | 34 +++++++++++++--------------------- net/8021q/vlan_dev.c | 25 ++++++++++++++++++++----- 2 files changed, 33 insertions(+), 26 deletions(-)
drivers/net/macvlan.c +13 -21
@@ -868,31 +868,22 @@ static int macvlan_change_mtu(struct net_device *dev, int new_mtu)return 0 ; } -static int macvlan_eth_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int macvlan_hwtstamp_get (struct net_device *dev, +struct kernel_hwtstamp_config *cfg, +struct netlink_ext_ack *extack) {struct net_device *real_dev =macvlan_dev_real_dev (dev); -const struct net_device_ops *ops = real_dev->netdev_ops; -struct ifreq ifrr; -int err = -EOPNOTSUPP ; -strscpy (ifrr.ifr_name, real_dev->name,IFNAMSIZ ); - ifrr.ifr_ifru = ifr->ifr_ifru; - -switch (cmd) { -case SIOCSHWTSTAMP : -if (!net_eq (dev_net (dev), &init_net)) -break ; - fallthrough; -case SIOCGHWTSTAMP : -if (netif_device_present (real_dev) && ops->ndo_eth_ioctl) - err = ops->ndo_eth_ioctl (real_dev, &ifrr, cmd); -break ; - } +return generic_hwtstamp_get_lower (real_dev, cfg, extack); +} -if (!err) - ifr->ifr_ifru = ifrr.ifr_ifru; +static int macvlan_hwtstamp_set (struct net_device *dev, +struct kernel_hwtstamp_config *cfg, +struct netlink_ext_ack *extack) +{ +struct net_device *real_dev =macvlan_dev_real_dev (dev); -return err; +return generic_hwtstamp_set_lower (real_dev, cfg, extack); }/*
@@ -1193,7 +1184,6 @@ static const struct net_device_ops macvlan_netdev_ops = { .ndo_stop = macvlan_stop, .ndo_start_xmit = macvlan_start_xmit, .ndo_change_mtu = macvlan_change_mtu, - .ndo_eth_ioctl = macvlan_eth_ioctl, .ndo_fix_features = macvlan_fix_features, .ndo_change_rx_flags = macvlan_change_rx_flags, .ndo_set_mac_address = macvlan_set_mac_address,
@@ -1212,6 +1202,8 @@ static const struct net_device_ops macvlan_netdev_ops = {#endif .ndo_get_iflink = macvlan_dev_get_iflink, .ndo_features_check = passthru_features_check, + .ndo_hwtstamp_get = macvlan_hwtstamp_get, + .ndo_hwtstamp_set = macvlan_hwtstamp_set, };static void macvlan_dev_free (struct net_device *dev)
net/8021q/vlan_dev.c +20 -5
@@ -353,6 +353,24 @@ static int vlan_dev_set_mac_address(struct net_device *dev, void *p)return 0 ; } +static int vlan_hwtstamp_get (struct net_device *dev, +struct kernel_hwtstamp_config *cfg, +struct netlink_ext_ack *extack) +{ +struct net_device *real_dev =vlan_dev_priv (dev)->real_dev; + +return generic_hwtstamp_get_lower (real_dev, cfg, extack); +} + +static int vlan_hwtstamp_set (struct net_device *dev, +struct kernel_hwtstamp_config *cfg, +struct netlink_ext_ack *extack) +{ +struct net_device *real_dev =vlan_dev_priv (dev)->real_dev; + +return generic_hwtstamp_set_lower (real_dev, cfg, extack); +} +static int vlan_dev_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) {struct net_device *real_dev =vlan_dev_priv (dev)->real_dev;
@@ -364,14 +382,9 @@ static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ifrr.ifr_ifru = ifr->ifr_ifru;switch (cmd) { -case SIOCSHWTSTAMP : -if (!net_eq (dev_net (dev),dev_net (real_dev))) -break ; - fallthrough;case SIOCGMIIPHY :case SIOCGMIIREG :case SIOCSMIIREG : -case SIOCGHWTSTAMP :if (netif_device_present (real_dev) && ops->ndo_eth_ioctl) err = ops->ndo_eth_ioctl (real_dev, &ifrr, cmd);break ;
@@ -842,6 +855,8 @@ static const struct net_device_ops vlan_netdev_ops = { .ndo_fix_features = vlan_dev_fix_features, .ndo_get_iflink = vlan_dev_get_iflink, .ndo_fill_forward_path = vlan_dev_fill_forward_path, + .ndo_hwtstamp_get = vlan_hwtstamp_get, + .ndo_hwtstamp_set = vlan_hwtstamp_set, };static void vlan_dev_free (struct net_device *dev)
Signature · 1 line
2.39.2
Jakub Kicinski
maintainerReview
Quoted 2 lines · On Sat, 22 Apr 2023 21:28:35 -0600 Maxim Georgiev wrote:
(quoted diff) +0
-2- if (!net_eq(dev_net(dev), &init_net)) - break;
Did we agree that the net namespace check is no longer needed? I don't see it anywhere after the changes.
Quoted 7 lines · Jakub Kicinski
Review
Quoted 2 lines · On Sat, 22 Apr 2023 21:28:35 -0600 Maxim Georgiev wrote:
(quoted diff) +0
-2- if (!net_eq(dev_net(dev), &init_net)) - break;Did we agree that the net namespace check is no longer needed? I don't see it anywhere after the changes.
My bad, I was under the impression that you, guys, decided that this check wasn't needed.
Let me add it back and resend the patch.
RFC PATCH v5 3/5 Add ndo_hwtstamp_get/set support to vlan/maxvlan code path
This patch makes VLAN and MAXVLAN drivers to use the newly introduced ndo_hwtstamp_get/set API to pass hw timestamp requests to underlying NIC drivers in case if these drivers implement ndo_hwtstamp_get/set functions. Otherwise VLAN subsystems falls back to calling ndo_eth_ioctl.
---
Notes:
Changes in v5:
- Re-introduced the net namespace check which
was dropped in v4.
Changes in v4:
- Moved hw timestamp get/set request processing logic from vlan_dev_ioctl() to .ndo_hwtstamp_get/set callbacks.
- Use the shared generic_hwtstamp_get/set_lower() functions to handle ndo_hwtstamp_get/set requests.
- Applay the same changes to macvlan driver.
--- drivers/net/macvlan.c | 35 +++++++++++++++-------------------- net/8021q/vlan_dev.c | 28 +++++++++++++++++++++++----- 2 files changed, 38 insertions(+), 25 deletions(-)
drivers/net/macvlan.c +15 -20
@@ -868,31 +868,25 @@ static int macvlan_change_mtu(struct net_device *dev, int new_mtu)return 0 ; } -static int macvlan_eth_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int macvlan_hwtstamp_get (struct net_device *dev, +struct kernel_hwtstamp_config *cfg, +struct netlink_ext_ack *extack) {struct net_device *real_dev =macvlan_dev_real_dev (dev); -const struct net_device_ops *ops = real_dev->netdev_ops; -struct ifreq ifrr; -int err = -EOPNOTSUPP ; -strscpy (ifrr.ifr_name, real_dev->name,IFNAMSIZ ); - ifrr.ifr_ifru = ifr->ifr_ifru; +return generic_hwtstamp_get_lower (real_dev, cfg, extack); +} -switch (cmd) { -case SIOCSHWTSTAMP : -if (!net_eq (dev_net (dev), &init_net)) -break ; - fallthrough; -case SIOCGHWTSTAMP : -if (netif_device_present (real_dev) && ops->ndo_eth_ioctl) - err = ops->ndo_eth_ioctl (real_dev, &ifrr, cmd); -break ; - } +static int macvlan_hwtstamp_set (struct net_device *dev, +struct kernel_hwtstamp_config *cfg, +struct netlink_ext_ack *extack) +{ +struct net_device *real_dev =macvlan_dev_real_dev (dev); -if (!err) - ifr->ifr_ifru = ifrr.ifr_ifru; +if (!net_eq (dev_net (dev), &init_net)) +return -EOPNOTSUPP ; -return err; +return generic_hwtstamp_set_lower (real_dev, cfg, extack); }/*
@@ -1193,7 +1187,6 @@ static const struct net_device_ops macvlan_netdev_ops = { .ndo_stop = macvlan_stop, .ndo_start_xmit = macvlan_start_xmit, .ndo_change_mtu = macvlan_change_mtu, - .ndo_eth_ioctl = macvlan_eth_ioctl, .ndo_fix_features = macvlan_fix_features, .ndo_change_rx_flags = macvlan_change_rx_flags, .ndo_set_mac_address = macvlan_set_mac_address,
@@ -1212,6 +1205,8 @@ static const struct net_device_ops macvlan_netdev_ops = {#endif .ndo_get_iflink = macvlan_dev_get_iflink, .ndo_features_check = passthru_features_check, + .ndo_hwtstamp_get = macvlan_hwtstamp_get, + .ndo_hwtstamp_set = macvlan_hwtstamp_set, };static void macvlan_dev_free (struct net_device *dev)
net/8021q/vlan_dev.c +23 -5
@@ -353,6 +353,27 @@ static int vlan_dev_set_mac_address(struct net_device *dev, void *p)return 0 ; } +static int vlan_hwtstamp_get (struct net_device *dev, +struct kernel_hwtstamp_config *cfg, +struct netlink_ext_ack *extack) +{ +struct net_device *real_dev =vlan_dev_priv (dev)->real_dev; + +return generic_hwtstamp_get_lower (real_dev, cfg, extack); +} + +static int vlan_hwtstamp_set (struct net_device *dev, +struct kernel_hwtstamp_config *cfg, +struct netlink_ext_ack *extack) +{ +struct net_device *real_dev =vlan_dev_priv (dev)->real_dev; + +if (!net_eq (dev_net (dev), &init_net)) +return -EOPNOTSUPP ; + +return generic_hwtstamp_set_lower (real_dev, cfg, extack); +} +static int vlan_dev_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) {struct net_device *real_dev =vlan_dev_priv (dev)->real_dev;
@@ -364,14 +385,9 @@ static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ifrr.ifr_ifru = ifr->ifr_ifru;switch (cmd) { -case SIOCSHWTSTAMP : -if (!net_eq (dev_net (dev),dev_net (real_dev))) -break ; - fallthrough;case SIOCGMIIPHY :case SIOCGMIIREG :case SIOCSMIIREG : -case SIOCGHWTSTAMP :if (netif_device_present (real_dev) && ops->ndo_eth_ioctl) err = ops->ndo_eth_ioctl (real_dev, &ifrr, cmd);break ;
@@ -842,6 +858,8 @@ static const struct net_device_ops vlan_netdev_ops = { .ndo_fix_features = vlan_dev_fix_features, .ndo_get_iflink = vlan_dev_get_iflink, .ndo_fill_forward_path = vlan_dev_fill_forward_path, + .ndo_hwtstamp_get = vlan_hwtstamp_get, + .ndo_hwtstamp_set = vlan_hwtstamp_set, };static void vlan_dev_free (struct net_device *dev)
Signature · 1 line
2.39.2
Jakub Kicinski
maintainerQuoted 10 lines · On Tue, 25 Apr 2023 22:43:34 -0600 Max Georgiev wrote:
Quoted 6 lines · On Sat, 22 Apr 2023 21:28:35 -0600 Maxim Georgiev wrote:
Review
Quoted 2 lines
(quoted diff) +0
-2- if (!net_eq(dev_net(dev), &init_net)) - break;Did we agree that the net namespace check is no longer needed? I don't see it anywhere after the changes.
My bad, I was under the impression that you, guys, decided that this check wasn't needed.
Let me add it back and resend the patch.
My memory holds for like a week at best :)
I was genuinely asking if we agreed, if we did just mention that in the commit msg and add a link to the discussion :)
Quoted 9 lines · Jakub Kicinski
Quoted 7 lines · On Tue, 25 Apr 2023 22:43:34 -0600 Max Georgiev wrote:
Quoted 6 lines · On Sat, 22 Apr 2023 21:28:35 -0600 Maxim Georgiev wrote:
Review
Quoted 2 lines
(quoted diff) +0
-2- if (!net_eq(dev_net(dev), &init_net)) - break;Did we agree that the net namespace check is no longer needed? I don't see it anywhere after the changes.
Quoted 7 lines
Quoted 3 lines
My bad, I was under the impression that you, guys, decided that this check wasn't needed.
Let me add it back and resend the patch.My memory holds for like a week at best :)
I was genuinely asking if we agreed, if we did just mention that in the commit msg and add a link to the discussion :)
I looked through the discussion between you and Vladimir on vlan and maxvlan driver conversion - there were no comments on the namespace check
(https://lore.kernel.org/netdev/20230406165055.egz32amam6o2bmqu@skbuf/T/)
I guess I was delusional by excluding this check - thank you for catching it!