ipset: Add wildcard support to net,iface
Subsystems (3)
RFC 1/1 ipset: Add wildcard support to net,iface
The net,iface equal functions currently compares the full interface names. In several cases, wildcard (or prefix) matching is useful. For example, when converting a large iptables rule-set to make use of ipset, I was able to significantly reduce the number of set elements by making use of wildcard matching.
Wildcard matching is enabled by setting the IPSET_FLAG_IFACE_WILDCARD-flag when adding an element. When this flag is set, only the initial part of the interface name of the set element is used for comparison.
I am submitting this change as an RFC, as I am not sure if my approach with using a flag (or wildcard matching at all) is OK. Please note that this patch is against kernel 4.14, as that is what my current devices are running. A final submission will be against net-next.
I will send my changes to the ipset-user space utility/library in a follow-up email.
--- include/uapi/linux/netfilter/ipset/ip_set.h | 2 ++ net/netfilter/ipset/ip_set_hash_netiface.c | 23 ++++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-)
include/uapi/linux/netfilter/ipset/ip_set.h +2 -0
@@ -201,6 +201,8 @@ enum ipset_cadt_flags {IPSET_FLAG_WITH_FORCEADD = (1 <<IPSET_FLAG_BIT_WITH_FORCEADD ),IPSET_FLAG_BIT_WITH_SKBINFO =6 ,IPSET_FLAG_WITH_SKBINFO = (1 <<IPSET_FLAG_BIT_WITH_SKBINFO ), +IPSET_FLAG_BIT_IFACE_WILDCARD =7 , +IPSET_FLAG_IFACE_WILDCARD = (1 <<IPSET_FLAG_BIT_IFACE_WILDCARD ), IPSET_FLAG_CADT_MAX = 15, };
net/netfilter/ipset/ip_set_hash_netiface.c +18 -5
@@ -29,7 +29,8 @@/* 3 Counters support added */ /* 4 Comments support added */ /* 5 Forceadd support added */ -#define IPSET_TYPE_REV_MAX 6/* skbinfo support added */ +/* 6 skbinfo support added */ +#define IPSET_TYPE_REV_MAX 7/* interface wildcard support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -61,6 +62,7 @@ struct hash_netiface4_elem {u8 cidr;u8 nomatch;u8 elem; +u8 wildcard;char iface[IFNAMSIZ ]; };
@@ -75,7 +77,9 @@ hash_netiface4_data_equal(const struct hash_netiface4_elem *ip1, ip1->cidr == ip2->cidr && (++*multi) && ip1->physdev == ip2->physdev && -strcmp (ip1->iface, ip2->iface) ==0 ; + (ip1->wildcard ? +strncmp (ip1->iface, ip2->iface,strlen (ip1->iface)) ==0 : +strcmp (ip1->iface, ip2->iface) ==0 ); } static inline int
@@ -107,7 +111,8 @@ static bool hash_netiface4_data_list(struct sk_buff *skb, const struct hash_netiface4_elem *data) { - u32 flags = data->physdev ? IPSET_FLAG_PHYSDEV : 0; + u32 flags = (data->physdev ? IPSET_FLAG_PHYSDEV : 0) | + (data->wildcard ?IPSET_FLAG_IFACE_WILDCARD :0 );if (data->nomatch) flags |=IPSET_FLAG_NOMATCH ;
@@ -233,6 +238,8 @@ hash_netiface4_uadt(struct ip_set *set, struct nlattr *tb[], e.physdev =1 ;if (cadt_flags &IPSET_FLAG_NOMATCH ) flags |= (IPSET_FLAG_NOMATCH <<16 ); +if (cadt_flags &IPSET_FLAG_IFACE_WILDCARD ) + e.wildcard =1 ; }if (adt ==IPSET_TEST || !tb[IPSET_ATTR_IP_TO ]) { e.ip =htonl (ip &ip_set_hostmask (e.cidr));
@@ -284,6 +291,7 @@ struct hash_netiface6_elem {u8 cidr;u8 nomatch;u8 elem; +u8 wildcard;char iface[IFNAMSIZ ]; };
@@ -298,7 +306,9 @@ hash_netiface6_data_equal(const struct hash_netiface6_elem *ip1, ip1->cidr == ip2->cidr && (++*multi) && ip1->physdev == ip2->physdev && -strcmp (ip1->iface, ip2->iface) ==0 ; + (ip1->wildcard ? +strncmp (ip1->iface, ip2->iface,strlen (ip1->iface)) ==0 : +strcmp (ip1->iface, ip2->iface) ==0 ); } static inline int
@@ -330,7 +340,8 @@ static bool hash_netiface6_data_list(struct sk_buff *skb, const struct hash_netiface6_elem *data) { - u32 flags = data->physdev ? IPSET_FLAG_PHYSDEV : 0; + u32 flags = (data->physdev ? IPSET_FLAG_PHYSDEV : 0) | + (data->wildcard ?IPSET_FLAG_IFACE_WILDCARD :0 );if (data->nomatch) flags |=IPSET_FLAG_NOMATCH ;
@@ -444,6 +455,8 @@ hash_netiface6_uadt(struct ip_set *set, struct nlattr *tb[], e.physdev =1 ;if (cadt_flags &IPSET_FLAG_NOMATCH ) flags |= (IPSET_FLAG_NOMATCH <<16 ); +if (cadt_flags &IPSET_FLAG_IFACE_WILDCARD ) + e.wildcard =1 ; } ret =adtfn (set, &e, &ext, &ext, flags);
Signature · 1 line
2.20.1
As mentioned in the RFC, here is the user-space part of wildcard-support.
BR,
Kristian
From 12864cadef57d70b33cfe6a3ec6a3df34d49e01b Mon Sep 17 00:00:00 2001
From: Kristian Evensen <[email protected]>
Date: Tue, 24 Sep 2019 15:39:51 +0200
Subject: [PATCH] ipset: Add interface wildcard support
--- include/libipset/args.h | 1 + include/libipset/data.h | 4 +- include/libipset/linux_ip_set.h | 2 + .../uapi/linux/netfilter/ipset/ip_set.h | 2 + .../netfilter/ipset/ip_set_hash_netiface.c | 23 ++++- lib/args.c | 8 ++ lib/data.c | 8 ++ lib/ipset_hash_netiface.c | 95 +++++++++++++++++++ 8 files changed, 137 insertions(+), 6 deletions(-)
include/libipset/args.h +1 -0
@@ -44,6 +44,7 @@ enum ipset_keywords {IPSET_ARG_FORCEADD ,/* forceadd */ IPSET_ARG_MARKMASK ,/* markmask */ IPSET_ARG_NOMATCH ,/* nomatch */ +IPSET_ARG_IFACE_WILDCARD ,/* interface wildcard match */ /* Extensions */ IPSET_ARG_TIMEOUT ,/* timeout */ IPSET_ARG_COUNTERS, /* counters */
include/libipset/data.h +3 -1
@@ -66,6 +66,7 @@ enum ipset_opt {IPSET_OPT_SKBMARK ,IPSET_OPT_SKBPRIO ,IPSET_OPT_SKBQUEUE , +IPSET_OPT_IFACE_WILDCARD ,/* Internal options */ IPSET_OPT_FLAGS =48 ,/* IPSET_FLAG_EXIST| */ IPSET_OPT_CADT_FLAGS, /* IPSET_FLAG_BEFORE| */
@@ -128,7 +129,8 @@ enum ipset_opt { | IPSET_FLAG(IPSET_OPT_ADT_COMMENT)\ | IPSET_FLAG(IPSET_OPT_SKBMARK) \ | IPSET_FLAG(IPSET_OPT_SKBPRIO) \ - | IPSET_FLAG(IPSET_OPT_SKBQUEUE)) + | IPSET_FLAG(IPSET_OPT_SKBQUEUE) \ + | IPSET_FLAG(IPSET_OPT_IFACE_WILDCARD))struct ipset_data ;
include/libipset/linux_ip_set.h +2 -0
@@ -204,6 +204,8 @@ enum ipset_cadt_flags {IPSET_FLAG_WITH_FORCEADD = (1 <<IPSET_FLAG_BIT_WITH_FORCEADD ),IPSET_FLAG_BIT_WITH_SKBINFO =6 ,IPSET_FLAG_WITH_SKBINFO = (1 <<IPSET_FLAG_BIT_WITH_SKBINFO ), +IPSET_FLAG_BIT_IFACE_WILDCARD =7 , +IPSET_FLAG_IFACE_WILDCARD = (1 <<IPSET_FLAG_BIT_IFACE_WILDCARD ), IPSET_FLAG_CADT_MAX = 15, };
kernel/include/uapi/linux/netfilter/ipset/ip_set.h +2 -0
@@ -204,6 +204,8 @@ enum ipset_cadt_flags {IPSET_FLAG_WITH_FORCEADD = (1 <<IPSET_FLAG_BIT_WITH_FORCEADD ),IPSET_FLAG_BIT_WITH_SKBINFO =6 ,IPSET_FLAG_WITH_SKBINFO = (1 <<IPSET_FLAG_BIT_WITH_SKBINFO ), +IPSET_FLAG_BIT_IFACE_WILDCARD =7 , +IPSET_FLAG_IFACE_WILDCARD = (1 <<IPSET_FLAG_BIT_IFACE_WILDCARD ), IPSET_FLAG_CADT_MAX = 15, };
kernel/net/netfilter/ipset/ip_set_hash_netiface.c +18 -5
@@ -29,7 +29,8 @@/* 3 Counters support added */ /* 4 Comments support added */ /* 5 Forceadd support added */ -#define IPSET_TYPE_REV_MAX 6/* skbinfo support added */ +/* 6 skbinfo support added */ +#define IPSET_TYPE_REV_MAX 7/* interface wildcard support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -61,6 +62,7 @@ struct hash_netiface4_elem {u8 cidr;u8 nomatch;u8 elem; +u8 wildcard;char iface[IFNAMSIZ ]; };
@@ -75,7 +77,9 @@ hash_netiface4_data_equal(const struct hash_netiface4_elem *ip1, ip1->cidr == ip2->cidr && (++*multi) && ip1->physdev == ip2->physdev && -strcmp (ip1->iface, ip2->iface) ==0 ; + (ip1->wildcard ? +strncmp (ip1->iface, ip2->iface,strlen (ip1->iface)) ==0 : +strcmp (ip1->iface, ip2->iface) ==0 ); } static inline int
@@ -107,7 +111,8 @@ static bool hash_netiface4_data_list(struct sk_buff *skb, const struct hash_netiface4_elem *data) { - u32 flags = data->physdev ? IPSET_FLAG_PHYSDEV : 0; + u32 flags = (data->physdev ? IPSET_FLAG_PHYSDEV : 0) | + (data->wildcard ?IPSET_FLAG_IFACE_WILDCARD :0 );if (data->nomatch) flags |=IPSET_FLAG_NOMATCH ;
@@ -233,6 +238,8 @@ hash_netiface4_uadt(struct ip_set *set, struct nlattr *tb[], e.physdev =1 ;if (cadt_flags &IPSET_FLAG_NOMATCH ) flags |= (IPSET_FLAG_NOMATCH <<16 ); +if (cadt_flags &IPSET_FLAG_IFACE_WILDCARD ) + e.wildcard =1 ; }if (adt ==IPSET_TEST || !tb[IPSET_ATTR_IP_TO ]) { e.ip =htonl (ip &ip_set_hostmask (e.cidr));
@@ -284,6 +291,7 @@ struct hash_netiface6_elem {u8 cidr;u8 nomatch;u8 elem; +u8 wildcard;char iface[IFNAMSIZ ]; };
@@ -298,7 +306,9 @@ hash_netiface6_data_equal(const struct hash_netiface6_elem *ip1, ip1->cidr == ip2->cidr && (++*multi) && ip1->physdev == ip2->physdev && -strcmp (ip1->iface, ip2->iface) ==0 ; + (ip1->wildcard ? +strncmp (ip1->iface, ip2->iface,strlen (ip1->iface)) ==0 : +strcmp (ip1->iface, ip2->iface) ==0 ); } static inline int
@@ -330,7 +340,8 @@ static bool hash_netiface6_data_list(struct sk_buff *skb, const struct hash_netiface6_elem *data) { - u32 flags = data->physdev ? IPSET_FLAG_PHYSDEV : 0; + u32 flags = (data->physdev ? IPSET_FLAG_PHYSDEV : 0) | + (data->wildcard ?IPSET_FLAG_IFACE_WILDCARD :0 );if (data->nomatch) flags |=IPSET_FLAG_NOMATCH ;
@@ -444,6 +455,8 @@ hash_netiface6_uadt(struct ip_set *set, struct nlattr *tb[], e.physdev =1 ;if (cadt_flags &IPSET_FLAG_NOMATCH ) flags |= (IPSET_FLAG_NOMATCH <<16 ); +if (cadt_flags &IPSET_FLAG_IFACE_WILDCARD ) + e.wildcard =1 ; } ret =adtfn (set, &e, &ext, &ext, flags);
lib/args.c +8 -0
@@ -195,6 +195,14 @@ static const struct ipset_arg ipset_args[] = { .print = ipset_print_flag, .help = "[nomatch]", }, + [IPSET_ARG_IFACE_WILDCARD] = { + .name = { "wildcard", NULL }, + .has_arg = IPSET_NO_ARG, + .opt = IPSET_OPT_IFACE_WILDCARD, + .parse = ipset_parse_flag, + .print = ipset_print_flag, + .help = "[wildcard]", + },/* Extensions */ [IPSET_ARG_TIMEOUT] = { .name = { "timeout", NULL },
lib/data.c +8 -0
@@ -410,6 +410,9 @@ ipset_data_set(struct ipset_data *data, enum ipset_opt opt, const void *value)case IPSET_OPT_NOMATCH :cadt_flag_type_attr (data, opt,IPSET_FLAG_NOMATCH );break ; +case IPSET_OPT_IFACE_WILDCARD : +cadt_flag_type_attr (data, opt,IPSET_FLAG_IFACE_WILDCARD ); +break ;case IPSET_OPT_FLAGS : data->flags = *(const uint32_t *)value;break ;
@@ -433,6 +436,9 @@ ipset_data_set(struct ipset_data *data, enum ipset_opt opt, const void *value)if (data->cadt_flags &IPSET_FLAG_WITH_SKBINFO )ipset_data_flags_set (data,IPSET_FLAG (IPSET_OPT_SKBINFO )); +if (data->cadt_flags &IPSET_FLAG_IFACE_WILDCARD ) +ipset_data_flags_set (data, +IPSET_FLAG (IPSET_OPT_IFACE_WILDCARD ));break ;default :return -1 ;
@@ -564,6 +570,7 @@ ipset_data_get(const struct ipset_data *data, enum ipset_opt opt)case IPSET_OPT_CREATE_COMMENT :case IPSET_OPT_FORCEADD :case IPSET_OPT_SKBINFO : +case IPSET_OPT_IFACE_WILDCARD :return &data->cadt_flags;default :return NULL ;
@@ -630,6 +637,7 @@ ipset_data_sizeof(enum ipset_opt opt, uint8_t family)case IPSET_OPT_NOMATCH :case IPSET_OPT_COUNTERS :case IPSET_OPT_FORCEADD : +case IPSET_OPT_IFACE_WILDCARD :return sizeof (uint32_t );case IPSET_OPT_ADT_COMMENT :return IPSET_MAX_COMMENT_SIZE +1 ;
lib/ipset_hash_netiface.c +95 -0
105 lines not on this page · raw message
Signature · 1 line
2.20.1
Hi Kristian,
Quoted 11 lines · Kristian Evensen
The net,iface equal functions currently compares the full interface names. In several cases, wildcard (or prefix) matching is useful. For example, when converting a large iptables rule-set to make use of ipset, I was able to significantly reduce the number of set elements by making use of wildcard matching.
Wildcard matching is enabled by setting the IPSET_FLAG_IFACE_WILDCARD-flag when adding an element. When this flag is set, only the initial part of the interface name of the set element is used for comparison.
Quoted 4 lines
I am submitting this change as an RFC, as I am not sure if my approach with using a flag (or wildcard matching at all) is OK. Please note that this patch is against kernel 4.14, as that is what my current devices are running. A final submission will be against net-next.
I like your patch, it's a nice extension. Please submit it against the ipset git tree, that's the easiest for me to handle the patches. I'll arrange the submission to net-next.
Best regards,
Jozsef
-
E-mail : [email protected], [email protected] PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics
H-1525 Budapest 114, POB. 49, Hungary