From: "Toke Høiland-Jørgensen" <toke@redhat.com>
To: Jakub Kicinski <kuba@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>,
Daniel Borkmann <daniel@iogearbox.net>,
Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andriin@fb.com>, Martin KaFai Lau <kafai@fb.com>,
Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>,
John Fastabend <john.fastabend@gmail.com>,
KP Singh <kpsingh@chromium.org>,
Jesper Dangaard Brouer <hawk@kernel.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
Romain Perier <romain.perier@gmail.com>,
Allen Pais <apais@linux.microsoft.com>,
Grygorii Strashko <grygorii.strashko@ti.com>,
Simon Horman <simon.horman@netronome.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
Lorenzo Bianconi <lorenzo@kernel.org>,
Wei Yongjun <weiyongjun1@huawei.com>,
Jiri Benc <jbenc@redhat.com>,
oss-drivers@netronome.com, linux-omap@vger.kernel.org,
netdev@vger.kernel.org, bpf@vger.kernel.org
Subject: [PATCH bpf 5/7] selftests/bpf/test_offload.py: fix expected case of extack messages
Date: Thu, 03 Dec 2020 22:35:22 +0100 [thread overview]
Message-ID: <160703132255.162669.6025526680043801946.stgit@toke.dk> (raw)
In-Reply-To: <160703131710.162669.9632344967082582016.stgit@toke.dk>
From: Toke Høiland-Jørgensen <toke@redhat.com>
Commit 7f0a838254bd ("bpf, xdp: Maintain info on attached XDP BPF programs
in net_device") changed the case of some of the extack messages being
returned when attaching of XDP programs failed. This broke test_offload.py,
so let's fix the test to reflect this.
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
---
tools/testing/selftests/bpf/test_offload.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_offload.py b/tools/testing/selftests/bpf/test_offload.py
index 6f8ff2f27027..5b0fe8e0b2d2 100755
--- a/tools/testing/selftests/bpf/test_offload.py
+++ b/tools/testing/selftests/bpf/test_offload.py
@@ -998,7 +998,7 @@ try:
fail=False, include_stderr=True)
fail(ret == 0, "Replaced XDP program with a program in different mode")
check_extack(err,
- "native and generic XDP can't be active at the same time.",
+ "Native and generic XDP can't be active at the same time.",
args)
start_test("Test MTU restrictions...")
@@ -1029,7 +1029,7 @@ try:
offload = bpf_pinned("/sys/fs/bpf/offload")
ret, _, err = sim.set_xdp(offload, "drv", fail=False, include_stderr=True)
fail(ret == 0, "attached offloaded XDP program to drv")
- check_extack(err, "using device-bound program without HW_MODE flag is not supported.", args)
+ check_extack(err, "Using device-bound program without HW_MODE flag is not supported.", args)
rm("/sys/fs/bpf/offload")
sim.wait_for_flush()
next prev parent reply other threads:[~2020-12-03 21:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-03 21:35 [PATCH bpf 0/7] selftests/bpf: Restore test_offload.py to working order Toke Høiland-Jørgensen
2020-12-03 21:35 ` [PATCH bpf 1/7] xdp: remove the xdp_attachment_flags_ok() callback Toke Høiland-Jørgensen
2020-12-04 1:42 ` Jakub Kicinski
2020-12-04 9:38 ` Toke Høiland-Jørgensen
2020-12-04 16:48 ` Jakub Kicinski
2020-12-04 17:12 ` Toke Høiland-Jørgensen
2020-12-03 21:35 ` [PATCH bpf 2/7] selftests/bpf/test_offload.py: Remove check for program load flags match Toke Høiland-Jørgensen
2020-12-03 21:35 ` [PATCH bpf 3/7] netdevsim: Add debugfs toggle to reject BPF programs in verifier Toke Høiland-Jørgensen
2020-12-04 1:44 ` Jakub Kicinski
2020-12-04 9:39 ` Toke Høiland-Jørgensen
2020-12-03 21:35 ` [PATCH bpf 4/7] selftests/bpf/test_offload.py: only check verifier log on verification fails Toke Høiland-Jørgensen
2020-12-03 21:35 ` Toke Høiland-Jørgensen [this message]
2020-12-03 21:35 ` [PATCH bpf 6/7] selftests/bpf/test_offload.py: reset ethtool features after failed setting Toke Høiland-Jørgensen
2020-12-03 21:35 ` [PATCH bpf 7/7] selftests/bpf/test_offload.py: filter bpftool internal map when counting maps Toke Høiland-Jørgensen
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=160703132255.162669.6025526680043801946.stgit@toke.dk \
--to=toke@redhat.com \
--cc=andriin@fb.com \
--cc=apais@linux.microsoft.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=grygorii.strashko@ti.com \
--cc=gustavoars@kernel.org \
--cc=hawk@kernel.org \
--cc=jbenc@redhat.com \
--cc=john.fastabend@gmail.com \
--cc=kafai@fb.com \
--cc=kpsingh@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=lorenzo@kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@netronome.com \
--cc=romain.perier@gmail.com \
--cc=simon.horman@netronome.com \
--cc=songliubraving@fb.com \
--cc=weiyongjun1@huawei.com \
--cc=yhs@fb.com \
/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;
as well as URLs for NNTP newsgroup(s).