Following patch adds basic multiple vxlan protocol handlers.
This does not change any functionality. This is required for
openvswitch vxlan support.
Signed-off-by: Pravin B Shelar <pshe...@nicira.com>
---
v1-v2:
- update patch against vxlan tree.
---
drivers/net/vxlan.c | 318 ++++++++++++++++++++++++++++++---------------------
1 files changed, 185 insertions(+), 133 deletions(-)
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index f658d39..3be6cda 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -57,6 +57,7 @@
#define VXLAN_VID_MASK (VXLAN_N_VID - 1)
/* IP header + UDP + VXLAN + Ethernet header */
#define VXLAN_HEADROOM (20 + 8 + 8 + 14)
+#define VXLAN_HLEN (sizeof(struct udphdr) + sizeof(struct vxlanhdr))
#define VXLAN_FLAGS 0x08000000 /* struct vxlanhdr.vx_flags required value. */
@@ -86,17 +87,31 @@ static const u8 all_zeros_mac[ETH_ALEN];
struct vxlan_sock {
struct hlist_node hlist;
struct rcu_head rcu;
- struct work_struct del_work;
- atomic_t refcnt;
struct socket *sock;
struct hlist_head vni_list[VNI_HASH_SIZE];
+ struct list_head handler_list;
+};
+
+struct vxlan_handler;
+typedef int (vxlan_rcv_t)(struct vxlan_handler *vh, struct sk_buff *skb,
__be32 key);
+
+struct vxlan_handler {
+ vxlan_rcv_t *rcv;
+ struct list_head node;
+ struct vxlan_sock *vs;
+ atomic_t refcnt;
+ struct rcu_head rcu;
+ struct work_struct del_work;
};
+static void vxlan_handler_hold(struct vxlan_handler *vh);
+static void vxlan_handler_put(struct vxlan_handler *vh);
+
/* per-network namespace private data for this module */
struct vxlan_net {
struct list_head vxlan_list;
struct hlist_head sock_list[PORT_HASH_SIZE];
- spinlock_t sock_lock;
+ struct mutex sock_lock; /* RTNL lock nests inside this lock. */
};
struct vxlan_rdst {
@@ -124,7 +139,7 @@ struct vxlan_fdb {
struct vxlan_dev {
struct hlist_node hlist; /* vni hash table */
struct list_head next; /* vxlan's per namespace list */
- struct vxlan_sock *vn_sock; /* listening socket */
+ struct vxlan_handler *vh;
struct net_device *dev;
struct vxlan_rdst default_dst; /* default destination */
__be32 saddr; /* source address */
@@ -135,7 +150,7 @@ struct vxlan_dev {
__u8 ttl;
u32 flags; /* VXLAN_F_* below */
- struct work_struct sock_work;
+ struct work_struct handler_work;
struct work_struct igmp_work;
unsigned long age_interval;
@@ -157,7 +172,7 @@ struct vxlan_dev {
static u32 vxlan_salt __read_mostly;
static struct workqueue_struct *vxlan_wq;
-static void vxlan_sock_work(struct work_struct *work);
+static void vxlan_handler_work(struct work_struct *work);
/* Virtual Network hash table head */
static inline struct hlist_head *vni_head(struct vxlan_sock *vs, u32 id)
@@ -211,6 +226,17 @@ static struct vxlan_dev *vxlan_find_vni(struct net *net,
u32 id, __be16 port)
return NULL;
}
+static struct vxlan_dev *vxlan_find_vni_port(struct vxlan_sock *vs, u32 id)
+{
+ struct vxlan_dev *vxlan;
+
+ hlist_for_each_entry_rcu(vxlan, vni_head(vs, id), hlist) {
+ if (vxlan->default_dst.remote_vni == id)
+ return vxlan;
+ }
+
+ return NULL;
+}
/* Fill in neighbour message in skbuff. */
static int vxlan_fdb_info(struct sk_buff *skb, struct vxlan_dev *vxlan,
const struct vxlan_fdb *fdb,
@@ -753,23 +779,6 @@ static bool vxlan_group_used(struct vxlan_net *vn, __be32
remote_ip)
return false;
}
-static void vxlan_sock_hold(struct vxlan_sock *vs)
-{
- atomic_inc(&vs->refcnt);
-}
-
-static void vxlan_sock_release(struct vxlan_net *vn, struct vxlan_sock *vs)
-{
- if (!atomic_dec_and_test(&vs->refcnt))
- return;
-
- spin_lock(&vn->sock_lock);
- hlist_del_rcu(&vs->hlist);
- spin_unlock(&vn->sock_lock);
-
- queue_work(vxlan_wq, &vs->del_work);
-}
-
/* Callback to update multicast group membership.
* Scheduled when vxlan goes up/down.
*/
@@ -777,8 +786,8 @@ static void vxlan_igmp_work(struct work_struct *work)
{
struct vxlan_dev *vxlan = container_of(work, struct vxlan_dev,
igmp_work);
struct vxlan_net *vn = net_generic(dev_net(vxlan->dev), vxlan_net_id);
- struct vxlan_sock *vs = vxlan->vn_sock;
- struct sock *sk = vs->sock->sk;
+ struct vxlan_handler *vh = vxlan->vh;
+ struct sock *sk = vh->vs->sock->sk;
struct ip_mreqn mreq = {
.imr_multiaddr.s_addr = vxlan->default_dst.remote_ip,
.imr_ifindex = vxlan->default_dst.remote_ifindex,
@@ -791,30 +800,24 @@ static void vxlan_igmp_work(struct work_struct *work)
ip_mc_leave_group(sk, &mreq);
release_sock(sk);
- vxlan_sock_release(vn, vs);
+ vxlan_handler_put(vh);
dev_put(vxlan->dev);
}
/* Callback from net/ipv4/udp.c to receive packets */
static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
{
- struct iphdr *oip;
+ struct vxlan_handler *vh;
+ struct vxlan_sock *vs;
struct vxlanhdr *vxh;
- struct vxlan_dev *vxlan;
- struct pcpu_tstats *stats;
__be16 port;
- __u32 vni;
- int err;
-
- /* pop off outer UDP header */
- __skb_pull(skb, sizeof(struct udphdr));
/* Need Vxlan and inner Ethernet header to be present */
- if (!pskb_may_pull(skb, sizeof(struct vxlanhdr)))
+ if (!pskb_may_pull(skb, VXLAN_HLEN))
goto error;
- /* Drop packets with reserved bits set */
- vxh = (struct vxlanhdr *) skb->data;
+ /* Return packets with reserved bits set */
+ vxh = (struct vxlanhdr *)(udp_hdr(skb) + 1);
if (vxh->vx_flags != htonl(VXLAN_FLAGS) ||
(vxh->vx_vni & htonl(0xff))) {
netdev_dbg(skb->dev, "invalid vxlan flags=%#x vni=%#x\n",
@@ -822,28 +825,45 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct
sk_buff *skb)
goto error;
}
- __skb_pull(skb, sizeof(struct vxlanhdr));
+ if (iptunnel_pull_header(skb, VXLAN_HLEN, htons(ETH_P_TEB)))
+ goto drop;
- /* Is this VNI defined? */
- vni = ntohl(vxh->vx_vni) >> 8;
port = inet_sk(sk)->inet_sport;
- vxlan = vxlan_find_vni(sock_net(sk), vni, port);
- if (!vxlan) {
- netdev_dbg(skb->dev, "unknown vni %d port %u\n",
- vni, ntohs(port));
- goto drop;
- }
- if (!pskb_may_pull(skb, ETH_HLEN)) {
- vxlan->dev->stats.rx_length_errors++;
- vxlan->dev->stats.rx_errors++;
+ vs = vxlan_find_port(sock_net(sk), port);
+ if (!vs)
goto drop;
+
+ list_for_each_entry_rcu(vh, &vs->handler_list, node) {
+ if (vh->rcv(vh, skb, vxh->vx_vni) == PACKET_RCVD)
+ return 0;
}
- skb_reset_mac_header(skb);
+drop:
+ /* Consume bad packet */
+ kfree_skb(skb);
+ return 0;
- /* Re-examine inner Ethernet packet */
- oip = ip_hdr(skb);
+error:
+ /* Return non vxlan pkt */
+ return 1;
+}
+
+static int vxlan_rcv(struct vxlan_handler *vh, struct sk_buff *skb, __be32
vx_vni)
+{
+ struct iphdr *oip;
+ struct vxlan_dev *vxlan;
+ struct pcpu_tstats *stats;
+ __u32 vni;
+ int err;
+
+ vni = ntohl(vx_vni) >> 8;
+ /* Is this VNI defined? */
+ vxlan = vxlan_find_vni_port(vh->vs, vni);
+ if (!vxlan)
+ return PACKET_REJECT;
+
+ skb_reset_mac_header(skb);
skb->protocol = eth_type_trans(skb, vxlan->dev);
/* Ignore packet loops (and multicast echo) */
@@ -851,11 +871,12 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct
sk_buff *skb)
vxlan->dev->dev_addr) == 0)
goto drop;
+ /* Re-examine inner Ethernet packet */
+ oip = ip_hdr(skb);
if ((vxlan->flags & VXLAN_F_LEARN) &&
vxlan_snoop(skb->dev, oip->saddr, eth_hdr(skb)->h_source))
goto drop;
- __skb_tunnel_rx(skb, vxlan->dev);
skb_reset_network_header(skb);
/* If the NIC driver gave us an encapsulated packet with
@@ -889,16 +910,11 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct
sk_buff *skb)
netif_rx(skb);
- return 0;
-error:
- /* Put UDP header back */
- __skb_push(skb, sizeof(struct udphdr));
-
- return 1;
+ return PACKET_RCVD;
drop:
/* Consume bad packet */
kfree_skb(skb);
- return 0;
+ return PACKET_RCVD;
}
static int arp_reduce(struct net_device *dev, struct sk_buff *skb)
@@ -1020,7 +1036,7 @@ static void vxlan_sock_put(struct sk_buff *skb)
static void vxlan_set_owner(struct net_device *dev, struct sk_buff *skb)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
- struct sock *sk = vxlan->vn_sock->sock->sk;
+ struct sock *sk = vxlan->vh->vs->sock->sk;
skb_orphan(skb);
sock_hold(sk);
@@ -1307,30 +1323,15 @@ static void vxlan_cleanup(unsigned long arg)
static int vxlan_init(struct net_device *dev)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
- struct vxlan_net *vn = net_generic(dev_net(dev), vxlan_net_id);
- struct vxlan_sock *vs;
- __u32 vni = vxlan->default_dst.remote_vni;
dev->tstats = alloc_percpu(struct pcpu_tstats);
if (!dev->tstats)
return -ENOMEM;
- spin_lock(&vn->sock_lock);
- vs = vxlan_find_port(dev_net(dev), vxlan->dst_port);
- if (vs) {
- /* If we have a socket with same port already, reuse it */
- atomic_inc(&vs->refcnt);
- vxlan->vn_sock = vs;
- spin_unlock(&vn->sock_lock);
- rtnl_lock();
- hlist_add_head_rcu(&vxlan->hlist, vni_head(vs, vni));
- rtnl_unlock();
- } else {
- spin_unlock(&vn->sock_lock);
- /* otherwise make new socket outside of RTNL */
- dev_hold(dev);
- queue_work(vxlan_wq, &vxlan->sock_work);
- }
+ /* Make new socket outside of RTNL */
+ dev_hold(dev);
+ vxlan->vh = NULL;
+ queue_work(vxlan_wq, &vxlan->handler_work);
return 0;
}
@@ -1349,13 +1350,11 @@ static void vxlan_fdb_delete_default(struct vxlan_dev
*vxlan)
static void vxlan_uninit(struct net_device *dev)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
- struct vxlan_net *vn = net_generic(dev_net(dev), vxlan_net_id);
- struct vxlan_sock *vs = vxlan->vn_sock;
+ struct vxlan_handler *vh = vxlan->vh;
vxlan_fdb_delete_default(vxlan);
-
- if (vs)
- vxlan_sock_release(vn, vs);
+ if (vh)
+ vxlan_handler_put(vh);
free_percpu(dev->tstats);
}
@@ -1363,14 +1362,14 @@ static void vxlan_uninit(struct net_device *dev)
static int vxlan_open(struct net_device *dev)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
- struct vxlan_sock *vs = vxlan->vn_sock;
+ struct vxlan_handler *vh = vxlan->vh;
/* socket hasn't been created */
- if (!vs)
+ if (!vh)
return -ENOTCONN;
if (IN_MULTICAST(ntohl(vxlan->default_dst.remote_ip))) {
- vxlan_sock_hold(vs);
+ vxlan_handler_hold(vh);
dev_hold(dev);
queue_work(vxlan_wq, &vxlan->igmp_work);
}
@@ -1404,10 +1403,10 @@ static void vxlan_flush(struct vxlan_dev *vxlan)
static int vxlan_stop(struct net_device *dev)
{
struct vxlan_dev *vxlan = netdev_priv(dev);
- struct vxlan_sock *vs = vxlan->vn_sock;
+ struct vxlan_handler *vh = vxlan->vh;
- if (vs && IN_MULTICAST(ntohl(vxlan->default_dst.remote_ip))) {
- vxlan_sock_hold(vs);
+ if (vh && IN_MULTICAST(ntohl(vxlan->default_dst.remote_ip))) {
+ vxlan_handler_hold(vh);
dev_hold(dev);
queue_work(vxlan_wq, &vxlan->igmp_work);
}
@@ -1475,7 +1474,7 @@ static void vxlan_setup(struct net_device *dev)
INIT_LIST_HEAD(&vxlan->next);
spin_lock_init(&vxlan->hash_lock);
INIT_WORK(&vxlan->igmp_work, vxlan_igmp_work);
- INIT_WORK(&vxlan->sock_work, vxlan_sock_work);
+ INIT_WORK(&vxlan->handler_work, vxlan_handler_work);
init_timer_deferrable(&vxlan->age_timer);
vxlan->age_timer.function = vxlan_cleanup;
@@ -1559,14 +1558,6 @@ static const struct ethtool_ops vxlan_ethtool_ops = {
.get_link = ethtool_op_get_link,
};
-static void vxlan_del_work(struct work_struct *work)
-{
- struct vxlan_sock *vs = container_of(work, struct vxlan_sock, del_work);
-
- sk_release_kernel(vs->sock->sk);
- kfree_rcu(vs, rcu);
-}
-
static struct vxlan_sock *vxlan_socket_create(struct net *net, __be16 port)
{
struct vxlan_sock *vs;
@@ -1586,7 +1577,6 @@ static struct vxlan_sock *vxlan_socket_create(struct net
*net, __be16 port)
for (h = 0; h < VNI_HASH_SIZE; ++h)
INIT_HLIST_HEAD(&vs->vni_list[h]);
- INIT_WORK(&vs->del_work, vxlan_del_work);
/* Create UDP socket for encapsulation receive. */
rc = sock_create_kern(AF_INET, SOCK_DGRAM, IPPROTO_UDP, &vs->sock);
@@ -1612,58 +1602,120 @@ static struct vxlan_sock *vxlan_socket_create(struct
net *net, __be16 port)
/* Disable multicast loopback */
inet_sk(sk)->mc_loop = 0;
+ INIT_LIST_HEAD(&vs->handler_list);
+ hlist_add_head_rcu(&vs->hlist, vs_head(net, port));
/* Mark socket as an encapsulation socket. */
udp_sk(sk)->encap_type = 1;
udp_sk(sk)->encap_rcv = vxlan_udp_encap_recv;
udp_encap_enable();
- atomic_set(&vs->refcnt, 1);
return vs;
}
-/* Scheduled at device creation to bind to a socket */
-static void vxlan_sock_work(struct work_struct *work)
+static void vxlan_socket_del(struct vxlan_sock *vs)
{
- struct vxlan_dev *vxlan
- = container_of(work, struct vxlan_dev, sock_work);
- struct net_device *dev = vxlan->dev;
- struct net *net = dev_net(dev);
- __u32 vni = vxlan->default_dst.remote_vni;
- __be16 port = vxlan->dst_port;
+ if (list_empty(&vs->handler_list)) {
+ hlist_del_rcu(&vs->hlist);
+
+ sk_release_kernel(vs->sock->sk);
+ kfree_rcu(vs, rcu);
+ }
+}
+
+static void vh_del_work(struct work_struct *work)
+{
+ struct vxlan_handler *vh = container_of(work, struct vxlan_handler,
del_work);
+ struct vxlan_sock *vs = vh->vs;
+ struct net *net = sock_net(vs->sock->sk);
struct vxlan_net *vn = net_generic(net, vxlan_net_id);
- struct vxlan_sock *nvs, *ovs;
- nvs = vxlan_socket_create(net, port);
- if (IS_ERR(nvs)) {
- netdev_err(vxlan->dev, "Can not create UDP socket, %ld\n",
- PTR_ERR(nvs));
+ mutex_lock(&vn->sock_lock);
+
+ list_del_rcu(&vh->node);
+ kfree_rcu(vh, rcu);
+ vxlan_socket_del(vs);
+
+ mutex_unlock(&vn->sock_lock);
+}
+
+static struct vxlan_handler *vxlan_handler_add(struct net *net,
+ __be16 portno, vxlan_rcv_t *rcv)
+{
+ struct vxlan_net *vn = net_generic(net, vxlan_net_id);
+ struct vxlan_sock *vs;
+ struct vxlan_handler *vh;
+
+ mutex_lock(&vn->sock_lock);
+ /* Look to see if can reuse socket */
+ vs = vxlan_find_port(net, portno);
+ if (!vs) {
+ vs = vxlan_socket_create(net, portno);
+ if (IS_ERR(vs)) {
+ vh = (void *) vs;
+ goto out;
+ }
+ }
+
+ /* Try existing vxlan hanlders for this socket. */
+ list_for_each_entry(vh, &vs->handler_list, node) {
+ if (vh->rcv == rcv) {
+ atomic_inc(&vh->refcnt);
+ goto out;
+ }
+ }
+
+ vh = kzalloc(sizeof(*vh), GFP_KERNEL);
+ if (!vh) {
+ vxlan_socket_del(vs);
+ vh = ERR_PTR(-ENOMEM);
goto out;
}
- spin_lock(&vn->sock_lock);
- /* Look again to see if can reuse socket */
- ovs = vxlan_find_port(net, port);
- if (ovs) {
- atomic_inc(&ovs->refcnt);
- vxlan->vn_sock = ovs;
- spin_unlock(&vn->sock_lock);
+ vh->rcv = rcv;
+ vh->vs = vs;
+ atomic_set(&vh->refcnt, 1);
+ INIT_WORK(&vh->del_work, vh_del_work);
- rtnl_lock();
- hlist_add_head_rcu(&vxlan->hlist, vni_head(ovs, vni));
- rtnl_unlock();
+ list_add_rcu(&vh->node, &vs->handler_list);
+out:
+ mutex_unlock(&vn->sock_lock);
+ return vh;
+}
- sk_release_kernel(nvs->sock->sk);
- kfree(nvs);
+static void vxlan_handler_hold(struct vxlan_handler *vh)
+{
+ atomic_inc(&vh->refcnt);
+}
+
+static void vxlan_handler_put(struct vxlan_handler *vh)
+{
+ BUG_ON(!vh->vs);
+
+ if (atomic_dec_and_test(&vh->refcnt))
+ queue_work(vxlan_wq, &vh->del_work);
+}
+
+/* Scheduled at device creation to bind to a socket */
+static void vxlan_handler_work(struct work_struct *work)
+{
+ struct vxlan_dev *vxlan = container_of(work, struct vxlan_dev,
handler_work);
+ struct net_device *dev = vxlan->dev;
+ struct net *net = dev_net(dev);
+ __u32 vni = vxlan->default_dst.remote_vni;
+ __be16 port = vxlan->dst_port;
+ struct vxlan_handler *vh = NULL;
+
+ vh = vxlan_handler_add(net, port, vxlan_rcv);
+ if (IS_ERR(vh)) {
+ netdev_err(vxlan->dev, "Can not create UDP socket, %ld\n",
+ PTR_ERR(vh));
} else {
- vxlan->vn_sock = nvs;
- hlist_add_head_rcu(&nvs->hlist, vs_head(net, port));
- spin_unlock(&vn->sock_lock);
+ vxlan->vh = vh;
rtnl_lock();
- hlist_add_head_rcu(&vxlan->hlist, vni_head(nvs, vni));
+ hlist_add_head_rcu(&vxlan->hlist, vni_head(vh->vs, vni));
rtnl_unlock();
}
-out:
dev_put(dev);
}
@@ -1868,7 +1920,7 @@ static __net_init int vxlan_init_net(struct net *net)
unsigned int h;
INIT_LIST_HEAD(&vn->vxlan_list);
- spin_lock_init(&vn->sock_lock);
+ mutex_init(&vn->sock_lock);
for (h = 0; h < PORT_HASH_SIZE; ++h)
INIT_HLIST_HEAD(&vn->sock_list[h]);
--
1.7.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
