From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9A93C46467 for ; Wed, 4 Jan 2023 22:00:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240425AbjADWAY (ORCPT ); Wed, 4 Jan 2023 17:00:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240355AbjADWAG (ORCPT ); Wed, 4 Jan 2023 17:00:06 -0500 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C19C63FC91 for ; Wed, 4 Jan 2023 14:00:01 -0800 (PST) Received: by mail-pg1-x549.google.com with SMTP id l68-20020a632547000000b00499a93ba8c9so11503031pgl.5 for ; Wed, 04 Jan 2023 14:00:01 -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=dX9/YJtNyGeKKa0nnE3YWk6KO4f9TGdhpOOWy6B2Tc9yjA3CCGwQlPSd/qFGK+YFGk ZeD6Sz/HbfH7O3/0xJQiWOIgq7vQ5ktOboMNbj4rNJSH/F83tSz4W1Ph+6p/SMNM68JA EbDQHwj7fmY28ReJ4WD+YWFxxbB8OOaYPkBeKBqucdOjWRdEUspw7Kqbripe4sa+TBdo 64JjLu4fLEnym/QoFhcuusSzhKFPTmYY+CISVrUEDp7rIsQKleRzvtxJSzLQlMpXCGgn a4P3MqvkaveNH9ExkW3YzeummR2zvXhP1LwkQteO5R4oGChOgjq8JyGoIZGCjiJz/bbn e+vQ== 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=kLIdsQ74hJKEWp6+Le3zVkvvl4F0DhoQG8oa7JWpnIiwCoSW1KcHR0tlIIEAMaUw4z B7xL5Ku9nQidf3v2pIG7mxkH8qB/RvFI5s5/s8wv4lG3DYjTLhlm9+rM1JS9IJryS0Jj gWEeQMSiYXKcG/yu9WtSjeDWrsXDTVuYc82tJnAjL7d/m11UXmTsgTw+h7rfjZ97mQLf 50OVosev1hTJA3Ff2qTz/BCA837iDC3krgkD65vacTo/rIaTX7mdhDzk8gAlZyd8oAyw J9IS7xc2P5dSUD+m+htJoPGbkDlmH109Eod5znuZRg8EskqcXtHkiozJT92yhOl32Wg9 Sabw== X-Gm-Message-State: AFqh2kpz3rOVQUrAJ/AExf/Ts258T4xPqwC1Bbwm3Ss+U9IfibDZgtEf 7bxBoGbD0Sm3TvGspf4HVPViyJUZMYD7NXYbwhcMJ99qV22F26CiqsyJ+2DSCMhC7B8HMHdIQAS p79f1Jzb1aXvAWdzPl0GTMJEjS8Xrbrg8cUlPTeZfAT6QtlytvQ== X-Google-Smtp-Source: AMrXdXvgPzPZlj9zlTaz+injXnQyhiKiUk7C9NXLy6CLELc1kWeX+qDF4jggMOCHj+VIIhXtxnCvQZc= X-Received: from sdf.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5935]) (user=sdf job=sendgmr) by 2002:a62:33c7:0:b0:581:2379:f591 with SMTP id z190-20020a6233c7000000b005812379f591mr1844670pfz.38.1672869600858; Wed, 04 Jan 2023 14:00:00 -0800 (PST) Date: Wed, 4 Jan 2023 13:59:38 -0800 In-Reply-To: <20230104215949.529093-1-sdf@google.com> Mime-Version: 1.0 References: <20230104215949.529093-1-sdf@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20230104215949.529093-7-sdf@google.com> Subject: [PATCH bpf-next v6 06/17] selftests/bpf: Update expected test_offload.py messages From: Stanislav Fomichev 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 , 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 Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org 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