Commit 2843b11a authored by Maíra Canal's avatar Maíra Canal Committed by Euler
Browse files

mm: move ``get_order_from_str()`` to internal.h 

mainline inclusion
from mainline-v6.12-rc1
commit 1c8d48497525d77acfb7bdaaa246a887e754f379
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IBG3J8

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1c8d48497525d77acfb7bdaaa246a887e754f379

--------------------------------

In order to implement a kernel parameter similar to ``thp_anon=`` for
shmem, we'll need the function ``get_order_from_str()``.

Instead of duplicating the function, move the function to a shared
header, in which both mm/shmem.c and mm/huge_memory.c will be able to
use it.

Link: https://lkml.kernel.org/r/20241101165719.1074234-5-mcanal@igalia.com


Signed-off-by: default avatarMaíra Canal <mcanal@igalia.com>
Reviewed-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Cc: Barry Song <baohua@kernel.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Lance Yang <ioworker0@gmail.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Conflicts:
    mm/internal.h
[Context conflicts in internal.h due to miss commit 4418c522f683]
Signed-off-by: default avatarWang Lian <dev01404@linx-info.com>
---
parent 70dd579a

mm/huge_memory.c

+15 −23
Original line number Diff line number Diff line
@@ -1067,26 +1067,6 @@ static int __init setup_transparent_hugepage(char *str) 
}

__setup("transparent_hugepage=", setup_transparent_hugepage);



static inline int get_order_from_str(const char *size_str)

{

	unsigned long size;

	char *endptr;

	int order;



	size = memparse(size_str, &endptr);



	if (!is_power_of_2(size))

		goto err;

	order = get_order(size);

	if (BIT(order) & ~THP_ORDERS_ALL_ANON)

		goto err;



	return order;

err:

	pr_err("invalid size %s in thp_anon boot parameter\n", size_str);

	return -EINVAL;

}



static char str_dup[PAGE_SIZE] __initdata;

static int __init setup_thp_anon(char *str)

{
@@ -1116,10 +1096,22 @@ static int __init setup_thp_anon(char *str) 
				start_size = strsep(&subtoken, "-");

				end_size = subtoken;



				start = get_order_from_str(start_size);

				end = get_order_from_str(end_size);

				start = get_order_from_str(start_size, THP_ORDERS_ALL_ANON);

				end = get_order_from_str(end_size, THP_ORDERS_ALL_ANON);

			} else {

				start = end = get_order_from_str(subtoken);

				start_size = end_size = subtoken;

				start = end = get_order_from_str(subtoken,

								 THP_ORDERS_ALL_ANON);

			}



			if (start == -EINVAL) {

				pr_err("invalid size %s in thp_anon boot parameter\n", start_size);

				goto err;

			}



			if (end == -EINVAL) {

				pr_err("invalid size %s in thp_anon boot parameter\n", end_size);

				goto err;

			}



			if (start < 0 || end < 0 || start > end)

mm/internal.h

+22 −0
Original line number Diff line number Diff line
@@ -1241,6 +1241,28 @@ struct page *follow_trans_huge_pmd(struct vm_area_struct *vma, 
				   unsigned long addr, pmd_t *pmd,

				   unsigned int flags);



/*

 * Parses a string with mem suffixes into its order. Useful to parse kernel

 * parameters.

 */

static inline int get_order_from_str(const char *size_str,

				     unsigned long valid_orders)

{

	unsigned long size;

	char *endptr;

	int order;



	size = memparse(size_str, &endptr);



	if (!is_power_of_2(size))

		return -EINVAL;

	order = get_order(size);

	if (BIT(order) & ~valid_orders)

		return -EINVAL;



	return order;

}



enum {

	/* mark page accessed */

	FOLL_TOUCH = 1 << 16,