|
 |
87db66 |
From 87a2128fcfd4c5b0847a8c611652ade8c54d8185 Mon Sep 17 00:00:00 2001
|
|
|
87db66 |
From: Phil Sutter <phil@nwl.cc>
|
|
|
87db66 |
Date: Fri, 2 Oct 2020 09:44:38 +0200
|
|
|
87db66 |
Subject: [PATCH] nft: Optimize class-based IP prefix matches
|
|
|
87db66 |
|
|
|
87db66 |
Payload expression works on byte-boundaries, leverage this with suitable
|
|
|
87db66 |
prefix lengths.
|
|
|
87db66 |
|
|
|
87db66 |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
87db66 |
(cherry picked from commit 323259001d617ae359430a03ee3d3e7f107684e0)
|
|
|
87db66 |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
87db66 |
---
|
|
|
87db66 |
iptables/nft-arp.c | 11 ++++++++---
|
|
|
87db66 |
iptables/nft-ipv4.c | 6 ++++--
|
|
|
87db66 |
iptables/nft-ipv6.c | 6 ++++--
|
|
|
87db66 |
iptables/nft-shared.c | 14 ++++++++++----
|
|
|
87db66 |
iptables/nft-shared.h | 4 ++++
|
|
|
87db66 |
5 files changed, 30 insertions(+), 11 deletions(-)
|
|
|
87db66 |
|
|
|
87db66 |
diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c
|
|
|
87db66 |
index d4a86610ec217..ac400e484a4fa 100644
|
|
|
87db66 |
--- a/iptables/nft-arp.c
|
|
|
87db66 |
+++ b/iptables/nft-arp.c
|
|
|
87db66 |
@@ -303,7 +303,8 @@ static bool nft_arp_parse_devaddr(struct nft_xt_ctx *ctx,
|
|
|
87db66 |
memcpy(info->mask, ctx->bitwise.mask, ETH_ALEN);
|
|
|
87db66 |
ctx->flags &= ~NFT_XT_CTX_BITWISE;
|
|
|
87db66 |
} else {
|
|
|
87db66 |
- memset(info->mask, 0xff, ETH_ALEN);
|
|
|
87db66 |
+ memset(info->mask, 0xff,
|
|
|
87db66 |
+ min(ctx->payload.len, ETH_ALEN));
|
|
|
87db66 |
}
|
|
|
87db66 |
|
|
|
87db66 |
return inv;
|
|
|
87db66 |
@@ -360,7 +361,9 @@ static void nft_arp_parse_payload(struct nft_xt_ctx *ctx,
|
|
|
87db66 |
parse_mask_ipv4(ctx, &fw->arp.smsk);
|
|
|
87db66 |
ctx->flags &= ~NFT_XT_CTX_BITWISE;
|
|
|
87db66 |
} else {
|
|
|
87db66 |
- fw->arp.smsk.s_addr = 0xffffffff;
|
|
|
87db66 |
+ memset(&fw->arp.smsk, 0xff,
|
|
|
87db66 |
+ min(ctx->payload.len,
|
|
|
87db66 |
+ sizeof(struct in_addr)));
|
|
|
87db66 |
}
|
|
|
87db66 |
|
|
|
87db66 |
if (inv)
|
|
|
87db66 |
@@ -380,7 +383,9 @@ static void nft_arp_parse_payload(struct nft_xt_ctx *ctx,
|
|
|
87db66 |
parse_mask_ipv4(ctx, &fw->arp.tmsk);
|
|
|
87db66 |
ctx->flags &= ~NFT_XT_CTX_BITWISE;
|
|
|
87db66 |
} else {
|
|
|
87db66 |
- fw->arp.tmsk.s_addr = 0xffffffff;
|
|
|
87db66 |
+ memset(&fw->arp.tmsk, 0xff,
|
|
|
87db66 |
+ min(ctx->payload.len,
|
|
|
87db66 |
+ sizeof(struct in_addr)));
|
|
|
87db66 |
}
|
|
|
87db66 |
|
|
|
87db66 |
if (inv)
|
|
|
87db66 |
diff --git a/iptables/nft-ipv4.c b/iptables/nft-ipv4.c
|
|
|
87db66 |
index 70634f8fad84d..c84af2df90da7 100644
|
|
|
87db66 |
--- a/iptables/nft-ipv4.c
|
|
|
87db66 |
+++ b/iptables/nft-ipv4.c
|
|
|
87db66 |
@@ -199,7 +199,8 @@ static void nft_ipv4_parse_payload(struct nft_xt_ctx *ctx,
|
|
|
87db66 |
parse_mask_ipv4(ctx, &cs->fw.ip.smsk);
|
|
|
87db66 |
ctx->flags &= ~NFT_XT_CTX_BITWISE;
|
|
|
87db66 |
} else {
|
|
|
87db66 |
- cs->fw.ip.smsk.s_addr = 0xffffffff;
|
|
|
87db66 |
+ memset(&cs->fw.ip.smsk, 0xff,
|
|
|
87db66 |
+ min(ctx->payload.len, sizeof(struct in_addr)));
|
|
|
87db66 |
}
|
|
|
87db66 |
|
|
|
87db66 |
if (inv)
|
|
|
87db66 |
@@ -212,7 +213,8 @@ static void nft_ipv4_parse_payload(struct nft_xt_ctx *ctx,
|
|
|
87db66 |
parse_mask_ipv4(ctx, &cs->fw.ip.dmsk);
|
|
|
87db66 |
ctx->flags &= ~NFT_XT_CTX_BITWISE;
|
|
|
87db66 |
} else {
|
|
|
87db66 |
- cs->fw.ip.dmsk.s_addr = 0xffffffff;
|
|
|
87db66 |
+ memset(&cs->fw.ip.dmsk, 0xff,
|
|
|
87db66 |
+ min(ctx->payload.len, sizeof(struct in_addr)));
|
|
|
87db66 |
}
|
|
|
87db66 |
|
|
|
87db66 |
if (inv)
|
|
|
87db66 |
diff --git a/iptables/nft-ipv6.c b/iptables/nft-ipv6.c
|
|
|
87db66 |
index d01491bfdb689..cfced245a781c 100644
|
|
|
87db66 |
--- a/iptables/nft-ipv6.c
|
|
|
87db66 |
+++ b/iptables/nft-ipv6.c
|
|
|
87db66 |
@@ -146,7 +146,8 @@ static void nft_ipv6_parse_payload(struct nft_xt_ctx *ctx,
|
|
|
87db66 |
parse_mask_ipv6(ctx, &cs->fw6.ipv6.smsk);
|
|
|
87db66 |
ctx->flags &= ~NFT_XT_CTX_BITWISE;
|
|
|
87db66 |
} else {
|
|
|
87db66 |
- memset(&cs->fw6.ipv6.smsk, 0xff, sizeof(struct in6_addr));
|
|
|
87db66 |
+ memset(&cs->fw6.ipv6.smsk, 0xff,
|
|
|
87db66 |
+ min(ctx->payload.len, sizeof(struct in6_addr)));
|
|
|
87db66 |
}
|
|
|
87db66 |
|
|
|
87db66 |
if (inv)
|
|
|
87db66 |
@@ -159,7 +160,8 @@ static void nft_ipv6_parse_payload(struct nft_xt_ctx *ctx,
|
|
|
87db66 |
parse_mask_ipv6(ctx, &cs->fw6.ipv6.dmsk);
|
|
|
87db66 |
ctx->flags &= ~NFT_XT_CTX_BITWISE;
|
|
|
87db66 |
} else {
|
|
|
87db66 |
- memset(&cs->fw6.ipv6.dmsk, 0xff, sizeof(struct in6_addr));
|
|
|
87db66 |
+ memset(&cs->fw6.ipv6.dmsk, 0xff,
|
|
|
87db66 |
+ min(ctx->payload.len, sizeof(struct in6_addr)));
|
|
|
87db66 |
}
|
|
|
87db66 |
|
|
|
87db66 |
if (inv)
|
|
|
87db66 |
diff --git a/iptables/nft-shared.c b/iptables/nft-shared.c
|
|
|
87db66 |
index f60f5df97fb86..b1237049d0a34 100644
|
|
|
87db66 |
--- a/iptables/nft-shared.c
|
|
|
87db66 |
+++ b/iptables/nft-shared.c
|
|
|
87db66 |
@@ -166,16 +166,22 @@ void add_addr(struct nftnl_rule *r, int offset,
|
|
|
87db66 |
void *data, void *mask, size_t len, uint32_t op)
|
|
|
87db66 |
{
|
|
|
87db66 |
const unsigned char *m = mask;
|
|
|
87db66 |
+ bool bitwise = false;
|
|
|
87db66 |
int i;
|
|
|
87db66 |
|
|
|
87db66 |
- add_payload(r, offset, len, NFT_PAYLOAD_NETWORK_HEADER);
|
|
|
87db66 |
-
|
|
|
87db66 |
for (i = 0; i < len; i++) {
|
|
|
87db66 |
- if (m[i] != 0xff)
|
|
|
87db66 |
+ if (m[i] != 0xff) {
|
|
|
87db66 |
+ bitwise = m[i] != 0;
|
|
|
87db66 |
break;
|
|
|
87db66 |
+ }
|
|
|
87db66 |
}
|
|
|
87db66 |
|
|
|
87db66 |
- if (i != len)
|
|
|
87db66 |
+ if (!bitwise)
|
|
|
87db66 |
+ len = i;
|
|
|
87db66 |
+
|
|
|
87db66 |
+ add_payload(r, offset, len, NFT_PAYLOAD_NETWORK_HEADER);
|
|
|
87db66 |
+
|
|
|
87db66 |
+ if (bitwise)
|
|
|
87db66 |
add_bitwise(r, mask, len);
|
|
|
87db66 |
|
|
|
87db66 |
add_cmp_ptr(r, op, data, len);
|
|
|
87db66 |
diff --git a/iptables/nft-shared.h b/iptables/nft-shared.h
|
|
|
87db66 |
index bee99a7dd0c93..c7f1e366b75ee 100644
|
|
|
87db66 |
--- a/iptables/nft-shared.h
|
|
|
87db66 |
+++ b/iptables/nft-shared.h
|
|
|
87db66 |
@@ -252,4 +252,8 @@ void xtables_restore_parse(struct nft_handle *h,
|
|
|
87db66 |
const struct nft_xt_restore_parse *p);
|
|
|
87db66 |
|
|
|
87db66 |
void nft_check_xt_legacy(int family, bool is_ipt_save);
|
|
|
87db66 |
+
|
|
|
87db66 |
+#define min(x, y) ((x) < (y) ? (x) : (y))
|
|
|
87db66 |
+#define max(x, y) ((x) > (y) ? (x) : (y))
|
|
|
87db66 |
+
|
|
|
87db66 |
#endif
|
|
|
87db66 |
--
|
|
|
87db66 |
2.28.0
|
|
|
87db66 |
|