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 82955C46467 for ; Thu, 19 Jan 2023 22:33:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230424AbjASWdI (ORCPT ); Thu, 19 Jan 2023 17:33:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230093AbjASWcQ (ORCPT ); Thu, 19 Jan 2023 17:32:16 -0500 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E3DCAA5E9 for ; Thu, 19 Jan 2023 14:15:49 -0800 (PST) Received: by mail-pl1-x64a.google.com with SMTP id s5-20020a170903214500b00195e3b26848so7276ple.7 for ; Thu, 19 Jan 2023 14:15:49 -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=EUVmBv6n1yWhw6xb7kdgIkQjazkcMJ0jEx+B+OPrm+s=; b=Ksz0kEMcH940hdwk/Ayvr3beOSD13KPAZuFiwab9mSkUUfoYDEQtzZ2LzAWZsU4Z/v UK3zUnyqTf+GfEUDwLP7h7Sg5WsWJH3QOZguFgOLqHAWLHFoFL945LU2RxQ7nij3yiCw gC4ZGjyVp06xNd2n4mXY8BaCpupr/b5U30gKqHR4aJTwuWrHSVb7Q/Utt789EJZgswFb bW8J8hhSHF03x9kcDuNi+jiCLsnIYTrRAr4+RZ2kwvEyQqwsTtxxgbLdk5fl+pbSPksq BAB7k4SKUgTMOaI/km53xAQSWMdmHxCf3w4QHD3N/r0fcYuEQ47Nl09cfU7o8dO6auDW MOcw== 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=EUVmBv6n1yWhw6xb7kdgIkQjazkcMJ0jEx+B+OPrm+s=; b=7gLDUJQM6HQjUTZZ/gLTlABPeNEjitqGVoGtwjAXlux6QjZozPbxwX/K8TVWbWkkR2 LnB+yal8GmDV+hzlL0OmKjQmVsFdBrD8uJpkp3yeBEwklV+tMMIVgdQ3gMb5dBHk15nQ RBvRv7DZs0aJJ5awumq+ICPjZZY2fisgRjEKLJHKS2XgFpbSm76TboJoDOuyef7OWHtm wvqHaiOhdT11oIrxfyBfK+brzXj+ziW5hUS2dYh7MZHvvadZJE2loGXalLKt0hh6y6dt TS6GMvxvH7LrD+WVOQuWSUY+Y/mxK0UJ1KWrNA93o1J0d+7kbBDwcu141WF6eazdF3bk dhEA== X-Gm-Message-State: AFqh2kqgPy7HZF4VxmkydzPV4dw5S5tMGTG3g+mTSQ0Z6pkqOWI7uRLY fO6tGyEsNbHhyaFaLVU6GzQfy/c= X-Google-Smtp-Source: AMrXdXtYG6XYudga/1qUvayFl3zZELMUnbf9QFMDzEfZUKXolfRrcqc9wXwoWaJ0lM7SXkO9RZwcut8= X-Received: from sdf.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5935]) (user=sdf job=sendgmr) by 2002:a17:903:2350:b0:192:b09c:e066 with SMTP id c16-20020a170903235000b00192b09ce066mr1219079plh.2.1674166548372; Thu, 19 Jan 2023 14:15:48 -0800 (PST) Date: Thu, 19 Jan 2023 14:15:25 -0800 In-Reply-To: <20230119221536.3349901-1-sdf@google.com> Mime-Version: 1.0 References: <20230119221536.3349901-1-sdf@google.com> X-Mailer: git-send-email 2.39.0.246.g2a6d74b583-goog Message-ID: <20230119221536.3349901-7-sdf@google.com> Subject: [PATCH bpf-next v8 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: netdev@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.246.g2a6d74b583-goog