From nobody Sat Feb 7 07:10:23 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) (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 5439F1E47AD; Wed, 9 Oct 2024 15:29:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728487745; cv=none; b=LQrG0KrDUyaA5j1mXzkScUoeUZW2W8yNyAUWc/p+5HYuw3stHQj2KkPMvcDPzZJdUADyEZ87vyClzCsBghgRHjxA1+aUJQkY8DeoMGQSiW9VeSCMXqURdaYHHbOdINBZ0nd9rtFB/DOnEC6N+WnhLfE4YfceUsvQF/Y86/RN5kA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728487745; c=relaxed/simple; bh=VWcOAVANAkT5BVZi5PuJvDmmLtKpescHO06WqVKkduk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DKFzt493EY7/OZnbyS91Fy0kyeUGWXJ7JGhBLbpxEKOHkzk6gF9w62hrbdMTMAbyWKw/bFHSGtAUl5UFRpDx8+yjsj0BM3VZiLEIyDLq6Wmr4k/KcJepp/9cJrVPgypPRd+6ltmceFHxETyoavl48zg3JGbM7oCQddy3sHZU8jI= 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=PTeUaBtu; arc=none smtp.client-ip=192.198.163.17 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="PTeUaBtu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1728487744; x=1760023744; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VWcOAVANAkT5BVZi5PuJvDmmLtKpescHO06WqVKkduk=; b=PTeUaBtu0jIW1wdSzHuiBMGRwZCsPtsmeFIe/TFzWxN1+SAocAx6xbKC 9RV37sXVJmV1Lhvo6thxAYrvyn6+vKuAiqN2sj/Qb07BWhJfBq6TtMo42 L3avyj0AGe73Kx6Hy7EdeeiB9g6y/QeW65vK0Gh7miioxs7cEWNViOkHW OMJ59cLb4qNVRZ7w7uvhuDv3jD8M9iTmcrJgq24emWGyFJNCumTXenF9W 70bKo9VQad45azSYHb/5ojEEORUssbkudQg0UiCLhEPRKSUjpzZtexWC5 G41ijA9xXpZRpZiD7gKXwWNGhfeS9qZAphOxBNY/+SvVDIFPbkbHj/CTW A==; X-CSE-ConnectionGUID: I2msODszTEKadPAk1JsJqg== X-CSE-MsgGUID: IHBPWBemTPKE+zF8GLEoag== X-IronPort-AV: E=McAfee;i="6700,10204,11220"; a="27675757" X-IronPort-AV: E=Sophos;i="6.11,190,1725346800"; d="scan'208";a="27675757" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Oct 2024 08:29:03 -0700 X-CSE-ConnectionGUID: KG79ojUbTzWjoNjB+gEqzw== X-CSE-MsgGUID: dwuzp8JXQsmm71avXFGVfg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,190,1725346800"; d="scan'208";a="81305954" Received: from newjersey.igk.intel.com ([10.102.20.203]) by orviesa004.jf.intel.com with ESMTP; 09 Oct 2024 08:28:59 -0700 From: Alexander Lobakin To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Alexander Lobakin , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Alexei Starovoitov , Daniel Borkmann , John Fastabend , Andrii Nakryiko , Stanislav Fomichev , Magnus Karlsson , nex.sw.ncis.osdt.itp.upstreaming@intel.com, bpf@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 07/18] net: Register system page pool as an XDP memory model Date: Wed, 9 Oct 2024 17:27:45 +0200 Message-ID: <20241009152756.3113697-8-aleksander.lobakin@intel.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241009152756.3113697-1-aleksander.lobakin@intel.com> References: <20241009152756.3113697-1-aleksander.lobakin@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Toke H=C3=B8iland-J=C3=B8rgensen To make the system page pool usable as a source for allocating XDP frames, we need to register it with xdp_reg_mem_model(), so that page return works correctly. This is done in preparation for using the system page pool for the XDP live frame mode in BPF_TEST_RUN; for the same reason, make the per-cpu variable non-static so we can access it from the test_run code as well. Signed-off-by: Toke H=C3=B8iland-J=C3=B8rgensen Signed-off-by: Alexander Lobakin --- include/linux/netdevice.h | 1 + net/core/dev.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index b31c8ef4bb7b..24700d0b4cc3 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3286,6 +3286,7 @@ struct softnet_data { }; =20 DECLARE_PER_CPU_ALIGNED(struct softnet_data, softnet_data); +DECLARE_PER_CPU(struct page_pool *, system_page_pool); =20 #ifndef CONFIG_PREEMPT_RT static inline int dev_recursion_level(void) diff --git a/net/core/dev.c b/net/core/dev.c index c86cf5e235fc..98f676f0be3a 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -460,7 +460,7 @@ EXPORT_PER_CPU_SYMBOL(softnet_data); * PP consumers must pay attention to run APIs in the appropriate context * (e.g. NAPI context). */ -static DEFINE_PER_CPU(struct page_pool *, system_page_pool); +DEFINE_PER_CPU(struct page_pool *, system_page_pool); =20 #ifdef CONFIG_LOCKDEP /* @@ -12037,11 +12037,18 @@ static int net_page_pool_create(int cpuid) .nid =3D cpu_to_mem(cpuid), }; struct page_pool *pp_ptr; + int err; =20 pp_ptr =3D page_pool_create_percpu(&page_pool_params, cpuid); if (IS_ERR(pp_ptr)) return -ENOMEM; =20 + err =3D xdp_reg_page_pool(pp_ptr); + if (err) { + page_pool_destroy(pp_ptr); + return err; + } + per_cpu(system_page_pool, cpuid) =3D pp_ptr; #endif return 0; @@ -12175,6 +12182,7 @@ static int __init net_dev_init(void) if (!pp_ptr) continue; =20 + xdp_unreg_page_pool(pp_ptr); page_pool_destroy(pp_ptr); per_cpu(system_page_pool, i) =3D NULL; } --=20 2.46.2