From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) (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 14FE826988C; Tue, 8 Apr 2025 12:48:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.9 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744116518; cv=none; b=fI6OUxRSJpn8te+k2gOr/rUWtYO5bAL6F2XDNlqfv7RApIc/PO2Y23oOrcxSHRJw1Vj4Vjg0Fe9bbxVsKwxd5RX1errM40nUy6fYRhFY45cgkToSgU3ePYALBE8XNFdB2g05exLqc/e79oW4uqbKAsUwZlThwuxQeM8vuY61G5Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744116518; c=relaxed/simple; bh=jhjKykB23fCTps87HNyTFruH+TAg/hlq47KmVtyfNDQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dBsVCpbT4RQKPoGoXaGW+FJGjPinFXiknhm0bIR+GCdzEzTrih3om/vEG1wzlq6r3EuHC17spDdlQdFMiOVAdxoKSycKtFhHc19e/2R7vKZBrdnB9s/+KL/roqRw/QsW55fS0I4GuZ8dYGxntHdgUIyccp6tSyFcRBuNQJM5l10= 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=iTsyg/Zs; arc=none smtp.client-ip=192.198.163.9 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="iTsyg/Zs" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744116517; x=1775652517; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jhjKykB23fCTps87HNyTFruH+TAg/hlq47KmVtyfNDQ=; b=iTsyg/Zssnb7dXURnySjFffqaJEDoSbl4BZ3fFNY4nbIpRyfCt0NFMDL +DqE5NkPgcrBNWNELLK+ewPWvn8fq1L6167ODYcqdVVBuE1stc9+Z2Pv+ ZfsFFTYKV5dnlK5WyB0XQSk1JceQbT+L5y7z/4IEOTWdOTI9QNCMwiH1k GIowEvtBBHMk4yb6CIFNhKyZgxfQnQEWG6SaYyz3t1jw+YxsXuDZYvOUU +1r6xy6KWWc02oCx4X4EOfFEZRC52u7TAiECVmIqR1JYPfJPcHw6unOlG 1s38xuuAWmq2opFC4oJ/dFQ/Ad7nXVHMtTN5dg6Z7nMaMPKHbIDq/+k4/ g==; X-CSE-ConnectionGUID: Zm0N18bvR/W6q7WWn0uxuQ== X-CSE-MsgGUID: sk4JyMhuQIiEV53H7HPZUQ== X-IronPort-AV: E=McAfee;i="6700,10204,11397"; a="56184861" X-IronPort-AV: E=Sophos;i="6.15,198,1739865600"; d="scan'208";a="56184861" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2025 05:48:36 -0700 X-CSE-ConnectionGUID: CZfrPApcRtCId0ZBuKjKCw== X-CSE-MsgGUID: MXI773cOS2aYCvetPKyo1w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,198,1739865600"; d="scan'208";a="133130663" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by orviesa003.jf.intel.com with ESMTP; 08 Apr 2025 05:48:29 -0700 Received: from mglak.igk.intel.com (mglak.igk.intel.com [10.237.112.146]) by irvmail002.ir.intel.com (Postfix) with ESMTP id 34B5E34319; Tue, 8 Apr 2025 13:48:26 +0100 (IST) From: Larysa Zaremba To: intel-wired-lan@lists.osuosl.org, Tony Nguyen Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jonathan Corbet , Przemek Kitszel , Jiri Pirko , Mustafa Ismail , Tatyana Nikolova , Andrew Lunn , Alexander Lobakin , Michael Ellerman , Maciej Fijalkowski , Lee Trager , Madhavan Srinivasan , Larysa Zaremba , Sridhar Samudrala , Jacob Keller , Michal Swiatkowski , Mateusz Polchlopek , Wenjun Wu , Ahmed Zaki , netdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, "Karlsson, Magnus" , Emil Tantilov , Madhu Chittim , Josh Hay , Milena Olech , pavan.kumar.linga@intel.com, "Singhai, Anjali" Subject: [PATCH iwl-next 04/14] libeth: allow to create fill queues without NAPI Date: Tue, 8 Apr 2025 14:47:50 +0200 Message-ID: <20250408124816.11584-5-larysa.zaremba@intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250408124816.11584-1-larysa.zaremba@intel.com> References: <20250408124816.11584-1-larysa.zaremba@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Pavan Kumar Linga Control queues can utilize libeth_rx fill queues, despite working outside of NAPI context. The only problem is standard fill queues requiring NAPI that provides them with the device pointer. Introduce a way to provide the device directly without using NAPI. Suggested-by: Alexander Lobakin Reviewed-by: Maciej Fijalkowski Signed-off-by: Pavan Kumar Linga Signed-off-by: Larysa Zaremba --- drivers/net/ethernet/intel/libeth/rx.c | 9 +++++---- include/net/libeth/rx.h | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/intel/libeth/rx.c b/drivers/net/ethernet/intel/libeth/rx.c index 66d1d23b8ad2..916e8888959c 100644 --- a/drivers/net/ethernet/intel/libeth/rx.c +++ b/drivers/net/ethernet/intel/libeth/rx.c @@ -141,19 +141,20 @@ static bool libeth_rx_page_pool_params_zc(struct libeth_fq *fq, /** * libeth_rx_fq_create - create a PP with the default libeth settings * @fq: buffer queue struct to fill - * @napi: &napi_struct covering this PP (no usage outside its poll loops) + * @napi_dev: &napi_struct for NAPI (data) queues, &device for others * * Return: %0 on success, -%errno on failure. */ -int libeth_rx_fq_create(struct libeth_fq *fq, struct napi_struct *napi) +int libeth_rx_fq_create(struct libeth_fq *fq, void *napi_dev) { + struct napi_struct *napi = fq->no_napi ? NULL : napi_dev; struct page_pool_params pp = { .flags = PP_FLAG_DMA_MAP | PP_FLAG_DMA_SYNC_DEV, .order = LIBETH_RX_PAGE_ORDER, .pool_size = fq->count, .nid = fq->nid, - .dev = napi->dev->dev.parent, - .netdev = napi->dev, + .dev = napi ? napi->dev->dev.parent : napi_dev, + .netdev = napi ? napi->dev : NULL, .napi = napi, .dma_dir = DMA_FROM_DEVICE, }; diff --git a/include/net/libeth/rx.h b/include/net/libeth/rx.h index ab05024be518..9b631299fa55 100644 --- a/include/net/libeth/rx.h +++ b/include/net/libeth/rx.h @@ -66,6 +66,7 @@ enum libeth_fqe_type { * @count: number of descriptors/buffers the queue has * @type: type of the buffers this queue has * @hsplit: flag whether header split is enabled + * @no_napi: the queue is not a data queue and does not have NAPI * @buf_len: HW-writeable length per each buffer * @nid: ID of the closest NUMA node with memory */ @@ -81,12 +82,13 @@ struct libeth_fq { /* Cold fields */ enum libeth_fqe_type type:2; bool hsplit:1; + bool no_napi:1; u32 buf_len; int nid; }; -int libeth_rx_fq_create(struct libeth_fq *fq, struct napi_struct *napi); +int libeth_rx_fq_create(struct libeth_fq *fq, void *napi_dev); void libeth_rx_fq_destroy(struct libeth_fq *fq); /** -- 2.47.0