Commit 40535704 authored by Stanislav Fomichev's avatar Stanislav Fomichev Committed by Martin KaFai Lau
Browse files

selftests/bpf: Update expected test_offload.py messages 



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: default avatarStanislav Fomichev <sdf@google.com>
Link: https://lore.kernel.org/r/20230119221536.3349901-7-sdf@google.com


Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parent 2b3486bc

tools/testing/selftests/bpf/test_offload.py

+5 −5
Original line number Diff line number Diff line
@@ -1039,7 +1039,7 @@ try: 
    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 @@ try: 
    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 @@ try: 
    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...")