BPF List
 help / color / mirror / Atom feed
From: Yonghong Song <yhs@fb.com>
To: Andrii Nakryiko <andriin@fb.com>, <bpf@vger.kernel.org>,
	Martin KaFai Lau <kafai@fb.com>, <netdev@vger.kernel.org>
Cc: Alexei Starovoitov <ast@fb.com>,
	Daniel Borkmann <daniel@iogearbox.net>, <kernel-team@fb.com>,
	Alexei Starovoitov <ast@kernel.org>
Subject: [PATCH bpf-next 4/8] bpf: add WARN_ONCE if bpf_seq_read show() return a positive number
Date: Tue, 12 May 2020 08:52:36 -0700	[thread overview]
Message-ID: <20200512155236.1080458-1-yhs@fb.com> (raw)
In-Reply-To: <20200512155232.1080167-1-yhs@fb.com>

In seq_read() implementation, a positive integer return value
of seq_ops->show() indicates that the current object seq_file
buffer is discarded and next object should be checked.
bpf_seq_read() implemented in a similar way if show()
returns a positive integer value.

But for bpf_seq_read(), show() didn't return positive integer for
all currently supported targets. Let us add a WARN_ONCE for
such cases so we can get an alert when things are changed.

Suggested-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Yonghong Song <yhs@fb.com>
---
 kernel/bpf/bpf_iter.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/bpf/bpf_iter.c b/kernel/bpf/bpf_iter.c
index 0a45a6cdfabd..b0c8b3bdf3b0 100644
--- a/kernel/bpf/bpf_iter.c
+++ b/kernel/bpf/bpf_iter.c
@@ -120,6 +120,7 @@ static ssize_t bpf_seq_read(struct file *file, char __user *buf, size_t size,
 
 	err = seq->op->show(seq, p);
 	if (err > 0) {
+		WARN_ONCE(1, "seq_ops->show() returns %d\n", err);
 		/* object is skipped, decrease seq_num, so next
 		 * valid object can reuse the same seq_num.
 		 */
@@ -156,6 +157,7 @@ static ssize_t bpf_seq_read(struct file *file, char __user *buf, size_t size,
 
 		err = seq->op->show(seq, p);
 		if (err > 0) {
+			WARN_ONCE(1, "seq_ops->show() returns %d\n", err);
 			bpf_iter_dec_seq_num(seq);
 			seq->count = offs;
 		} else if (err < 0 || seq_has_overflowed(seq)) {
-- 
2.24.1


  parent reply	other threads:[~2020-05-12 15:52 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-12 15:52 [PATCH bpf-next 0/8] misc fixes for bpf_iter Yonghong Song
2020-05-12 15:52 ` [PATCH bpf-next 1/8] tools/bpf: selftests : explain bpf_iter test failures with llvm 10.0.0 Yonghong Song
2020-05-12 15:52 ` [PATCH bpf-next 2/8] bpf: change btf_iter func proto prefix to "bpf_iter_" Yonghong Song
2020-05-12 22:21   ` Andrii Nakryiko
2020-05-12 15:52 ` [PATCH bpf-next 3/8] bpf: add comments to interpret bpf_prog return values Yonghong Song
2020-05-12 22:21   ` Andrii Nakryiko
2020-05-12 15:52 ` Yonghong Song [this message]
2020-05-12 22:23   ` [PATCH bpf-next 4/8] bpf: add WARN_ONCE if bpf_seq_read show() return a positive number Andrii Nakryiko
2020-05-12 15:52 ` [PATCH bpf-next 5/8] bpf: net: refactor bpf_iter target registration Yonghong Song
2020-05-12 22:19   ` Andrii Nakryiko
2020-05-12 15:52 ` [PATCH bpf-next 6/8] bpf: change func bpf_iter_unreg_target() signature Yonghong Song
2020-05-12 22:24   ` Andrii Nakryiko
2020-05-12 15:52 ` [PATCH bpf-next 7/8] bpf: enable bpf_iter targets registering ctx argument types Yonghong Song
2020-05-12 22:29   ` Andrii Nakryiko
2020-05-12 15:52 ` [PATCH bpf-next 8/8] samples/bpf: remove compiler warnings Yonghong Song
2020-05-12 22:30   ` Andrii Nakryiko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200512155236.1080458-1-yhs@fb.com \
    --to=yhs@fb.com \
    --cc=andriin@fb.com \
    --cc=ast@fb.com \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=kafai@fb.com \
    --cc=kernel-team@fb.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox