!18 [sync] PR-17: sync backport patch from 20.03-LTS-SP3 branch

From: @openeuler-sync-bot 
Reviewed-by: @nlgwcy 
Signed-off-by: @nlgwcy
This commit is contained in:
openeuler-ci-bot 2022-08-04 02:30:07 +00:00 committed by Gitee
commit b9806b579d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 40 additions and 2 deletions

View File

@ -0,0 +1,34 @@
From 4d32ba754a242fb31827923c4a6f051063b32fea Mon Sep 17 00:00:00 2001
From: Hou Tao <houtao1@huawei.com>
Date: Mon, 4 Oct 2021 17:48:56 +0800
Subject: [PATCH] libbpf: Support detecting and attaching of writable
tracepoint program
Program on writable tracepoint is BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE,
but its attachment is the same as BPF_PROG_TYPE_RAW_TRACEPOINT.
Signed-off-by: Hou Tao <houtao1@huawei.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211004094857.30868-3-hotforest@gmail.com
---
src/libbpf.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/libbpf.c b/src/libbpf.c
index d9ece93..02e9d33 100644
--- a/src/libbpf.c
+++ b/src/libbpf.c
@@ -6894,6 +6894,10 @@ static const struct bpf_sec_def section_defs[] = {
.attach_fn = attach_raw_tp),
SEC_DEF("raw_tp/", RAW_TRACEPOINT,
.attach_fn = attach_raw_tp),
+ SEC_DEF("raw_tracepoint.w/", RAW_TRACEPOINT_WRITABLE,
+ .attach_fn = attach_raw_tp),
+ SEC_DEF("raw_tp.w/", RAW_TRACEPOINT_WRITABLE,
+ .attach_fn = attach_raw_tp),
SEC_DEF("tp_btf/", TRACING,
.expected_attach_type = BPF_TRACE_RAW_TP,
.is_attach_btf = true,
--
2.29.2

View File

@ -4,7 +4,7 @@
Name: %{githubname}
Version: %{githubver}
Release: 1.h0
Release: 1.h1
Summary: Libbpf library
License: LGPLv2 or BSD
@ -12,7 +12,7 @@ URL: https://github.com/%{githubname}/%{githubname}
Source: https://github.com/%{githubname}/%{githubname}/archive/%{githubname}-%{githubver}.tar.gz
BuildRequires: gcc elfutils-libelf-devel elfutils-devel
#patches
Patch6000: backport-libbpf-Support-detecting-and-attaching-of-writable-t.patch
# This package supersedes libbpf from kernel-tools,
# which has default Epoch: 0. By having Epoch: 1
@ -65,6 +65,10 @@ developing applications that use %{name}
%{_libdir}/libbpf.a
%changelog
* Wed Aug 3 2022 Lv Ying<lvying6@huawei.com> - 0.6.1-1.h1
- support detecting and attaching of writable tracepoint program
https://lore.kernel.org/bpf/20211004094857.30868-3-hotforest@gmail.com
* Mon Dec 27 2021 sunsuwan<sunsuwan2@huawei.com> - 0.6.1-1.h0
- update libbpf from v0.1.1 to v0.3