From: Jiri Olsa <jolsa@kernel.org>
Date: Sun, 9 May 2021 15:36:36 +0000 (+0200)
Subject: tools/ttysnoop: Fix tty_write probe to use new arguments
X-Git-Tag: v0.21.0~55
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc1e013bb191354f63f28305fec54fd8ea9ab901;p=platform%2Fupstream%2Fbcc.git

tools/ttysnoop: Fix tty_write probe to use new arguments

Kernel commit [1] changed arguments of tty_write function,
changing the probe function to new prototypes.

Also switching to trampolines.

[1] 9bb48c82aced tty: implement write_iter

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---

diff --git a/tools/ttysnoop.py b/tools/ttysnoop.py
index b576b7ae..707ca8cb 100755
--- a/tools/ttysnoop.py
+++ b/tools/ttysnoop.py
@@ -62,6 +62,7 @@ except:
 bpf_text = """
 #include <uapi/linux/ptrace.h>
 #include <linux/fs.h>
+#include <linux/uio.h>
 
 #define BUFSIZE 256
 struct data_t {
@@ -71,12 +72,8 @@ struct data_t {
 
 BPF_PERF_OUTPUT(events);
 
-int kprobe__tty_write(struct pt_regs *ctx, struct file *file,
-    const char __user *buf, size_t count)
+static int do_tty_write(void *ctx, const char __user *buf, size_t count)
 {
-    if (file->f_inode->i_ino != PTS)
-        return 0;
-
     // bpf_probe_read_user() can only use a fixed size, so truncate to count
     // in user space:
     struct data_t data = {};
@@ -89,6 +86,40 @@ int kprobe__tty_write(struct pt_regs *ctx, struct file *file,
 
     return 0;
 };
+
+/**
+ * commit 9bb48c82aced (v5.11-rc4) tty: implement write_iter
+ * changed arguments of tty_write function
+ */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
+int kprobe__tty_write(struct pt_regs *ctx, struct file *file,
+    const char __user *buf, size_t count)
+{
+    if (file->f_inode->i_ino != PTS)
+        return 0;
+
+    return do_tty_write(ctx, buf, count);
+}
+#else
+KFUNC_PROBE(tty_write, struct kiocb *iocb, struct iov_iter *from)
+{
+    const char __user *buf;
+    const struct kvec *kvec;
+    size_t count;
+
+    if (iocb->ki_filp->f_inode->i_ino != PTS)
+        return 0;
+
+    if (from->type != (ITER_IOVEC + WRITE))
+        return 0;
+
+    kvec  = from->kvec;
+    buf   = kvec->iov_base;
+    count = kvec->iov_len;
+
+    return do_tty_write(ctx, kvec->iov_base, kvec->iov_len);
+}
+#endif
 """
 
 bpf_text = bpf_text.replace('PTS', str(pi.st_ino))