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 X-Spam-Level: X-Spam-Status: No, score=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38840C48BC2 for ; Wed, 23 Jun 2021 11:17:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 200356102A for ; Wed, 23 Jun 2021 11:17:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230224AbhFWLT7 (ORCPT ); Wed, 23 Jun 2021 07:19:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24808 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230204AbhFWLT4 (ORCPT ); Wed, 23 Jun 2021 07:19:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624447058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=b/3yS7LjHTHKfwybIlEpPmbf7+iHJm11BxEfhxSMx4s=; b=SxQGLlR7g284IO5qTrBzTivM1l94i6wUUv8GFWr2FVWvd3LYWhyPb3eIiBtaJG8+02f7Qk ARb588eA81/RW7o4yYZiYSSV2lx/dhJkUvmmC5Hm6lI4n6Iu2S7GQ2ioXW9FMrjbw22n1X z5c0IJPE91L3PJ/Gc3lePSb9UQY0yDw= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-373-LSOPQmGCODyAvFlGcO6RXw-1; Wed, 23 Jun 2021 07:17:37 -0400 X-MC-Unique: LSOPQmGCODyAvFlGcO6RXw-1 Received: by mail-ej1-f69.google.com with SMTP id w22-20020a17090652d6b029048a3391d9f6so856590ejn.12 for ; Wed, 23 Jun 2021 04:17:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=b/3yS7LjHTHKfwybIlEpPmbf7+iHJm11BxEfhxSMx4s=; b=FifgSAdj+6vBQMzxq7ytryuQeLM6nbPCXv6ty/8oWVRIrn60H8QzvrkVd66k9s74Cf UAayV+4iHC8BsC+qJjnxclM3fcmCw1kR697p1hwI4Uwnsg7VnmAogIuJtG2sBeNnCq3g mjGIOP5yxW6um5EpPo7bFG2Bc3G2rXNSnDPf8rneDhfRoKyX6+uyKCLoaPnFHerpkjsB CnmT+n0XHWvIu/5DPiUChjWbprMnmdQj8Y5NIC7N0pJd5MnLjVj9VjVHHpPN9CcL4rkv G8g6FVolrnDpgtSoh8diazHA1E155JuOWuU5vf0nUKhAQkxYrn9gO3SIRTRzgZsFf0Au 257A== X-Gm-Message-State: AOAM5328mjkuFK5QGQNhTWY8FHRa2POXwIC48Yau0ov3e0A/90B2hr1+ HSB+f9jU70C9sGEXFjIBng8vpeLELvXSJs5e90hIdHxL2+QQFhiFbCJk5e77I2793aYONWMoDnt 1KGPyNUSwPQy1 X-Received: by 2002:a17:907:628a:: with SMTP id nd10mr9446187ejc.326.1624447056182; Wed, 23 Jun 2021 04:17:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz25B0vO27pZCcHDvVK0CgKzd9Bg8TdjridQdPvHb/yGoxtJKIdGkfYPe6XcUq0TCELpd5TLQ== X-Received: by 2002:a17:907:628a:: with SMTP id nd10mr9446166ejc.326.1624447056034; Wed, 23 Jun 2021 04:17:36 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id cd4sm7154729ejb.104.2021.06.23.04.17.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 04:17:35 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id EC264180730; Wed, 23 Jun 2021 13:17:34 +0200 (CEST) From: Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= To: Kumar Kartikeya Dwivedi , netdev@vger.kernel.org Cc: Kumar Kartikeya Dwivedi , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Jesper Dangaard Brouer , "David S. Miller" , Jakub Kicinski , John Fastabend , Martin KaFai Lau , bpf@vger.kernel.org Subject: Re: [PATCH net-next v3 5/5] bpf: update XDP selftests to not fail with generic XDP In-Reply-To: <20210622202835.1151230-6-memxor@gmail.com> References: <20210622202835.1151230-1-memxor@gmail.com> <20210622202835.1151230-6-memxor@gmail.com> X-Clacks-Overhead: GNU Terry Pratchett Date: Wed, 23 Jun 2021 13:17:34 +0200 Message-ID: <878s30omnl.fsf@toke.dk> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Kumar Kartikeya Dwivedi writes: > Generic XDP devmaps and cpumaps now allow setting value_size to 8 bytes > (so that prog_fd can be specified) and XDP progs using them succeed in > SKB mode now. Adjust the checks. > > Signed-off-by: Kumar Kartikeya Dwivedi > --- > tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c | 4 ++-- > tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c b/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c > index 0176573fe4e7..42e46d2ae349 100644 > --- a/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c > +++ b/tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c > @@ -29,8 +29,8 @@ void test_xdp_with_cpumap_helpers(void) > */ > prog_fd = bpf_program__fd(skel->progs.xdp_redir_prog); > err = bpf_set_link_xdp_fd(IFINDEX_LO, prog_fd, XDP_FLAGS_SKB_MODE); > - CHECK(err == 0, "Generic attach of program with 8-byte CPUMAP", > - "should have failed\n"); > + CHECK(err, "Generic attach of program with 8-byte CPUMAP", > + "shouldn't have failed\n"); There's a comment right above this that is now wrong... Also, this program is never being detached. > prog_fd = bpf_program__fd(skel->progs.xdp_dummy_cm); > map_fd = bpf_map__fd(skel->maps.cpu_map); > diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c b/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c > index 88ef3ec8ac4c..861db508ace2 100644 > --- a/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c > +++ b/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c > @@ -31,8 +31,8 @@ void test_xdp_with_devmap_helpers(void) > */ > dm_fd = bpf_program__fd(skel->progs.xdp_redir_prog); > err = bpf_set_link_xdp_fd(IFINDEX_LO, dm_fd, XDP_FLAGS_SKB_MODE); > - CHECK(err == 0, "Generic attach of program with 8-byte devmap", > - "should have failed\n"); > + CHECK(err, "Generic attach of program with 8-byte devmap", > + "shouldn't have failed\n"); ... same here -Toke