Skip to content

Commit 1bd48b9

Browse files
authored
Upgrade bcc and libbpf to fix Google COS socket tracer issues (#1909)
Summary: Upgrade bcc and libbpf to fix Google COS socket tracer issues See GitHub issue comments below for more details. This pulls in the following BCC fix (iovisor/bcc@57ca51b). Relevant Issues: Closes #1900, part of #1905 Type of change: /kind bug Test Plan: Skaffold'ed this change to a Ubuntu and Google COS cluster and verified socket tracer works again - [x] Verified that all kernel build passes - [x] Verified that all kernel build used a bcc repo reference that matches latest commit ``` ddelnano@noble-dev:~/code/bcc/build (pixie8) $ git diff pixie/pixie8 ddelnano/pixie8 ddelnano@noble-dev:~/code/bcc/build (pixie8) $ ``` Changelog Message: Fix issue with socket tracer on recent Google COS instances --------- Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
1 parent d8aab71 commit 1bd48b9

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

bazel/repository_locations.bzl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ REPOSITORY_LOCATIONS = dict(
127127
urls = ["https://github.com/h2o/picohttpparser/archive/1d2b8a184e7ebe6651c30dcede37ba1d89691351.tar.gz"],
128128
),
129129
com_github_iovisor_bcc = dict(
130-
sha256 = "38f07777a214582a20a198b535691459d882a1e5da80057ff30f2ee27a53055c",
131-
strip_prefix = "bcc-0171a363859b4a96c23543c06ef67517ddc3e789",
130+
sha256 = "d34f9484588a9c25be936c910c86f8b25b04e5b0c802d0630e77cc9a8a272aed",
131+
strip_prefix = "bcc-e0698be7b797129cb113912e96ad741a551e2291",
132132
urls = [
133-
"https://github.com/pixie-io/bcc/archive/0171a363859b4a96c23543c06ef67517ddc3e789.tar.gz",
133+
"https://github.com/pixie-io/bcc/archive/e0698be7b797129cb113912e96ad741a551e2291.tar.gz",
134134
],
135135
),
136136
com_github_iovisor_bpftrace = dict(
@@ -146,10 +146,10 @@ REPOSITORY_LOCATIONS = dict(
146146
urls = ["https://github.com/jupp0r/prometheus-cpp/archive/81e208c250748657f1d5dab247e82c4429a931af.tar.gz"],
147147
),
148148
com_github_libbpf_libbpf = dict(
149-
sha256 = "3d6afde67682c909e341bf194678a8969f17628705af25f900d5f68bd299cb03",
150-
strip_prefix = "libbpf-1.0.1",
149+
sha256 = "4d503428c7aead070a59630dd0906318a430b3e279a35f51ec601fbdd7d31eb6",
150+
strip_prefix = "libbpf-3b0973892891744d20ae79e99c0d1a26a59c4222",
151151
urls = [
152-
"https://github.com/libbpf/libbpf/archive/refs/tags/v1.0.1.tar.gz",
152+
"https://github.com/libbpf/libbpf/archive/3b0973892891744d20ae79e99c0d1a26a59c4222.tar.gz",
153153
],
154154
),
155155
com_github_libuv_libuv = dict(

src/stirling/bpf_tools/bcc_symbolizer_bpf_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ TEST(BCCSymbolizer, ModuleName) {
6868
for (const auto& entry : smaps) {
6969
if (entry.pathname == "[vdso]") {
7070
const std::string_view symbol = symbolizer.SymbolOrAddrIfUnknown(pid, entry.vmem_start);
71-
EXPECT_EQ(symbol, "[m] [vdso] + 0x00000000");
71+
const std::string expected = absl::StrCat("[m] [vdso] + 0x", absl::Hex(entry.vmem_start));
72+
EXPECT_EQ(symbol, expected);
7273
}
7374
}
7475
}

0 commit comments

Comments
 (0)