From: Arnd Bergmann <arnd@kernel.org> To: netdev@vger.kernel.org Cc: Arnd Bergmann <arnd@arndb.de>, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, bridge@lists.linux-foundation.org, linux-hams@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>, Christoph Hellwig <hch@lst.de>, Alexander Viro <viro@zeniv.linux.org.uk>, Johannes Berg <johannes@sipsolutions.net>, Andrew Lunn <andrew@lunn.ch>, Heiner Kallweit <hkallweit1@gmail.com> Subject: [RFC net-next 11/28] hamachi: use ndo_siocdevprivate Date: Fri, 6 Nov 2020 23:17:26 +0100 [thread overview] Message-ID: <20201106221743.3271965-12-arnd@kernel.org> (raw) In-Reply-To: <20201106221743.3271965-1-arnd@kernel.org> From: Arnd Bergmann <arnd@arndb.de> hamachi has one command that overloads the ifreq argument and requires a conversion to ndo_siocdevprivate in order to make compat mode work, so split it from ndo_ioctl. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/ethernet/packetengines/hamachi.c | 63 ++++++++++++-------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/drivers/net/ethernet/packetengines/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c index d058a63602a9..f6980fac8407 100644 --- a/drivers/net/ethernet/packetengines/hamachi.c +++ b/drivers/net/ethernet/packetengines/hamachi.c @@ -546,7 +546,9 @@ static int read_eeprom(void __iomem *ioaddr, int location); static int mdio_read(struct net_device *dev, int phy_id, int location); static void mdio_write(struct net_device *dev, int phy_id, int location, int value); static int hamachi_open(struct net_device *dev); -static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); +static int hamachi_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); +static int hamachi_siocdevprivate(struct net_device *dev, struct ifreq *rq, + void __user *data, int cmd); static void hamachi_timer(struct timer_list *t); static void hamachi_tx_timeout(struct net_device *dev, unsigned int txqueue); static void hamachi_init_ring(struct net_device *dev); @@ -571,7 +573,8 @@ static const struct net_device_ops hamachi_netdev_ops = { .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr, .ndo_tx_timeout = hamachi_tx_timeout, - .ndo_do_ioctl = netdev_ioctl, + .ndo_do_ioctl = hamachi_ioctl, + .ndo_siocdevprivate = hamachi_siocdevprivate, }; @@ -1867,7 +1870,36 @@ static const struct ethtool_ops ethtool_ops_no_mii = { .get_drvinfo = hamachi_get_drvinfo, }; -static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +/* private ioctl: set rx,tx intr params */ +static int hamachi_siocdevprivate(struct net_device *dev, struct ifreq *rq, + void __user *data, int cmd) +{ + struct hamachi_private *np = netdev_priv(dev); + u32 *d = (u32 *)&rq->ifr_ifru; + + if (!netif_running(dev)) + return -EINVAL; + + if (cmd != SIOCDEVPRIVATE+3) + return -EOPNOTSUPP; + + /* Should add this check here or an ordinary user can do nasty + * things. -KDU + * + * TODO: Shut down the Rx and Tx engines while doing this. + */ + if (!capable(CAP_NET_ADMIN)) + return -EPERM; + writel(d[0], np->base + TxIntrCtrl); + writel(d[1], np->base + RxIntrCtrl); + printk(KERN_NOTICE "%s: tx %08x, rx %08x intr\n", dev->name, + (u32) readl(np->base + TxIntrCtrl), + (u32) readl(np->base + RxIntrCtrl)); + + return 0; +} + +static int hamachi_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { struct hamachi_private *np = netdev_priv(dev); struct mii_ioctl_data *data = if_mii(rq); @@ -1876,28 +1908,9 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) if (!netif_running(dev)) return -EINVAL; - if (cmd == (SIOCDEVPRIVATE+3)) { /* set rx,tx intr params */ - u32 *d = (u32 *)&rq->ifr_ifru; - /* Should add this check here or an ordinary user can do nasty - * things. -KDU - * - * TODO: Shut down the Rx and Tx engines while doing this. - */ - if (!capable(CAP_NET_ADMIN)) - return -EPERM; - writel(d[0], np->base + TxIntrCtrl); - writel(d[1], np->base + RxIntrCtrl); - printk(KERN_NOTICE "%s: tx %08x, rx %08x intr\n", dev->name, - (u32) readl(np->base + TxIntrCtrl), - (u32) readl(np->base + RxIntrCtrl)); - rc = 0; - } - - else { - spin_lock_irq(&np->lock); - rc = generic_mii_ioctl(&np->mii_if, data, cmd, NULL); - spin_unlock_irq(&np->lock); - } + spin_lock_irq(&np->lock); + rc = generic_mii_ioctl(&np->mii_if, data, cmd, NULL); + spin_unlock_irq(&np->lock); return rc; } -- 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@kernel.org> To: netdev@vger.kernel.org Cc: Andrew Lunn <andrew@lunn.ch>, Arnd Bergmann <arnd@arndb.de>, bridge@lists.linux-foundation.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Viro <viro@zeniv.linux.org.uk>, Jakub Kicinski <kuba@kernel.org>, linux-hams@vger.kernel.org, Johannes Berg <johannes@sipsolutions.net>, Christoph Hellwig <hch@lst.de>, Heiner Kallweit <hkallweit1@gmail.com> Subject: [Bridge] [RFC net-next 11/28] hamachi: use ndo_siocdevprivate Date: Fri, 6 Nov 2020 23:17:26 +0100 [thread overview] Message-ID: <20201106221743.3271965-12-arnd@kernel.org> (raw) In-Reply-To: <20201106221743.3271965-1-arnd@kernel.org> From: Arnd Bergmann <arnd@arndb.de> hamachi has one command that overloads the ifreq argument and requires a conversion to ndo_siocdevprivate in order to make compat mode work, so split it from ndo_ioctl. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/ethernet/packetengines/hamachi.c | 63 ++++++++++++-------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/drivers/net/ethernet/packetengines/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c index d058a63602a9..f6980fac8407 100644 --- a/drivers/net/ethernet/packetengines/hamachi.c +++ b/drivers/net/ethernet/packetengines/hamachi.c @@ -546,7 +546,9 @@ static int read_eeprom(void __iomem *ioaddr, int location); static int mdio_read(struct net_device *dev, int phy_id, int location); static void mdio_write(struct net_device *dev, int phy_id, int location, int value); static int hamachi_open(struct net_device *dev); -static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); +static int hamachi_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); +static int hamachi_siocdevprivate(struct net_device *dev, struct ifreq *rq, + void __user *data, int cmd); static void hamachi_timer(struct timer_list *t); static void hamachi_tx_timeout(struct net_device *dev, unsigned int txqueue); static void hamachi_init_ring(struct net_device *dev); @@ -571,7 +573,8 @@ static const struct net_device_ops hamachi_netdev_ops = { .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr, .ndo_tx_timeout = hamachi_tx_timeout, - .ndo_do_ioctl = netdev_ioctl, + .ndo_do_ioctl = hamachi_ioctl, + .ndo_siocdevprivate = hamachi_siocdevprivate, }; @@ -1867,7 +1870,36 @@ static const struct ethtool_ops ethtool_ops_no_mii = { .get_drvinfo = hamachi_get_drvinfo, }; -static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +/* private ioctl: set rx,tx intr params */ +static int hamachi_siocdevprivate(struct net_device *dev, struct ifreq *rq, + void __user *data, int cmd) +{ + struct hamachi_private *np = netdev_priv(dev); + u32 *d = (u32 *)&rq->ifr_ifru; + + if (!netif_running(dev)) + return -EINVAL; + + if (cmd != SIOCDEVPRIVATE+3) + return -EOPNOTSUPP; + + /* Should add this check here or an ordinary user can do nasty + * things. -KDU + * + * TODO: Shut down the Rx and Tx engines while doing this. + */ + if (!capable(CAP_NET_ADMIN)) + return -EPERM; + writel(d[0], np->base + TxIntrCtrl); + writel(d[1], np->base + RxIntrCtrl); + printk(KERN_NOTICE "%s: tx %08x, rx %08x intr\n", dev->name, + (u32) readl(np->base + TxIntrCtrl), + (u32) readl(np->base + RxIntrCtrl)); + + return 0; +} + +static int hamachi_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { struct hamachi_private *np = netdev_priv(dev); struct mii_ioctl_data *data = if_mii(rq); @@ -1876,28 +1908,9 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) if (!netif_running(dev)) return -EINVAL; - if (cmd == (SIOCDEVPRIVATE+3)) { /* set rx,tx intr params */ - u32 *d = (u32 *)&rq->ifr_ifru; - /* Should add this check here or an ordinary user can do nasty - * things. -KDU - * - * TODO: Shut down the Rx and Tx engines while doing this. - */ - if (!capable(CAP_NET_ADMIN)) - return -EPERM; - writel(d[0], np->base + TxIntrCtrl); - writel(d[1], np->base + RxIntrCtrl); - printk(KERN_NOTICE "%s: tx %08x, rx %08x intr\n", dev->name, - (u32) readl(np->base + TxIntrCtrl), - (u32) readl(np->base + RxIntrCtrl)); - rc = 0; - } - - else { - spin_lock_irq(&np->lock); - rc = generic_mii_ioctl(&np->mii_if, data, cmd, NULL); - spin_unlock_irq(&np->lock); - } + spin_lock_irq(&np->lock); + rc = generic_mii_ioctl(&np->mii_if, data, cmd, NULL); + spin_unlock_irq(&np->lock); return rc; } -- 2.27.0
next prev parent reply other threads:[~2020-11-06 22:21 UTC|newest] Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-06 22:17 [RFC net-next 00/28] ndo_ioctl rework Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 01/28] net: split out SIOCDEVPRIVATE handling from dev_ioctl Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 02/28] staging: rtlwifi: use siocdevprivate Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 03/28] staging: wlan-ng: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 04/28] hostap: use ndo_siocdevprivate Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 05/28] wireless: remove old ioctls Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 06/28] bridge: use ndo_siocdevprivate Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 07/28] phonet: use siocdevprivate Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 08/28] tulip: use ndo_siocdevprivate Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 09/28] bonding: use siocdevprivate Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 10/28] appletalk: use ndo_siocdevprivate Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` Arnd Bergmann [this message] 2020-11-06 22:17 ` [Bridge] [RFC net-next 11/28] hamachi: " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 12/28] tehuti: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 13/28] eql: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 14/28] fddi: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 15/28] net: usb: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 16/28] slip/plip: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 17/28] qeth: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 18/28] cxgb3: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 19/28] dev_ioctl: pass SIOCDEVPRIVATE data separately Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 20/28] dev_ioctl: split out ndo_eth_ioctl Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 21/28] wan: use ndo_siocdevprivate Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 22/28] hamradio: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 23/28] airo: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 24/28] ip_tunnel: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 25/28] hippi: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 26/28] sb1000: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 27/28] ppp: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 28/28] net: socket: return changed ifreq from SIOCDEVPRIVATE Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-08 0:06 ` [RFC net-next 00/28] ndo_ioctl rework Jakub Kicinski 2020-11-08 0:06 ` [Bridge] " Jakub Kicinski 2020-11-08 0:06 ` Jakub Kicinski 2020-11-08 8:27 ` Arnd Bergmann 2020-11-08 8:27 ` [Bridge] " Arnd Bergmann 2020-11-08 11:21 ` Kalle Valo 2020-11-08 11:21 ` [Bridge] " Kalle Valo 2020-11-08 11:42 ` Arnd Bergmann 2020-11-08 11:42 ` [Bridge] " Arnd Bergmann 2020-11-08 11:42 ` Arnd Bergmann 2020-11-09 11:25 ` Kalle Valo 2020-11-09 11:25 ` [Bridge] " Kalle Valo 2020-11-09 11:25 ` Kalle Valo
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=20201106221743.3271965-12-arnd@kernel.org \ --to=arnd@kernel.org \ --cc=andrew@lunn.ch \ --cc=arnd@arndb.de \ --cc=bridge@lists.linux-foundation.org \ --cc=hch@lst.de \ --cc=hkallweit1@gmail.com \ --cc=johannes@sipsolutions.net \ --cc=kuba@kernel.org \ --cc=linux-hams@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-wireless@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=viro@zeniv.linux.org.uk \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.