new kernel adapt by lec-bit · Pull Request #1198 · kmesh-net/kmesh

lec-bit · 2025-01-16T06:20:18Z

What type of PR is this?
/kind feature

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

hzxuzhonghu · 2025-01-16T11:14:00Z

Can you add some description what you are doing and why

bitcoffeeiux · 2025-01-16T12:16:12Z

A proposal is required.

codecov · 2025-01-17T03:16:19Z

Codecov Report

Attention: Patch coverage is 0% with 70 lines in your changes missing coverage. Please review.

Project coverage is 44.64%. Comparing base (5f09731) to head (d950911).
Report is 11 commits behind head on main.

Files with missing lines	Patch %	Lines
pkg/kolog/kolog.go	0.00%	69 Missing ⚠️
pkg/controller/controller.go	0.00%	1 Missing ⚠️

Files with missing lines	Coverage Δ
pkg/controller/controller.go	`0.00% <0.00%> (ø)`
pkg/kolog/kolog.go	`0.00% <0.00%> (ø)`

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1e5505b...d950911. Read the comment docs.

bitcoffeeiux · 2025-01-18T01:52:53Z

A proposal is required.

proposal: #1202

LiZhenCheng9527 · 2025-01-23T09:16:54Z

kernel/ko_src/kmesh/kmesh_parse_protocol_data.c

+    if (strcmp(key, "All") == 0) {
+        msg = (struct bpf_mem_ptr *)(ctx->t_ctx);
+        if (strnstr(msg->ptr, subptr, subptr_len) != NULL) {
+            return 1;


Is it possible to use variables to indicate what 1 and 0 mean?

lec-bit · 2025-01-24T08:31:14Z

bpf/kmesh/ads/include/route_config.h

-                DEBUG,
-                ROUTER_CONFIG,
-                "match virtual_host, name=\"%s\"\n",
-                (char *)KMESH_GET_PTR_VAL(virt_host->name, char *));


The number of instructions occupied by BPF_LOG is very large, and printing logs within multiple nested loops can cause the total instruction count of the ebpf program to exceed 1,000,000 insn.
so I move it out of func

lec-bit · 2025-02-05T02:25:21Z

bpf/include/bpf_helper_defs_ext.h

-static __u64 (*bpf__strncmp)(const char *s1, __u32 s1_size, const char *s2) = (void *)174;
-static long (*bpf_parse_header_msg)(struct bpf_mem_ptr *msg) = (void *)175;
-static void *(*bpf_get_msg_header_element)(void *name) = (void *)176;
+static int (*bpf_km_strnstr)(


The comment needs to be supplemented and the usage needs to be defined.
The naming needs to be adjusted.

lec-bit · 2025-02-05T03:06:34Z

kernel/ko_src/kmesh/kmesh_parse_protocol_data.c

+
+    data = kmesh_protocol_data_search(key);
+    if (!data)
+        return 0;


The return value need modified.

lec-bit · 2025-02-05T03:10:15Z

kernel/ko_src/kmesh/kmesh_parse_protocol_data.c

        if (!cur->parse_protocol_msg)
            continue;
-        ret = cur->parse_protocol_msg(msg);
+        ret = cur->parse_protocol_msg(ctx);


The CTX does not need to be transferred.

lec-bit · 2025-02-05T03:21:01Z

bpf/kmesh/ads/cgroup_sock.c


 static const char kmesh_module_name[] = "kmesh_defer";
-
+static char kmesh_module_name_get[16];


Write a macro to define

lec-bit · 2025-02-05T03:54:29Z

kernel/ko_src/kmesh/defer_connect.c

-    err = sk->sk_prot->connect(sk, (struct sockaddr *)&addr_in, sizeof(struct sockaddr_in));
-    inet_sk(sk)->bpf_defer_connect = 0;
+    err = sk->sk_prot->connect(sk, (struct sockaddr *)&uaddr, sizeof(struct sockaddr_in));
+    inet_sk(sk)->defer_connect = 0;


Retry needs to be allowed. The value is changed to line 113.

lec-bit · 2025-02-05T03:59:58Z

kernel/ko_src/kmesh/defer_connect.c

        return -ENOMEM;
+    kmesh_defer_proto_ops = kmalloc(sizeof(struct proto_ops), GFP_ATOMIC);
+    if (!kmesh_defer_proto_ops)
+        return -ENOMEM;


Signed-off-by: lec-bit <glfhmzmy@126.com>

bitcoffeeiux · 2025-02-24T12:16:31Z

bpf/kmesh/ads/cgroup_sock.c

-#else  // KMESH_ENABLE_HTTP
-    ret = listener_manager(ctx, listener, NULL);
+    ret = bpf_getsockopt(ctx, IPPROTO_TCP, TCP_ULP, (void *)kmesh_module_name_get, KMESH_MODULE_NAME_LEN);
+    if (ret != 0 || bpf__strncmp(kmesh_module_name_get, KMESH_MODULE_NAME_LEN, kmesh_module_name)) {


When the bpf_getsockopt command is executed successfully, 0 should be returned. When the command is executed for the first time, the corresponding ulp model is not found. What should be the ret value?

bitcoffeeiux · 2025-02-24T12:19:12Z

bpf/kmesh/ads/cgroup_sock.c

+        return 0;
+    }
+#endif
+    ret = listener_manager(ctx, listener, ctx);


What is the purpose of changing the third parameter from NULL to ctx?

Forgot to modify it back after debugging, fixed

bitcoffeeiux · 2025-02-24T12:24:03Z

bpf/kmesh/ads/include/route_config.h

        return 0;

-    if (bpf_strnstr(ptr, prefix, BPF_DATA_MAX_LEN) == NULL)
+    if (bpf_km_header_strnstr(ctx, uri, uri_len, prefix, BPF_DATA_MAX_LEN) == 0) {


The code style is unified. Generally, if (!bpf_km_header_strnstr(ctx, uri, uri_len, prefix, BPF_DATA_MAX_LEN)) is written in kernel.

Signed-off-by: lec-bit <glfhmzmy@126.com>

Signed-off-by: lec-bit <glfhzmy@126.com>

hzxuzhonghu · 2025-02-25T02:01:14Z

pkg/kolog/kolog.go

+		return time.Time{}, err
+	}
+
+	for _, line := range strings.Split(string(data), "\n") {


change to use bufio.NewScanner, read line by line

hzxuzhonghu · 2025-02-25T02:06:57Z

pkg/kolog/kolog.go

+			case <-stopCh:
+				return
+			default:
+				line, err := reader.ReadString('\n')


nit: can use scanner as well

hzxuzhonghu

/lgtm

Signed-off-by: lec-bit <glfhzmy@126.com>

lec-bit · 2025-02-25T12:36:48Z

/retest

kmesh-bot · 2025-02-25T13:07:36Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bitcoffeeiux, hzxuzhonghu

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [bitcoffeeiux,hzxuzhonghu]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

bitcoffeeiux · 2025-02-25T13:11:24Z

/lgtm

kmesh-bot added the kind/feature label Jan 16, 2025

kmesh-bot requested review from Okabe-Rintarou-0 and kevin-wangzefeng January 16, 2025 06:20

kmesh-bot added the size/L label Jan 16, 2025

lec-bit force-pushed the new-kernel branch 2 times, most recently from c0bf649 to 9b1b030 Compare January 16, 2025 08:01

lec-bit force-pushed the new-kernel branch 3 times, most recently from 14bbc8e to 0a2d78f Compare January 17, 2025 03:01

lec-bit force-pushed the new-kernel branch from 0a2d78f to e42860b Compare January 17, 2025 06:50

lec-bit force-pushed the new-kernel branch from e42860b to 8423b77 Compare January 18, 2025 06:43

LiZhenCheng9527 reviewed Jan 23, 2025

View reviewed changes

lec-bit force-pushed the new-kernel branch from 8423b77 to 9d735e4 Compare January 23, 2025 12:22

kmesh-bot added size/XL and removed size/L labels Jan 23, 2025

lec-bit commented Jan 24, 2025

View reviewed changes

lec-bit force-pushed the new-kernel branch from e2b3001 to e6ac2cb Compare January 24, 2025 08:59

lec-bit commented Feb 5, 2025

View reviewed changes

lec-bit force-pushed the new-kernel branch 3 times, most recently from 291dd6f to de3101a Compare February 18, 2025 07:20

lec-bit force-pushed the new-kernel branch from 54d6d9b to ee9bebb Compare February 21, 2025 09:45

lec-bit added 2 commits February 24, 2025 17:24

adapt new kernel enhanced

b9f2ad7

Signed-off-by: lec-bit <glfhmzmy@126.com>

adapt new kernel, not need bpf_defer_connect and tracepoint

52efd5d

Signed-off-by: lec-bit <glfhmzmy@126.com>

lec-bit force-pushed the new-kernel branch from ee9bebb to 29538ec Compare February 24, 2025 12:11

bitcoffeeiux reviewed Feb 24, 2025

View reviewed changes

lec-bit added 2 commits February 24, 2025 21:43

adapt helper func

b483787

Signed-off-by: lec-bit <glfhmzmy@126.com>

add kernel module log

5ba7c6e

Signed-off-by: lec-bit <glfhmzmy@126.com>

lec-bit force-pushed the new-kernel branch from 29538ec to 6468089 Compare February 24, 2025 13:59

optimize

9abee7c

Signed-off-by: lec-bit <glfhzmy@126.com>

lec-bit force-pushed the new-kernel branch from 6468089 to 9abee7c Compare February 24, 2025 14:04

hzxuzhonghu reviewed Feb 25, 2025

View reviewed changes

hzxuzhonghu previously approved these changes Feb 25, 2025

View reviewed changes

kmesh-bot assigned hzxuzhonghu Feb 25, 2025

kmesh-bot added lgtm approved labels Feb 25, 2025

optimize kolog

f7c0e51

Signed-off-by: lec-bit <glfhzmy@126.com>

lec-bit dismissed hzxuzhonghu’s stale review via f7c0e51 February 25, 2025 09:19

lec-bit force-pushed the new-kernel branch from 1fd7eea to f7c0e51 Compare February 25, 2025 09:19

kmesh-bot removed the lgtm label Feb 25, 2025

lec-bit force-pushed the new-kernel branch 2 times, most recently from d3eb7da to 8ec8456 Compare February 25, 2025 12:12

optimize bpf_getsockopt ret judgment

d950911

Signed-off-by: lec-bit <glfhzmy@126.com>

lec-bit force-pushed the new-kernel branch from 8ec8456 to d950911 Compare February 25, 2025 12:17

bitcoffeeiux approved these changes Feb 25, 2025

View reviewed changes

kmesh-bot assigned bitcoffeeiux Feb 25, 2025

kmesh-bot added the lgtm label Feb 25, 2025

kmesh-bot merged commit ededfc7 into kmesh-net:main Feb 25, 2025
12 checks passed


		static const char kmesh_module_name[] = "kmesh_defer";

		static char kmesh_module_name_get[16];

Conversation

lec-bit commented Jan 16, 2025

Uh oh!

hzxuzhonghu commented Jan 16, 2025

Uh oh!

bitcoffeeiux commented Jan 16, 2025

Uh oh!

codecov bot commented Jan 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

bitcoffeeiux commented Jan 18, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lec-bit Feb 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hzxuzhonghu left a comment

Choose a reason for hiding this comment

Uh oh!

lec-bit commented Feb 25, 2025

Uh oh!

kmesh-bot commented Feb 25, 2025

Uh oh!

bitcoffeeiux commented Feb 25, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov bot commented Jan 17, 2025 •

edited

Loading

lec-bit Feb 5, 2025 •

edited

Loading