Skip to content

update new os patch for new kernel adapt #1251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+153 −688
Open

update new os patch for new kernel adapt #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 130 additions & 0 deletions kernel/patches/5.10.0/0001-add-helper-strnstr-strncmp-parse_header_msg.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
From 03cea45be513a52a0c57c022594d6a5e98450642 Mon Sep 17 00:00:00 2001
From: zhangmingyi <[email protected]>
Date: Thu, 9 Jan 2025 07:27:31 +0000
Subject: [PATCH 1/2] add helper strnstr strncmp parse_header_msg

User messages need to be parsed when the bpf link establishment
is delayed. add three helper func to parse and operate str.

Signed-off-by: zhangmingyi <[email protected]>
---
include/uapi/linux/bpf.h | 3 ++
net/core/filter.c | 67 ++++++++++++++++++++++++++++++++++
tools/include/uapi/linux/bpf.h | 3 ++
3 files changed, 73 insertions(+)

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index fcda8b986..bd2235fc4 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -4051,6 +4051,9 @@ union bpf_attr {
FN(cpumask_op), \
FN(cpus_share_cache), \
FN(is_local_ipaddr), \
+ FN(km_header_strnstr), \
+ FN(km_header_strncmp), \
+ FN(parse_header_msg), \
/* */

/* integer value in 'imm' field of BPF_CALL instruction selects which helper
diff --git a/net/core/filter.c b/net/core/filter.c
index 431e778bb..4a5d944c9 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -6986,6 +6986,67 @@ const struct bpf_func_proto bpf_sock_ops_get_sk_rx_dst_proto = {
};

#endif /* CONFIG_INET */
+typedef int (*bpf_parse_protocol_func)(struct bpf_sock_addr_kern* ctx);
+bpf_parse_protocol_func parse_protocol_func = NULL;
+EXPORT_SYMBOL(parse_protocol_func);
+
+typedef int (*bpf_km_header_strnstr_func)(struct bpf_sock_addr_kern *ctx, const char *key, int key_sz, const char *subptr, int subptr_sz);
+bpf_km_header_strnstr_func km_header_strnstr_func = NULL;
+EXPORT_SYMBOL(km_header_strnstr_func);
+
+typedef int (*bpf_km_header_strncmp_func)(const char *key, int key_sz, const char *target, int target_sz, int opt);
+bpf_km_header_strncmp_func km_header_strncmp_func = NULL;
+EXPORT_SYMBOL(km_header_strncmp_func);
+
+BPF_CALL_1(bpf_parse_header_msg, struct bpf_sock_addr_kern *, ctx)
+{
+ if (!parse_protocol_func)
+ return -ENOTSUPP;
+ return parse_protocol_func(ctx);
+}
+
+static const struct bpf_func_proto bpf_parse_header_msg_proto = {
+ .func = bpf_parse_header_msg,
+ .gpl_only = false,
+ .ret_type = RET_INTEGER,
+ .arg1_type = ARG_PTR_TO_CTX,
+};
+
+BPF_CALL_5(bpf_km_header_strnstr, struct bpf_sock_addr_kern *, ctx, const char *, key, int , key_sz, const char *, subptr, int, subptr_sz)
+{
+ if (!km_header_strnstr_func)
+ return -ENOTSUPP;
+ return km_header_strnstr_func(ctx, key, key_sz, subptr, subptr_sz);
+}
+
+static const struct bpf_func_proto bpf_km_header_strnstr_proto = {
+ .func = bpf_km_header_strnstr,
+ .gpl_only = false,
+ .ret_type = RET_INTEGER,
+ .arg1_type = ARG_PTR_TO_CTX,
+ .arg2_type = ARG_PTR_TO_MEM | MEM_RDONLY,
+ .arg3_type = ARG_CONST_SIZE,
+ .arg4_type = ARG_PTR_TO_MEM | MEM_RDONLY,
+ .arg5_type = ARG_CONST_SIZE,
+};
+
+BPF_CALL_5(bpf_km_header_strncmp, const char *, key, int , key_sz, const char *, target, int, target_sz, int, opt)
+{
+ if (!km_header_strncmp_func)
+ return -ENOTSUPP;
+ return km_header_strncmp_func(key, key_sz, target, target_sz, opt);
+}
+
+static const struct bpf_func_proto bpf_km_header_strncmp_proto = {
+ .func = bpf_km_header_strncmp,
+ .gpl_only = false,
+ .ret_type = RET_INTEGER,
+ .arg1_type = ARG_PTR_TO_MEM | MEM_RDONLY,
+ .arg2_type = ARG_CONST_SIZE,
+ .arg3_type = ARG_PTR_TO_MEM | MEM_RDONLY,
+ .arg4_type = ARG_CONST_SIZE,
+ .arg5_type = ARG_ANYTHING,
Copy link
Contributor

@nlgwcy nlgwcy Feb 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why ARG_ANYTHING

Copy link
Contributor Author

@lec-bit lec-bit Mar 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

opt and flags are generally used to use ARG_ANYTHING.
For example,

BPF_CALL_4(bpf_map_update_elem, struct bpf_map *, map, void *, key,
	   void *, value, u64, flags)
{
	WARN_ON_ONCE(!rcu_read_lock_held() && !rcu_read_lock_trace_held() &&
		     !rcu_read_lock_bh_held());
	return map->ops->map_update_elem(map, key, value, flags);
}

const struct bpf_func_proto bpf_map_update_elem_proto = {
	.func		= bpf_map_update_elem,
	.gpl_only	= false,
	.pkt_access	= true,
	.ret_type	= RET_INTEGER,
	.arg1_type	= ARG_CONST_MAP_PTR,
	.arg2_type	= ARG_PTR_TO_MAP_KEY,
	.arg3_type	= ARG_PTR_TO_MAP_VALUE,
	.arg4_type	= ARG_ANYTHING,
};

+};

bool bpf_helper_changes_pkt_data(void *func)
{
@@ -7139,6 +7200,12 @@ sock_addr_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
default:
return NULL;
}
+ case BPF_FUNC_parse_header_msg:
+ return &bpf_parse_header_msg_proto;
+ case BPF_FUNC_km_header_strnstr:
+ return &bpf_km_header_strnstr_proto;
+ case BPF_FUNC_km_header_strncmp:
+ return &bpf_km_header_strncmp_proto;
default:
return bpf_sk_base_func_proto(func_id);
}
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index 588750c46..63069c2a8 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -4051,6 +4051,9 @@ union bpf_attr {
FN(cpumask_op), \
FN(cpus_share_cache), \
FN(is_local_ipaddr), \
+ FN(km_header_strnstr), \
+ FN(km_header_strncmp), \
+ FN(parse_header_msg), \
/* */

/* integer value in 'imm' field of BPF_CALL instruction selects which helper
--
2.33.0
29 changes: 0 additions & 29 deletions kernel/patches/5.10.0/0001-bpf-sockmap-add-extra-return-value-for-sockops.patch
View file
Open in desktop

This file was deleted.

32 changes: 23 additions & 9 deletions ...oduced-to-support-the-ULP-to-modify.patch → ...P_ULP-support-in-bpf_getset_sockopt.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
From 2b40ef8d75316e6fb005ac8c3844b3b096850b07 Mon Sep 17 00:00:00 2001
From: kongweibin <kongweibin2@huawei.com>
Date: Fri, 13 Oct 2023 18:06:31 +0800
Subject: [PATCH 3/8] ipv4, bpf: Introduced to support the ULP to modify
From 0436456007494da206743fcbcee0a9e23188af32 Mon Sep 17 00:00:00 2001
From: zhangmingyi <zhangmingyi@huawei.com>
Date: Thu, 9 Jan 2025 07:29:35 +0000
Subject: [PATCH 2/2] add TCP_ULP support in bpf_get/set_sockopt

Currently, the ebpf program can distinguish sockets according to
the address accessed by the client, and use the ULP framework to
modify the matched sockets to delay link establishment.

Signed-off-by: kongweibin <kongweibin2@huawei.com>
Signed-off-by: zhangmingyi <zhangmingyi@huawei.com>
---
net/core/filter.c | 6 +++++++
1 file changed, 6 insertions(+)
net/core/filter.c | 14 ++++++++++++++++++++
1 file changed, 14 insertions(+)

diff --git a/net/core/filter.c b/net/core/filter.c
index c36dbcee6..6a0fdc5ce 100644
index 2f56d21c9..789dc1c85 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -4838,6 +4838,12 @@ static int _bpf_setsockopt(struct sock *sk, int level, int optname,
Expand All @@ -29,6 +29,20 @@ index c36dbcee6..6a0fdc5ce 100644
} else {
struct inet_connection_sock *icsk = inet_csk(sk);
struct tcp_sock *tp = tcp_sk(sk);
@@ -5042,6 +5048,14 @@ static int _bpf_getsockopt(struct sock *sk, int level, int optname,
goto err_clear;
memcpy(optval, tp->saved_syn->data, optlen);
break;
+ case TCP_ULP:
+ icsk = inet_csk(sk);
+ if (!icsk->icsk_ulp_ops || optlen <= 1) {
+ goto err_clear;
+ }
+ strncpy(optval, icsk->icsk_ulp_ops->name, optlen);
+ optval[optlen - 1] = 0;
+ break;
default:
goto err_clear;
}
--
2.33.0

54 changes: 0 additions & 54 deletions kernel/patches/5.10.0/0002-net-ipv4-A-new-bit-is-added-to-indicate-whether-to-d.patch
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions kernel/patches/5.10.0/0004-net-bpf-Add-a-writeable_tracepoint-to-inet_stream_co.patch
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions kernel/patches/5.10.0/0005-bpf-Introduces-a-new-state-to-identify-the-location-.patch
View file
Open in desktop

This file was deleted.

Loading
Loading