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.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 A88E6C433E0 for ; Wed, 3 Feb 2021 08:13:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 655BE64F69 for ; Wed, 3 Feb 2021 08:13:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232658AbhBCIMs (ORCPT ); Wed, 3 Feb 2021 03:12:48 -0500 Received: from mga12.intel.com ([192.55.52.136]:59625 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232599AbhBCIM3 (ORCPT ); Wed, 3 Feb 2021 03:12:29 -0500 IronPort-SDR: /5oA5nLkkBXc0snXvADJVKb08j5MRY5+4xOvlA1ObX5XVeyc3y70u/cPNDCQItcvyE1UtmNAaN IuQM3Ay6ccqA== X-IronPort-AV: E=McAfee;i="6000,8403,9883"; a="160170068" X-IronPort-AV: E=Sophos;i="5.79,397,1602572400"; d="scan'208";a="160170068" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Feb 2021 00:11:37 -0800 IronPort-SDR: ZJGLFtFKQSUUnC5DOOHOektPCBR6wT3gbzdJ1VMCJ6iVwEqnida51QkUvoK8zCk44K95rWLguI 5r1s4s81tgLg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,397,1602572400"; d="scan'208";a="413932480" Received: from silpixa00399839.ir.intel.com (HELO localhost.localdomain) ([10.237.222.142]) by fmsmga002.fm.intel.com with ESMTP; 03 Feb 2021 00:11:35 -0800 From: Ciara Loftus To: netdev@vger.kernel.org, bpf@vger.kernel.org, magnus.karlsson@intel.com, bjorn@kernel.org, weqaar.a.janjua@intel.com Cc: daniel@iogearbox.net, Ciara Loftus Subject: [PATCH bpf-next v4 5/6] selftests/bpf: XSK_TRACE_INVALID_FILLADDR test Date: Wed, 3 Feb 2021 07:41:26 +0000 Message-Id: <20210203074127.8616-6-ciara.loftus@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210203074127.8616-1-ciara.loftus@intel.com> References: <20210203074127.8616-1-ciara.loftus@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org This test supplies invalid addresses to the fill queue at init. On RX, traces are expected which report the invalid address which look like so: xsk_packet_drop: netdev: ve3213 qid 0 reason: invalid fill addr: \ addr 262144 not_used 0 not_used 0 The test validates that these traces were successfully generated. Signed-off-by: Ciara Loftus --- tools/testing/selftests/bpf/test_xsk.sh | 24 ++++++++++++++++++++ tools/testing/selftests/bpf/xdpxceiver.c | 29 ++++++++++++++++++------ 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/bpf/test_xsk.sh b/tools/testing/selftests/bpf/test_xsk.sh index 5b4e42ac8c20..bc026da25d54 100755 --- a/tools/testing/selftests/bpf/test_xsk.sh +++ b/tools/testing/selftests/bpf/test_xsk.sh @@ -271,6 +271,30 @@ retval=$? test_status $retval "${TEST_NAME}" statusList+=($retval) +### TEST 12 +TEST_NAME="SKB TRACE INVALID_FILLADDR" + +vethXDPgeneric ${VETH0} ${VETH1} ${NS1} + +params=("-S" "-t" "1" "-C" "${TRACEPKTS}") +execxdpxceiver params + +retval=$? +test_status $retval "${TEST_NAME}" +statusList+=($retval) + +### TEST 13 +TEST_NAME="DRV TRACE INVALID_FILLADDR" + +vethXDPnative ${VETH0} ${VETH1} ${NS1} + +params=("-N" "-t" "1" "-C" "${TRACEPKTS}") +execxdpxceiver params + +retval=$? +test_status $retval "${TEST_NAME}" +statusList+=($retval) + ## END TESTS cleanup_exit ${VETH0} ${VETH1} ${NS1} diff --git a/tools/testing/selftests/bpf/xdpxceiver.c b/tools/testing/selftests/bpf/xdpxceiver.c index dda965c3d9ec..e63dc1c228ed 100644 --- a/tools/testing/selftests/bpf/xdpxceiver.c +++ b/tools/testing/selftests/bpf/xdpxceiver.c @@ -35,6 +35,8 @@ * mode is used * e. Tracing - XSK_TRACE_DROP_PKT_TOO_BIG * Increase the headroom size and send packets. Validate traces. + * f. Tracing - XSK_TRACE_DROP_INVALID_FILLADDR + * Populate the fill queue with invalid addresses. Validate traces. * * 2. AF_XDP DRV/Native mode * Works on any netdevice with XDP_REDIRECT support, driver dependent. Processes @@ -47,8 +49,9 @@ * - Only copy mode is supported because veth does not currently support * zero-copy mode * e. Tracing - XSK_TRACE_DROP_PKT_TOO_BIG + * f. Tracing - XSK_TRACE_DROP_INVALID_FILLADDR * - * Total tests: 10 + * Total tests: 12 * * Flow: * ----- @@ -276,7 +279,8 @@ static void xsk_configure_umem(struct ifobject *data, void *buffer, u64 size) { int ret; struct xsk_umem_config cfg = { - .fill_size = XSK_RING_PROD__DEFAULT_NUM_DESCS, + .fill_size = opt_trace_code == XSK_TRACE_DROP_INVALID_FILLADDR ? opt_pkt_count : + XSK_RING_PROD__DEFAULT_NUM_DESCS, .comp_size = XSK_RING_CONS__DEFAULT_NUM_DESCS, .frame_size = XSK_UMEM__DEFAULT_FRAME_SIZE, .frame_headroom = XSK_UMEM__DEFAULT_FRAME_HEADROOM, @@ -302,13 +306,21 @@ static void xsk_populate_fill_ring(struct xsk_umem_info *umem) { int ret, i; u32 idx; + u32 num_addrs = XSK_RING_PROD__DEFAULT_NUM_DESCS; + u32 invalid = 0; - ret = xsk_ring_prod__reserve(&umem->fq, XSK_RING_PROD__DEFAULT_NUM_DESCS, &idx); - if (ret != XSK_RING_PROD__DEFAULT_NUM_DESCS) + if (opt_trace_code == XSK_TRACE_DROP_INVALID_FILLADDR) { + num_addrs = opt_pkt_count; + invalid = num_frames * XSK_UMEM__DEFAULT_FRAME_SIZE; + } + + ret = xsk_ring_prod__reserve(&umem->fq, num_addrs, &idx); + if (ret != num_addrs) exit_with_error(ret); - for (i = 0; i < XSK_RING_PROD__DEFAULT_NUM_DESCS; i++) - *xsk_ring_prod__fill_addr(&umem->fq, idx++) = i * XSK_UMEM__DEFAULT_FRAME_SIZE; - xsk_ring_prod__submit(&umem->fq, XSK_RING_PROD__DEFAULT_NUM_DESCS); + for (i = 0; i < num_addrs; i++) + *xsk_ring_prod__fill_addr(&umem->fq, idx++) = + (i * XSK_UMEM__DEFAULT_FRAME_SIZE) + invalid; + xsk_ring_prod__submit(&umem->fq, num_addrs); } static int xsk_configure_socket(struct ifobject *ifobject) @@ -1172,6 +1184,9 @@ int main(int argc, char **argv) case XSK_TRACE_DROP_PKT_TOO_BIG: reason_str = "packet too big"; break; + case XSK_TRACE_DROP_INVALID_FILLADDR: + reason_str = "invalid fill addr"; + break; default: ksft_test_result_fail("ERROR: unsupported trace %i\n", opt_trace_code); -- 2.17.1