From patchwork Sat Apr 8 19:24:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Dangaard Brouer X-Patchwork-Id: 13205799 X-Patchwork-Delegate: bpf@iogearbox.net 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 29EE0C77B6C for ; Sat, 8 Apr 2023 19:26:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229642AbjDHT0T (ORCPT ); Sat, 8 Apr 2023 15:26:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229615AbjDHT0S (ORCPT ); Sat, 8 Apr 2023 15:26:18 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9430DB77A for ; Sat, 8 Apr 2023 12:24:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680981892; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eO/r8MtggLglxkiJ3agqPFRas0YnxAM9LNBZVhZj1AA=; b=Bph0OZpxH7c3kTDsOFLa4KNDor4j/bO/Rbq2/CA09Wbm0CA9CRoHYhk/gtjA83UyOOp3sg iE/Y9vKiFEztruF3LLhnh0Q/DSUSLvF8EwCnR/5YTCR5pQXosewZ9v9NhRaYnf42lu7lPG +X4BTZbBjyqyCd8UeZmG1pHMM6T7eaI= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-639-WNc-nW5aNYCSe86ldUi1gQ-1; Sat, 08 Apr 2023 15:24:49 -0400 X-MC-Unique: WNc-nW5aNYCSe86ldUi1gQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5608D29AA2E9; Sat, 8 Apr 2023 19:24:48 +0000 (UTC) Received: from firesoul.localdomain (unknown [10.45.242.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5CC4014171BE; Sat, 8 Apr 2023 19:24:47 +0000 (UTC) Received: from [10.1.1.1] (localhost [IPv6:::1]) by firesoul.localdomain (Postfix) with ESMTP id 73149307372E8; Sat, 8 Apr 2023 21:24:46 +0200 (CEST) Subject: [PATCH bpf V7 2/7] selftests/bpf: Add counters to xdp_hw_metadata From: Jesper Dangaard Brouer To: bpf@vger.kernel.org, Stanislav Fomichev , =?utf-8?q?Toke?= =?utf-8?q?_H=C3=B8iland-J=C3=B8rgensen?= Cc: Jesper Dangaard Brouer , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, martin.lau@kernel.org, ast@kernel.org, daniel@iogearbox.net, alexandr.lobakin@intel.com, larysa.zaremba@intel.com, xdp-hints@xdp-project.net, anthony.l.nguyen@intel.com, yoong.siang.song@intel.com, boon.leong.ong@intel.com, intel-wired-lan@lists.osuosl.org, pabeni@redhat.com, jesse.brandeburg@intel.com, kuba@kernel.org, edumazet@google.com, john.fastabend@gmail.com, hawk@kernel.org, davem@davemloft.net, tariqt@nvidia.com, saeedm@nvidia.com, leon@kernel.org, linux-rdma@vger.kernel.org Date: Sat, 08 Apr 2023 21:24:46 +0200 Message-ID: <168098188642.96582.9605191658852260548.stgit@firesoul> In-Reply-To: <168098183268.96582.7852359418481981062.stgit@firesoul> References: <168098183268.96582.7852359418481981062.stgit@firesoul> User-Agent: StGit/1.4 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Add counters for skipped, failed and redirected packets. The xdp_hw_metadata program only redirects UDP port 9091. This helps users to quickly identify then packets are skipped and identify failures of bpf_xdp_adjust_meta. Signed-off-by: Jesper Dangaard Brouer --- .../testing/selftests/bpf/progs/xdp_hw_metadata.c | 15 +++++++++++++-- tools/testing/selftests/bpf/xdp_hw_metadata.c | 4 +++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c b/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c index 980eb60d8e5b..d11aca50e54d 100644 --- a/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c +++ b/tools/testing/selftests/bpf/progs/xdp_hw_metadata.c @@ -25,6 +25,10 @@ struct { __type(value, __u32); } xsk SEC(".maps"); +volatile __u64 pkts_skip = 0; +volatile __u64 pkts_fail = 0; +volatile __u64 pkts_redir = 0; + extern int bpf_xdp_metadata_rx_timestamp(const struct xdp_md *ctx, __u64 *timestamp) __ksym; extern int bpf_xdp_metadata_rx_hash(const struct xdp_md *ctx, @@ -59,16 +63,21 @@ int rx(struct xdp_md *ctx) udp = NULL; } - if (!udp) + if (!udp) { + pkts_skip++; return XDP_PASS; + } /* Forwarding UDP:9091 to AF_XDP */ - if (udp->dest != bpf_htons(9091)) + if (udp->dest != bpf_htons(9091)) { + pkts_skip++; return XDP_PASS; + } ret = bpf_xdp_adjust_meta(ctx, -(int)sizeof(struct xdp_meta)); if (ret != 0) { bpf_printk("bpf_xdp_adjust_meta returned %d", ret); + pkts_fail++; return XDP_PASS; } @@ -78,6 +87,7 @@ int rx(struct xdp_md *ctx) if (meta + 1 > data) { bpf_printk("bpf_xdp_adjust_meta doesn't appear to work"); + pkts_fail++; return XDP_PASS; } @@ -91,6 +101,7 @@ int rx(struct xdp_md *ctx) else meta->rx_hash = 0; /* Used by AF_XDP as not avail signal */ + pkts_redir++; return bpf_redirect_map(&xsk, ctx->rx_queue_index, XDP_PASS); } diff --git a/tools/testing/selftests/bpf/xdp_hw_metadata.c b/tools/testing/selftests/bpf/xdp_hw_metadata.c index 1c8acb68b977..3b942ef7297b 100644 --- a/tools/testing/selftests/bpf/xdp_hw_metadata.c +++ b/tools/testing/selftests/bpf/xdp_hw_metadata.c @@ -212,7 +212,9 @@ static int verify_metadata(struct xsk *rx_xsk, int rxq, int server_fd) while (true) { errno = 0; ret = poll(fds, rxq + 1, 1000); - printf("poll: %d (%d)\n", ret, errno); + printf("poll: %d (%d) skip=%llu fail=%llu redir=%llu\n", + ret, errno, bpf_obj->bss->pkts_skip, + bpf_obj->bss->pkts_fail, bpf_obj->bss->pkts_redir); if (ret < 0) break; if (ret == 0)