mm-swapfilec-optimize-code-in-setup_clusters.patch removed from -mm tree
The quilt patch titled
Subject: mm/swapfile.c: optimize code in setup_clusters()
has been removed from the -mm tree. Its filename was
mm-swapfilec-optimize-code-in-setup_clusters.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Baoquan He <[email protected]>
Subject: mm/swapfile.c: optimize code in setup_clusters()
Date: Wed, 5 Feb 2025 17:27:16 +0800
In the last 'for' loop inside setup_clusters(), using two local variable 'k' and 'j' are obvisouly redundant. Using 'j' is enough and simpler.
And also move macro SWAP_CLUSTER_COLS close to its only user setup_clusters().
---
mm/swapfile.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
mm/swapfile.c renamed from mm/swapfile.c~mm-swapfilec-optimize-code-in-setup_clusters +9 -10
@@ -3127,13 +3127,6 @@ static unsigned long read_swap_header(streturn maxpages; } -#define SWAP_CLUSTER_INFO_COLS \ - DIV_ROUND_UP(L1_CACHE_BYTES, sizeof(struct swap_cluster_info)) -#define SWAP_CLUSTER_SPACE_COLS \ - DIV_ROUND_UP(SWAP_ADDRESS_SPACE_PAGES, SWAPFILE_CLUSTER) -#define SWAP_CLUSTER_COLS \ - max_t(unsigned int, SWAP_CLUSTER_INFO_COLS, SWAP_CLUSTER_SPACE_COLS) - static int setup_swap_map_and_extents(struct swap_info_struct *si, union swap_header *swap_header, unsigned char *swap_map,
@@ -3173,13 +3166,20 @@ static int setup_swap_map_and_extents(streturn nr_extents; } +#define SWAP_CLUSTER_INFO_COLS \ + DIV_ROUND_UP(L1_CACHE_BYTES, sizeof(struct swap_cluster_info)) +#define SWAP_CLUSTER_SPACE_COLS \ + DIV_ROUND_UP(SWAP_ADDRESS_SPACE_PAGES, SWAPFILE_CLUSTER) +#define SWAP_CLUSTER_COLS \ + max_t(unsigned int, SWAP_CLUSTER_INFO_COLS, SWAP_CLUSTER_SPACE_COLS) +static struct swap_cluster_info *setup_clusters (struct swap_info_struct *si,union swap_header *swap_header,unsigned long maxpages) {unsigned long nr_clusters =DIV_ROUND_UP (maxpages,SWAPFILE_CLUSTER );struct swap_cluster_info *cluster_info; -unsigned long i, j, k, idx; +unsigned long i, j, idx;int cpu, err = -ENOMEM ; cluster_info =kvcalloc (nr_clusters,sizeof (*cluster_info),GFP_KERNEL );
@@ -3240,8 +3240,7 @@ static struct swap_cluster_info *setup_c* Reduce false cache line sharing between cluster_info and * sharing same address space. */ -for (k =0 ; k <SWAP_CLUSTER_COLS ; k++) { - j = k %SWAP_CLUSTER_COLS ; +for (j =0 ; j <SWAP_CLUSTER_COLS ; j++) {for (i =0 ; i <DIV_ROUND_UP (nr_clusters,SWAP_CLUSTER_COLS ); i++) {struct swap_cluster_info *ci; idx = i *SWAP_CLUSTER_COLS + j;
_
Patches currently in -mm which might be from [email protected] are