From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by mail.toke.dk (Postfix) with ESMTPS id 81BE49CF219 for ; Tue, 13 Dec 2022 03:36:14 +0100 (CET) Authentication-Results: mail.toke.dk; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20210112 header.b=AQmLlkOw Received: by mail-pj1-x104a.google.com with SMTP id v16-20020a17090a899000b00219b1f0ddebso1276045pjn.5 for ; Mon, 12 Dec 2022 18:36:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=qvvIC7YrDQMRyZvpvAP4n+tRFkpRWKJ/6Yf2M75Qa3M=; b=AQmLlkOwM+PjHCIjUllzOz2prpi9ZfYy0ptb4bI8FYikZWpBw7yL+pHvng3TiXDbhe cySGOjVaG7GOwiT2Nj69f/P0anH/WtlywuCRrh04mzmvu+oktD7mtxTzcXqoQ2soStuG wNf+fquL3Xqkhz+hgq83Ro9e8LHrYbh8OidCzG8XtlYy9pKxZRFa4dpCRdhB/+7keB/4 zID1bPp3pfHzyzY0sXJ9tdfleUNc2BIyBL7KsGm1dsNGjPCqfUlLah4Z7IvITv8nElkK XbK1NFJSntAPIH5Tk82Fzs7qjgGY6+NNeIxik6H8hULF/LprVWN0/v1JhdQRcaOF7EOq bdQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qvvIC7YrDQMRyZvpvAP4n+tRFkpRWKJ/6Yf2M75Qa3M=; b=p2UhqTdCRaGu8KUd1uB8y+kC2VF6zPyRrw/aMA28Xt17ytGXmdUaW3NVxSNPhjYc7y jNfZj9T42nduwLeGJ2xxydCB41Ogb6nTcoa9hSLtDOp8Cg08Vo6GpmqAtNj1g6RwbBGL GHZGlGdJ284QkIpJ1/QRAd5dnG6tx4NdSrKA1XewKkTTIiJAjeorCrN6iZ0oHYLAnfP3 eBnu2qKY5/pxYI5PR1F31MBPuuWYHfHgUZdo22ebTsUfTvzlsGlnmV7bC8KvDdl0U8vg BItVo1fbxJR2bEYLfU5k9xA7bKfW4rdfTQLbfMFSbLfD9nlz7Jq4W+RWY0kFqIyCUtms LsUA== X-Gm-Message-State: ANoB5pmjwdFIgimSuVr/jLg9Tcaqfm0u1Vxr/T0hxfsPVYJpQdCKbRcd 5syYb8Un4BFaL2a7oXilVJoq0Hc= X-Google-Smtp-Source: AA0mqf6ciZA8rokylYS3W9hhZ7SyYnvGkNX6Ju2z5ynQu8qDYkxxS60UW4sBaBHfC6+Ktw2lOmUXGUY= X-Received: from sdf.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5935]) (user=sdf job=sendgmr) by 2002:a62:1dcd:0:b0:576:4b38:c08e with SMTP id d196-20020a621dcd000000b005764b38c08emr31155877pfd.37.1670898973905; Mon, 12 Dec 2022 18:36:13 -0800 (PST) Date: Mon, 12 Dec 2022 18:35:54 -0800 In-Reply-To: <20221213023605.737383-1-sdf@google.com> Mime-Version: 1.0 References: <20221213023605.737383-1-sdf@google.com> X-Mailer: git-send-email 2.39.0.rc1.256.g54fd8350bd-goog Message-ID: <20221213023605.737383-5-sdf@google.com> From: Stanislav Fomichev To: bpf@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Message-ID-Hash: BGFKFGLND3GJLSIGWCX75GCQQO7VFUSB X-Message-ID-Hash: BGFKFGLND3GJLSIGWCX75GCQQO7VFUSB X-MailFrom: 3HeWXYwMKCWoaLNOWWOTM.KWUfLX-PQVbafLX-XZWRMKb.VMb@flex--sdf.bounces.google.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header 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 , Jakub Kicinski , Willem de Bruijn , Jesper Dangaard Brouer , Anatoly Burakov , Alexander Lobakin , Magnus Karlsson , Maryam Tahhan , xdp-hints@xdp-project.net, netdev@vger.kernel.org X-Mailman-Version: 3.3.7 Precedence: list Subject: [xdp-hints] [PATCH bpf-next v4 04/15] selftests/bpf: Update expected test_offload.py messages List-Id: XDP hardware hints design discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Generic check has a different error message, update the selftest. Cc: John Fastabend Cc: David Ahern Cc: Martin KaFai Lau Cc: Jakub Kicinski Cc: Willem de Bruijn Cc: Jesper Dangaard Brouer Cc: Anatoly Burakov Cc: Alexander Lobakin Cc: Magnus Karlsson Cc: Maryam Tahhan Cc: xdp-hints@xdp-project.net Cc: netdev@vger.kernel.org Signed-off-by: Stanislav Fomichev --- 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.rc1.256.g54fd8350bd-goog