tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

mm: memory: rename pages_per_huge_page to nr_pages

Since the callers are converted to use nr_pages naming, use it inside too.

Link: https://lkml.kernel.org/r/20240618091242.2140164-5-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: "Huang, Ying" <ying.huang@intel.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Muchun Song <muchun.song@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Kefeng Wang and committed by
Andrew Morton 2f9f0854 530dd992

+12 -12
+12 -12
mm/memory.c
··· 6387 6387 * cache lines hot. 6388 6388 */ 6389 6389 static inline int process_huge_page( 6390 - unsigned long addr_hint, unsigned int pages_per_huge_page, 6390 + unsigned long addr_hint, unsigned int nr_pages, 6391 6391 int (*process_subpage)(unsigned long addr, int idx, void *arg), 6392 6392 void *arg) 6393 6393 { 6394 6394 int i, n, base, l, ret; 6395 6395 unsigned long addr = addr_hint & 6396 - ~(((unsigned long)pages_per_huge_page << PAGE_SHIFT) - 1); 6396 + ~(((unsigned long)nr_pages << PAGE_SHIFT) - 1); 6397 6397 6398 6398 /* Process target subpage last to keep its cache lines hot */ 6399 6399 might_sleep(); 6400 6400 n = (addr_hint - addr) / PAGE_SIZE; 6401 - if (2 * n <= pages_per_huge_page) { 6401 + if (2 * n <= nr_pages) { 6402 6402 /* If target subpage in first half of huge page */ 6403 6403 base = 0; 6404 6404 l = n; 6405 6405 /* Process subpages at the end of huge page */ 6406 - for (i = pages_per_huge_page - 1; i >= 2 * n; i--) { 6406 + for (i = nr_pages - 1; i >= 2 * n; i--) { 6407 6407 cond_resched(); 6408 6408 ret = process_subpage(addr + i * PAGE_SIZE, i, arg); 6409 6409 if (ret) ··· 6411 6411 } 6412 6412 } else { 6413 6413 /* If target subpage in second half of huge page */ 6414 - base = pages_per_huge_page - 2 * (pages_per_huge_page - n); 6415 - l = pages_per_huge_page - n; 6414 + base = nr_pages - 2 * (nr_pages - n); 6415 + l = nr_pages - n; 6416 6416 /* Process subpages at the begin of huge page */ 6417 6417 for (i = 0; i < base; i++) { 6418 6418 cond_resched(); ··· 6442 6442 } 6443 6443 6444 6444 static void clear_gigantic_page(struct folio *folio, unsigned long addr, 6445 - unsigned int pages_per_huge_page) 6445 + unsigned int nr_pages) 6446 6446 { 6447 6447 int i; 6448 6448 6449 6449 might_sleep(); 6450 - for (i = 0; i < pages_per_huge_page; i++) { 6450 + for (i = 0; i < nr_pages; i++) { 6451 6451 cond_resched(); 6452 6452 clear_user_highpage(folio_page(folio, i), addr + i * PAGE_SIZE); 6453 6453 } ··· 6477 6477 } 6478 6478 6479 6479 static int copy_user_gigantic_page(struct folio *dst, struct folio *src, 6480 - unsigned long addr, 6481 - struct vm_area_struct *vma, 6482 - unsigned int pages_per_huge_page) 6480 + unsigned long addr, 6481 + struct vm_area_struct *vma, 6482 + unsigned int nr_pages) 6483 6483 { 6484 6484 int i; 6485 6485 struct page *dst_page; 6486 6486 struct page *src_page; 6487 6487 6488 - for (i = 0; i < pages_per_huge_page; i++) { 6488 + for (i = 0; i < nr_pages; i++) { 6489 6489 dst_page = folio_page(dst, i); 6490 6490 src_page = folio_page(src, i); 6491 6491