gre and ipip tunnel support
Pablo Neira Ayuso
maintainercover gre and ipip tunnel support
Hi,
This patchset adds support for gre and ipip tunnels, including support for matching inner header fields.
First patch is larger because it adds the NFT_META_L4PROTO dependency logic to restrict matches to IPPROTO_GRE. The second patch is significantly smaller, because previous patches adding VxLAN and GRE already provided the necessary infrastructure to add IPIP with minimal updates.
No tests and documentation updates in this v1.
Pablo Neira Ayuso (2):
src: add gre support
src: add ipip support
include/linux/netfilter/nf_tables.h | 1 + include/payload.h | 2 ++ include/proto.h | 15 ++++++++ src/evaluate.c | 40 ++++++++++++++++------ src/netlink_delinearize.c | 45 ++++++++++++++++++++++++ src/parser_bison.y | 53 +++++++++++++++++++++++++++-- src/payload.c | 47 +++++++++++++++++++++++++ src/proto.c | 45 ++++++++++++++++++++++++ src/scanner.l | 3 ++ 9 files changed, 237 insertions(+), 14 deletions(-)
--
2.30.2
Pablo Neira Ayuso
maintainerPATCH 1/2 src: add gre support
GRE has a number of fields that are conditional based on flags, which requires custom dependency code similar to icmp and icmpv6. Matching on optional fields is not supported at this stage.
Since this is a layer 3 tunnel protocol, an implicit dependency on NFT_META_L4PROTO for IPPROTO_GRE is generated. To achieve this, this patch adds new infrastructure to remove an outer dependency based on the inner protocol from delinearize path.
--- include/linux/netfilter/nf_tables.h | 1 + include/payload.h | 2 ++ include/proto.h | 13 ++++++++ src/evaluate.c | 40 +++++++++++++++++------- src/netlink_delinearize.c | 41 +++++++++++++++++++++++++ src/parser_bison.y | 35 +++++++++++++++++++-- src/payload.c | 47 +++++++++++++++++++++++++++++ src/proto.c | 27 +++++++++++++++++ src/scanner.l | 2 ++ 9 files changed, 194 insertions(+), 14 deletions(-)
include/linux/netfilter/nf_tables.h +1 -0
@@ -783,6 +783,7 @@ enum nft_payload_csum_flags {enum nft_inner_type {NFT_INNER_UNSPEC =0 ,NFT_INNER_VXLAN , +NFT_INNER_GENEVE , };enum nft_inner_flags {
include/payload.h +2 -0
@@ -15,6 +15,8 @@ struct eval_ctx;struct stmt ;extern int payload_gen_dependency (struct eval_ctx *ctx,const struct expr *expr,struct stmt **res); +int payload_gen_inner_dependency (struct eval_ctx *ctx,const struct expr *expr, +struct stmt **res);extern int payload_gen_icmp_dependency (struct eval_ctx *ctx,const struct expr *expr,struct stmt **res);
include/proto.h +13 -0
@@ -97,6 +97,7 @@ enum proto_desc_id {PROTO_DESC_VLAN ,PROTO_DESC_ETHER ,PROTO_DESC_VXLAN , +PROTO_DESC_GRE , __PROTO_DESC_MAX };#define PROTO_DESC_MAX (__PROTO_DESC_MAX - 1)
@@ -396,7 +397,19 @@ enum vxlan_hdr_fields { VXLANHDR_FLAGS, }; +struct grehdr { +uint16_t flags; +uint16_t protocol; +}; + +enum gre_hdr_fields { +GREHDR_INVALID , +GREHDR_FLAGS , +GREHDR_PROTOCOL , +}; +extern const struct proto_desc proto_vxlan; +extern const struct proto_desc proto_gre;extern const struct proto_desc proto_icmp;extern const struct proto_desc proto_igmp;
src/evaluate.c +29 -11
@@ -862,22 +862,40 @@ static int expr_evaluate_inner(struct eval_ctx *ctx, struct expr **exprp)struct proto_ctx *pctx =eval_proto_ctx (ctx);const struct proto_desc *desc;struct expr *expr = *exprp; +enum proto_bases base;int ret; - desc = pctx->protocol[expr->payload.inner_desc->base -1 ].desc; -if (!desc) { -return expr_error (ctx->msgs, expr, -"no transport protocol specified" ); - } +assert (expr->etype ==EXPR_PAYLOAD ); + base = expr->payload.base; -if (proto_find_num (desc, expr->payload.inner_desc) <0 ) { -return expr_error (ctx->msgs, expr, -"unexpected transport protocol %s" , - desc->name); + pctx =eval_proto_ctx (ctx); + desc = pctx->protocol[base].desc; +if (desc ==NULL && + expr->payload.inner_desc->base <PROTO_BASE_INNER_HDR ) { +struct stmt *nstmt; + +if (payload_gen_inner_dependency (ctx, expr, &nstmt) <0 ) +return -1 ; + +rule_stmt_insert_at (ctx->rule, nstmt, ctx->stmt); } -proto_ctx_update (pctx,PROTO_BASE_INNER_HDR , &expr->location, - expr->payload.inner_desc); +if (expr->payload.inner_desc->base ==PROTO_BASE_INNER_HDR ) { + desc = pctx->protocol[expr->payload.inner_desc->base -1 ].desc; +if (!desc) { +return expr_error (ctx->msgs, expr, +"no transport protocol specified" ); + } + +if (proto_find_num (desc, expr->payload.inner_desc) <0 ) { +return expr_error (ctx->msgs, expr, +"unexpected transport protocol %s" , + desc->name); + } + +proto_ctx_update (pctx, expr->payload.inner_desc->base, &expr->location, + expr->payload.inner_desc); + }if (expr->payload.base !=PROTO_BASE_INNER_HDR ) ctx->inner_desc = expr->payload.inner_desc;
src/netlink_delinearize.c +41 -0
59 lines not on this page · raw message
src/parser_bison.y +32 -3
@@ -431,6 +431,8 @@ int nft_lex(void *, void *, void *); %token VXLAN "vxlan" %token VNI "vni" +%token GRE "gre" + %token SCTP "sctp" %token CHUNK "chunk" %token DATA "data"
@@ -889,9 +891,9 @@ int nft_lex(void *, void *, void *); %type <val> tcpopt_field_maxseg tcpopt_field_mptcp tcpopt_field_sack tcpopt_field_tsopt tcpopt_field_window %type <tcp_kind_field> tcp_hdr_option_kind_and_field -%type <expr> inner_eth_expr inner_inet_expr inner_expr vxlan_hdr_expr -%destructor { expr_free($$); } inner_eth_expr inner_inet_expr inner_expr vxlan_hdr_expr -%type <val> vxlan_hdr_field +%type <expr> inner_eth_expr inner_inet_expr inner_expr vxlan_hdr_expr gre_hdr_expr +%destructor { expr_free($$); } inner_eth_expr inner_inet_expr inner_expr vxlan_hdr_expr gre_hdr_expr +%type <val> vxlan_hdr_field gre_hdr_field %type <stmt> optstrip_stmt %destructor { stmt_free($$); } optstrip_stmt
@@ -4844,6 +4846,13 @@ primary_rhs_expr : symbol_expr { $$ = $1; } BYTEORDER_HOST_ENDIAN, sizeof(data) * BITS_PER_BYTE, &data); } + | GRE + { + uint8_t data = IPPROTO_GRE; + $$ = constant_expr_alloc(&@$, &inet_protocol_type, + BYTEORDER_HOST_ENDIAN, + sizeof(data) * BITS_PER_BYTE, &data); + } | COMP close_scope_comp { uint8_t data = IPPROTO_COMP;
@@ -5300,6 +5309,7 @@ payload_expr : payload_raw_expr | sctp_hdr_expr | th_hdr_expr | vxlan_hdr_expr + | gre_hdr_expr ; payload_raw_expr : AT payload_base_spec COMMA NUM COMMA NUM close_scope_at
@@ -5596,6 +5606,25 @@ vxlan_hdr_field : VNI { $$ = VXLANHDR_VNI; } | FLAGS { $$ = VXLANHDR_FLAGS; } ; +gre_hdr_expr : GRE gre_hdr_field + { + struct expr *expr; + + expr = payload_expr_alloc(&@$, &proto_gre, $2); + expr->payload.inner_desc = &proto_gre; + $$ = expr; + } + | GRE inner_expr + { + $$ = $2; + $$->payload.inner_desc = &proto_gre; + } + ; + +gre_hdr_field : FLAGS { $$ = GREHDR_FLAGS; } + | PROTOCOL { $$ = GREHDR_PROTOCOL; } + ; + optstrip_stmt : RESET TCP OPTION tcp_hdr_option_type close_scope_tcp { $$ = optstrip_stmt_alloc(&@$, tcpopt_expr_alloc(&@$,
src/payload.c +47 -0
56 lines not on this page · raw message
src/proto.c +27 -0
@@ -90,6 +90,7 @@ int proto_find_num(const struct proto_desc *base,static const struct proto_desc *inner_protocols[] = { &proto_vxlan, + &proto_gre, }; const struct proto_desc *proto_find_inner(uint32_t type, uint32_t hdrsize,
@@ -771,6 +772,29 @@ const struct datatype ecn_type = { .sym_tbl = &ecn_type_tbl, }; +#define GREHDR_FIELD (__name, __member) \ + HDR_FIELD(__name, struct grehdr, __member) +#define GREHDR_TEMPLATE (__name, __dtype, __member) \ + HDR_TEMPLATE(__name, __dtype, struct grehdr, __member) +#define GREHDR_TYPE (__name, __member) \ + GREHDR_TEMPLATE(__name, ðertype_type, __member) + +const struct proto_desc proto_gre = { + .name ="gre" , + .id =PROTO_DESC_GRE , + .base =PROTO_BASE_TRANSPORT_HDR , + .templates = { + [0 ] =PROTO_META_TEMPLATE ("l4proto" , &inet_protocol_type,NFT_META_L4PROTO ,8 ), + [GREHDR_PROTOCOL ] =GREHDR_TYPE ("protocol" , flags), + [GREHDR_FLAGS ] =GREHDR_FIELD ("flags" , protocol), + }, + .inner = { + .hdrsize =0 , + .flags =NFT_INNER_NH |NFT_INNER_TH , + .type =NFT_INNER_GENEVE +1 , + }, +}; +#define IPHDR_FIELD (__name, __member) \ HDR_FIELD(__name, struct iphdr, __member)#define IPHDR_ADDR (__name, __member) \
@@ -794,6 +818,7 @@ const struct proto_desc proto_ip = {PROTO_LINK (IPPROTO_TCP , &proto_tcp),PROTO_LINK (IPPROTO_DCCP , &proto_dccp),PROTO_LINK (IPPROTO_SCTP , &proto_sctp), + PROTO_LINK(IPPROTO_GRE, &proto_gre), }, .templates = { [0] = PROTO_META_TEMPLATE("l4proto", &inet_protocol_type, NFT_META_L4PROTO, 8),
@@ -985,6 +1010,7 @@ const struct proto_desc proto_inet_service = {PROTO_LINK (IPPROTO_ICMP , &proto_icmp),PROTO_LINK (IPPROTO_IGMP , &proto_igmp),PROTO_LINK (IPPROTO_ICMPV6 , &proto_icmp6), + PROTO_LINK(IPPROTO_GRE, &proto_gre), }, .templates = { [0] = PROTO_META_TEMPLATE("l4proto", &inet_protocol_type, NFT_META_L4PROTO, 8),
@@ -1226,6 +1252,7 @@ static const struct proto_desc *proto_definitions[PROTO_DESC_MAX + 1] = { [PROTO_DESC_VLAN] = &proto_vlan, [PROTO_DESC_ETHER] = &proto_eth, [PROTO_DESC_VXLAN] = &proto_vxlan, + [PROTO_DESC_GRE] = &proto_gre, };const struct proto_desc *proto_find_desc (enum proto_desc_id desc_id)
src/scanner.l +2 -0
@@ -623,6 +623,8 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "vxlan" { return VXLAN; } "vni" { return VNI; } +"gre" { return GRE; } + "tcp" { scanner_push_start_cond(yyscanner, SCANSTATE_TCP); return TCP; } "dccp" { scanner_push_start_cond(yyscanner, SCANSTATE_EXPR_DCCP); return DCCP; }
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/2 src: add ipip support
In reply to Pablo Neira AyusoThis generates an implicit dependency on NFT_META_L4PROTO for IPPROTO_IP. This does _not_ generate a dependendy for NFT_META_PROTOCOL on 0x800 (ip) because the tunnel protocol driver "ip6tnl" in the tree uses IPPROTO_IP for IPv4 over IPv6 (ipip6).
--- include/proto.h | 2 ++ src/netlink_delinearize.c | 4 ++++ src/parser_bison.y | 22 ++++++++++++++++++++-- src/proto.c | 18 ++++++++++++++++++ src/scanner.l | 1 + 5 files changed, 45 insertions(+), 2 deletions(-)
include/proto.h +2 -0
@@ -98,6 +98,7 @@ enum proto_desc_id {PROTO_DESC_ETHER ,PROTO_DESC_VXLAN ,PROTO_DESC_GRE , +PROTO_DESC_IPIP , __PROTO_DESC_MAX };#define PROTO_DESC_MAX (__PROTO_DESC_MAX - 1)
@@ -410,6 +411,7 @@ enum gre_hdr_fields {extern const struct proto_desc proto_vxlan;extern const struct proto_desc proto_gre; +extern const struct proto_desc proto_ipip;extern const struct proto_desc proto_icmp;extern const struct proto_desc proto_igmp;
src/netlink_delinearize.c +4 -0
@@ -1980,6 +1980,10 @@ static bool meta_outer_may_dependency_kill(struct rule_pp_ctx *ctx,if (expr->left->payload.inner_desc == &proto_gre)return true;break ; +case IPPROTO_IPIP : +if (expr->left->payload.inner_desc == &proto_ipip) +return true; +break ;default :break ; }
src/parser_bison.y +20 -2
@@ -432,6 +432,7 @@ int nft_lex(void *, void *, void *); %token VNI "vni" %token GRE "gre" +%token IPIP "ipip" %token SCTP "sctp" %token CHUNK "chunk"
@@ -891,8 +892,8 @@ int nft_lex(void *, void *, void *); %type <val> tcpopt_field_maxseg tcpopt_field_mptcp tcpopt_field_sack tcpopt_field_tsopt tcpopt_field_window %type <tcp_kind_field> tcp_hdr_option_kind_and_field -%type <expr> inner_eth_expr inner_inet_expr inner_expr vxlan_hdr_expr gre_hdr_expr -%destructor { expr_free($$); } inner_eth_expr inner_inet_expr inner_expr vxlan_hdr_expr gre_hdr_expr +%type <expr> inner_eth_expr inner_inet_expr inner_expr vxlan_hdr_expr gre_hdr_expr ipip_hdr_expr +%destructor { expr_free($$); } inner_eth_expr inner_inet_expr inner_expr vxlan_hdr_expr gre_hdr_expr ipip_hdr_expr %type <val> vxlan_hdr_field gre_hdr_field %type <stmt> optstrip_stmt
@@ -4849,6 +4850,15 @@ primary_rhs_expr : symbol_expr { $$ = $1; } | GRE { uint8_t data = IPPROTO_GRE; + + $$ = constant_expr_alloc(&@$, &inet_protocol_type, + BYTEORDER_HOST_ENDIAN, + sizeof(data) * BITS_PER_BYTE, &data); + } + | IPIP + { + uint8_t data = IPPROTO_IPIP; + $$ = constant_expr_alloc(&@$, &inet_protocol_type, BYTEORDER_HOST_ENDIAN, sizeof(data) * BITS_PER_BYTE, &data);
@@ -5310,6 +5320,7 @@ payload_expr : payload_raw_expr | th_hdr_expr | vxlan_hdr_expr | gre_hdr_expr + | ipip_hdr_expr ; payload_raw_expr : AT payload_base_spec COMMA NUM COMMA NUM close_scope_at
@@ -5625,6 +5636,13 @@ gre_hdr_field : FLAGS { $$ = GREHDR_FLAGS; } | PROTOCOL { $$ = GREHDR_PROTOCOL; } ; +ipip_hdr_expr : IPIP inner_expr + { + $$ = $2; + $$->payload.inner_desc = &proto_ipip; + } + ; + optstrip_stmt : RESET TCP OPTION tcp_hdr_option_type close_scope_tcp { $$ = optstrip_stmt_alloc(&@$, tcpopt_expr_alloc(&@$,
src/proto.c +18 -0
@@ -91,6 +91,7 @@ int proto_find_num(const struct proto_desc *base,static const struct proto_desc *inner_protocols[] = { &proto_vxlan, &proto_gre, + &proto_ipip, }; const struct proto_desc *proto_find_inner(uint32_t type, uint32_t hdrsize,
@@ -800,6 +801,20 @@ const struct proto_desc proto_gre = {#define IPHDR_ADDR (__name, __member) \ HDR_TYPE(__name, &ipaddr_type, struct iphdr, __member) +const struct proto_desc proto_ipip = { + .name ="ipip" , + .id =PROTO_DESC_IPIP , + .base =PROTO_BASE_TRANSPORT_HDR , + .templates = { + [0 ] =PROTO_META_TEMPLATE ("l4proto" , &inet_protocol_type,NFT_META_L4PROTO ,8 ), + }, + .inner = { + .hdrsize =0 , + .flags =NFT_INNER_NH |NFT_INNER_TH , + .type =NFT_INNER_GENEVE +2 , + }, +}; +const struct proto_desc proto_ip = { .name ="ip" , .id =PROTO_DESC_IP ,
@@ -819,6 +834,7 @@ const struct proto_desc proto_ip = {PROTO_LINK (IPPROTO_DCCP , &proto_dccp),PROTO_LINK (IPPROTO_SCTP , &proto_sctp),PROTO_LINK (IPPROTO_GRE , &proto_gre), + PROTO_LINK(IPPROTO_IPIP, &proto_ipip), }, .templates = { [0] = PROTO_META_TEMPLATE("l4proto", &inet_protocol_type, NFT_META_L4PROTO, 8),
@@ -1011,6 +1027,7 @@ const struct proto_desc proto_inet_service = {PROTO_LINK (IPPROTO_IGMP , &proto_igmp),PROTO_LINK (IPPROTO_ICMPV6 , &proto_icmp6),PROTO_LINK (IPPROTO_GRE , &proto_gre), + PROTO_LINK(IPPROTO_IPIP, &proto_ipip), }, .templates = { [0] = PROTO_META_TEMPLATE("l4proto", &inet_protocol_type, NFT_META_L4PROTO, 8),
@@ -1253,6 +1270,7 @@ static const struct proto_desc *proto_definitions[PROTO_DESC_MAX + 1] = { [PROTO_DESC_ETHER] = &proto_eth, [PROTO_DESC_VXLAN] = &proto_vxlan, [PROTO_DESC_GRE] = &proto_gre, + [PROTO_DESC_IPIP] = &proto_ipip, };const struct proto_desc *proto_find_desc (enum proto_desc_id desc_id)
src/scanner.l +1 -0
@@ -624,6 +624,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "vni" { return VNI; } "gre" { return GRE; } +"ipip" { return IPIP; } "tcp" { scanner_push_start_cond(yyscanner, SCANSTATE_TCP); return TCP; }
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerRe: [PATCH nft 2/2] src: add ipip support
Quoted 1 line · Pablo Neira Ayuso
This generates an implicit dependency on
NFT_META_L4PROTOforIPPROTO_IP.
s/IPPROTO_IP/IPPROTO_IPIP
Quoted 2 lines
This does _not_ generate a dependendy for
NFT_META_PROTOCOLon0x800(ip) because the tunnel protocol driver "ip6tnl" in the tree usesIPPROTO_IP
again:
s/IPPROTO_IP/IPPROTO_IPIP
Quoted 1 line
for IPv4 over IPv6 (ipip6).