From: Stanislav Fomichev <sdf@google.com>
To: bpf@vger.kernel.org
Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
martin.lau@linux.dev, song@kernel.org, yhs@fb.com,
john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com,
haoluo@google.com, jolsa@kernel.org,
David Ahern <dsahern@gmail.com>, Jakub Kicinski <kuba@kernel.org>,
Willem de Bruijn <willemb@google.com>,
Jesper Dangaard Brouer <brouer@redhat.com>,
Anatoly Burakov <anatoly.burakov@intel.com>,
Alexander Lobakin <alexandr.lobakin@intel.com>,
Magnus Karlsson <magnus.karlsson@gmail.com>,
Maryam Tahhan <mtahhan@redhat.com>,
xdp-hints@xdp-project.net, netdev@vger.kernel.org
Subject: [PATCH bpf-next v6 06/17] selftests/bpf: Update expected test_offload.py messages
Date: Wed, 4 Jan 2023 13:59:38 -0800 [thread overview]
Message-ID: <20230104215949.529093-7-sdf@google.com> (raw)
In-Reply-To: <20230104215949.529093-1-sdf@google.com>
Generic check has a different error message, update the selftest.
Cc: John Fastabend <john.fastabend@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Martin KaFai Lau <martin.lau@linux.dev>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Willem de Bruijn <willemb@google.com>
Cc: Jesper Dangaard Brouer <brouer@redhat.com>
Cc: Anatoly Burakov <anatoly.burakov@intel.com>
Cc: Alexander Lobakin <alexandr.lobakin@intel.com>
Cc: Magnus Karlsson <magnus.karlsson@gmail.com>
Cc: Maryam Tahhan <mtahhan@redhat.com>
Cc: xdp-hints@xdp-project.net
Cc: netdev@vger.kernel.org
Signed-off-by: Stanislav Fomichev <sdf@google.com>
---
tools/testing/selftests/bpf/test_offload.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/bpf/test_offload.py b/tools/testing/selftests/bpf/test_offload.py
index 7cb1bc05e5cf..40cba8d368d9 100755
--- a/tools/testing/selftests/bpf/test_offload.py
+++ b/tools/testing/selftests/bpf/test_offload.py
@@ -1039,7 +1039,7 @@ netns = []
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 offloaded program without HW_MODE flag is not supported.", args)
rm("/sys/fs/bpf/offload")
sim.wait_for_flush()
@@ -1088,12 +1088,12 @@ netns = []
ret, _, err = sim.set_xdp(pinned, "offload",
fail=False, include_stderr=True)
fail(ret == 0, "Pinned program loaded for a different device accepted")
- check_extack_nsim(err, "program bound to different dev.", args)
+ check_extack(err, "Program bound to different device.", args)
simdev2.remove()
ret, _, err = sim.set_xdp(pinned, "offload",
fail=False, include_stderr=True)
fail(ret == 0, "Pinned program loaded for a removed device accepted")
- check_extack_nsim(err, "xdpoffload of non-bound program.", args)
+ check_extack(err, "Program bound to different device.", args)
rm(pin_file)
bpftool_prog_list_wait(expected=0)
@@ -1334,12 +1334,12 @@ netns = []
ret, _, err = simA.set_xdp(progB, "offload", force=True, JSON=False,
fail=False, include_stderr=True)
fail(ret == 0, "cross-ASIC program allowed")
- check_extack_nsim(err, "program bound to different dev.", args)
+ check_extack(err, "Program bound to different device.", args)
for d in simdevB.nsims:
ret, _, err = d.set_xdp(progA, "offload", force=True, JSON=False,
fail=False, include_stderr=True)
fail(ret == 0, "cross-ASIC program allowed")
- check_extack_nsim(err, "program bound to different dev.", args)
+ check_extack(err, "Program bound to different device.", args)
start_test("Test multi-dev ASIC cross-dev map reuse...")
--
2.39.0.314.g84b9a713c41-goog
next prev parent reply other threads:[~2023-01-04 22:00 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-04 21:59 [PATCH bpf-next v6 00/17] xdp: hints via kfuncs Stanislav Fomichev
2023-01-04 21:59 ` [PATCH bpf-next v6 01/17] bpf: Document XDP RX metadata Stanislav Fomichev
2023-01-06 15:09 ` David Vernet
2023-01-04 21:59 ` [PATCH bpf-next v6 02/17] bpf: Rename bpf_{prog,map}_is_dev_bound to is_offloaded Stanislav Fomichev
2023-01-04 21:59 ` [PATCH bpf-next v6 03/17] bpf: Move offload initialization into late_initcall Stanislav Fomichev
2023-01-04 21:59 ` [PATCH bpf-next v6 04/17] bpf: Reshuffle some parts of bpf/offload.c Stanislav Fomichev
2023-01-04 21:59 ` [PATCH bpf-next v6 05/17] bpf: Introduce device-bound XDP programs Stanislav Fomichev
2023-01-06 0:41 ` Martin KaFai Lau
2023-01-06 17:17 ` Stanislav Fomichev
2023-01-04 21:59 ` Stanislav Fomichev [this message]
2023-01-04 21:59 ` [PATCH bpf-next v6 07/17] bpf: XDP metadata RX kfuncs Stanislav Fomichev
2023-01-06 0:47 ` Martin KaFai Lau
2023-01-06 17:17 ` Stanislav Fomichev
2023-01-04 21:59 ` [PATCH bpf-next v6 08/17] bpf: Support consuming XDP HW metadata from fext programs Stanislav Fomichev
2023-01-06 0:57 ` Martin KaFai Lau
2023-01-06 17:17 ` Stanislav Fomichev
2023-01-04 21:59 ` [PATCH bpf-next v6 09/17] veth: Introduce veth_xdp_buff wrapper for xdp_buff Stanislav Fomichev
2023-01-04 21:59 ` [PATCH bpf-next v6 10/17] veth: Support RX XDP metadata Stanislav Fomichev
2023-01-04 21:59 ` [PATCH bpf-next v6 11/17] selftests/bpf: Verify xdp_metadata xdp->af_xdp path Stanislav Fomichev
2023-01-04 21:59 ` [PATCH bpf-next v6 12/17] net/mlx4_en: Introduce wrapper for xdp_buff Stanislav Fomichev
2023-01-04 21:59 ` [PATCH bpf-next v6 13/17] net/mlx4_en: Support RX XDP metadata Stanislav Fomichev
2023-01-04 21:59 ` [PATCH bpf-next v6 14/17] xsk: Add cb area to struct xdp_buff_xsk Stanislav Fomichev
2023-01-04 21:59 ` [PATCH bpf-next v6 15/17] net/mlx5e: Introduce wrapper for xdp_buff Stanislav Fomichev
2023-01-08 7:38 ` Tariq Toukan
2023-01-09 22:44 ` Stanislav Fomichev
2023-01-04 21:59 ` [PATCH bpf-next v6 16/17] net/mlx5e: Support RX XDP metadata Stanislav Fomichev
2023-01-06 1:08 ` Martin KaFai Lau
2023-01-08 7:38 ` Tariq Toukan
2023-01-09 22:44 ` Stanislav Fomichev
2023-01-04 21:59 ` [PATCH bpf-next v6 17/17] selftests/bpf: Simple program to dump XDP RX metadata Stanislav Fomichev
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=20230104215949.529093-7-sdf@google.com \
--to=sdf@google.com \
--cc=alexandr.lobakin@intel.com \
--cc=anatoly.burakov@intel.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=brouer@redhat.com \
--cc=daniel@iogearbox.net \
--cc=dsahern@gmail.com \
--cc=haoluo@google.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=magnus.karlsson@gmail.com \
--cc=martin.lau@linux.dev \
--cc=mtahhan@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=song@kernel.org \
--cc=willemb@google.com \
--cc=xdp-hints@xdp-project.net \
--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).