From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by mail.toke.dk (Postfix) with ESMTPS id 7B38C9D294A for ; Tue, 20 Dec 2022 23:20:58 +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=ri7Xb+bk Received: by mail-pj1-x1049.google.com with SMTP id ep17-20020a17090ae65100b00219702c495cso5820639pjb.2 for ; Tue, 20 Dec 2022 14:20:58 -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=Du1KYnr7Moi/U3hIPL9DDDUf7OPxblLIVYbFH0ndSJg=; b=ri7Xb+bkAJiHp1jBXuVSlRN0tKijGZS0LBTjxxHNyyqWaIFfqYPv0Q/SCl2ZRFwMPm gTwi9I65ZEOL5vKNKiitNZqqSbSihgju5/32OCCEMYL3dHyOzX2pSTZKfui0qWY+Y2VU ar7Dn3jObHP52hTDUqkPFOhmBW2nRjgh7SBI5Hum03apTGjArCA2drk1Oc3PhLN+pZ1Y zclvLUU3mAV3+1CS4ZxFWDmbs5HnrWH+pGUy9iK2iU1uzoWprBJVcoyh+te4jTVd/RYo fZJaF9rzWPkLADvRkSKWrXev0tc+mfY1DspAXfslUVttJ8dSuoXNDsAHoA1ZcZJyzwdc 6MHg== 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=Du1KYnr7Moi/U3hIPL9DDDUf7OPxblLIVYbFH0ndSJg=; b=y/bF/uFGIh6NbxzGEm3pKJzO4GtqazWHXKYV1PeJQ4jltCkPHiT4eg/Eqp4uEiEZKX 0kAhP0c6Z9VpMpYCxXwUe62Ugdxm5HsHdbV4AVbJxFd/+j7faOU+C495seJxB/C0JFjJ M1cl5MIJYvPFSUA0r1DJBg9Eq0SRTAahEJBs9XFJvXvzwtGumlQOC6N/2au3DissX+ma q1+EWpma4mmXghZ3LwnW9m5VUBS+5f2hUYdJXLBsdXR0uhQcZq1kVTBB+1HlSykzaupA +u/YXKg4vGK7X78iHT44fjFtt04uTccf3zSZvCo7EHcWfWU8jWcTcelaJ5xy+qwUSJ0q +7EA== X-Gm-Message-State: ANoB5pkhz/TJmK24/0YmUM0Sgn8KMVg70pklcbIMKx7NdA+ZenZQ6xYT asvxnUANgWRAMz/vB9Y8/ccxR3w= X-Google-Smtp-Source: AA0mqf6iolMgejfctGTDoe16hwGrPgzedqIHe0lF7Vr8NyGoVA6+J6CkoRb0x4Jf/BOAW1ZpkSuAhOQ= X-Received: from sdf.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5935]) (user=sdf job=sendgmr) by 2002:a62:1812:0:b0:56c:afe:e8bf with SMTP id 18-20020a621812000000b0056c0afee8bfmr82017566pfy.51.1671574856441; Tue, 20 Dec 2022 14:20:56 -0800 (PST) Date: Tue, 20 Dec 2022 14:20:32 -0800 In-Reply-To: <20221220222043.3348718-1-sdf@google.com> Mime-Version: 1.0 References: <20221220222043.3348718-1-sdf@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20221220222043.3348718-7-sdf@google.com> From: Stanislav Fomichev To: bpf@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Message-ID-Hash: GTIG6GFOI7IEAKV5GEMKGV6A3NTRPCZP X-Message-ID-Hash: GTIG6GFOI7IEAKV5GEMKGV6A3NTRPCZP X-MailFrom: 3SDWiYwMKCV8PACDLLDIB.9LJUAM-EFKQPUAM-MOLGB9Q.KBQ@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 v5 06/17] 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.314.g84b9a713c41-goog