1 files changed, 17 insertions, 18 deletions

diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-tools-opensnoop-snoop-do_sys_openat2-for-kernel-v5.6.patch b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-tools-opensnoop-snoop-do_sys_openat2-for-kernel-v5.6.patch
index f2b1495..fb659cc 100644
--- a/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-tools-opensnoop-snoop-do_sys_openat2-for-kernel-v5.6.patch
+++ b/dynamic-layers/openembedded-layer/recipes-devtools/bcc/bcc/0001-tools-opensnoop-snoop-do_sys_openat2-for-kernel-v5.6.patch
@@ -1,4 +1,4 @@
-From 935f7e47f54df1af30f4a1cdfd2f385863ab9dec Mon Sep 17 00:00:00 2001
+From 8e12b10e7576a6d47e0dc2cdc36caeb9ba26fa12 Mon Sep 17 00:00:00 2001
 From: He Zhe <zhe.he@windriver.com>
 Date: Mon, 15 Jun 2020 07:05:24 +0000
 Subject: [PATCH] tools: opensnoop: snoop do_sys_openat2 for kernel v5.6 and
@@ -12,14 +12,14 @@ Upstream-Status: Inappropriate, upstream context has changed and needs more
 
 Signed-off-by: He Zhe <zhe.he@windriver.com>
 ---
- tools/opensnoop.py | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
+ tools/opensnoop.py | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/tools/opensnoop.py b/tools/opensnoop.py
-index 6d1388b3..3f7e48a3 100755
+index 51d3dc05..522812d4 100755
 --- a/tools/opensnoop.py
 +++ b/tools/opensnoop.py
-@@ -21,6 +21,8 @@ from bcc.utils import printb
+@@ -22,6 +22,8 @@ from bcc.utils import printb
  import argparse
  from datetime import datetime, timedelta
  import os
@@ -28,24 +28,23 @@ index 6d1388b3..3f7e48a3 100755
  
  # arguments
  examples = """examples:
-@@ -195,8 +197,15 @@ if debug or args.ebpf:
- 
+@@ -235,8 +237,14 @@ if debug or args.ebpf:
  # initialize BPF
  b = BPF(text=bpf_text)
--b.attach_kprobe(event="do_sys_open", fn_name="trace_entry")
--b.attach_kretprobe(event="do_sys_open", fn_name="trace_return")
-+
-+# Since kernel v5.6, do_sys_openat2 instead of do_sys_open has been used as entry function for open
-+if parse_version(platform.uname().release.split('-')[0]) > parse_version('5.6.0'):
-+    entry = "do_sys_openat2"
-+else:
-+    entry = "do_sys_open"
+ if not is_support_kfunc:
+-    b.attach_kprobe(event="do_sys_open", fn_name="trace_entry")
+-    b.attach_kretprobe(event="do_sys_open", fn_name="trace_return")
++    # Since kernel v5.6, do_sys_openat2 instead of do_sys_open has been used as entry function for open
++    if parse_version(platform.uname().release.split('-')[0]) > parse_version('5.6.0'):
++        entry = "do_sys_openat2"
++    else:
++        entry = "do_sys_open"
 +
-+b.attach_kprobe(event=entry, fn_name="trace_entry")
-+b.attach_kretprobe(event=entry, fn_name="trace_return")
++    b.attach_kprobe(event=entry, fn_name="trace_entry")
++    b.attach_kretprobe(event=entry, fn_name="trace_return")
  
  initial_ts = 0
  
 -- 
-2.24.1
+2.17.1