Define a new IFF_6LO flag for the tun/tap driver that enables 6LoWPAN
compression/decompression for tap devices. This is achieved by calling
lowpan_header_compress once the sk_buff is destined for user space and
calling lowpan_header_decompress when the user space writes packets to
kernel. A copy of the ethernet MAC headers are needed both ways, as
the 6LoWPAN compression may end up expanding the header size by one
byte in the worst case.
LOWPAN_IPHC_MAX_HC_BUF_LEN more bytes are added to sk_buff headroom
to ensure there will be enough bytes to push headers to. This is
probably an overkill and probably done wrongly anyway.
An ethernet MAC header is added in front of the (compressed) IPv6
datagram in both directions; no such transport exists for 6LoWPAN,
but this is just an example implementation trying to explain the
idea behind the BTLE handling in user space and the 6LoWPAN
compression and decompression in kernel space. Thus the tun/tap
driver comes in handy as the victim of the demonstration.
Signed-off-by: Patrik Flykt <patrik.flykt@xxxxxxxxxxxxxxx>
---
Hi,
This is the one applying on fac72b24.
Patrik
drivers/net/tun.c | 61 +++++++++++++++++++++++++++++++++++++++++++--
include/uapi/linux/if_tun.h | 1 +
2 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 57e4c31fa84a..11b6494bb7ca 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -66,6 +66,7 @@
#include <linux/nsproxy.h>
#include <linux/virtio_net.h>
#include <linux/rcupdate.h>
+#include <net/6lowpan.h>
#include <net/net_namespace.h>
#include <net/netns/generic.h>
#include <net/rtnetlink.h>
@@ -231,6 +232,8 @@ struct tun_struct {
u32 rx_batched;
struct tun_pcpu_stats __percpu *pcpu_stats;
struct bpf_prog __rcu *xdp_prog;
+
+ struct lowpan_dev ldev;
};
static int tun_napi_receive(struct napi_struct *napi, int budget)
@@ -1071,6 +1074,9 @@ static void tun_set_headroom(struct net_device *dev, int new_hr)
new_hr = NET_SKB_PAD;
tun->align = new_hr;
+
+ if ((tun->flags & (IFF_TAP|IFF_6LO)) == (IFF_TAP|IFF_6LO))
+ tun->align += LOWPAN_IPHC_MAX_HC_BUF_LEN;
}
static void
@@ -1697,6 +1703,27 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
skb->dev = tun->dev;
break;
case IFF_TAP:
+ if (tun->flags & IFF_6LO) {
+ struct ethhdr eth;
+
+ skb_reset_mac_header(skb);
+ memcpy(ð, skb_mac_header(skb), sizeof(eth));
+
+ skb_pull(skb, sizeof(struct ethhdr));
+ skb_reset_network_header(skb);
+
+ if (lowpan_header_decompress(skb, &tun->ldev,
+ tun->dev->dev_addr,
+ ð.h_source) < 0) {
+ this_cpu_inc(tun->pcpu_stats->rx_dropped);
+ kfree_skb(skb);
+ return -EINVAL;
+ }
+
+ memcpy(skb_push(skb, sizeof(eth)), ð, sizeof(eth));
+ skb_reset_mac_header(skb);
+ }
+
if (!frags)
skb->protocol = eth_type_trans(skb, tun->dev);
break;
@@ -1809,6 +1836,25 @@ static ssize_t tun_put_user(struct tun_struct *tun,
int vlan_hlen = 0;
int vnet_hdr_sz = 0;
+ if ((tun->flags & (IFF_6LO | IFF_TAP)) == (IFF_6LO | IFF_TAP) &&
+ skb->protocol == htons(ETH_P_IPV6)) {
+ struct ethhdr eth;
+ int err;
+
+ memcpy(ð, skb_mac_header(skb), sizeof(eth));
+
+ skb_pull(skb, sizeof(struct ethhdr));
+ skb_reset_network_header(skb);
+
+ err = lowpan_header_compress(skb, &tun->ldev, ð.h_dest,
+ tun->dev->dev_addr);
+ if (err < 0)
+ return -EINVAL;
+
+ memcpy(skb_push(skb, sizeof(eth)), ð, sizeof(eth));
+ skb_reset_mac_header(skb);
+ }
+
if (skb_vlan_tag_present(skb))
vlan_hlen = VLAN_HLEN;
@@ -2117,7 +2163,8 @@ static struct proto tun_proto = {
static int tun_flags(struct tun_struct *tun)
{
- return tun->flags & (TUN_FEATURES | IFF_PERSIST | IFF_TUN | IFF_TAP);
+ return tun->flags & (TUN_FEATURES | IFF_PERSIST | IFF_TUN | IFF_TAP |
+ IFF_6LO);
}
static ssize_t tun_show_flags(struct device *dev, struct device_attribute *attr,
@@ -2196,6 +2243,9 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
!!(tun->flags & IFF_MULTI_QUEUE))
return -EINVAL;
+ if (ifr->ifr_flags & IFF_6LO && !(ifr->ifr_flags & IFF_TAP))
+ return -EINVAL;
+
if (tun_not_capable(tun))
return -EPERM;
err = security_tun_dev_open(tun->security);
@@ -2236,9 +2286,14 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
/* TAP device */
flags |= IFF_TAP;
name = "tap%d";
+ if (ifr->ifr_flags & IFF_6LO)
+ flags |= IFF_6LO;
} else
return -EINVAL;
+ if (ifr->ifr_flags & IFF_6LO && !(ifr->ifr_flags & IFF_TAP))
+ return -EINVAL;
+
if (*ifr->ifr_name)
name = ifr->ifr_name;
@@ -2277,6 +2332,8 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
if (err < 0)
goto err_free_stat;
+ lowpan_initialize_ctx(&tun->ldev, LOWPAN_LLTYPE_BTLE);
+
tun_net_init(dev);
tun_flow_init(tun);
@@ -2480,7 +2537,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
* This is needed because we never checked for invalid flags on
* TUNSETIFF.
*/
- return put_user(IFF_TUN | IFF_TAP | TUN_FEATURES,
+ return put_user(IFF_TUN | IFF_TAP | IFF_6LO | TUN_FEATURES,
(unsigned int __user*)argp);
} else if (cmd == TUNSETQUEUE)
return tun_set_queue(file, &ifr);
diff --git a/include/uapi/linux/if_tun.h b/include/uapi/linux/if_tun.h
index 365ade5685c9..52815e4f1366 100644
--- a/include/uapi/linux/if_tun.h
+++ b/include/uapi/linux/if_tun.h
@@ -62,6 +62,7 @@
#define IFF_TAP 0x0002
#define IFF_NAPI 0x0010
#define IFF_NAPI_FRAGS 0x0020
+#define IFF_6LO 0X0040
#define IFF_NO_PI 0x1000
/* This flag has no real effect */
#define IFF_ONE_QUEUE 0x2000
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
