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=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 08BFFC433DB for ; Thu, 21 Jan 2021 12:35:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9C13E23A00 for ; Thu, 21 Jan 2021 12:35:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731178AbhAUMcu (ORCPT ); Thu, 21 Jan 2021 07:32:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731266AbhAUMcN (ORCPT ); Thu, 21 Jan 2021 07:32:13 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0B46C061757; Thu, 21 Jan 2021 04:31:32 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id q7so1541853wre.13; Thu, 21 Jan 2021 04:31:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=kxt+8VTbL5P82Zla3+Br2VOk1X53L1SllJ3pQxNFV4I=; b=HHCSo01bXnQgMpwqL52ROhQATVFNzK8PrPjBZ3XmdcTJkUEsPw44HPITYcVTxxJj+9 wGLrjT713a8yQayfOYMtZYJQ3fXiJZML7Hs7fD5Gp8kmw9xadkYsmpXoj48Y95oawmev okXtIQyatfInPXPVLT00tsZp8AfadaS0G38n/cb7+NHFDkszX4L1W5LD7i7P4jS0FYIX g4jPoe970r4n3X+CrFvDcNSvyXpsOhSVvEYlnyylfVnE+2+2CCZQ9JGjaQdAXqRjCxA5 E7o1YqEElVRcZVcvsFXEz18M5A30YTOfoip2XZNq6b6GdGJPl8tWMY7tygO7ZVTKEV+t 9jeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=kxt+8VTbL5P82Zla3+Br2VOk1X53L1SllJ3pQxNFV4I=; b=Yyowda1E13QWjVIVEv5MX4793/av7B1IADzc1l4//nDJac6A6ziwM47j4LOvC4tQhL 7p0qi14N6Jbu2OwB+HzNei6gh2dPbbSSv0eUMBn3ZcFKw3MY/ht/cKV3WuLrFGQ03/UC +G+nAd1Wfizt18ZD5dpG0glpl5Vkg8UoDxcr9No7lr73rVrMwDvM/vJzYYPMmxeeAR46 fBKDhNbPX6OlDoAK7patAcSJyJcMG6xiMGjMh5iKu1bu21wP4O3hwd4/Ns7Pqy2zzawK Fk4QEL+uW4ohaBjeZPA7hKGcqGL3WTFwhlnp9U1Zyydi9SWBbP+6dJ1Tmz7KbiJVjFfY GULg== X-Gm-Message-State: AOAM530Fpiw6XuISS8d+F/Rn1FX+PNAmwBoc/dI6dz6UILkNIcZkZBW5 xEXjYXnxEb532yVCic9zp3ZZXB0raOrlThfTtPv+qwOtRqw= X-Google-Smtp-Source: ABdhPJyd/4byrhV0CV690dVapDuTFQXpp9uzj0cm8+leX8+CKUFCTrAtGs5lAGH/Ra34ViNbkic8xXGBbsSRSEOczIo= X-Received: by 2002:adf:bc92:: with SMTP id g18mr13707364wrh.160.1611232291639; Thu, 21 Jan 2021 04:31:31 -0800 (PST) MIME-Version: 1.0 References: <20210119155013.154808-1-bjorn.topel@gmail.com> <20210119155013.154808-8-bjorn.topel@gmail.com> In-Reply-To: From: =?UTF-8?B?QmrDtnJuIFTDtnBlbA==?= Date: Thu, 21 Jan 2021 13:31:19 +0100 Message-ID: Subject: Re: [PATCH bpf-next v2 7/8] selftest/bpf: add XDP socket tests for bpf_redirect_{xsk, map}() To: Andrii Nakryiko Cc: Alexei Starovoitov , Daniel Borkmann , Networking , bpf , =?UTF-8?B?QmrDtnJuIFTDtnBlbA==?= , Magnus Karlsson , Maciej Fijalkowski , Jakub Kicinski , Jonathan Lemon , maximmi@nvidia.com, "David S. Miller" , Jesper Dangaard Brouer , john fastabend , Ciara Loftus , Weqaar Janjua Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Thu, 21 Jan 2021 at 08:39, Andrii Nakryiko w= rote: > > On Tue, Jan 19, 2021 at 7:55 AM Bj=C3=B6rn T=C3=B6pel wrote: > > > > From: Bj=C3=B6rn T=C3=B6pel > > > > Add support for externally loaded XDP programs to > > xdpxceiver/test_xsk.sh, so that bpf_redirect_xsk() and > > bpf_redirect_map() can be exercised. > > > > Signed-off-by: Bj=C3=B6rn T=C3=B6pel > > --- > > .../selftests/bpf/progs/xdpxceiver_ext1.c | 15 ++++ > > .../selftests/bpf/progs/xdpxceiver_ext2.c | 9 +++ > > tools/testing/selftests/bpf/test_xsk.sh | 48 ++++++++++++ > > tools/testing/selftests/bpf/xdpxceiver.c | 77 ++++++++++++++++++- > > tools/testing/selftests/bpf/xdpxceiver.h | 2 + > > 5 files changed, 147 insertions(+), 4 deletions(-) > > create mode 100644 tools/testing/selftests/bpf/progs/xdpxceiver_ext1.c > > create mode 100644 tools/testing/selftests/bpf/progs/xdpxceiver_ext2.c > > > > diff --git a/tools/testing/selftests/bpf/progs/xdpxceiver_ext1.c b/tool= s/testing/selftests/bpf/progs/xdpxceiver_ext1.c > > new file mode 100644 > > index 000000000000..18894040cca6 > > --- /dev/null > > +++ b/tools/testing/selftests/bpf/progs/xdpxceiver_ext1.c > > @@ -0,0 +1,15 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +#include > > +#include > > + > > +struct { > > + __uint(type, BPF_MAP_TYPE_XSKMAP); > > + __uint(max_entries, 32); > > + __uint(key_size, sizeof(int)); > > + __uint(value_size, sizeof(int)); > > +} xsks_map SEC(".maps"); > > + > > +SEC("xdp_sock") int xdp_sock_prog(struct xdp_md *ctx) > > hmm.. that's unconventional... please keep SEC() on separate line > > > +{ > > + return bpf_redirect_map(&xsks_map, ctx->rx_queue_index, XDP_DRO= P); > > +} > > diff --git a/tools/testing/selftests/bpf/progs/xdpxceiver_ext2.c b/tool= s/testing/selftests/bpf/progs/xdpxceiver_ext2.c > > new file mode 100644 > > index 000000000000..bd239b958c01 > > --- /dev/null > > +++ b/tools/testing/selftests/bpf/progs/xdpxceiver_ext2.c > > @@ -0,0 +1,9 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +#include > > +#include > > + > > +SEC("xdp_sock") int xdp_sock_prog(struct xdp_md *ctx) > > same here > Thanks Andrii! I'll make sure to have the SECs on separate lines going forw= ard! Bj=C3=B6rn