Skip to content

Commit f8a23d8

Browse files
davem330davem330
committed
Merge branch 'net-erspan-add-support-for-openvswitch'
William Tu says: ==================== net: erspan: add support for openvswitch The first patch refactors the erspan header definitions. Originally, the erspan fields are defined as a group into a __be16 field, and use mask and offset to access each field. This is more costly due to calling ntohs/htons and error-prone. The first patch changes it to use bitfields. The second patch creates erspan.h in UAPI and move the definition 'struct erspan_metadata' to it for later openvswitch to use. The final patch introduces the new OVS tunnel key attribute, OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS, to program both v1 and v2 erspan tunnel for openvswitch. ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents b89d06c + fc1372f commit f8a23d8

File tree

6 files changed

+209
-93
lines changed

6 files changed

+209
-93
lines changed

‎include/net/erspan.h

Lines changed: 78 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
* GRE proto ERSPAN type II = 0x88BE, type III = 0x22EB
4747
*/
4848

49+
#include <uapi/linux/erspan.h>
50+
4951
#define ERSPAN_VERSION 0x1 /* ERSPAN type II */
5052
#define VER_MASK 0xf000
5153
#define VLAN_MASK 0x0fff
@@ -65,17 +67,8 @@
6567
#define GRA_MASK 0x0006
6668
#define O_MASK 0x0001
6769

68-
/* ERSPAN version 2 metadata header */
69-
struct erspan_md2 {
70-
__be32 timestamp;
71-
__be16 sgt; /* security group tag */
72-
__be16 flags;
73-
#define P_OFFSET 15
74-
#define FT_OFFSET 10
75-
#define HWID_OFFSET 4
76-
#define DIR_OFFSET 3
77-
#define GRA_OFFSET 1
78-
};
70+
#define HWID_OFFSET 4
71+
#define DIR_OFFSET 3
7972

8073
enum erspan_encap_type {
8174
ERSPAN_ENCAP_NOVLAN = 0x0, /* originally without VLAN tag */
@@ -86,24 +79,64 @@ enum erspan_encap_type {
8679

8780
#define ERSPAN_V1_MDSIZE 4
8881
#define ERSPAN_V2_MDSIZE 8
89-
struct erspan_metadata {
90-
union {
91-
__be32 index; /* Version 1 (type II)*/
92-
struct erspan_md2 md2; /* Version 2 (type III) */
93-
} u;
94-
int version;
95-
};
9682

9783
struct erspan_base_hdr {
98-
__be16 ver_vlan;
99-
#define VER_OFFSET 12
100-
__be16 session_id;
101-
#define COS_OFFSET 13
102-
#define EN_OFFSET 11
103-
#define BSO_OFFSET EN_OFFSET
104-
#define T_OFFSET 10
84+
#if defined(__LITTLE_ENDIAN_BITFIELD)
85+
__u8 vlan_upper:4,
86+
ver:4;
87+
__u8 vlan:8;
88+
__u8 session_id_upper:2,
89+
t:1,
90+
en:2,
91+
cos:3;
92+
__u8 session_id:8;
93+
#elif defined(__BIG_ENDIAN_BITFIELD)
94+
__u8 ver: 4,
95+
vlan_upper:4;
96+
__u8 vlan:8;
97+
__u8 cos:3,
98+
en:2,
99+
t:1,
100+
session_id_upper:2;
101+
__u8 session_id:8;
102+
#else
103+
#error "Please fix <asm/byteorder.h>"
104+
#endif
105105
};
106106

107+
static inline void set_session_id(struct erspan_base_hdr *ershdr, u16 id)
108+
{
109+
ershdr->session_id = id & 0xff;
110+
ershdr->session_id_upper = (id >> 8) & 0x3;
111+
}
112+
113+
static inline u16 get_session_id(const struct erspan_base_hdr *ershdr)
114+
{
115+
return (ershdr->session_id_upper << 8) + ershdr->session_id;
116+
}
117+
118+
static inline void set_vlan(struct erspan_base_hdr *ershdr, u16 vlan)
119+
{
120+
ershdr->vlan = vlan & 0xff;
121+
ershdr->vlan_upper = (vlan >> 8) & 0xf;
122+
}
123+
124+
static inline u16 get_vlan(const struct erspan_base_hdr *ershdr)
125+
{
126+
return (ershdr->vlan_upper << 8) + ershdr->vlan;
127+
}
128+
129+
static inline void set_hwid(struct erspan_md2 *md2, u8 hwid)
130+
{
131+
md2->hwid = hwid & 0xf;
132+
md2->hwid_upper = (hwid >> 4) & 0x3;
133+
}
134+
135+
static inline u8 get_hwid(const struct erspan_md2 *md2)
136+
{
137+
return (md2->hwid_upper << 4) + md2->hwid;
138+
}
139+
107140
static inline int erspan_hdr_len(int version)
108141
{
109142
return sizeof(struct erspan_base_hdr) +
@@ -120,7 +153,7 @@ static inline u8 tos_to_cos(u8 tos)
120153
}
121154

122155
static inline void erspan_build_header(struct sk_buff *skb,
123-
__be32 id, u32 index,
156+
u32 id, u32 index,
124157
bool truncate, bool is_ipv4)
125158
{
126159
struct ethhdr *eth = (struct ethhdr *)skb->data;
@@ -154,12 +187,12 @@ static inline void erspan_build_header(struct sk_buff *skb,
154187
memset(ershdr, 0, sizeof(*ershdr) + ERSPAN_V1_MDSIZE);
155188

156189
/* Build base header */
157-
ershdr->ver_vlan = htons((vlan_tci & VLAN_MASK) |
158-
(ERSPAN_VERSION << VER_OFFSET));
159-
ershdr->session_id = htons((u16)(ntohl(id) & ID_MASK) |
160-
((tos_to_cos(tos) << COS_OFFSET) & COS_MASK) |
161-
(enc_type << EN_OFFSET & EN_MASK) |
162-
((truncate << T_OFFSET) & T_MASK));
190+
ershdr->ver = ERSPAN_VERSION;
191+
ershdr->cos = tos_to_cos(tos);
192+
ershdr->en = enc_type;
193+
ershdr->t = truncate;
194+
set_vlan(ershdr, vlan_tci);
195+
set_session_id(ershdr, id);
163196

164197
/* Build metadata */
165198
ersmd = (struct erspan_metadata *)(ershdr + 1);
@@ -187,7 +220,7 @@ static inline __be32 erspan_get_timestamp(void)
187220
}
188221

189222
static inline void erspan_build_header_v2(struct sk_buff *skb,
190-
__be32 id, u8 direction, u16 hwid,
223+
u32 id, u8 direction, u16 hwid,
191224
bool truncate, bool is_ipv4)
192225
{
193226
struct ethhdr *eth = (struct ethhdr *)skb->data;
@@ -198,7 +231,6 @@ static inline void erspan_build_header_v2(struct sk_buff *skb,
198231
__be16 tci;
199232
} *qp;
200233
u16 vlan_tci = 0;
201-
u16 session_id;
202234
u8 gra = 0; /* 100 usec */
203235
u8 bso = 0; /* Bad/Short/Oversized */
204236
u8 sgt = 0;
@@ -221,22 +253,23 @@ static inline void erspan_build_header_v2(struct sk_buff *skb,
221253
memset(ershdr, 0, sizeof(*ershdr) + ERSPAN_V2_MDSIZE);
222254

223255
/* Build base header */
224-
ershdr->ver_vlan = htons((vlan_tci & VLAN_MASK) |
225-
(ERSPAN_VERSION2 << VER_OFFSET));
226-
session_id = (u16)(ntohl(id) & ID_MASK) |
227-
((tos_to_cos(tos) << COS_OFFSET) & COS_MASK) |
228-
(bso << BSO_OFFSET & BSO_MASK) |
229-
((truncate << T_OFFSET) & T_MASK);
230-
ershdr->session_id = htons(session_id);
256+
ershdr->ver = ERSPAN_VERSION2;
257+
ershdr->cos = tos_to_cos(tos);
258+
ershdr->en = bso;
259+
ershdr->t = truncate;
260+
set_vlan(ershdr, vlan_tci);
261+
set_session_id(ershdr, id);
231262

232263
/* Build metadata */
233264
md = (struct erspan_metadata *)(ershdr + 1);
234265
md->u.md2.timestamp = erspan_get_timestamp();
235266
md->u.md2.sgt = htons(sgt);
236-
md->u.md2.flags = htons(((1 << P_OFFSET) & P_MASK) |
237-
((hwid << HWID_OFFSET) & HWID_MASK) |
238-
((direction << DIR_OFFSET) & DIR_MASK) |
239-
((gra << GRA_OFFSET) & GRA_MASK));
267+
md->u.md2.p = 1;
268+
md->u.md2.ft = 0;
269+
md->u.md2.dir = direction;
270+
md->u.md2.gra = gra;
271+
md->u.md2.o = 0;
272+
set_hwid(&md->u.md2, hwid);
240273
}
241274

242275
#endif

‎include/uapi/linux/erspan.h

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2+
/*
3+
* ERSPAN Tunnel Metadata
4+
*
5+
* Copyright (c) 2018 VMware
6+
*
7+
* This program is free software; you can redistribute it and/or modify
8+
* it under the terms of the GNU General Public License version 2
9+
* as published by the Free Software Foundation.
10+
*
11+
* Userspace API for metadata mode ERSPAN tunnel
12+
*/
13+
#ifndef _UAPI_ERSPAN_H
14+
#define _UAPI_ERSPAN_H
15+
16+
#include <linux/types.h> /* For __beXX in userspace */
17+
#include <asm/byteorder.h>
18+
19+
/* ERSPAN version 2 metadata header */
20+
struct erspan_md2 {
21+
__be32 timestamp;
22+
__be16 sgt; /* security group tag */
23+
#if defined(__LITTLE_ENDIAN_BITFIELD)
24+
__u8 hwid_upper:2,
25+
ft:5,
26+
p:1;
27+
__u8 o:1,
28+
gra:2,
29+
dir:1,
30+
hwid:4;
31+
#elif defined(__BIG_ENDIAN_BITFIELD)
32+
__u8 p:1,
33+
ft:5,
34+
hwid_upper:2;
35+
__u8 hwid:4,
36+
dir:1,
37+
gra:2,
38+
o:1;
39+
#else
40+
#error "Please fix <asm/byteorder.h>"
41+
#endif
42+
};
43+
44+
struct erspan_metadata {
45+
int version;
46+
union {
47+
__be32 index; /* Version 1 (type II)*/
48+
struct erspan_md2 md2; /* Version 2 (type III) */
49+
} u;
50+
};
51+
52+
#endif /* _UAPI_ERSPAN_H */

‎include/uapi/linux/openvswitch.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ enum ovs_tunnel_key_attr {
363363
OVS_TUNNEL_KEY_ATTR_IPV6_SRC, /* struct in6_addr src IPv6 address. */
364364
OVS_TUNNEL_KEY_ATTR_IPV6_DST, /* struct in6_addr dst IPv6 address. */
365365
OVS_TUNNEL_KEY_ATTR_PAD,
366+
OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS, /* struct erspan_metadata */
366367
__OVS_TUNNEL_KEY_ATTR_MAX
367368
};
368369

‎net/ipv4/ip_gre.c

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
114114
static struct rtnl_link_ops ipgre_link_ops __read_mostly;
115115
static int ipgre_tunnel_init(struct net_device *dev);
116116
static void erspan_build_header(struct sk_buff *skb,
117-
__be32 id, u32 index,
117+
u32 id, u32 index,
118118
bool truncate, bool is_ipv4);
119119

120120
static unsigned int ipgre_net_id __read_mostly;
@@ -273,12 +273,12 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi,
273273

274274
iph = ip_hdr(skb);
275275
ershdr = (struct erspan_base_hdr *)(skb->data + gre_hdr_len);
276-
ver = (ntohs(ershdr->ver_vlan) & VER_MASK) >> VER_OFFSET;
276+
ver = ershdr->ver;
277277

278278
/* The original GRE header does not have key field,
279279
* Use ERSPAN 10-bit session ID as key.
280280
*/
281-
tpi->key = cpu_to_be32(ntohs(ershdr->session_id) & ID_MASK);
281+
tpi->key = cpu_to_be32(get_session_id(ershdr));
282282
tunnel = ip_tunnel_lookup(itn, skb->dev->ifindex,
283283
tpi->flags | TUNNEL_KEY,
284284
iph->saddr, iph->daddr, tpi->key);
@@ -324,14 +324,8 @@ static int erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi,
324324
if (ver == 1) {
325325
tunnel->index = ntohl(pkt_md->u.index);
326326
} else {
327-
u16 md2_flags;
328-
u16 dir, hwid;
329-
330-
md2_flags = ntohs(pkt_md->u.md2.flags);
331-
dir = (md2_flags & DIR_MASK) >> DIR_OFFSET;
332-
hwid = (md2_flags & HWID_MASK) >> HWID_OFFSET;
333-
tunnel->dir = dir;
334-
tunnel->hwid = hwid;
327+
tunnel->dir = pkt_md->u.md2.dir;
328+
tunnel->hwid = get_hwid(&pkt_md->u.md2);
335329
}
336330

337331
}
@@ -615,19 +609,14 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev,
615609
}
616610

617611
if (version == 1) {
618-
erspan_build_header(skb, tunnel_id_to_key32(key->tun_id),
612+
erspan_build_header(skb, ntohl(tunnel_id_to_key32(key->tun_id)),
619613
ntohl(md->u.index), truncate, true);
620614
} else if (version == 2) {
621-
u16 md2_flags;
622-
u8 direction;
623-
u16 hwid;
624-
625-
md2_flags = ntohs(md->u.md2.flags);
626-
direction = (md2_flags & DIR_MASK) >> DIR_OFFSET;
627-
hwid = (md2_flags & HWID_MASK) >> HWID_OFFSET;
628-
629-
erspan_build_header_v2(skb, tunnel_id_to_key32(key->tun_id),
630-
direction, hwid, truncate, true);
615+
erspan_build_header_v2(skb,
616+
ntohl(tunnel_id_to_key32(key->tun_id)),
617+
md->u.md2.dir,
618+
get_hwid(&md->u.md2),
619+
truncate, true);
631620
} else {
632621
goto err_free_rt;
633622
}
@@ -733,10 +722,11 @@ static netdev_tx_t erspan_xmit(struct sk_buff *skb,
733722

734723
/* Push ERSPAN header */
735724
if (tunnel->erspan_ver == 1)
736-
erspan_build_header(skb, tunnel->parms.o_key, tunnel->index,
725+
erspan_build_header(skb, ntohl(tunnel->parms.o_key),
726+
tunnel->index,
737727
truncate, true);
738728
else
739-
erspan_build_header_v2(skb, tunnel->parms.o_key,
729+
erspan_build_header_v2(skb, ntohl(tunnel->parms.o_key),
740730
tunnel->dir, tunnel->hwid,
741731
truncate, true);
742732

0 commit comments

Comments
 (0)