From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A14DE6F06C for ; Fri, 1 Nov 2024 16:44:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EE03B6B0099; Fri, 1 Nov 2024 12:44:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E69776B009A; Fri, 1 Nov 2024 12:44:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CE30E6B009B; Fri, 1 Nov 2024 12:44:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id AC3386B0099 for ; Fri, 1 Nov 2024 12:44:22 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 6881B40200 for ; Fri, 1 Nov 2024 16:44:22 +0000 (UTC) X-FDA: 82738098828.02.853EEDE Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) by imf03.hostedemail.com (Postfix) with ESMTP id 9387720015 for ; Fri, 1 Nov 2024 16:44:07 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=igalia.com header.s=20170329 header.b=WFYfnakS; dmarc=pass (policy=none) header.from=igalia.com; spf=pass (imf03.hostedemail.com: domain of mcanal@igalia.com designates 178.60.130.6 as permitted sender) smtp.mailfrom=mcanal@igalia.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730479404; a=rsa-sha256; cv=none; b=kcHMsJ348rsJJJpaCgCd1GOJHaevlUoyvoRdvuMOMQVYHEdsp0PE5qL8pNZWxWDgS0I6xh 8oUuZtTRomw3N+Qx5b369XZphqYzgewIW4VWCBLaMQSRS36WkCviDUnFDrehvpyYDyR6fE wi/Q6HKIxbAGX3OwJSQkGZUkIbNUjAQ= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=igalia.com header.s=20170329 header.b=WFYfnakS; dmarc=pass (policy=none) header.from=igalia.com; spf=pass (imf03.hostedemail.com: domain of mcanal@igalia.com designates 178.60.130.6 as permitted sender) smtp.mailfrom=mcanal@igalia.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730479404; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=o9wsenaQ3AcpIiJeQpHBb8YYNhX0DwDwcM2h4qRlEQY=; b=keq6ruMC3DTR7Abbm2lJ1AqPCPgYhHTtHNAyQh09Tt6uVKaP714ugwNMLWOf4zI6xEbqWY /lf0YF3Rxyh0wZIWr6F6JYweOacyMlcRm4vbn3KwbD6AG3rJnWaSuUKE7LTvyy54hcKbV4 2zT+ZYBx8f4b2SojbEj9hn/RzIycR+s= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=o9wsenaQ3AcpIiJeQpHBb8YYNhX0DwDwcM2h4qRlEQY=; b=WFYfnakSNgP4L62dn4dpHzoQTp oTIAJ63pkIHMWhmJYgJvWLh9xLVz9HOXa4LBuzpP5XBmceLm6cvI5r7dVkU5EcQRmOY5IeTHuaYm/ 4TNKjWRHBuyfiDAu8/kQPp6V+t9nEuWFAQ+8z4K9MZ3cP7oKuomzIPHQFyfPKqGXeXWSB36dhiVfD THzf0TuFA1d70IFdifNe98fhpGbMcC0vFpxwNMd0tlr/4YM458fGi8ADVhIyt10qbG7yTum3C7VzQ zhYhR5aW1QoslBer7qF6dqt6CES3vKwY2ofV0wgYt5C8yn0sJgx7C/kk5t8x+CKEYcaxKivnPAO6b yflGv1+Q==; Received: from [187.36.213.55] (helo=morissey..) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1t6uks-000V38-7H; Fri, 01 Nov 2024 17:44:10 +0100 From: =?UTF-8?q?Ma=C3=ADra=20Canal?= To: Jonathan Corbet , Andrew Morton , Hugh Dickins , Barry Song , David Hildenbrand , Ryan Roberts , Baolin Wang , Lance Yang Cc: linux-mm@kvack.org, dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-dev@igalia.com, =?UTF-8?q?Ma=C3=ADra=20Canal?= Subject: [PATCH v4 3/5] mm: move ``get_order_from_str()`` to internal.h Date: Fri, 1 Nov 2024 13:38:44 -0300 Message-ID: <20241101164313.1073238-5-mcanal@igalia.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241101164313.1073238-2-mcanal@igalia.com> References: <20241101164313.1073238-2-mcanal@igalia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 9387720015 X-Rspamd-Server: rspam01 X-Stat-Signature: fhjiaaes5iwwwukawcytyeofpqcircbq X-HE-Tag: 1730479447-635085 X-HE-Meta: U2FsdGVkX19wCYKsxsY3Y1VkUVX2EGNvud5fGPQqjiXGL1jnP6nj06Ieu4z1fSR9d5Sw45MGxazlSbHFVv/bRmtGabGEQ8+/M823f7kuLRreF38HMeVnfEv2SDALGyKFX647HlpikdZE72AczdVAGQHsY0Pu7NCMzctQwhVEe2iNClRDONdCTvpX8aHlvLoCguVfyRp4n3R0Z/GiHmEEhfzqGMg32GRE7PxAaxgzE/1hr0kO9znci0b8FGB1jtU7iOoo+EBVWX5EsSGEZ/VB0XetEtLcn6hXPzqj/AmqG7dK6eCu4ec017qA3c0jAZ+EDUYlbTTt5U1BkjM9UqPLn6b1/Zrq9Xp887VJXd++Q7ChNsx+4SlX0Pl4WzRY15WnNRbLYN6opEhGT26Joa28ttZ8drr6hVF1J4jV5WI20yOtrp+qXCI0znrCq6g5lrwn9oEPporEJu5q0VcRK3hgZvQlP6Nbs7z9v4JH3C99Pd3YpvA/VteQjo5xj1F0UNVhFlz9fF/QztidufBj2BhrfpIBy95oN1W81PbTeeBRIRjzi/kyc01lu8v6gK33ctSP5Kqj1/26Cx+iSN+tVTQFa1W2zaGD0AJ3gJzLiZpVlMUsgtwz2Ov1iS2ZBcS/HijWPRBzHBM3CPCAYmezvPAO6jgDCUedHN1eU8yW8Hce04NHF+6WAODOF5dT5XReHprOdrFKQcRLkuKi7vIlvlwyHJjeYhMdE0SWw5msNyOP8tBRmCRfsltfHXw6G6wrn9W1pqXHNLMc6NdhL7yNEJBe5RJVYoyYQ4lx4yRsjz9ydV1n/XoKpXqmB+NigIbdq8SRaTSXCnWG1UE0REBgJ+oqOTUdS8vESCg/m+5+Z4UBLKScq50TUTQ9k8oKO44KS25R0PwP1TAmFMOuZu5Dwr1moIeGLED/Wwu7NW9zazOUNILDeCFpSJgNG9cqwF27t7WE6e6uL6Rrb+RaFiR7O19 Boh1tXwg 5kDL0YFNm4VhCSBeYJOniNv4WFJ3Tjo4VoF8AOaO2SNPv/LQxzyVW/Q4wFoPnYXxpf5WCAxPkGcjwvP52+Dgie5/8NVo1zBwpnj36j4vDHtYfTqblNpX8MZIsDMTSaDMqHtNsybZPI0TaiLCwqPt3kRWW+wOBSDBir5I9rVi+amqMKJYgvTmGAnATZIpUXwa8/t9JFl9E5LPnkzLFErP+yubDSfd0tWmZZIXDbhGZoZw8Ir6nzMZaLFqLq2WBaA4eDYQUgtioiYzhcGtAlV+m2ufn5xn8iQdQ2lNcYhFeiGqoik6u3NnlUJ5R4Bf6z+C5Z70BYg/tPD0RrSoguUYmcGTJsmXwsnf2tBfKEBxMKepUnKqYpgyiM0eXOV6B96sNLeU3 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Maíra Canal 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. Signed-off-by: Maíra Canal --- mm/huge_memory.c | 38 +++++++++++++++----------------------- mm/internal.h | 22 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 23 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index f92068864469..a6edbd8c4f49 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -958,26 +958,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) { @@ -1007,10 +987,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) diff --git a/mm/internal.h b/mm/internal.h index d5b93c5b6364..5a7302baeed7 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1291,6 +1291,28 @@ static inline bool alloc_zeroed(void) &init_on_alloc); } +/* + * 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, -- 2.46.2