From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (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 69BCB3E51FA; Tue, 31 Mar 2026 15:02:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774969340; cv=none; b=p9gEH3dge2/aOl6Jv7nb3x/5NROVGENQY/fMnXhLpFSIbF5wcUszXtuvO+A9FjWb78jmsMiXvLEYmjGIUZPhJKdAFb/CXc6sfBTu5irK+HibCK8CzIwGFW+OLd9lwAvUAMHcWHWNxxEkihJLXnW3n/8RbLKZvphCWtDAFAR34hU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774969340; c=relaxed/simple; bh=A/QYaJnLTcg85kNTS2YUuxrvo0qQ+GxqhLCyT14dS3I=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=N9Dd2zzhAV04Q920Z0HD5YAPLsbl0UgpaDTMzs2wVTQWDSBw35XEdsIhOa5XtGuvd07jbB20SBegLUZBwPdI+c2h8DHKnn8p1x6G+gdFSH/MyZrDlhqSiVY/yW0auDiU7jqgwCZfC8k1QxFVmiZklJnNv6n6ZJjjpqyZuQ52JNo= 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=ZH8WIcKr; arc=none smtp.client-ip=192.198.163.14 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="ZH8WIcKr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1774969340; x=1806505340; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=A/QYaJnLTcg85kNTS2YUuxrvo0qQ+GxqhLCyT14dS3I=; b=ZH8WIcKrdSA8LiC4aKqAfFlfCWymp094eDDhISKzsvKiP/3i03Tn2Rq+ sQ+PxGX70ivqP5+zmr6CSm0M5LWcgocdLIDHV2UoX28hVnweFYwtS+jXl N4ZDQbsYGxQEkOU3OFC5GDQo4A/dZ+JTN2PhhEHZQRct2x3/P76ntYOQA yvW98tGSCJ9xqf9MUBtbHvSdDP6H/De0ZRfHJkyg5fbNMjDNnLtC7lnFi /qcPkNqR5eziO6qscvOje7iAiuVXJ8BcRDVvABYGc/igB0YZVxLDsvQH0 AvH+hmEGPqWRfhK+ESXLYYXnEgXLbs9AaDVGus/JpA8RIhNU0lQRw+wEO Q==; X-CSE-ConnectionGUID: bF8p23SQQbuRBkx6tyviow== X-CSE-MsgGUID: lWGd6ftHSFOtJ6Ac0q+O6w== X-IronPort-AV: E=McAfee;i="6800,10657,11745"; a="76046079" X-IronPort-AV: E=Sophos;i="6.23,152,1770624000"; d="scan'208";a="76046079" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2026 08:02:19 -0700 X-CSE-ConnectionGUID: 9qiSr/k8R7KjISZE8F8YdA== X-CSE-MsgGUID: VLC7m+sKRlqFU/Ot6U9yXQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,152,1770624000"; d="scan'208";a="219735479" Received: from boxer.igk.intel.com ([10.102.20.173]) by fmviesa009.fm.intel.com with ESMTP; 31 Mar 2026 08:02:16 -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 v5 net 00/11] xsk: tailroom reservation and MTU validation Date: Tue, 31 Mar 2026 17:02:02 +0200 Message-Id: <20260331150213.550797-1-maciej.fijalkowski@intel.com> X-Mailer: git-send-email 2.38.1 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 v4->v5: - add further review tags from Bjorn - fix ./test_progs -t xsk * do so by making the procfs reading common so test_xsk.c can use it - get back to idea of relying on pool->umem->zc in xsk_pool_get_tailroom(); that is because we now call its caller (xsk_pool_get_rx_frame_size()) before getting down to driver via ndo_bpf - we do it to rule out invalid setups in terms of MTU vs xsk frame size/number of exposed segments by driver - bring back explicit rejection of mbuf && segs == 1 combo v3->v4: - allow exact 128 bytes of space when user defined headroom is deducted from total frame size - provide a routine for reading procfs entries within xskxceiver * use it to fetch cache line size and calculate skb_shared_info size on our own - clean up gve and igc xsk pool enablement routines - include mtu vs frame size * max zc segments validation in xp_assign_dev() v2->v3: - add tags from Bjorn/Stan - provide at least 128 bytes instead ETH_ZLEN when validating frame headroom * this way we can get rid of i40e/ice changes * make sure xsk_pool_get_rx_frame_size() returns value 128b-aligned * and remove pre-check from idpf - separate XDP_UMEM_SG_FLAG fixes from MTU validation in xsk_bind() - make drop_idx a local variable in xsk's xdp drop prog - adjust rx_dropped to new 128b related values - move ugly placed define (Bjorn) - remove READ_ONCE when fetching netdev->mtu (Bjorn) v1->v2: - remove xsk_pool_get_tailroom() definition for !CONFIG_XDP_SOCKETS (Stan) - do not rely on pool->umem->zc when configuring tailroom (Stan, Bjorn) - simplify dbuff setting in ZC drivers (Bjorn) - use defines for {head,tail}room in tests (Bjorn) - return EINVAL instead of EOPNOTSUPP when mtu setting is wrong (Bjorn) - include vlan headers and fcs length when validating mtu (Olek) - tighten umem headroom validation when registering umem (Sashiko AI) - set XDP_USE_SG in xp_assign_dev_shared() (Sashiko AI) - adjust rx dropped xskxceiver test Hi, here we fix a long-standing issue regarding multi-buffer scenario in ZC mode - we have not been providing space at the end of the buffer where multi-buffer XDP works on skb_shared_info. This has been brought to our attention via [0]. Unaligned mode does not get any specific treatment, it is user's responsibility to properly handle XSK addresses in queues. With adjustments included here in this set against xskxceiver I have been able to pass the full test suite on ice. Thanks, Maciej [0]: https://community.intel.com/t5/Ethernet-Products/X710-XDP-Packet-Corruption-Issue-DRV-MODE-Zero-Copy-Multi-Buffer/m-p/1724208 Maciej Fijalkowski (11): xsk: tighten UMEM headroom validation to account for tailroom and min frame xsk: respect tailroom for ZC setups xsk: fix XDP_UMEM_SG_FLAG issues xsk: validate MTU against usable frame size on bind selftests: bpf: introduce a common routine for reading procfs selftests: bpf: fix pkt grow tests selftests: bpf: have a separate variable for drop test selftests: bpf: adjust rx_dropped xskxceiver's test to respect tailroom idpf: remove xsk frame size check against alignment igc: remove home-grown xsk's frame size validation gve: remove home-grown xsk's frame size validation drivers/net/ethernet/google/gve/gve_main.c | 5 -- drivers/net/ethernet/intel/idpf/xsk.c | 10 ---- drivers/net/ethernet/intel/igc/igc_xdp.c | 11 ---- include/net/xdp_sock.h | 2 +- include/net/xdp_sock_drv.h | 17 +++++- net/xdp/xdp_umem.c | 3 +- net/xdp/xsk_buff_pool.c | 25 ++++++++- .../selftests/bpf/prog_tests/test_xsk.c | 55 +++++++++---------- .../selftests/bpf/prog_tests/test_xsk.h | 23 ++++++++ tools/testing/selftests/bpf/prog_tests/xsk.c | 19 +++++++ .../selftests/bpf/progs/xsk_xdp_progs.c | 4 +- tools/testing/selftests/bpf/xskxceiver.c | 23 ++++++++ 12 files changed, 135 insertions(+), 62 deletions(-) -- 2.43.0