From: Boris Sukholitko <boris.sukholitko@broadcom.com>
To: netfilter-devel@vger.kernel.org
Cc: Ilya Lifshits <ilya.lifshits@broadcom.com>,
Boris Sukholitko <boris.sukholitko@broadcom.com>
Subject: [PATCH nf-next 17/19] netfilter: nftables: payload save mechanism
Date: Wed, 3 May 2023 15:55:50 +0300 [thread overview]
Message-ID: <20230503125552.41113-18-boris.sukholitko@broadcom.com> (raw)
In-Reply-To: <20230503125552.41113-1-boris.sukholitko@broadcom.com>
[-- Attachment #1: Type: text/plain, Size: 2358 bytes --]
nf_flow_offload_save_payload saves the payload in the nftables
conntrack extension so that nf_flow_offload_apply_payload can apply it
later.
Signed-off-by: Boris Sukholitko <boris.sukholitko@broadcom.com>
---
include/net/netfilter/nf_tables.h | 11 +++++++++++
net/netfilter/nft_conntrack_ext.c | 30 ++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+)
diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 48357db14602..6bfb38738838 100644
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -1762,6 +1762,10 @@ int nf_flow_offload_apply_payload(struct sk_buff *skb,
struct nf_conn *ct,
enum ip_conntrack_dir dir,
unsigned int thoff);
+
+int nf_flow_offload_save_payload(struct sk_buff *skb,
+ const struct nft_payload_set *priv,
+ const u32 *src);
#else
static inline void nfct_nft_ext_add(struct nf_conn *ct)
{
@@ -1774,6 +1778,13 @@ static inline int nf_flow_offload_apply_payload(struct sk_buff *skb,
{
return 0;
}
+
+static inline int nf_flow_offload_save_payload(struct sk_buff *skb,
+ const struct nft_payload_set *priv,
+ const u32 *src)
+{
+ return -1;
+}
#endif
#endif /* _NET_NF_TABLES_H */
diff --git a/net/netfilter/nft_conntrack_ext.c b/net/netfilter/nft_conntrack_ext.c
index 0dabd2a84422..750aeaaf2928 100644
--- a/net/netfilter/nft_conntrack_ext.c
+++ b/net/netfilter/nft_conntrack_ext.c
@@ -1,6 +1,36 @@
// SPDX-License-Identifier: GPL-2.0
#include <net/netfilter/nf_tables.h>
+int nf_flow_offload_save_payload(struct sk_buff *skb,
+ const struct nft_payload_set *priv,
+ const u32 *src)
+{
+ struct nf_conn_nft_ext_entry *en;
+ enum ip_conntrack_info ctinfo;
+ struct nf_conn_nft_ext *ncft;
+ struct nf_conn *ct;
+
+ ct = nf_ct_get(skb, &ctinfo);
+ if (!ct)
+ goto err;
+
+ ncft = nf_ct_ext_find(ct, NF_CT_EXT_NFT_EXT);
+ if (!ncft)
+ goto err;
+
+ en = &ncft->nfte_entries[CTINFO2DIR(ctinfo)];
+ if (en->nfte_type != NFT_EXT_UNDEFINED)
+ goto err;
+
+ en->nfte_type = NFT_EXT_PAYLOAD_SET;
+ en->nfte_data = *src;
+ memcpy(&en->nfte_payload, priv, sizeof(*priv));
+ return 0;
+err:
+ return -1;
+}
+EXPORT_SYMBOL_GPL(nf_flow_offload_save_payload);
+
int nf_flow_offload_apply_payload(struct sk_buff *skb,
struct nf_conn *ct,
enum ip_conntrack_dir dir,
--
2.32.0
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4221 bytes --]
next prev parent reply other threads:[~2023-05-03 12:56 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-03 12:55 [PATCH nf-next 00/19] netfilter: nftables: dscp modification offload Boris Sukholitko
2023-05-03 12:55 ` [PATCH nf-next 01/19] selftest: netfilter: use /proc for pid checking Boris Sukholitko
2023-05-03 18:47 ` Florian Westphal
2023-05-04 8:53 ` Boris Sukholitko
2023-05-03 12:55 ` [PATCH nf-next 02/19] selftest: netfilter: no need for ps -x option Boris Sukholitko
2023-05-03 18:53 ` Florian Westphal
2023-05-03 12:55 ` [PATCH nf-next 03/19] selftest: netfilter: wait for specific nc pids Boris Sukholitko
2023-05-03 12:55 ` [PATCH nf-next 04/19] selftest: netfilter: monitor result file sizes Boris Sukholitko
2023-05-03 18:54 ` Florian Westphal
2023-05-03 12:55 ` [PATCH nf-next 05/19] netfilter: nft_payload: refactor mangle operation Boris Sukholitko
2023-05-03 12:55 ` [PATCH nf-next 06/19] netfilter: nft_payload: publish nft_payload_set Boris Sukholitko
2023-05-03 12:55 ` [PATCH nf-next 07/19] netfilter: nft_payload: export mangle Boris Sukholitko
2023-05-03 12:55 ` [PATCH nf-next 08/19] netfilter: nft_payload: use flag for checksum need Boris Sukholitko
2023-05-03 12:55 ` [PATCH nf-next 09/19] netfilter: nft_payload: add offload flag define Boris Sukholitko
2023-05-03 12:55 ` [PATCH nf-next 10/19] netfilter: nft_payload: allow offload in the netlink Boris Sukholitko
2023-05-03 12:55 ` [PATCH nf-next 11/19] netfilter: conntrack: nft extension Kconfig Boris Sukholitko
2023-05-03 12:55 ` [PATCH nf-next 12/19] netfilter: nft: empty nft conntrack extension Boris Sukholitko
2023-05-03 12:55 ` [PATCH nf-next 13/19] netfilter: conntrack: register nft extension Boris Sukholitko
2023-05-03 12:55 ` [PATCH nf-next 14/19] netfilter: nft: add payload context into extension Boris Sukholitko
2023-05-03 12:55 ` [PATCH nf-next 15/19] netfilter: nft: add payload application Boris Sukholitko
2023-05-03 23:32 ` kernel test robot
2023-05-04 0:44 ` kernel test robot
2023-05-03 12:55 ` [PATCH nf-next 16/19] netfilter: nftables: fast path payload mangle Boris Sukholitko
2023-05-03 15:41 ` kernel test robot
2023-05-03 12:55 ` Boris Sukholitko [this message]
2023-05-03 12:55 ` [PATCH nf-next 18/19] netfilter: nft_payload: save payload if needed Boris Sukholitko
2023-05-03 12:55 ` [PATCH nf-next 19/19] selftests: netfilter: dscp offload test Boris Sukholitko
2023-05-03 18:46 ` [PATCH nf-next 00/19] netfilter: nftables: dscp modification offload Florian Westphal
2023-05-07 15:22 ` Boris Sukholitko
2023-05-07 17:37 ` Florian Westphal
2023-05-08 13:38 ` Boris Sukholitko
2023-05-08 20:07 ` Pablo Neira Ayuso
2023-05-09 14:56 ` Boris Sukholitko
2023-05-09 9:48 ` Florian Westphal
2023-05-10 7:49 ` Boris Sukholitko
2023-05-10 12:55 ` Florian Westphal
2023-05-11 15:59 ` Boris Sukholitko
2023-05-11 16:36 ` Florian Westphal
2023-05-03 20:30 ` Pablo Neira Ayuso
2023-05-03 20:41 ` Pablo Neira Ayuso
2023-05-04 8:50 ` Boris Sukholitko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230503125552.41113-18-boris.sukholitko@broadcom.com \
--to=boris.sukholitko@broadcom.com \
--cc=ilya.lifshits@broadcom.com \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox