Received: by 2002:a05:6500:1b45:b0:1f5:f2ab:c469 with SMTP id cz5csp1243428lqb; Thu, 18 Apr 2024 04:40:18 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUenwggq0cDcy3LyYnCm6/d7EFN7yN9ojF0+Z++tMN+07KSmVYzV6hsskWX6N5vhgvSDq89zdWKdXw+w57WEWx5lfCHCEvJOtStDEjtZg== X-Google-Smtp-Source: AGHT+IEqIsTjo6jAAXCJA6mZpLY2rviio7Y/mYsv3KQxjhr0x4JwK9gcTQXCLzaVSs1aLLiiN+u4 X-Received: by 2002:a05:6830:620c:b0:6eb:51ca:ce21 with SMTP id cd12-20020a056830620c00b006eb51cace21mr3517764otb.4.1713440418510; Thu, 18 Apr 2024 04:40:18 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713440418; cv=pass; d=google.com; s=arc-20160816; b=EzrOyTyDhmGhOl4q06wqpYLjGeh3+pcoFfDAcwKNWAdM3A/UvcofXOMQ/yw2r4h6Ne 6jnMdbnfl/lQ7DqzBJWo12+i3IcnPwrHZiwQtYeuTEuoHEIYgUHzx48XKEbIPTPSyaXv MUmBY2hvsIvoZ2UAb686PbEzsL4Aa/Ea9pMGGoIaLLPfGEq0YOlmJYKdbmU+twfua5nt 4OpHWuVDF8IkHzOo2BqfhuRBiFyx3aFJ1rF3/BhTYIzOhTsGtYCA/EsywwC5ziFK1Oyy mahATk1rgkMqnOlOuZx+2hTg1APBoyNHFSZKyAjbCmeQcHtvhgObqp2bmZyjqDwtzA8g ljIg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=MfoG59Ii3GnXIympG3Q0TE5v8Q+0lb0NrDw41syBAIM=; fh=ps4nFDdrv5D141BvZPHZDPKlyIszUoOomMEUgJgEGV4=; b=AzVXHX3ck+72WfpjNhmOmevhTwYGw391TqKZ0UXQZ+Io8M8QhUvZhG7TZRVZyzMjV9 B+oRnDGFqir7eDml8vqH+wWjz32ch6LSnvqNTgF0TDUuRCOsKnpiu+UDt6h/pr3wel0j AHYz91tdI8IRkG1wb5W9pp0OSOoUW8fMiH6L8+QU2OnstO9H4Fzp7OTyD+X3VaIU5V17 oMuqvMFFQsIvCMhIbnl7XkfLs6MuU2X6Y9VhXXZ5+8A02kFG+A9DXv/BWCXcv3VcAaEi 2fG7WWHvIEeYFjJXE6iSe9eNtY5hP4DaYHB1veiAQfjxr6TGxVqIXBKSl2LGi65MN+sy eD/Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=hCUSfI2V; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-149982-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-149982-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id n5-20020a654505000000b005f403188855si1197620pgq.608.2024.04.18.04.40.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 04:40:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-149982-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=hCUSfI2V; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-149982-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-149982-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 92462B2201C for ; Thu, 18 Apr 2024 11:38:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id ED79D160787; Thu, 18 Apr 2024 11:36:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="hCUSfI2V" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (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 78A9415FCFC; Thu, 18 Apr 2024 11:36:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713440219; cv=none; b=k8k+dG31l9Fde54MDzATKR48Ho8efF8XOitJjDQsSwtAAhnNAiWvOEt12Nfl3jqP4+Ig3ruUHc6VLe7yZtJlVMKSc4DdfR8ZecKsFWsmV7I1NXa6GOpBFhqTt3LGVBhKhVhqASn+H6DG6bR++lRn/XQNlzrR5NQilK/vDoC+2Wc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713440219; c=relaxed/simple; bh=h2xX5viKcqXvvZA3Hz2In9WNHWkHFwMdaq3Z6SIdJfY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RuavgvlXS3VqUFwZmV9izEN9F+jBqDTbVsmQ/32hCLjVqNQtjHkF5onBapSg+vw8PtkxXGMVw3Q79r/6fSzUBV6Jmybek+Ip0BYlYU3nvO3kgxutytO3oKzmWcsMfmKs8k0f3CdCQk+aaQqQ2g0U5HGFoPhY8oAWipm4EQ21fTY= 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=hCUSfI2V; arc=none smtp.client-ip=192.198.163.11 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713440217; x=1744976217; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=h2xX5viKcqXvvZA3Hz2In9WNHWkHFwMdaq3Z6SIdJfY=; b=hCUSfI2V7UB08TXuq5B9Nm9aXLSImS9nV4KY8keT3LCdpjwNYfTLe8M/ 7rwXCmukA7Sda8LqpvUJNOirtCklDQO1aLWsovt093qfzcTAraN45QXZo bxNmqtSUxbH1zQkRcH5DuoYRcZWtlaQfdQRDnewKGZ8ACDTwgFtlP5z18 35vIr1DwA6hLR95rkJZlI86knJ/O0ft73Nbld63xk2/EcMCdMlqjg8jVD H41kO8d9DCEbFN8tCgyB8hF/A9rtWd5WnMmQm+1NbACoS0A5fjTq41DRR WsLZqIuOLChPqgO4NNLtG5NHJ5AsWqiO6ZMOenR3c2jEKXY9HDvSTiKLA g==; X-CSE-ConnectionGUID: 0K2iP1ckQWq0XQmDuAXQCg== X-CSE-MsgGUID: AzIXBtpZQ1WPOG2ehy061Q== X-IronPort-AV: E=McAfee;i="6600,9927,11047"; a="19587773" X-IronPort-AV: E=Sophos;i="6.07,212,1708416000"; d="scan'208";a="19587773" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Apr 2024 04:36:57 -0700 X-CSE-ConnectionGUID: p6W5bC0aQhmsn14JYtA0WQ== X-CSE-MsgGUID: VXQ/b6QsQvqcKshkj46Mlg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,212,1708416000"; d="scan'208";a="27586114" Received: from newjersey.igk.intel.com ([10.102.20.203]) by fmviesa004.fm.intel.com with ESMTP; 18 Apr 2024 04:36:53 -0700 From: Alexander Lobakin To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Alexander Lobakin , Alexander Duyck , Yunsheng Lin , Jesper Dangaard Brouer , Ilias Apalodimas , Christoph Lameter , Vlastimil Babka , Andrew Morton , Przemek Kitszel , nex.sw.ncis.osdt.itp.upstreaming@intel.com, netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v10 05/10] page_pool: constify some read-only function arguments Date: Thu, 18 Apr 2024 13:36:11 +0200 Message-ID: <20240418113616.1108566-6-aleksander.lobakin@intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240418113616.1108566-1-aleksander.lobakin@intel.com> References: <20240418113616.1108566-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-Transfer-Encoding: 8bit There are several functions taking pointers to data they don't modify. This includes statistics fetching, page and page_pool parameters, etc. Constify the pointers, so that call sites will be able to pass const pointers as well. No functional changes, no visible changes in functions sizes. Reviewed-by: Ilias Apalodimas Signed-off-by: Alexander Lobakin --- include/net/page_pool/types.h | 4 ++-- include/net/page_pool/helpers.h | 10 +++++----- net/core/page_pool.c | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/net/page_pool/types.h b/include/net/page_pool/types.h index 5e43a08d3231..a6ebed002216 100644 --- a/include/net/page_pool/types.h +++ b/include/net/page_pool/types.h @@ -213,7 +213,7 @@ struct xdp_mem_info; #ifdef CONFIG_PAGE_POOL void page_pool_destroy(struct page_pool *pool); void page_pool_use_xdp_mem(struct page_pool *pool, void (*disconnect)(void *), - struct xdp_mem_info *mem); + const struct xdp_mem_info *mem); void page_pool_put_page_bulk(struct page_pool *pool, void **data, int count); #else @@ -223,7 +223,7 @@ static inline void page_pool_destroy(struct page_pool *pool) static inline void page_pool_use_xdp_mem(struct page_pool *pool, void (*disconnect)(void *), - struct xdp_mem_info *mem) + const struct xdp_mem_info *mem) { } diff --git a/include/net/page_pool/helpers.h b/include/net/page_pool/helpers.h index 1d397c1a0043..c7bb06750e85 100644 --- a/include/net/page_pool/helpers.h +++ b/include/net/page_pool/helpers.h @@ -58,7 +58,7 @@ /* Deprecated driver-facing API, use netlink instead */ int page_pool_ethtool_stats_get_count(void); u8 *page_pool_ethtool_stats_get_strings(u8 *data); -u64 *page_pool_ethtool_stats_get(u64 *data, void *stats); +u64 *page_pool_ethtool_stats_get(u64 *data, const void *stats); bool page_pool_get_stats(const struct page_pool *pool, struct page_pool_stats *stats); @@ -73,7 +73,7 @@ static inline u8 *page_pool_ethtool_stats_get_strings(u8 *data) return data; } -static inline u64 *page_pool_ethtool_stats_get(u64 *data, void *stats) +static inline u64 *page_pool_ethtool_stats_get(u64 *data, const void *stats) { return data; } @@ -204,8 +204,8 @@ static inline void *page_pool_dev_alloc_va(struct page_pool *pool, * Get the stored dma direction. A driver might decide to store this locally * and avoid the extra cache line from page_pool to determine the direction. */ -static -inline enum dma_data_direction page_pool_get_dma_dir(struct page_pool *pool) +static inline enum dma_data_direction +page_pool_get_dma_dir(const struct page_pool *pool) { return pool->p.dma_dir; } @@ -370,7 +370,7 @@ static inline void page_pool_free_va(struct page_pool *pool, void *va, * Fetch the DMA address of the page. The page pool to which the page belongs * must had been created with PP_FLAG_DMA_MAP. */ -static inline dma_addr_t page_pool_get_dma_addr(struct page *page) +static inline dma_addr_t page_pool_get_dma_addr(const struct page *page) { dma_addr_t ret = page->dma_addr; diff --git a/net/core/page_pool.c b/net/core/page_pool.c index 4c175091fc0a..273c24429bce 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -123,9 +123,9 @@ int page_pool_ethtool_stats_get_count(void) } EXPORT_SYMBOL(page_pool_ethtool_stats_get_count); -u64 *page_pool_ethtool_stats_get(u64 *data, void *stats) +u64 *page_pool_ethtool_stats_get(u64 *data, const void *stats) { - struct page_pool_stats *pool_stats = stats; + const struct page_pool_stats *pool_stats = stats; *data++ = pool_stats->alloc_stats.fast; *data++ = pool_stats->alloc_stats.slow; @@ -383,8 +383,8 @@ static struct page *__page_pool_get_cached(struct page_pool *pool) return page; } -static void page_pool_dma_sync_for_device(struct page_pool *pool, - struct page *page, +static void page_pool_dma_sync_for_device(const struct page_pool *pool, + const struct page *page, unsigned int dma_sync_size) { dma_addr_t dma_addr = page_pool_get_dma_addr(page); @@ -987,7 +987,7 @@ static void page_pool_release_retry(struct work_struct *wq) } void page_pool_use_xdp_mem(struct page_pool *pool, void (*disconnect)(void *), - struct xdp_mem_info *mem) + const struct xdp_mem_info *mem) { refcount_inc(&pool->user_cnt); pool->disconnect = disconnect; -- 2.44.0