Skip to contentSkip to conversation

Attributes for concatenated ranges

PATCH Superseded Stefano Brivio 2 participants 6 messages Jan 19, 2020 – Jan 28, 2020 netfilter

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover Attributes for concatenated ranges

This series adds support for NFTA_SET_DESC_CONCAT set attribute and the additional key passed as NFTA_SET_ELEM_KEY_END to denote the upper bound of a range in a generic way, as suggested by Pablo.

v3: Support for separate "end" key added as 2/2, reworked 1/2 to
use set description data for length of concatenation fields

Stefano Brivio (2):
set: Add support for NFTA_SET_DESC_CONCAT attributes
set_elem: Introduce support for NFTNL_SET_ELEM_KEY_END

 include/libnftnl/set.h |   2 +
 include/set.h          |   2 +
 include/set_elem.h     |   1 +
 src/set.c              | 111 ++++++++++++++++++++++++++++++++++-------
 src/set_elem.c         |  24 +++++++++
 5 files changed, 121 insertions(+), 19 deletions(-)
Signature · 1 line
2.24.1
#1 lore raw

PATCH v3 1/2 set: Add support for NFTA_SET_DESC_CONCAT attributes

If NFTNL_SET_DESC_CONCAT data is passed, pass that to the kernel as NFTA_SET_DESC_CONCAT attributes: it describes the length of single concatenated fields, in bytes.

Similarly, parse NFTA_SET_DESC_CONCAT attributes if received from the kernel.

This is the libnftnl counterpart for nftables patch:
src: Add support for NFTNL_SET_DESC_CONCAT

v3:
- use NFTNL_SET_DESC_CONCAT and NFTA_SET_DESC_CONCAT instead of a stand-alone NFTA_SET_SUBKEY attribute (Pablo Neira Ayuso)
- pass field length in bytes instead of bits, fields would get unnecessarily big otherwise
v2:
- fixed grammar in commit message
- removed copy of array bytes in nftnl_set_nlmsg_build_subkey_payload(), we're simply passing values to htonl() (Phil Sutter)

---
 include/libnftnl/set.h |   1 +
 include/set.h          |   2 +
 src/set.c              | 111 ++++++++++++++++++++++++++++++++++-------
 3 files changed, 95 insertions(+), 19 deletions(-)
include/libnftnl/set.h +1 -0
index db3fa686d60a..dcae354b76c4 100644
@@ -24,6 +24,7 @@ enum nftnl_set_attr {
 	NFTNL_SET_ID,
 	NFTNL_SET_POLICY,
 	NFTNL_SET_DESC_SIZE,
+	NFTNL_SET_DESC_CONCAT,
 	NFTNL_SET_TIMEOUT,
 	NFTNL_SET_GC_INTERVAL,
 	NFTNL_SET_USERDATA,
include/set.h +2 -0
index 446acd24ca7c..895ffdb48bdb 100644
@@ -25,6 +25,8 @@ struct nftnl_set {
 	enum nft_set_policies	policy;
 	struct {
 		uint32_t	size;
+		uint8_t		field_len[NFT_REG32_COUNT];
+		uint8_t		field_count;
 	} desc;
 	struct list_head	element_list;
 
src/set.c +92 -19

169 lines not on this page · raw message

Signature · 1 line
2.24.1
#5 lore raw

PATCH v3 2/2 set_elem: Introduce support for NFTNL_SET_ELEM_KEY_END

In reply to Stefano Brivio

The new set element attribute maps to the netlink attribute NFTA_SET_ELEM_KEY_END in the same way as NFTNL_SET_ELEM_KEY maps to NFTA_SET_ELEM_KEY, and represents the key data used to express the upper bound of a range, in concatenations.

v3: New patch

---
 include/libnftnl/set.h |  1 +
 include/set_elem.h     |  1 +
 src/set_elem.c         | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+)
include/libnftnl/set.h +1 -0
index dcae354b76c4..58d1e7c52f40 100644
@@ -105,6 +105,7 @@ enum {
 	NFTNL_SET_ELEM_USERDATA,
 	NFTNL_SET_ELEM_EXPR,
 	NFTNL_SET_ELEM_OBJREF,
+	NFTNL_SET_ELEM_KEY_END,
 	__NFTNL_SET_ELEM_MAX
 };
 #define NFTNL_SET_ELEM_MAX (__NFTNL_SET_ELEM_MAX - 1)
include/set_elem.h +1 -0
index cc4d52943272..52f185aa11be 100644
@@ -8,6 +8,7 @@ struct nftnl_set_elem {
 	uint32_t		set_elem_flags;
 	uint32_t		flags;
 	union nftnl_data_reg	key;
+	union nftnl_data_reg	key_end;
 	union nftnl_data_reg	data;
 	struct nftnl_expr	*expr;
 	uint64_t		timeout;
src/set_elem.c +24 -0
index d3ce807d838c..22031938ebbc 100644
@@ -75,6 +75,7 @@ void nftnl_set_elem_unset(struct nftnl_set_elem *s, uint16_t attr)
 		break;
 	case NFTNL_SET_ELEM_FLAGS:
 	case NFTNL_SET_ELEM_KEY:	/* NFTA_SET_ELEM_KEY */
+	case NFTNL_SET_ELEM_KEY_END:	/* NFTA_SET_ELEM_KEY_END */
 	case NFTNL_SET_ELEM_VERDICT:	/* NFTA_SET_ELEM_DATA */
 	case NFTNL_SET_ELEM_DATA:	/* NFTA_SET_ELEM_DATA */
 	case NFTNL_SET_ELEM_TIMEOUT:	/* NFTA_SET_ELEM_TIMEOUT */
@@ -118,6 +119,10 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr,
 		memcpy(&s->key.val, data, data_len);
 		s->key.len = data_len;
 		break;
+	case NFTNL_SET_ELEM_KEY_END:	/* NFTA_SET_ELEM_KEY_END */
+		memcpy(&s->key_end.val, data, data_len);
+		s->key_end.len = data_len;
+		break;
 	case NFTNL_SET_ELEM_VERDICT:	/* NFTA_SET_ELEM_DATA */
 		memcpy(&s->data.verdict, data, sizeof(s->data.verdict));
 		break;
@@ -193,6 +198,9 @@ const void *nftnl_set_elem_get(struct nftnl_set_elem *s, uint16_t attr, uint32_t
 	case NFTNL_SET_ELEM_KEY:	/* NFTA_SET_ELEM_KEY */
 		*data_len = s->key.len;
 		return &s->key.val;
+	case NFTNL_SET_ELEM_KEY_END:	/* NFTA_SET_ELEM_KEY_END */
+		*data_len = s->key_end.len;
+		return &s->key_end.val;
 	case NFTNL_SET_ELEM_VERDICT:	/* NFTA_SET_ELEM_DATA */
 		*data_len = sizeof(s->data.verdict);
 		return &s->data.verdict;
@@ -287,6 +295,14 @@ void nftnl_set_elem_nlmsg_build_payload(struct nlmsghdr *nlh,
 		mnl_attr_put(nlh, NFTA_DATA_VALUE, e->key.len, e->key.val);
 		mnl_attr_nest_end(nlh, nest1);
 	}
+	if (e->flags & (1 << NFTNL_SET_ELEM_KEY_END)) {
+		struct nlattr *nest1;
+
+		nest1 = mnl_attr_nest_start(nlh, NFTA_SET_ELEM_KEY_END);
+		mnl_attr_put(nlh, NFTA_DATA_VALUE, e->key_end.len,
+			     e->key_end.val);
+		mnl_attr_nest_end(nlh, nest1);
+	}
 	if (e->flags & (1 << NFTNL_SET_ELEM_VERDICT)) {
 		struct nlattr *nest1, *nest2;
 
@@ -373,6 +389,7 @@ static int nftnl_set_elem_parse_attr_cb(const struct nlattr *attr, void *data)
 			abi_breakage();
 		break;
 	case NFTA_SET_ELEM_KEY:
+	case NFTA_SET_ELEM_KEY_END:
 	case NFTA_SET_ELEM_DATA:
 	case NFTA_SET_ELEM_EXPR:
 		if (mnl_attr_validate(attr, MNL_TYPE_NESTED) < 0)
@@ -421,6 +438,13 @@ static int nftnl_set_elems_parse2(struct nftnl_set *s, const struct nlattr *nest
 			goto out_set_elem;
 		e->flags |= (1 << NFTNL_SET_ELEM_KEY);
         }
+	if (tb[NFTA_SET_ELEM_KEY_END]) {
+		ret = nftnl_parse_data(&e->key_end, tb[NFTA_SET_ELEM_KEY_END],
+				       &type);
+		if (ret < 0)
+			goto out_set_elem;
+		e->flags |= (1 << NFTNL_SET_ELEM_KEY_END);
+	}
         if (tb[NFTA_SET_ELEM_DATA]) {
 		ret = nftnl_parse_data(&e->data, tb[NFTA_SET_ELEM_DATA], &type);
 		if (ret < 0)
Signature · 1 line
2.24.1
#2 lore raw

Re: [PATCH libnftnl v3 1/2] set: Add support for NFTA_SET_DESC_CONCAT attributes

In reply to Stefano Brivio
Quoted 32 lines · Stefano Brivio

If NFTNL_SET_DESC_CONCAT data is passed, pass that to the kernel as NFTA_SET_DESC_CONCAT attributes: it describes the length of single concatenated fields, in bytes.

Similarly, parse NFTA_SET_DESC_CONCAT attributes if received from the kernel.

This is the libnftnl counterpart for nftables patch:
src: Add support for NFTNL_SET_DESC_CONCAT

v3:
- use NFTNL_SET_DESC_CONCAT and NFTA_SET_DESC_CONCAT instead of a stand-alone NFTA_SET_SUBKEY attribute (Pablo Neira Ayuso)
- pass field length in bytes instead of bits, fields would get unnecessarily big otherwise
v2:
- fixed grammar in commit message
- removed copy of array bytes in nftnl_set_nlmsg_build_subkey_payload(), we're simply passing values to htonl() (Phil Sutter)

---
 include/libnftnl/set.h |   1 +
 include/set.h          |   2 +
 src/set.c              | 111 ++++++++++++++++++++++++++++++++++-------
 3 files changed, 95 insertions(+), 19 deletions(-)
include/libnftnl/set.h +0 -0
index db3fa686d60a..dcae354b76c4 100644

include/libnftnl/set.h enum nftnl_set_attr { · line 27

Quoted 4 lines
include/libnftnl/set.h +1 -0
@@ -24,6 +24,7 @@ enum nftnl_set_attr {
 	NFTNL_SET_ID,
 	NFTNL_SET_POLICY,
 	NFTNL_SET_DESC_SIZE,
+	NFTNL_SET_DESC_CONCAT,

This one needs to be defined at the end to not break binary interface.

Compilation breaks for some reason:

In file included from ../include/internal.h:10,

                 from gen.c:9:
../include/set.h:28:22: error: ‘NFT_REG32_COUNT’ undeclared here (not
in a function); did you mean ‘NFT_REG32_15’?
   28 |   uint8_t  field_len[NFT_REG32_COUNT];
      |                      ^~~~~~~~~~~~~~~
      |                      NFT_REG32_15

Thanks.

#3 lore raw

Re: [PATCH libnftnl v3 1/2] set: Add support for NFTA_SET_DESC_CONCAT attributes

Quoted 28 lines · On Tue, 28 Jan 2020 20:30:16 +0100 Pablo Neira Ayuso <[email protected]>…
Quoted 27 lines · Stefano Brivio

If NFTNL_SET_DESC_CONCAT data is passed, pass that to the kernel as NFTA_SET_DESC_CONCAT attributes: it describes the length of single concatenated fields, in bytes.

Similarly, parse NFTA_SET_DESC_CONCAT attributes if received from the kernel.

This is the libnftnl counterpart for nftables patch:
src: Add support for NFTNL_SET_DESC_CONCAT

v3:
- use NFTNL_SET_DESC_CONCAT and NFTA_SET_DESC_CONCAT instead of a stand-alone NFTA_SET_SUBKEY attribute (Pablo Neira Ayuso)
- pass field length in bytes instead of bits, fields would get unnecessarily big otherwise
v2:
- fixed grammar in commit message
- removed copy of array bytes in nftnl_set_nlmsg_build_subkey_payload(), we're simply passing values to htonl() (Phil Sutter)

---
 include/libnftnl/set.h |   1 +
 include/set.h          |   2 +
 src/set.c              | 111 ++++++++++++++++++++++++++++++++++-------
 3 files changed, 95 insertions(+), 19 deletions(-)
Quoted 11 lines

include/libnftnl/set.h enum nftnl_set_attr { · line 27

Quoted 9 lines
include/libnftnl/set.h +1 -0
index db3fa686d60a..dcae354b76c4 100644
@@ -24,6 +24,7 @@ enum nftnl_set_attr {
 	NFTNL_SET_ID,
 	NFTNL_SET_POLICY,
 	NFTNL_SET_DESC_SIZE,
+	NFTNL_SET_DESC_CONCAT,  

This one needs to be defined at the end to not break binary interface.

Hah, right, I just focused on not breaking kernel UAPI and didn't check this. I'll move it.

Quoted 9 lines

Compilation breaks for some reason:

In file included from ../include/internal.h:10,

                 from gen.c:9:
../include/set.h:28:22: error: ‘NFT_REG32_COUNT’ undeclared here (not
in a function); did you mean ‘NFT_REG32_15’?
   28 |   uint8_t  field_len[NFT_REG32_COUNT];
      |                      ^~~~~~~~~~~~~~~
      |                      NFT_REG32_15

That's something that comes from kernel headers changes, now commit f3a2181e16f1 ("netfilter: nf_tables: Support for sets with multiple ranged fields"), this hunk:

include/uapi/linux/netfilter/nf_tables.h +1 -0
index c13106496bd2..065218a20bb7 100644
@@ -48,6 +48,7 @@ enum nft_registers {
 
 #define NFT_REG_SIZE   16
 #define NFT_REG32_SIZE 4
+#define NFT_REG32_COUNT        (NFT_REG32_15 - NFT_REG32_00 + 1)
 
 /**
  * enum nft_verdicts - nf_tables internal verdicts

I didn't include those in userspace patches, following e.g. current iproute2 practice. Let me know if I should actually submit that as separate change -- I thought it would be more practical for you to sync headers as needed.

Signature · 1 line
Stefano
#4 lore raw

Re: [PATCH libnftnl v3 1/2] set: Add support for NFTA_SET_DESC_CONCAT attributes

Quoted 43 lines · Stefano Brivio
Quoted 28 lines · On Tue, 28 Jan 2020 20:30:16 +0100 Pablo Neira Ayuso <[email protected]>…
Quoted 27 lines · Stefano Brivio

If NFTNL_SET_DESC_CONCAT data is passed, pass that to the kernel as NFTA_SET_DESC_CONCAT attributes: it describes the length of single concatenated fields, in bytes.

Similarly, parse NFTA_SET_DESC_CONCAT attributes if received from the kernel.

This is the libnftnl counterpart for nftables patch:
src: Add support for NFTNL_SET_DESC_CONCAT

v3:
- use NFTNL_SET_DESC_CONCAT and NFTA_SET_DESC_CONCAT instead of a stand-alone NFTA_SET_SUBKEY attribute (Pablo Neira Ayuso)
- pass field length in bytes instead of bits, fields would get unnecessarily big otherwise
v2:
- fixed grammar in commit message
- removed copy of array bytes in nftnl_set_nlmsg_build_subkey_payload(), we're simply passing values to htonl() (Phil Sutter)

---
 include/libnftnl/set.h |   1 +
 include/set.h          |   2 +
 src/set.c              | 111 ++++++++++++++++++++++++++++++++++-------
 3 files changed, 95 insertions(+), 19 deletions(-)
Quoted 11 lines

include/libnftnl/set.h enum nftnl_set_attr { · line 27

Quoted 9 lines
include/libnftnl/set.h +1 -0
index db3fa686d60a..dcae354b76c4 100644
@@ -24,6 +24,7 @@ enum nftnl_set_attr {
 	NFTNL_SET_ID,
 	NFTNL_SET_POLICY,
 	NFTNL_SET_DESC_SIZE,
+	NFTNL_SET_DESC_CONCAT,  

This one needs to be defined at the end to not break binary interface.

Quoted 2 lines

Hah, right, I just focused on not breaking kernel UAPI and didn't check this. I'll move it.

Good, thanks.

Quoted 27 lines
Quoted 9 lines

Compilation breaks for some reason:

In file included from ../include/internal.h:10,

                 from gen.c:9:
../include/set.h:28:22: error: ‘NFT_REG32_COUNT’ undeclared here (not
in a function); did you mean ‘NFT_REG32_15’?
   28 |   uint8_t  field_len[NFT_REG32_COUNT];
      |                      ^~~~~~~~~~~~~~~
      |                      NFT_REG32_15

That's something that comes from kernel headers changes, now commit f3a2181e16f1 ("netfilter: nf_tables: Support for sets with multiple ranged fields"), this hunk:

include/uapi/linux/netfilter/nf_tables.h +1 -0
index c13106496bd2..065218a20bb7 100644
@@ -48,6 +48,7 @@ enum nft_registers {
 
 #define NFT_REG_SIZE   16
 #define NFT_REG32_SIZE 4
+#define NFT_REG32_COUNT        (NFT_REG32_15 - NFT_REG32_00 + 1)
 
 /**
  * enum nft_verdicts - nf_tables internal verdicts
Quoted 4 lines

I didn't include those in userspace patches, following e.g. current iproute2 practice. Let me know if I should actually submit that as separate change -- I thought it would be more practical for you to sync headers as needed.

I'd suggest you send a separated patch to get the nf_tables.h cached copy under libnftnl/include/linux/

I occasionally make patches like this one:

commit 239fabea9a436aaa7b787f389d80dfb57f7b893c

Author: Pablo Neira Ayuso <[email protected]>
Date:   Tue Aug 13 21:41:45 2019 +0200

include: resync nf_tables.h cache copy

Get this header in sync with 5.3-rc1.

You bring all pending updates, so you help keep it sync :-)

Thanks.