lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0149/1039] selftests/bpf: Fix xdpxceiver failures for no hugepages
    Date
    From: Tirthendu Sarkar <tirthendu.sarkar@intel.com>

    [ Upstream commit dd7f091fd22b1dce6c20e8f7769aa068ed88ac6d ]

    xsk_configure_umem() needs hugepages to work in unaligned mode. So when
    hugepages are not configured, 'unaligned' tests should be skipped which
    is determined by the helper function hugepages_present(). This function
    erroneously returns true with MAP_NORESERVE flag even when no hugepages
    are configured. The removal of this flag fixes the issue.

    The test TEST_TYPE_UNALIGNED_INV_DESC also needs to be skipped when
    there are no hugepages. However, this was not skipped as there was no
    check for presence of hugepages and hence was failing. The check to skip
    the test has now been added.

    Fixes: a4ba98dd0c69 (selftests: xsk: Add test for unaligned mode)
    Signed-off-by: Tirthendu Sarkar <tirthendu.sarkar@intel.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Link: https://lore.kernel.org/bpf/20211117123613.22288-1-tirthendu.sarkar@intel.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/bpf/xdpxceiver.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/tools/testing/selftests/bpf/xdpxceiver.c b/tools/testing/selftests/bpf/xdpxceiver.c
    index 6c7cf8aadc792..621342ec30c48 100644
    --- a/tools/testing/selftests/bpf/xdpxceiver.c
    +++ b/tools/testing/selftests/bpf/xdpxceiver.c
    @@ -1219,7 +1219,7 @@ static bool hugepages_present(struct ifobject *ifobject)
    void *bufs;

    bufs = mmap(NULL, mmap_sz, PROT_READ | PROT_WRITE,
    - MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE | MAP_HUGETLB, -1, 0);
    + MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, -1, 0);
    if (bufs == MAP_FAILED)
    return false;

    @@ -1366,6 +1366,10 @@ static void run_pkt_test(struct test_spec *test, enum test_mode mode, enum test_
    testapp_invalid_desc(test);
    break;
    case TEST_TYPE_UNALIGNED_INV_DESC:
    + if (!hugepages_present(test->ifobj_tx)) {
    + ksft_test_result_skip("No 2M huge pages present.\n");
    + return;
    + }
    test_spec_set_name(test, "UNALIGNED_INV_DESC");
    test->ifobj_tx->umem->unaligned_mode = true;
    test->ifobj_rx->umem->unaligned_mode = true;
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 22:54    [W:2.652 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site