Skip to content

Commit f839eff

Browse files
authored
Merge pull request kmesh-net#1268 from lec-bit/new-kernel-doc
adapt doc
2 parents 5d61b19 + e8d0131 commit f839eff

File tree

4 files changed

+17
-21
lines changed

4 files changed

+17
-21
lines changed

docs/kmesh_kernel_compile-zh.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ kernel/
1919
├── ko_src
2020
└── patches # 内核增强特性补丁
2121
└── 5.10.0 # 基于linux 5.10制作的增强patch
22-
└── 0001-bpf-sockmap-add-extra-return-value-for-sockops.patch
23-
└── 0002-xxx.patch
24-
└── ......
25-
└── bpf-support-writable-context-for-bare-tracepoint.patch #该补丁为社区补丁,在linux 5.16引入,在此之前版本需要判断是否已回合该补丁并按需回合;此补丁提供了kmesh所依赖内核功能相关宏定义
22+
└── 0001-add-helper-strnstr-strncmp-parse_header_msg.patch
23+
└── 0002-add-TCP_ULP-support-in-bpf_getset_sockopt.patch
2624
```
2725

2826
内核构建时,按需获取/适配patch。
@@ -58,7 +56,7 @@ kernel/
5856
# 将项目仓中patch拷贝到SOURCE目录下
5957
[root@dev SOURCES]# pwd
6058
/home/test/kmesh_kernel/root/rpmbuild/SOURCES
61-
[root@dev SOURCES]# cp 0001-bpf-sockmap-add-extra-return-value-for-sockops.patch .
59+
[root@dev SOURCES]# cp 0001-add-helper-strnstr-strncmp-parse_header_msg.patch .
6260
......
6361
[root@dev SOURCES]# cp xxx.patch .
6462
```
@@ -72,12 +70,12 @@ kernel/
7270

7371
# b. spec中增加patch定义
7472
# 增加增强特性补丁
75-
Source9003: 0001-bpf-sockmap-add-extra-return-value-for-sockops.patch
76-
Source900X: ......
73+
Source9003: 0001-add-helper-strnstr-strncmp-parse_header_msg.patch
74+
Source9004: 0002-add-TCP_ULP-support-in-bpf_getset_sockopt.patch
7775

7876
# c. %prep中增加打patch步骤
7977
patch -s -F0 -E -p1 --no-backup-if-mismatch -i %{SOURCE9003}
80-
patch -s -F0 -E -p1 --no-backup-if-mismatch -i ......
78+
patch -s -F0 -E -p1 --no-backup-if-mismatch -i %{SOURCE9004}
8179
```
8280

8381
- 编译

docs/kmesh_kernel_compile.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ kernel/
2020
├── ko_src
2121
└── patches # Kernel enhancement feature patches
2222
└── 5.10.0 # Enhancement patch made based on Linux 5.10
23-
└── 0001-bpf-sockmap-add-extra-return-value-for-sockops.patch
24-
└── 0002-xxx.patch
25-
└── ......
26-
└── bpf-support-writable-context-for-bare-tracepoint.patch #This patch is a community patch, introduced in Linux 5.16. For versions prior to this, it is necessary to determine whether this patch has already been merged and merge as needed. This patch provides the macro definitions related to the kernel features that kmesh depends on
23+
└── 0001-add-helper-strnstr-strncmp-parse_header_msg.patch
24+
└── 0002-add-TCP_ULP-support-in-bpf_getset_sockopt.patch
2725
```
2826

2927
When building the kernel, get/adapt the patch as needed.
@@ -60,8 +58,7 @@ Taking openEuler 2203 LTS SP2(linux 5.10)as an example, the build steps as f
6058
[root@dev SOURCES]# pwd
6159
/home/test/kmesh_kernel/root/rpmbuild/SOURCES
6260
[root@dev SOURCES]# cp 0001-bpf-sockmap-add-extra-return-value-for-sockops.patch .
63-
......
64-
[root@dev SOURCES]# cp xxx.patch .
61+
[root@dev SOURCES]# cp 0002-add-TCP_ULP-support-in-bpf_getset_sockopt.patch .
6562
```
6663

6764
- Modify SPEC to add patch
@@ -73,12 +70,12 @@ Taking openEuler 2203 LTS SP2(linux 5.10)as an example, the build steps as f
7370

7471
# b. add patch definition in spec
7572
# add enhancement feature patch
76-
Source9003: 0001-bpf-sockmap-add-extra-return-value-for-sockops.patch
77-
Source900X: ......
73+
Source9003: 0001-add-helper-strnstr-strncmp-parse_header_msg.patch
74+
Source9004: 0002-add-TCP_ULP-support-in-bpf_getset_sockopt.patch
7875

7976
# c. %prep add apply patch step
8077
patch -s -F0 -E -p1 --no-backup-if-mismatch -i %{SOURCE9003}
81-
patch -s -F0 -E -p1 --no-backup-if-mismatch -i ......
78+
patch -s -F0 -E -p1 --no-backup-if-mismatch -i %{SOURCE9004}
8279
```
8380

8481
- Compile

docs/kmesh_support-zh.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
| 操作系统版本 | 内核版本 | 操作系统发布路径 |
66
| :-------------: | :------: | :-----------------------------------------: |
7-
| openEuler-23.03 | 6.1.19 | https://repo.openeuler.org/openEuler-23.03/ |
7+
| openEuler-24.03 | 6.6.0 | https://repo.openeuler.org/openEuler-24.03-LTS/ |
8+
| ubuntu-24.04 | 6.8.0 | https://releases.ubuntu.com/24.04/ |
89

910
### 通过Kmesh增强内核支持所有特性
1011

docs/kmesh_use_enhanced_kernel.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# Use Enhanced Kernel in Kmesh
22

3-
Some features of kmesh depend on enhanced kernel (e.g., L7 traffic control in ads mode). To utilize it, you can use `openEuler 23.03`, which natively supports all features.
3+
Some features of kmesh depend on enhanced kernel (e.g., L7 traffic control in ads mode). To utilize it, you can use `openEuler 24.03-LTS`, which natively supports all features.
44

55
You can follow the steps below to use enhanced kernel:
66

7-
+ Download `openEuler 23.03` image on: https://repo.openeuler.org/openEuler-23.03/ISO/.
7+
+ Download `openEuler 24.03-LTS` image on: https://repo.openeuler.org/openEuler-24.03-LTS/ISO/.
88
+ Install the operation system: Here, we take [VMware](https://www.vmware.com/products/workstation-pro/html.html) for example (you can also use other VM management tools).
99

1010
![](./pics/install_openEuler.png)
1111

12-
Notice that `openEuler 23.03`'s kernel version is **6.1.19**. So you should select `其他 Linux 6.x 内核 64位`(`Linux 6.x kernel 64bit`).
12+
Notice that `openEuler 24.03-LTS`'s kernel version is **6.6.0**. So you should select `其他 Linux 6.x 内核 64位`(`Linux 6.x kernel 64bit`).
1313

1414
Then, you can follow the [official blog](https://www.openeuler.org/zh/blog/20240306vmware/20240306vmware.html) to install it.
1515

0 commit comments

Comments
 (0)