ipset patches for nf-next
Subsystems (2)
cover ipset patches for nf-next
Hi Pablo,
Please consider to apply the next patches in the nf-next tree:
- Update byte and packet counters regardless of whether they match patch from Stefano Brivio. Finally I accepted Stefano's reasoning about updating the counters always.
- Add supporting the -exist flag with the destroy command too. The -exist flag was supported with add/del and create only but not with destroy. Now it is possible to write restore "scripts" which contains destroy and it won't abort when the set to be destroyed does not exist.
- Add the bucketsize parameter to all hash types, which makes possible to limit the max bucket size in the hash. Thus one can tune for faster matching with the price of higher memory footprint.
- Expose the initval hash parameter to userspace: after saving the set, one can now restore exactly the same set content and structure.
Best regards,
Jozsef
The following changes since commit 3cb12d27ff655e57e8efe3486dca2a22f4e30578:
Merge tag 'net-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2020-10-23 12:05:49 -0700)
are available in the Git repository at:
git://blackhole.kfki.hu/nf-next 17eca1ad71619af37e
for you to fetch changes up to 17eca1ad71619af37e136606fb87f7fc8a6fe8b5:
netfilter: ipset: Expose the initval hash parameter to userspace (2020-10-29 15:50:55 +0100)
----------------------------------------------------------------
Jozsef Kadlecsik (3):
netfilter: ipset: Support the -exist flag with the destroy command
netfilter: ipset: Add bucketsize parameter to all hash types
netfilter: ipset: Expose the initval hash parameter to userspace
Stefano Brivio (1):
netfilter: ipset: Update byte and packet counters regardless of whether they match
include/linux/netfilter/ipset/ip_set.h | 5 ++++ include/uapi/linux/netfilter/ipset/ip_set.h | 6 ++-- net/netfilter/ipset/ip_set_core.c | 9 ++++-- net/netfilter/ipset/ip_set_hash_gen.h | 45 ++++++++++++++++++---------- net/netfilter/ipset/ip_set_hash_ip.c | 7 +++-- net/netfilter/ipset/ip_set_hash_ipmac.c | 6 ++-- net/netfilter/ipset/ip_set_hash_ipmark.c | 7 +++-- net/netfilter/ipset/ip_set_hash_ipport.c | 7 +++-- net/netfilter/ipset/ip_set_hash_ipportip.c | 7 +++-- net/netfilter/ipset/ip_set_hash_ipportnet.c | 7 +++-- net/netfilter/ipset/ip_set_hash_mac.c | 6 ++-- net/netfilter/ipset/ip_set_hash_net.c | 7 +++-- net/netfilter/ipset/ip_set_hash_netiface.c | 7 +++-- net/netfilter/ipset/ip_set_hash_netnet.c | 7 +++-- net/netfilter/ipset/ip_set_hash_netport.c | 7 +++-- net/netfilter/ipset/ip_set_hash_netportnet.c | 7 +++-- 16 files changed, 103 insertions(+), 44 deletions(-)
PATCH 1/4 netfilter: ipset: Update byte and packet counters regardless of whether they match
From: Stefano Brivio <[email protected]>
In ip_set_match_extensions(), for sets with counters, we take care of updating counters themselves by calling ip_set_update_counter(), and of checking if the given comparison and values match, by calling ip_set_match_counter() if needed.
However, if a given comparison on counters doesn't match the configured values, that doesn't mean the set entry itself isn't matching.
This fix restores the behaviour we had before commit 4750005a85f7 ("netfilter: ipset: Fix "don't update counters" mode when counters used at the matching"), without reintroducing the issue fixed there: back then, mtype_data_match() first updated counters in any case, and then took care of matching on counters.
Now, if the IPSET_FLAG_SKIP_COUNTER_UPDATE flag is set, ip_set_update_counter() will anyway skip counter updates if desired.
The issue observed is illustrated by this reproducer:
ipset create c hash:ip counters ipset add c 192.0.2.1 iptables -I INPUT -m set --match-set c src --bytes-gt 800 -j DROP
if we now send packets from 192.0.2.1, bytes and packets counters for the entry as shown by 'ipset list' are always zero, and, no matter how many bytes we send, the rule will never match, because counters themselves are not updated.
--- net/netfilter/ipset/ip_set_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/ipset/ip_set_core.c +2 -1
@@ -637,13 +637,14 @@ ip_set_match_extensions(struct ip_set *set, const struct ip_set_ext *ext,if (SET_WITH_COUNTER (set)) {struct ip_set_counter *counter =ext_counter (data, set); +ip_set_update_counter (counter, ext, flags); +if (flags &IPSET_FLAG_MATCH_COUNTERS && !(ip_set_match_counter (ip_set_get_packets (counter), mext->packets, mext->packets_op) &&ip_set_match_counter (ip_set_get_bytes (counter), mext->bytes, mext->bytes_op)))return false; -ip_set_update_counter (counter, ext, flags); }if (SET_WITH_SKBINFO (set)) ip_set_get_skbinfo(ext_skbinfo(data, set),
Signature · 1 line
2.20.1
PATCH 3/4 netfilter: ipset: Add bucketsize parameter to all hash types
In reply to Jozsef KadlecsikThe parameter defines the upper limit in any hash bucket at adding new entries from userspace - if the limit would be exceeded, ipset doubles the hash size and rehashes. It means the set may consume more memory but gives faster evaluation at matching in the set.
--- include/linux/netfilter/ipset/ip_set.h | 5 +++ include/uapi/linux/netfilter/ipset/ip_set.h | 4 ++- net/netfilter/ipset/ip_set_core.c | 2 ++ net/netfilter/ipset/ip_set_hash_gen.h | 38 ++++++++++++-------- net/netfilter/ipset/ip_set_hash_ip.c | 6 ++-- net/netfilter/ipset/ip_set_hash_ipmac.c | 5 +-- net/netfilter/ipset/ip_set_hash_ipmark.c | 6 ++-- net/netfilter/ipset/ip_set_hash_ipport.c | 6 ++-- net/netfilter/ipset/ip_set_hash_ipportip.c | 6 ++-- net/netfilter/ipset/ip_set_hash_ipportnet.c | 6 ++-- net/netfilter/ipset/ip_set_hash_mac.c | 5 +-- net/netfilter/ipset/ip_set_hash_net.c | 6 ++-- net/netfilter/ipset/ip_set_hash_netiface.c | 6 ++-- net/netfilter/ipset/ip_set_hash_netnet.c | 6 ++-- net/netfilter/ipset/ip_set_hash_netport.c | 6 ++-- net/netfilter/ipset/ip_set_hash_netportnet.c | 6 ++-- 16 files changed, 79 insertions(+), 40 deletions(-)
include/linux/netfilter/ipset/ip_set.h +5 -0
@@ -198,6 +198,9 @@ struct ip_set_region {u32 elements;/* Number of elements vs timeout */ }; +/* The max revision number supported by any set type + 1 */ +#define IPSET_REVISION_MAX 9 +/* The core set type structure */ struct ip_set_type {struct list_head list;
@@ -215,6 +218,8 @@ struct ip_set_type {u8 family;/* Type revisions */ u8 revision_min, revision_max; +/* Revision-specific supported (create) flags */ +u8 create_flags[IPSET_REVISION_MAX +1 ];/* Set features to control swapping */ u16 features;
include/uapi/linux/netfilter/ipset/ip_set.h +3 -1
@@ -96,7 +96,7 @@ enum {IPSET_ATTR_HASHSIZE ,IPSET_ATTR_MAXELEM ,IPSET_ATTR_NETMASK , -IPSET_ATTR_PROBES , +IPSET_ATTR_BUCKETSIZE ,/* was unused IPSET_ATTR_PROBES */ IPSET_ATTR_RESIZE , IPSET_ATTR_SIZE,/* Kernel-only */
@@ -214,6 +214,8 @@ enum ipset_cadt_flags {enum ipset_create_flags {IPSET_CREATE_FLAG_BIT_FORCEADD =0 ,IPSET_CREATE_FLAG_FORCEADD = (1 <<IPSET_CREATE_FLAG_BIT_FORCEADD ), +IPSET_CREATE_FLAG_BIT_BUCKETSIZE =1 , +IPSET_CREATE_FLAG_BUCKETSIZE = (1 <<IPSET_CREATE_FLAG_BIT_BUCKETSIZE ),IPSET_CREATE_FLAG_BIT_MAX =7 , };
net/netfilter/ipset/ip_set_core.c +2 -0
@@ -1110,6 +1110,8 @@ static int ip_set_create(struct net *net, struct sock *ctnl, ret = -IPSET_ERR_PROTOCOL ; goto put_out; } +/* Set create flags depending on the type revision */ + set->flags |= set->type->create_flags[revision]; ret = set->type->create (net, set, tb, flags);if (ret !=0 )
net/netfilter/ipset/ip_set_hash_gen.h +23 -15
@@ -37,18 +37,18 @@*/ /* Number of elements to store in an initial array block */ -#define AHASH_INIT_SIZE 4 +#define AHASH_INIT_SIZE 2/* Max number of elements to store in an array block */ -#define AHASH_MAX_SIZE (3 * AHASH_INIT_SIZE) +#define AHASH_MAX_SIZE (6 * AHASH_INIT_SIZE)/* Max muber of elements in the array block when tuned */ #define AHASH_MAX_TUNED 64 +#define AHASH_MAX (h) ((h)->bucketsize) +/* Max number of elements can be tuned */ #ifdef IP_SET_HASH_WITH_MULTI -#define AHASH_MAX (h) ((h)->ahash_max) -static u8 -tune_ahash_max (u8 curr,u32 multi) +tune_bucketsize (u8 curr,u32 multi) {u32 n;
@@ -61,12 +61,10 @@ tune_ahash_max(u8 curr, u32 multi)*/ return n > curr && n <= AHASH_MAX_TUNED ? n : curr; } - -#define TUNE_AHASH_MAX (h, multi) \ - ((h)->ahash_max = tune_ahash_max((h)->ahash_max, multi)) +#define TUNE_BUCKETSIZE (h, multi) \ + ((h)->bucketsize = tune_bucketsize((h)->bucketsize, multi))#else -#define AHASH_MAX (h) AHASH_MAX_SIZE -#define TUNE_AHASH_MAX (h, multi) +#define TUNE_BUCKETSIZE (h, multi)#endif /* A hash bucket */
@@ -321,9 +319,7 @@ struct htype {#ifdef IP_SET_HASH_WITH_MARKMASK u32 markmask;/* markmask value for mark mask to store */ #endif -#ifdef IP_SET_HASH_WITH_MULTI -u8 ahash_max;/* max elements in an array block */ -#endif +u8 bucketsize;/* max elements in an array block */ #ifdef IP_SET_HASH_WITH_NETMASK u8 netmask;/* netmask value for subnets to store */ #endif
@@ -950,7 +946,7 @@ mtype_add(struct ip_set *set, void *value, const struct ip_set_ext *ext, goto set_full;/* Create a new slot */ if (n->pos >= n->size) { -TUNE_AHASH_MAX (h, multi); +TUNE_BUCKETSIZE (h, multi);if (n->size >=AHASH_MAX (h)) {/* Trigger rehashing */ mtype_data_next (&h->next, d);
@@ -1305,6 +1301,9 @@ mtype_head(struct ip_set *set, struct sk_buff *skb)if (nla_put_u32 (skb,IPSET_ATTR_MARKMASK , h->markmask)) goto nla_put_failure;#endif +if (set->flags &IPSET_CREATE_FLAG_BUCKETSIZE && +nla_put_u8 (skb,IPSET_ATTR_BUCKETSIZE , h->bucketsize)) + goto nla_put_failure;if (nla_put_net32 (skb,IPSET_ATTR_REFERENCES ,htonl (set->ref)) ||nla_put_net32 (skb,IPSET_ATTR_MEMSIZE ,htonl (memsize)) ||nla_put_net32 (skb,IPSET_ATTR_ELEMENTS ,htonl (elements)))
@@ -1548,7 +1547,16 @@ IPSET_TOKEN(HTYPE, _create)(struct net *net, struct ip_set *set, h->markmask = markmask;#endif get_random_bytes (&h->initval,sizeof (h->initval)); - + h->bucketsize =AHASH_MAX_SIZE ; +if (tb[IPSET_ATTR_BUCKETSIZE ]) { + h->bucketsize =nla_get_u8 (tb[IPSET_ATTR_BUCKETSIZE ]); +if (h->bucketsize <AHASH_INIT_SIZE ) + h->bucketsize =AHASH_INIT_SIZE ; +else if (h->bucketsize >AHASH_MAX_SIZE ) + h->bucketsize =AHASH_MAX_SIZE ; +else if (h->bucketsize %2 ) + h->bucketsize +=1 ; + } t->htable_bits = hbits; t->maxelem = h->maxelem /ahash_numof_locks (hbits);RCU_INIT_POINTER (h->table, t);
net/netfilter/ipset/ip_set_hash_ip.c +4 -2
@@ -23,7 +23,8 @@/* 1 Counters support */ /* 2 Comments support */ /* 3 Forceadd support */ -#define IPSET_TYPE_REV_MAX 4/* skbinfo support */ +/* 4 skbinfo support */ +#define IPSET_TYPE_REV_MAX 5/* bucketsize support */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -277,11 +278,12 @@ static struct ip_set_type hash_ip_type __read_mostly = { .family = NFPROTO_UNSPEC, .revision_min = IPSET_TYPE_REV_MIN, .revision_max = IPSET_TYPE_REV_MAX, + .create_flags[IPSET_TYPE_REV_MAX] = IPSET_CREATE_FLAG_BUCKETSIZE, .create = hash_ip_create, .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, - [IPSET_ATTR_PROBES] = { .type = NLA_U8 }, + [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 }, [IPSET_ATTR_NETMASK] = { .type = NLA_U8 },
net/netfilter/ipset/ip_set_hash_ipmac.c +3 -2
@@ -23,7 +23,7 @@#include <linux/netfilter/ipset/ip_set_hash.h> #define IPSET_TYPE_REV_MIN 0 -#define IPSET_TYPE_REV_MAX 0 +#define IPSET_TYPE_REV_MAX 1/* bucketsize support */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Tomasz Chilinski <[email protected]>" );
@@ -268,11 +268,12 @@ static struct ip_set_type hash_ipmac_type __read_mostly = { .family = NFPROTO_UNSPEC, .revision_min = IPSET_TYPE_REV_MIN, .revision_max = IPSET_TYPE_REV_MAX, + .create_flags[IPSET_TYPE_REV_MAX] = IPSET_CREATE_FLAG_BUCKETSIZE, .create = hash_ipmac_create, .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, - [IPSET_ATTR_PROBES] = { .type = NLA_U8 }, + [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 }, [IPSET_ATTR_CADT_FLAGS] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_ipmark.c +4 -2
@@ -21,7 +21,8 @@#define IPSET_TYPE_REV_MIN 0/* 1 Forceadd support */ -#define IPSET_TYPE_REV_MAX 2/* skbinfo support */ +/* 2 skbinfo support */ +#define IPSET_TYPE_REV_MAX 3/* bucketsize support */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Vytas Dauksa <[email protected]>" );
@@ -274,12 +275,13 @@ static struct ip_set_type hash_ipmark_type __read_mostly = { .family = NFPROTO_UNSPEC, .revision_min = IPSET_TYPE_REV_MIN, .revision_max = IPSET_TYPE_REV_MAX, + .create_flags[IPSET_TYPE_REV_MAX] = IPSET_CREATE_FLAG_BUCKETSIZE, .create = hash_ipmark_create, .create_policy = { [IPSET_ATTR_MARKMASK] = { .type = NLA_U32 }, [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, - [IPSET_ATTR_PROBES] = { .type = NLA_U8 }, + [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 }, [IPSET_ATTR_CADT_FLAGS] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_ipport.c +4 -2
@@ -25,7 +25,8 @@/* 2 Counters support added */ /* 3 Comments support added */ /* 4 Forceadd support added */ -#define IPSET_TYPE_REV_MAX 5/* skbinfo support added */ +/* 5 skbinfo support added */ +#define IPSET_TYPE_REV_MAX 6/* bucketsize support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -341,11 +342,12 @@ static struct ip_set_type hash_ipport_type __read_mostly = { .family = NFPROTO_UNSPEC, .revision_min = IPSET_TYPE_REV_MIN, .revision_max = IPSET_TYPE_REV_MAX, + .create_flags[IPSET_TYPE_REV_MAX] = IPSET_CREATE_FLAG_BUCKETSIZE, .create = hash_ipport_create, .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, - [IPSET_ATTR_PROBES] = { .type = NLA_U8 }, + [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_PROTO] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_ipportip.c +4 -2
@@ -25,7 +25,8 @@/* 2 Counters support added */ /* 3 Comments support added */ /* 4 Forceadd support added */ -#define IPSET_TYPE_REV_MAX 5/* skbinfo support added */ +/* 5 skbinfo support added */ +#define IPSET_TYPE_REV_MAX 6/* bucketsize support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -356,11 +357,12 @@ static struct ip_set_type hash_ipportip_type __read_mostly = { .family = NFPROTO_UNSPEC, .revision_min = IPSET_TYPE_REV_MIN, .revision_max = IPSET_TYPE_REV_MAX, + .create_flags[IPSET_TYPE_REV_MAX] = IPSET_CREATE_FLAG_BUCKETSIZE, .create = hash_ipportip_create, .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, - [IPSET_ATTR_PROBES] = { .type = NLA_U8 }, + [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 }, [IPSET_ATTR_CADT_FLAGS] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_ipportnet.c +4 -2
@@ -27,7 +27,8 @@/* 4 Counters support added */ /* 5 Comments support added */ /* 6 Forceadd support added */ -#define IPSET_TYPE_REV_MAX 7/* skbinfo support added */ +/* 7 skbinfo support added */ +#define IPSET_TYPE_REV_MAX 8/* bucketsize support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -513,11 +514,12 @@ static struct ip_set_type hash_ipportnet_type __read_mostly = { .family = NFPROTO_UNSPEC, .revision_min = IPSET_TYPE_REV_MIN, .revision_max = IPSET_TYPE_REV_MAX, + .create_flags[IPSET_TYPE_REV_MAX] = IPSET_CREATE_FLAG_BUCKETSIZE, .create = hash_ipportnet_create, .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, - [IPSET_ATTR_PROBES] = { .type = NLA_U8 }, + [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 }, [IPSET_ATTR_CADT_FLAGS] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_mac.c +3 -2
@@ -16,7 +16,7 @@#include <linux/netfilter/ipset/ip_set_hash.h> #define IPSET_TYPE_REV_MIN 0 -#define IPSET_TYPE_REV_MAX 0 +#define IPSET_TYPE_REV_MAX 1/* bucketsize support */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -125,11 +125,12 @@ static struct ip_set_type hash_mac_type __read_mostly = { .family = NFPROTO_UNSPEC, .revision_min = IPSET_TYPE_REV_MIN, .revision_max = IPSET_TYPE_REV_MAX, + .create_flags[IPSET_TYPE_REV_MAX] = IPSET_CREATE_FLAG_BUCKETSIZE, .create = hash_mac_create, .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, - [IPSET_ATTR_PROBES] = { .type = NLA_U8 }, + [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 }, [IPSET_ATTR_CADT_FLAGS] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_net.c +4 -2
@@ -24,7 +24,8 @@/* 3 Counters support added */ /* 4 Comments support added */ /* 5 Forceadd support added */ -#define IPSET_TYPE_REV_MAX 6/* skbinfo mapping support added */ +/* 6 skbinfo support added */ +#define IPSET_TYPE_REV_MAX 7/* bucketsize support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -354,11 +355,12 @@ static struct ip_set_type hash_net_type __read_mostly = { .family = NFPROTO_UNSPEC, .revision_min = IPSET_TYPE_REV_MIN, .revision_max = IPSET_TYPE_REV_MAX, + .create_flags[IPSET_TYPE_REV_MAX] = IPSET_CREATE_FLAG_BUCKETSIZE, .create = hash_net_create, .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, - [IPSET_ATTR_PROBES] = { .type = NLA_U8 }, + [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 }, [IPSET_ATTR_CADT_FLAGS] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_netiface.c +4 -2
@@ -26,7 +26,8 @@/* 4 Comments support added */ /* 5 Forceadd support added */ /* 6 skbinfo support added */ -#define IPSET_TYPE_REV_MAX 7/* interface wildcard support added */ +/* 7 interface wildcard support added */ +#define IPSET_TYPE_REV_MAX 8/* bucketsize support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -470,11 +471,12 @@ static struct ip_set_type hash_netiface_type __read_mostly = { .family = NFPROTO_UNSPEC, .revision_min = IPSET_TYPE_REV_MIN, .revision_max = IPSET_TYPE_REV_MAX, + .create_flags[IPSET_TYPE_REV_MAX] = IPSET_CREATE_FLAG_BUCKETSIZE, .create = hash_netiface_create, .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, - [IPSET_ATTR_PROBES] = { .type = NLA_U8 }, + [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_PROTO] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_netnet.c +4 -2
@@ -22,7 +22,8 @@#define IPSET_TYPE_REV_MIN 0/* 1 Forceadd support added */ -#define IPSET_TYPE_REV_MAX 2/* skbinfo support added */ +/* 2 skbinfo support added */ +#define IPSET_TYPE_REV_MAX 3/* bucketsize support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Oliver Smith <[email protected]>" );
@@ -459,11 +460,12 @@ static struct ip_set_type hash_netnet_type __read_mostly = { .family = NFPROTO_UNSPEC, .revision_min = IPSET_TYPE_REV_MIN, .revision_max = IPSET_TYPE_REV_MAX, + .create_flags[IPSET_TYPE_REV_MAX] = IPSET_CREATE_FLAG_BUCKETSIZE, .create = hash_netnet_create, .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, - [IPSET_ATTR_PROBES] = { .type = NLA_U8 }, + [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 }, [IPSET_ATTR_CADT_FLAGS] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_netport.c +4 -2
@@ -26,7 +26,8 @@/* 4 Counters support added */ /* 5 Comments support added */ /* 6 Forceadd support added */ -#define IPSET_TYPE_REV_MAX 7/* skbinfo support added */ +/* 7 skbinfo support added */ +#define IPSET_TYPE_REV_MAX 8/* bucketsize support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -460,11 +461,12 @@ static struct ip_set_type hash_netport_type __read_mostly = { .family = NFPROTO_UNSPEC, .revision_min = IPSET_TYPE_REV_MIN, .revision_max = IPSET_TYPE_REV_MAX, + .create_flags[IPSET_TYPE_REV_MAX] = IPSET_CREATE_FLAG_BUCKETSIZE, .create = hash_netport_create, .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, - [IPSET_ATTR_PROBES] = { .type = NLA_U8 }, + [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_PROTO] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_netportnet.c +4 -2
@@ -23,7 +23,8 @@#define IPSET_TYPE_REV_MIN 0/* 0 Comments support added */ /* 1 Forceadd support added */ -#define IPSET_TYPE_REV_MAX 2/* skbinfo support added */ +/* 2 skbinfo support added */ +#define IPSET_TYPE_REV_MAX 3/* bucketsize support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Oliver Smith <[email protected]>" );
@@ -558,11 +559,12 @@ static struct ip_set_type hash_netportnet_type __read_mostly = { .family = NFPROTO_UNSPEC, .revision_min = IPSET_TYPE_REV_MIN, .revision_max = IPSET_TYPE_REV_MAX, + .create_flags[IPSET_TYPE_REV_MAX] = IPSET_CREATE_FLAG_BUCKETSIZE, .create = hash_netportnet_create, .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, - [IPSET_ATTR_PROBES] = { .type = NLA_U8 }, + [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 }, [IPSET_ATTR_CADT_FLAGS] = { .type = NLA_U32 },
Signature · 1 line
2.20.1
PATCH 2/4 netfilter: ipset: Support the -exist flag with the destroy command
In reply to Jozsef KadlecsikThe -exist flag was supported with the create, add and delete commands. In order to gracefully handle the destroy command with nonexistent sets, the -exist flag is added to destroy too.
--- net/netfilter/ipset/ip_set_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/netfilter/ipset/ip_set_core.c +3 -1
@@ -1240,10 +1240,12 @@ static int ip_set_destroy(struct net *net, struct sock *ctnl,/* Modified by ip_set_destroy() only, which is serialized */ inst->is_destroyed = false; }else { +u32 flags =flag_exist (nlh); s =find_set_and_id (inst,nla_data (attr[IPSET_ATTR_SETNAME ]), &i);if (!s) { - ret = -ENOENT ; +if (!(flags &IPSET_FLAG_EXIST )) + ret = -ENOENT ; goto out; }else if (s->ref || s->ref_netlink) { ret = -IPSET_ERR_BUSY ;
Signature · 1 line
2.20.1
PATCH 4/4 netfilter: ipset: Expose the initval hash parameter to userspace
In reply to Jozsef KadlecsikIt makes possible to reproduce exactly the same set after a save/restore.
--- include/uapi/linux/netfilter/ipset/ip_set.h | 2 +- net/netfilter/ipset/ip_set_hash_gen.h | 13 +++++++++---- net/netfilter/ipset/ip_set_hash_ip.c | 3 ++- net/netfilter/ipset/ip_set_hash_ipmac.c | 3 ++- net/netfilter/ipset/ip_set_hash_ipmark.c | 3 ++- net/netfilter/ipset/ip_set_hash_ipport.c | 3 ++- net/netfilter/ipset/ip_set_hash_ipportip.c | 3 ++- net/netfilter/ipset/ip_set_hash_ipportnet.c | 3 ++- net/netfilter/ipset/ip_set_hash_mac.c | 3 ++- net/netfilter/ipset/ip_set_hash_net.c | 3 ++- net/netfilter/ipset/ip_set_hash_netiface.c | 3 ++- net/netfilter/ipset/ip_set_hash_netnet.c | 3 ++- net/netfilter/ipset/ip_set_hash_netport.c | 3 ++- net/netfilter/ipset/ip_set_hash_netportnet.c | 3 ++- 14 files changed, 34 insertions(+), 17 deletions(-)
include/uapi/linux/netfilter/ipset/ip_set.h +1 -1
@@ -92,7 +92,7 @@ enum {/* Reserve empty slots */ IPSET_ATTR_CADT_MAX =16 ,/* Create-only specific attributes */ -IPSET_ATTR_GC , +IPSET_ATTR_INITVAL ,/* was unused IPSET_ATTR_GC */ IPSET_ATTR_HASHSIZE ,IPSET_ATTR_MAXELEM , IPSET_ATTR_NETMASK,
net/netfilter/ipset/ip_set_hash_gen.h +9 -4
@@ -1301,9 +1301,11 @@ mtype_head(struct ip_set *set, struct sk_buff *skb)if (nla_put_u32 (skb,IPSET_ATTR_MARKMASK , h->markmask)) goto nla_put_failure;#endif -if (set->flags &IPSET_CREATE_FLAG_BUCKETSIZE && -nla_put_u8 (skb,IPSET_ATTR_BUCKETSIZE , h->bucketsize)) - goto nla_put_failure; +if (set->flags &IPSET_CREATE_FLAG_BUCKETSIZE ) { +if (nla_put_u8 (skb,IPSET_ATTR_BUCKETSIZE , h->bucketsize) || +nla_put_net32 (skb,IPSET_ATTR_INITVAL ,htonl (h->initval))) + goto nla_put_failure; + }if (nla_put_net32 (skb,IPSET_ATTR_REFERENCES ,htonl (set->ref)) ||nla_put_net32 (skb,IPSET_ATTR_MEMSIZE ,htonl (memsize)) ||nla_put_net32 (skb,IPSET_ATTR_ELEMENTS ,htonl (elements)))
@@ -1546,7 +1548,10 @@ IPSET_TOKEN(HTYPE, _create)(struct net *net, struct ip_set *set,#ifdef IP_SET_HASH_WITH_MARKMASK h->markmask = markmask;#endif -get_random_bytes (&h->initval,sizeof (h->initval)); +if (tb[IPSET_ATTR_INITVAL ]) + h->initval =ntohl (nla_get_be32 (tb[IPSET_ATTR_INITVAL ])); +else +get_random_bytes (&h->initval,sizeof (h->initval)); h->bucketsize =AHASH_MAX_SIZE ;if (tb[IPSET_ATTR_BUCKETSIZE ]) { h->bucketsize =nla_get_u8 (tb[IPSET_ATTR_BUCKETSIZE ]);
net/netfilter/ipset/ip_set_hash_ip.c +2 -1
@@ -24,7 +24,7 @@/* 2 Comments support */ /* 3 Forceadd support */ /* 4 skbinfo support */ -#define IPSET_TYPE_REV_MAX 5/* bucketsize support */ +#define IPSET_TYPE_REV_MAX 5/* bucketsize, initval support */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -283,6 +283,7 @@ static struct ip_set_type hash_ip_type __read_mostly = { .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, + [IPSET_ATTR_INITVAL] = { .type = NLA_U32 }, [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_ipmac.c +2 -1
@@ -23,7 +23,7 @@#include <linux/netfilter/ipset/ip_set_hash.h> #define IPSET_TYPE_REV_MIN 0 -#define IPSET_TYPE_REV_MAX 1/* bucketsize support */ +#define IPSET_TYPE_REV_MAX 1/* bucketsize, initval support */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Tomasz Chilinski <[email protected]>" );
@@ -273,6 +273,7 @@ static struct ip_set_type hash_ipmac_type __read_mostly = { .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, + [IPSET_ATTR_INITVAL] = { .type = NLA_U32 }, [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_ipmark.c +2 -1
@@ -22,7 +22,7 @@#define IPSET_TYPE_REV_MIN 0/* 1 Forceadd support */ /* 2 skbinfo support */ -#define IPSET_TYPE_REV_MAX 3/* bucketsize support */ +#define IPSET_TYPE_REV_MAX 3/* bucketsize, initval support */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Vytas Dauksa <[email protected]>" );
@@ -281,6 +281,7 @@ static struct ip_set_type hash_ipmark_type __read_mostly = { [IPSET_ATTR_MARKMASK] = { .type = NLA_U32 }, [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, + [IPSET_ATTR_INITVAL] = { .type = NLA_U32 }, [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_ipport.c +2 -1
@@ -26,7 +26,7 @@/* 3 Comments support added */ /* 4 Forceadd support added */ /* 5 skbinfo support added */ -#define IPSET_TYPE_REV_MAX 6/* bucketsize support added */ +#define IPSET_TYPE_REV_MAX 6/* bucketsize, initval support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -347,6 +347,7 @@ static struct ip_set_type hash_ipport_type __read_mostly = { .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, + [IPSET_ATTR_INITVAL] = { .type = NLA_U32 }, [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_PROTO] = { .type = NLA_U8 },
net/netfilter/ipset/ip_set_hash_ipportip.c +2 -1
@@ -26,7 +26,7 @@/* 3 Comments support added */ /* 4 Forceadd support added */ /* 5 skbinfo support added */ -#define IPSET_TYPE_REV_MAX 6/* bucketsize support added */ +#define IPSET_TYPE_REV_MAX 6/* bucketsize, initval support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -362,6 +362,7 @@ static struct ip_set_type hash_ipportip_type __read_mostly = { .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, + [IPSET_ATTR_INITVAL] = { .type = NLA_U32 }, [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_ipportnet.c +2 -1
@@ -28,7 +28,7 @@/* 5 Comments support added */ /* 6 Forceadd support added */ /* 7 skbinfo support added */ -#define IPSET_TYPE_REV_MAX 8/* bucketsize support added */ +#define IPSET_TYPE_REV_MAX 8/* bucketsize, initval support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -519,6 +519,7 @@ static struct ip_set_type hash_ipportnet_type __read_mostly = { .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, + [IPSET_ATTR_INITVAL] = { .type = NLA_U32 }, [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_mac.c +2 -1
@@ -16,7 +16,7 @@#include <linux/netfilter/ipset/ip_set_hash.h> #define IPSET_TYPE_REV_MIN 0 -#define IPSET_TYPE_REV_MAX 1/* bucketsize support */ +#define IPSET_TYPE_REV_MAX 1/* bucketsize, initval support */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -130,6 +130,7 @@ static struct ip_set_type hash_mac_type __read_mostly = { .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, + [IPSET_ATTR_INITVAL] = { .type = NLA_U32 }, [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_net.c +2 -1
@@ -25,7 +25,7 @@/* 4 Comments support added */ /* 5 Forceadd support added */ /* 6 skbinfo support added */ -#define IPSET_TYPE_REV_MAX 7/* bucketsize support added */ +#define IPSET_TYPE_REV_MAX 7/* bucketsize, initval support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -360,6 +360,7 @@ static struct ip_set_type hash_net_type __read_mostly = { .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, + [IPSET_ATTR_INITVAL] = { .type = NLA_U32 }, [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_netiface.c +2 -1
@@ -27,7 +27,7 @@/* 5 Forceadd support added */ /* 6 skbinfo support added */ /* 7 interface wildcard support added */ -#define IPSET_TYPE_REV_MAX 8/* bucketsize support added */ +#define IPSET_TYPE_REV_MAX 8/* bucketsize, initval support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -476,6 +476,7 @@ static struct ip_set_type hash_netiface_type __read_mostly = { .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, + [IPSET_ATTR_INITVAL] = { .type = NLA_U32 }, [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_PROTO] = { .type = NLA_U8 },
net/netfilter/ipset/ip_set_hash_netnet.c +2 -1
@@ -23,7 +23,7 @@#define IPSET_TYPE_REV_MIN 0/* 1 Forceadd support added */ /* 2 skbinfo support added */ -#define IPSET_TYPE_REV_MAX 3/* bucketsize support added */ +#define IPSET_TYPE_REV_MAX 3/* bucketsize, initval support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Oliver Smith <[email protected]>" );
@@ -465,6 +465,7 @@ static struct ip_set_type hash_netnet_type __read_mostly = { .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, + [IPSET_ATTR_INITVAL] = { .type = NLA_U32 }, [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 },
net/netfilter/ipset/ip_set_hash_netport.c +2 -1
@@ -27,7 +27,7 @@/* 5 Comments support added */ /* 6 Forceadd support added */ /* 7 skbinfo support added */ -#define IPSET_TYPE_REV_MAX 8/* bucketsize support added */ +#define IPSET_TYPE_REV_MAX 8/* bucketsize, initval support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Jozsef Kadlecsik <[email protected]>" );
@@ -466,6 +466,7 @@ static struct ip_set_type hash_netport_type __read_mostly = { .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, + [IPSET_ATTR_INITVAL] = { .type = NLA_U32 }, [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_PROTO] = { .type = NLA_U8 },
net/netfilter/ipset/ip_set_hash_netportnet.c +2 -1
@@ -24,7 +24,7 @@/* 0 Comments support added */ /* 1 Forceadd support added */ /* 2 skbinfo support added */ -#define IPSET_TYPE_REV_MAX 3/* bucketsize support added */ +#define IPSET_TYPE_REV_MAX 3/* bucketsize, initval support added */ MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Oliver Smith <[email protected]>" );
@@ -564,6 +564,7 @@ static struct ip_set_type hash_netportnet_type __read_mostly = { .create_policy = { [IPSET_ATTR_HASHSIZE] = { .type = NLA_U32 }, [IPSET_ATTR_MAXELEM] = { .type = NLA_U32 }, + [IPSET_ATTR_INITVAL] = { .type = NLA_U32 }, [IPSET_ATTR_BUCKETSIZE] = { .type = NLA_U8 }, [IPSET_ATTR_RESIZE] = { .type = NLA_U8 }, [IPSET_ATTR_TIMEOUT] = { .type = NLA_U32 },
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerRe: [PATCH 1/4] netfilter: ipset: Update byte and packet counters regardless of whether they match
In reply to Jozsef KadlecsikHi Jozsef,
Quoted 21 lines · Jozsef Kadlecsik
From: Stefano Brivio <[email protected]>
In
ip_set_match_extensions(), for sets with counters, we take care of updating counters themselves by callingip_set_update_counter(), and of checking if the given comparison and values match, by callingip_set_match_counter()if needed.However, if a given comparison on counters doesn't match the configured values, that doesn't mean the set entry itself isn't matching.
This fix restores the behaviour we had before commit
4750005a85f7("netfilter: ipset: Fix "don't update counters" mode when counters used at the matching"), without reintroducing the issue fixed there: back then,mtype_data_match()first updated counters in any case, and then took care of matching on counters.Now, if the
IPSET_FLAG_SKIP_COUNTER_UPDATEflag is set,ip_set_update_counter()will anyway skip counter updates if desired.The issue observed is illustrated by this reproducer:
Quoted 8 lines
ipset create c hash:ip counters ipset add c 192.0.2.1 iptables -I INPUT -m set --match-set c src --bytes-gt 800 -j DROPif we now send packets from 192.0.2.1, bytes and packets counters for the entry as shown by 'ipset list' are always zero, and, no matter how many bytes we send, the rule will never match, because counters themselves are not updated.
If possible, let me split this batch.
I'll apply this fix (1/4) to nf.git instead, so this shows up in 5.10 swiftly.
My understanding is that 2/4, 3/4 and 4/4 have no dependency on this one, so I'll apply these three remaining patches in the batch to nf-next.git
Let me know,
Thanks.
Re: [PATCH 1/4] netfilter: ipset: Update byte and packet counters regardless of whether they match
Hi Pablo,
Quoted 31 lines · Pablo Neira Ayuso
Quoted 21 lines · Jozsef Kadlecsik
From: Stefano Brivio <[email protected]>
In
ip_set_match_extensions(), for sets with counters, we take care of updating counters themselves by callingip_set_update_counter(), and of checking if the given comparison and values match, by callingip_set_match_counter()if needed.However, if a given comparison on counters doesn't match the configured values, that doesn't mean the set entry itself isn't matching.
This fix restores the behaviour we had before commit
4750005a85f7("netfilter: ipset: Fix "don't update counters" mode when counters used at the matching"), without reintroducing the issue fixed there: back then,mtype_data_match()first updated counters in any case, and then took care of matching on counters.Now, if the
IPSET_FLAG_SKIP_COUNTER_UPDATEflag is set,ip_set_update_counter()will anyway skip counter updates if desired.The issue observed is illustrated by this reproducer:
Quoted 8 lines
ipset create c hash:ip counters ipset add c 192.0.2.1 iptables -I INPUT -m set --match-set c src --bytes-gt 800 -j DROPif we now send packets from 192.0.2.1, bytes and packets counters for the entry as shown by 'ipset list' are always zero, and, no matter how many bytes we send, the rule will never match, because counters themselves are not updated.
Quoted 8 lines
If possible, let me split this batch.
I'll apply this fix (1/4) to nf.git instead, so this shows up in 5.10 swiftly.
My understanding is that 2/4, 3/4 and 4/4 have no dependency on this one, so I'll apply these three remaining patches in the batch to nf-next.git
Yes, it's better that way. Thanks!
Best regards,
Jozsef
-
E-mail : [email protected], [email protected] PGP key : https://wigner.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics
H-1525 Budapest 114, POB. 49, Hungary