From: Stephen Hemminger <stephen@networkplumber.org>
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: Helmut Grohne <h.grohne@cygnusnetworks.de>,
David Miller <davem@davemloft.net>,
netdev@vger.kernel.org
Subject: [PATCH net-next 2/3] tuntap: allow overriding ethtool driver info
Date: Wed, 24 Jul 2013 16:13:25 -0700 [thread overview]
Message-ID: <20130724161325.38404ed3@nehalam.linuxnetplumber.net> (raw)
In-Reply-To: <20130724161156.4a8cf02b@nehalam.linuxnetplumber.net>
This patch adds new ioctl to allow setting the ethtool information
returned by the TUN device. This is useful when using tun device as a surrogate
for hardware or other software emulation.
If the application does not override the ethtool settings, the
original hard coded values are used.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/tun.c | 56 +++++++++++++++++++++++++++++++++-----------
include/uapi/linux/if_tun.h | 15 +++++++++++
2 files changed, 58 insertions(+), 13 deletions(-)
--- a/drivers/net/tun.c 2013-07-24 11:33:06.759433743 -0700
+++ b/drivers/net/tun.c 2013-07-24 11:39:56.233298852 -0700
@@ -189,6 +189,7 @@ struct tun_struct {
u32 flow_count;
u32 speed;
u8 duplex;
+ struct tun_info info;
};
static inline u32 tun_hashfn(u32 rxhash)
@@ -872,9 +873,13 @@ static void tun_net_init(struct net_devi
{
struct tun_struct *tun = netdev_priv(dev);
+ strlcpy(tun->info.driver, DRV_NAME, sizeof(tun->info.driver));
+ strlcpy(tun->info.version, DRV_VERSION, sizeof(tun->info.version));
+
switch (tun->flags & TUN_TYPE_MASK) {
case TUN_TUN_DEV:
dev->netdev_ops = &tun_netdev_ops;
+ strlcpy(tun->info.bus, "tun", sizeof(tun->info.bus));
/* Point-to-Point TUN Device */
dev->hard_header_len = 0;
@@ -889,6 +894,8 @@ static void tun_net_init(struct net_devi
case TUN_TAP_DEV:
dev->netdev_ops = &tap_netdev_ops;
+ strlcpy(tun->info.bus, "tap", sizeof(tun->info.bus));
+
/* Ethernet TAP Device */
ether_setup(dev);
dev->priv_flags &= ~IFF_TX_SKB_SHARING;
@@ -2092,6 +2099,15 @@ static long __tun_chr_ioctl(struct file
tun_detach_filter(tun, tun->numqueues);
break;
+ case TUNSETINFO: {
+ struct tun_info info;
+
+ if (copy_from_user(&info, argp, sizeof(info)))
+ return -EFAULT;
+
+ tun->info = info;
+ break;
+ }
default:
ret = -EINVAL;
break;
@@ -2120,6 +2136,7 @@ static long tun_chr_compat_ioctl(struct
case TUNSETTXFILTER:
case TUNGETSNDBUF:
case TUNSETSNDBUF:
+ case TUNSETINFO:
case SIOCGIFHWADDR:
case SIOCSIFHWADDR:
arg = (unsigned long)compat_ptr(arg);
@@ -2267,17 +2284,9 @@ static void tun_get_drvinfo(struct net_d
{
struct tun_struct *tun = netdev_priv(dev);
- strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
- strlcpy(info->version, DRV_VERSION, sizeof(info->version));
-
- switch (tun->flags & TUN_TYPE_MASK) {
- case TUN_TUN_DEV:
- strlcpy(info->bus_info, "tun", sizeof(info->bus_info));
- break;
- case TUN_TAP_DEV:
- strlcpy(info->bus_info, "tap", sizeof(info->bus_info));
- break;
- }
+ strlcpy(info->driver, tun->info.driver, sizeof(info->driver));
+ strlcpy(info->version, tun->info.version, sizeof(info->version));
+ strlcpy(info->bus_info, tun->info.bus, sizeof(info->bus_info));
}
static u32 tun_get_msglevel(struct net_device *dev)
--- a/include/uapi/linux/if_tun.h 2013-07-24 11:24:55.543040360 -0700
+++ b/include/uapi/linux/if_tun.h 2013-07-24 11:35:54.620898504 -0700
@@ -56,6 +56,7 @@
#define TUNGETVNETHDRSZ _IOR('T', 215, int)
#define TUNSETVNETHDRSZ _IOW('T', 216, int)
#define TUNSETQUEUE _IOW('T', 217, int)
+#define TUNSETINFO _IOW('T', 219, struct tun_info)
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001
@@ -103,4 +104,11 @@ struct tun_filter {
__u8 addr[0][ETH_ALEN];
};
+/* Subset of ethtool_info */
+struct tun_info {
+ char driver[32];
+ char bus[32];
+ char version[32];
+};
+
#endif /* _UAPI__IF_TUN_H */
next prev parent reply other threads:[~2013-07-24 23:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-24 23:11 [PATCH net-next 1/3] tuntap: allow changing ethtool speed (v2) Stephen Hemminger
2013-07-24 23:13 ` Stephen Hemminger [this message]
2013-07-24 23:48 ` [PATCH net-next 2/3] tuntap: allow overriding ethtool driver info Ben Hutchings
2013-07-25 0:16 ` Stephen Hemminger
2013-07-25 21:19 ` Ben Hutchings
2013-07-25 21:32 ` Stephen Hemminger
2013-07-25 21:36 ` Ben Hutchings
2013-07-25 21:56 ` Stephen Hemminger
2013-07-24 23:15 ` [PATCH net-next 3/3] tuntap: allow overriding link statistics Stephen Hemminger
2013-07-24 23:40 ` [PATCH net-next 1/3] tuntap: allow changing ethtool speed (v2) Ben Hutchings
2013-07-25 0:17 ` Stephen Hemminger
2013-07-25 0:29 ` David Miller
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=20130724161325.38404ed3@nehalam.linuxnetplumber.net \
--to=stephen@networkplumber.org \
--cc=davem@davemloft.net \
--cc=h.grohne@cygnusnetworks.de \
--cc=netdev@vger.kernel.org \
/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).