From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 466713EF65A; Thu, 2 Apr 2026 15:50:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.20 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775145048; cv=none; b=HrrohfS8p2qAMBpcsWsWATUCjhKOb8Ls1f1MtgDhNojY1ob+HAV72h8J6M/oh5qvUoOamV60/GA/U0NjAcpY5TeLYtB2WbuIjvmvrHxfW0uzYX3XMW2iXCH2aX+aj8xrhuekfziVRiq9XfUWnmz0fmUAmZsvNUPrvua3ZCphgdU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775145048; c=relaxed/simple; bh=J57BK9sBNCaQf7KgZJxvzeutVaG94MCuRhfmbZmW3+E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=Q9sDfZ3wmIBDJSsgwE49zZNR6Xzah+wd6gHHbYwDkRIyOxTPSVWxOmhgC1scIGN4spg9ncXTR9c2rVuIHtxdX0ydtw5BgkWnKEt5FYpMVqzjScgKSeyWxBUBMoFSfAE+wQBJiD1JmD566mS0fAvOA0ZAuC/ak/aMbuy0OAX1lVY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=O/oMf/1S; arc=none smtp.client-ip=198.175.65.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="O/oMf/1S" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1775145047; x=1806681047; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=J57BK9sBNCaQf7KgZJxvzeutVaG94MCuRhfmbZmW3+E=; b=O/oMf/1S/ywRtYXJ498lTqQCIl7PzUD8e/wA/xGWMimCI1ARrnqm21xD D1RugUD3heoL1FIS8Lhn/XWx5ah0Cw2ArCMpsBeHKlnNRknBVWJMYqvpq kCrCRxaG3rEQPNG+5NL37xRQObI8ECsdaMpy2760G35Ui2xZsUo1hAKU3 zRxIjyD88yAKuh2s6BW1PlEH4ksVU+BJWMwryc4n3oJ1RGzigSDRIzb2W ZbgzdGB7t5sFTagMSgFYV97ANx10eZrdbWWhjA2qvocmfPbJ/FxMBvlm2 NSHwUfj2jZhTcAi5Wf9T81MkpMDEMx3UbLJQqYLemytmIcVzXcP2YVLNK w==; X-CSE-ConnectionGUID: Fuq6ZriUSqePtQwGYSfmqA== X-CSE-MsgGUID: LYehvJAhSReHaGevecmlcw== X-IronPort-AV: E=McAfee;i="6800,10657,11747"; a="75927995" X-IronPort-AV: E=Sophos;i="6.23,156,1770624000"; d="scan'208";a="75927995" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2026 08:50:47 -0700 X-CSE-ConnectionGUID: 9kqh3HVXQvGfGFb0/YUIeQ== X-CSE-MsgGUID: /sFYB3ZSSN+MXq8liRdERA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,156,1770624000"; d="scan'208";a="224157705" Received: from boxer.igk.intel.com ([10.102.20.173]) by fmviesa008.fm.intel.com with ESMTP; 02 Apr 2026 08:50:43 -0700 From: Maciej Fijalkowski To: netdev@vger.kernel.org Cc: bpf@vger.kernel.org, magnus.karlsson@intel.com, stfomichev@gmail.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, larysa.zaremba@intel.com, aleksander.lobakin@intel.com, bjorn@kernel.org, Maciej Fijalkowski Subject: [PATCH v6 net 6/8] selftests: bpf: fix pkt grow tests Date: Thu, 2 Apr 2026 17:49:56 +0200 Message-Id: <20260402154958.562179-7-maciej.fijalkowski@intel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20260402154958.562179-1-maciej.fijalkowski@intel.com> References: <20260402154958.562179-1-maciej.fijalkowski@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Skip tail adjust tests in xskxceiver for SKB mode as it is not very friendly for it. multi-buffer case does not work as xdp_rxq_info that is registered for generic XDP does not report ::frag_size. The non-mbuf path copies packet via skb_pp_cow_data() which only accounts for headroom, leaving us with no tailroom and causing underlying XDP prog to drop packets therefore. For multi-buffer test on other modes, change the amount of bytes we use for growth, assume worst-case scenario and take care of headroom and tailroom. Reviewed-by: Björn Töpel Signed-off-by: Maciej Fijalkowski --- .../selftests/bpf/prog_tests/test_xsk.c | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/test_xsk.c b/tools/testing/selftests/bpf/prog_tests/test_xsk.c index 62118ffba661..ee60bcc22ee4 100644 --- a/tools/testing/selftests/bpf/prog_tests/test_xsk.c +++ b/tools/testing/selftests/bpf/prog_tests/test_xsk.c @@ -2528,16 +2528,34 @@ int testapp_adjust_tail_shrink_mb(struct test_spec *test) int testapp_adjust_tail_grow(struct test_spec *test) { + if (test->mode == TEST_MODE_SKB) + return TEST_SKIP; + /* Grow by 4 bytes for testing purpose */ return testapp_adjust_tail(test, 4, MIN_PKT_SIZE * 2); } int testapp_adjust_tail_grow_mb(struct test_spec *test) { + u32 grow_size; + + if (test->mode == TEST_MODE_SKB) + return TEST_SKIP; + + /* worst case scenario is when underlying setup will work on 3k + * buffers, let us account for it; given that we will use 6k as + * pkt_len, expect that it will be broken down to 2 descs each + * with 3k payload; + * + * 4k is truesize, 3k payload, 256 HR, 320 TR; + */ + grow_size = XSK_UMEM__MAX_FRAME_SIZE - + XSK_UMEM__LARGE_FRAME_SIZE - + XDP_PACKET_HEADROOM - + test->ifobj_tx->umem_tailroom; test->mtu = MAX_ETH_JUMBO_SIZE; - /* Grow by (frag_size - last_frag_Size) - 1 to stay inside the last fragment */ - return testapp_adjust_tail(test, (XSK_UMEM__MAX_FRAME_SIZE / 2) - 1, - XSK_UMEM__LARGE_FRAME_SIZE * 2); + + return testapp_adjust_tail(test, grow_size, XSK_UMEM__LARGE_FRAME_SIZE * 2); } int testapp_tx_queue_consumer(struct test_spec *test) -- 2.43.0