From patchwork Wed Mar 12 16:47:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 14013689 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 8D4C5C2BA1B for ; Wed, 12 Mar 2025 16:48:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D12C9280004; Wed, 12 Mar 2025 12:47:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CC326280001; Wed, 12 Mar 2025 12:47:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AEF93280004; Wed, 12 Mar 2025 12:47:58 -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 8FA71280001 for ; Wed, 12 Mar 2025 12:47:58 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 7810F1213BF for ; Wed, 12 Mar 2025 16:47:59 +0000 (UTC) X-FDA: 83213481078.07.4731C09 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf17.hostedemail.com (Postfix) with ESMTP id DDAAD40004 for ; Wed, 12 Mar 2025 16:47:57 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=S4ZB8b+W; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf17.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741798077; a=rsa-sha256; cv=none; b=2XR2p+619kDyAOU2RYVL+oMxf0jl26d+QhVhZy2eFOmfakTx/wegDTCNE2+qSiQl/b4+oI gUnclzVB3mcmgLXlXdJ4wS3nd0J2IEqqPQRIFEm10XRTYZxWwOBeNwm6/slti00ciPWRds fPzAqrePKhTmSncN9V/FqI6/WQOigRk= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=S4ZB8b+W; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf17.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741798077; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=oFo19FpFVpozJZTdlIyDVCeglelTVMz33ONLcvis2kE=; b=c9zRiTxvIochQk00S55oU3uqXBxsHQBx4hOPak1o1LFoRi1NIgB8OfkXw9pjz9hxOBlAK3 9FocFf7htCEnwjaCJTqqY0gowZXSZMWlXFS5jMkyWTd4DUdxD/k7BEMSLMQDOQ4D9nbmwZ gO+FJcvXZpCtxCP1KD3SnGDr0or9pas= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 26053A45DD5; Wed, 12 Mar 2025 16:42:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9002EC4CEEA; Wed, 12 Mar 2025 16:47:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741798076; bh=R+e8CTxMlC5a9+cJIUD2kjg5SVKUgmKQ8eqkhBREN1I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S4ZB8b+WRB9tABLA+kR6BoJJoJsGvVdSB9/bBxdiCpolouipSi4/O7Qr5BGUeLkSa 6MUp6ZdCqNSkxP1bPjpjQjhSdjM+rPY6VAeslqbuEn6XMrHwu+jTgZOTI+Jv0GBLPY PDBFfPnRuww0RNcyeKsQ+/xmnVIurib3COiNir+gm57rhKRfGcAnCWDahE5d3Uexoz Ar7bx+A81pamWTcDzuzA255+sPkcOf/2W+e/njmMuT1bWGWNqTxGXhpeJ7tpYH9XxL PRFvWx4rNkCBQbt/vQeqeayLcIgJ0TPgVMF3EASutKH/BhfPkFyxif7enETN7aPvxP peoJCzeWNDWfA== From: SeongJae Park To: Andrew Morton Cc: SeongJae Park , "Liam R. Howlett" , David Hildenbrand , Lorenzo Stoakes , Shakeel Butt , Vlastimil Babka , kernel-team@meta.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 1/4] mm/madvise: use is_memory_failure() from madvise_do_behavior() Date: Wed, 12 Mar 2025 09:47:47 -0700 Message-Id: <20250312164750.59215-2-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250312164750.59215-1-sj@kernel.org> References: <20250312164750.59215-1-sj@kernel.org> MIME-Version: 1.0 X-Stat-Signature: s18isb8tyy8jc9n5b63b9a3heyq96bas X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: DDAAD40004 X-Rspam-User: X-HE-Tag: 1741798077-523487 X-HE-Meta: U2FsdGVkX1/2SomPgMZpcghYilSfnE0Dxsmx5BnxVv5oDam+SMd9COO/CwqIc1sD45CU4R1RtVgulCVV4I7MLYqH4Wsuj5t4nkl7nXSJMBS1IqPYlRSSg12GyH2ndy32Nr63Ut2cFitwTyZ6ap538QDau33vLrIiexYEX9karemLgaOQQpv+hNDgbFuQGhgM9Mc/n/1uMqkvFMlI1nrbdQ6mYsvp0/LGr612/IDDi3JQJZKiYJJqSEVtvvp12woPeI7it7eBtVnwwwQenDakoRHbdGX6JJQAsP1djYPG1IIqXDbaaskS24B2fH+6DZfQA/OJFGevS3RhofLzavy1NZbI1iXvilXpEhCFmwM8MCzdDxH8CRTYpPUV6M6wh5DFe82MgmNMyuiozRsYD0yToYpGDGRIzHcTyFFlmvzT8LRhe4OXtIQ/vSeBqFTTRbDUhvr63gHS9xpE9e9/po6LmNgsBcp9K0hK6+6kgrdppn1hoi80H5LgwX+TkLfbrY2ZI2Z12H1FnKn2LOWFCHoX+CpxrUruAoareGYBnfVBu+hpysawNWxD4Bi4uIrtuS2soEyi5gLKxWI5Lm26NxKuf6ZME/4o7tftLJJNTI+HshsCjb8Bg5q83QOU9wq2AAMZg7dbmffv1RCY2QEtSg7VVzxyhsgNMidbjtPOe5oTQ6xpqt5hrqEvtUtJI7NvIMl6m3x7UVo3RXfpKHWnzQFaJtWSSJM6k6gBq7QidR29niHJfGQm+mDrCDFGUf50jYt4VcCXW9z+ZDmzxSqlC5pq3Bl5w1/ARibq5ku0vTh/CRBhQl2qW6hDf2z3nYcbqnmtCuCtxIBcUTejkBx2fYj2aTFKtrR8JYP/qGHcdPuLJRMeO0oAVcyf/PT48AppRpy8TIh+N9o5ePeRFaWNL38Qq5YzQzUWZKqvqASNTUc63VqJ91ichP84sDKCG8JpCnCsXZvjkQX9b57pGmfV324 CSjmKBX9 mJK/M2S3Y6ZAMiYJ2uk3k4rbaGX7bIlQS4zh7BGCRm+TluUepqdemMVi1jo7p7j5ta1TmMu+tE3uFppIb3FxQ1qpLB7THaMqO8L2sn+AqkmSiFaRIgk7H3RF8DJpoUSEiK3zHLWr4kH5o8TiV77dwXrP4GW87JxG13agPmIDkxB950EoM5Z11KjPqw+qxS5Ryx58GHMtSAvCOL0OgQnOolMOFwg0cU9vv3F4M5hkfA5zFwnazdrBZUw2Vl2S3WwUk1S5ppGV4PAshfR5qrIthBtf9rZQzfiCFZidh1EmPaZhZ6vo= 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: To reduce redundant open-coded checks of CONFIG_MEMORY_FAILURE and MADV_{HWPOISON,SOFT_OFFLINE} in madvise_[un]lock(), is_memory_failure() is introduced. madvise_do_behavior() is still doing the same open-coded check, though. Use is_memory_failure() instead. To avoid build failure on !CONFIG_MEMORY_FAILURE case, implement an empty madvise_inject_error() under the config. Also move the definition of is_memory_failure() inside #ifdef CONFIG_MEMORY_FAILURE clause for madvise_inject_error() definition, to reduce duplicated ifdef clauses. Signed-off-by: SeongJae Park Reviewed-by: Lorenzo Stoakes Reviewed-by: Shakeel Butt --- mm/madvise.c | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 388dc289b5d1..c3ab1f283b18 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1392,7 +1392,32 @@ static int madvise_inject_error(int behavior, return 0; } -#endif + +static bool is_memory_failure(int behavior) +{ + switch (behavior) { + case MADV_HWPOISON: + case MADV_SOFT_OFFLINE: + return true; + default: + return false; + } +} + +#else + +static int madvise_inject_error(int behavior, + unsigned long start, unsigned long end) +{ + return 0; +} + +static bool is_memory_failure(int behavior) +{ + return false; +} + +#endif /* CONFIG_MEMORY_FAILURE */ static bool madvise_behavior_valid(int behavior) @@ -1569,24 +1594,6 @@ int madvise_set_anon_name(struct mm_struct *mm, unsigned long start, } #endif /* CONFIG_ANON_VMA_NAME */ -#ifdef CONFIG_MEMORY_FAILURE -static bool is_memory_failure(int behavior) -{ - switch (behavior) { - case MADV_HWPOISON: - case MADV_SOFT_OFFLINE: - return true; - default: - return false; - } -} -#else -static bool is_memory_failure(int behavior) -{ - return false; -} -#endif - static int madvise_lock(struct mm_struct *mm, int behavior) { if (is_memory_failure(behavior)) @@ -1640,10 +1647,8 @@ static int madvise_do_behavior(struct mm_struct *mm, unsigned long end; int error; -#ifdef CONFIG_MEMORY_FAILURE - if (behavior == MADV_HWPOISON || behavior == MADV_SOFT_OFFLINE) + if (is_memory_failure(behavior)) return madvise_inject_error(behavior, start, start + len_in); -#endif start = untagged_addr_remote(mm, start); end = start + len; From patchwork Wed Mar 12 16:47:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 14013690 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 C5C2AC28B28 for ; Wed, 12 Mar 2025 16:48:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BFD5E280005; Wed, 12 Mar 2025 12:47:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B36BF280001; Wed, 12 Mar 2025 12:47:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9D7C6280005; Wed, 12 Mar 2025 12:47:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 8256A280001 for ; Wed, 12 Mar 2025 12:47:59 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 86B321A146B for ; Wed, 12 Mar 2025 16:48:00 +0000 (UTC) X-FDA: 83213481120.05.719E11A Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf25.hostedemail.com (Postfix) with ESMTP id E5E2DA000B for ; Wed, 12 Mar 2025 16:47:58 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="R/vD7NQy"; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf25.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741798079; a=rsa-sha256; cv=none; b=pZUVPMrLHAPRLmo7hktulT9uC8fzDQ6wid7xomWMQhZtsIa4awOpuBCB2uT3+DbrVl2KT8 w0K6HzTvS+8t125xHFSfdv5/nyIz3kNjDlodS09wuURIqZQS/r+lClKiWvHAkVICSMNku/ sc5ouEtS5Md9FgDemU5q2NAa9tMqSXk= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="R/vD7NQy"; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf25.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741798079; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=gXXAHD7uwvB8h5MxH9ShBVzxwb1YfFLM66K5Z93/MGc=; b=L8+f9er7RZQabdrPyNbsyXqe5ta80D+k9WVOMOZC8PCnlqPmxyx5A1djIYWEoyK05CNPg+ olYEsC902kROSd1BjOUKDyHzVmudr2CrsCAUN9d2WuMAHCi82g7Ex8BGUHNm6uRqxXCFff ihfWuFg9/RSaZRY85q8QEDNovYO0KgU= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 631D35C5CB8; Wed, 12 Mar 2025 16:45:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6438C4CEEB; Wed, 12 Mar 2025 16:47:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741798077; bh=H37g5zw8JYgcEHcrKgCoScNGY44vZwcAGnWDri47ll4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R/vD7NQyc6drg6smFF+csAqealwJ9oeCp8RBZuR7gdkEm6tK8IQ8s+pJIAND/ar6p PquW8UddAL7JN0XDsZH2HFLFMoWo5r/oN9cBCPfkqxvHvnJ/p0wIDGaGdOJe07CTx1 orgRMFPr3iwNZd5q7gV5/8pbAVbEctxUSp9NL5rEYQ2t+vvW+7l2FiISNCaI93IeMs rkiorPIVaI6S3a4TTdptzn+1628Vb6MN3dcPlLLZs06TYjWBWAA0BinMGzNouXH9+o /b3FAzYkUDGMgRdI9BPGPkhIacekGiex1o5ZMjQ/Usfed89xuQkdZf/84b7KCgqQlR d2+OCfyvW+pnQ== From: SeongJae Park To: Andrew Morton Cc: SeongJae Park , "Liam R. Howlett" , David Hildenbrand , Lorenzo Stoakes , Shakeel Butt , Vlastimil Babka , kernel-team@meta.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 2/4] mm/madvise: split out populate behavior check logic Date: Wed, 12 Mar 2025 09:47:48 -0700 Message-Id: <20250312164750.59215-3-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250312164750.59215-1-sj@kernel.org> References: <20250312164750.59215-1-sj@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspam-User: X-Stat-Signature: ba98icntf4kg76e4yebxhkck5q5kqux3 X-Rspamd-Queue-Id: E5E2DA000B X-HE-Tag: 1741798078-668563 X-HE-Meta: U2FsdGVkX18P1gTcSu4mzBS8FG+dvlS7F3afkZqV02hPlBsLHUe/gfc0946OW3F/9Oe+OBKyfEgSLMnW8R2W2U87lp6gRqOl8s65rASbsAPwYlECCbeLFeB+zSI2BmpwfrTiukP+eEQ8CcYclsZei7nf7R+CUueg41Ia+mp8fOyT5uJPoTgScxsibH5BCPVbMpeJq6fCRr2QXvFZXPvaGnJrQjiOTywQdMbwD8TNzqHDC3oYptN6nGXJQiop4rNIFdZevibHSbXdo6oVpF/9YY6WqveUor8rIpN43klmC5xHBfjYm4vweeQXZOa/3asJBySW0gJd4YKEkf+IvvWaXQqasMcwYJOdcRtcJrGZAbj7QACL05+ciFVPc3Fc0w9U5d3YaNS6IUgyr1SbGOZMopoJLrHy9FRQMFrQm6G62LPhIpZz7hXQjLjHV4qK3fusCkoPFB7jcaR8KRldt0K0zDo5PFi+h5wU9Jtyjc3RroX5MECyGziPRULxHxb6gCSCUT9t4/6IxYprx2cVxFpYxB5O/q6fZGO1g60K8sB8/shox9yeR1ykPxVu5mfg4YPE1Vakt6+KgcWDXQS3dfUXcQ/53b1wLLDjU/thO7S7r1ph3OMPApeg8j0nstX1lOYVTE7kLTQw2CMroMZI6iVIjyAg0Q3cF2qEmvm2R0RTvmMjKuk4Qlx8Hm67WYwjHQNgnfpTtfSrS5jM/lrnHQu95GGcqFfomFYF30D2By2dBbZ0iuZqb+LZdJC6qHHss9UrmTroz5l5CoiecpuzQy7/ynldL14gxiVCOUCF+4sV/4E+4O/K4MEgJ4xKS5cVzPUmrSiS/QLqaM+kz+zaubinrDfJoi9bSesXpqMvyGbwIVUdCHdbI/Q/q1IzhZwZzNbULgPZsiEsgzk7Q8ku88fUy+uu1vr6WYF9pS2I19amVZO+Puz2CsjyB2PcffSDwd3wkBe2P/geFCjFKJfcKan xzhWbsst 5Q5z9OWsmSCT4Kfpafd2p8YFa8NuiUIbJsH/csp2BaewtFtt4Ne7/t3ddv0DDcAcpZNCqmlpbTfun8pxIBxZIa/rMrNH1Wyoi0EvWbl0wlqDpupxFsIrem+pi+Td3OAG7xG5L/TJe+2vRHNdOEMYFNqF2lYBKvcdBpdbgTkQk0Mq4fPV/rZFk7nOdocMdmzLkU1/UofF3TzogaartViPEmAYXkxylcXq50TUaoJdjjgLdvp6yfMAbLjY8+Wg/sCp5CPeS 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: madvise_do_behavior() has a long open-coded 'behavior' check for MADV_POPULATE_{READ,WRITE}. It adds multiple layers[1] and make the code arguably take longer time to read. Like is_memory_failure(), split out the check to a separate function. This is not technically removing the additional layer but discourage further extending the switch-case. Also it makes madvise_do_behavior() code shorter and therefore easier to read. [1] https://lore.kernel.org/bd6d0bf1-c79e-46bd-a810-9791efb9ad73@lucifer.local Signed-off-by: SeongJae Park Reviewed-by: Lorenzo Stoakes Reviewed-by: Shakeel Butt --- mm/madvise.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index c3ab1f283b18..611db868ae38 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1640,6 +1640,17 @@ static bool is_valid_madvise(unsigned long start, size_t len_in, int behavior) return true; } +static bool is_madvise_populate(int behavior) +{ + switch (behavior) { + case MADV_POPULATE_READ: + case MADV_POPULATE_WRITE: + return true; + default: + return false; + } +} + static int madvise_do_behavior(struct mm_struct *mm, unsigned long start, size_t len_in, size_t len, int behavior) { @@ -1653,16 +1664,11 @@ static int madvise_do_behavior(struct mm_struct *mm, end = start + len; blk_start_plug(&plug); - switch (behavior) { - case MADV_POPULATE_READ: - case MADV_POPULATE_WRITE: + if (is_madvise_populate(behavior)) error = madvise_populate(mm, start, end, behavior); - break; - default: + else error = madvise_walk_vmas(mm, start, end, behavior, madvise_vma_behavior); - break; - } blk_finish_plug(&plug); return error; } From patchwork Wed Mar 12 16:47:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 14013691 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 4B310C28B28 for ; Wed, 12 Mar 2025 16:48:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BF8A9280006; Wed, 12 Mar 2025 12:48:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BD5BE280001; Wed, 12 Mar 2025 12:48:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A71B1280006; Wed, 12 Mar 2025 12:48:00 -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 80971280001 for ; Wed, 12 Mar 2025 12:48:00 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 74AF5121437 for ; Wed, 12 Mar 2025 16:48:01 +0000 (UTC) X-FDA: 83213481162.30.0E1E399 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf12.hostedemail.com (Postfix) with ESMTP id DD41740005 for ; Wed, 12 Mar 2025 16:47:59 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=j0R2BVOR; spf=pass (imf12.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741798079; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=766bFuMSEMQSVYPIJ8mS7qhrM1JBolsiUH1n2zHNRvk=; b=SXkA5r0Oh8Dv/aXr8cUP3lFBtFtKmpENaTDrQpZSZSkrZzno6b3kM0SeXB28YvP2p1wHx8 A5FJp+JkNofDZsYACLcQ3OekyMxE0kENMxo9kz0J60QL02AFOiBXPvD2mt6uBtVrNkFVv9 6d6JZitevvkXMAFx3BRQjN+O6eUGwRc= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=j0R2BVOR; spf=pass (imf12.hostedemail.com: domain of sj@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=sj@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741798079; a=rsa-sha256; cv=none; b=DtukPc3Z+KA7Ie/pBMG6LHuYY02mQxNfFk9ePxNgxqcIpESTGOcpXKR+/gjaa7MjIFhpti zkG1dSCgTv7zvWLoriCbeIKhpKcMymbQi1Wg1Z67mNhmCI/ubx1yITJZlG47u7laM+L4SD Nw/j0zIBkUQBh4aqEDT8RQWDBa3Mkeg= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 53B2BA45F83; Wed, 12 Mar 2025 16:42:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5A71C4CEF0; Wed, 12 Mar 2025 16:47:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741798078; bh=oQN+mH789PvTmGLvlHTcsIxu+Znjze2S0+wMa1s72FE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j0R2BVORIe3z3UqUZHwFFZiyYbMSgywv0UHdCOInvRehpN+8M8jbPX0167V/218YG 2qliFJ0mz4oVhqtkYaYWxKe2lkFz02tzY6LYW5mtMnMSptWnh8H3l7geT0gB5ZLYIy GVHYLAUraEAbLRgf+zuN+hUBplGQ45BwMF/QUW8U+Kr4AzUqNkDZ6l84Nf6X9mogRg scc7lFkhIPwaxHi8n6+e02hoWJWOEjkGji4YNe88ubCHrlq87dnOx7cgjqWIJjhXO1 0P3wJu6fSNnOmmCBXgWmWiycwscR3SABGzd9IFDFN6hf8ssnoDlMvK0CSyDomfjHJH ED5w+PmylaquQ== From: SeongJae Park To: Andrew Morton Cc: SeongJae Park , "Liam R. Howlett" , David Hildenbrand , Lorenzo Stoakes , Shakeel Butt , Vlastimil Babka , kernel-team@meta.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 3/4] mm/madvise: deduplicate madvise_do_behavior() skip case handlings Date: Wed, 12 Mar 2025 09:47:49 -0700 Message-Id: <20250312164750.59215-4-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250312164750.59215-1-sj@kernel.org> References: <20250312164750.59215-1-sj@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: DD41740005 X-Rspamd-Server: rspam08 X-Stat-Signature: foxrsn6kryheyd1rwe9ky8ejgujmok33 X-HE-Tag: 1741798079-10850 X-HE-Meta: U2FsdGVkX1/7Px0nOz8WFVBk5RFFbZNR7CuEQ7/NOQkMz7Mh796V1C0+waG8SFoXbZJVdxa3oR2wYDT6EUa/aS8ClJ2ttwtt13deTw+zlvkGTiVnNm/2VSgWdWwLJdZrXpoq0tOS3dVJ0gwCqOLE7tsIuXtcgRKxWCOT8AxfXvOvio1QqErtDMcjm6HHWauiGtranSUkSkoIwCOw7v27Fq2vrhyWeBxOQ8i1MrvbR2GrTqko/8pF2PAWKTxI9sUSM986qlWfW2z6oMFjVxArMYDVyVkoYN9CAKvBkQCvjSFe4VLTk0RBqVNjxPK0F/a1a/Qdf3h5YIW+yglrWvpAeGtrSldNEoRGbzn3PVOoT5feHa4AHQVwRgGkCvLV0aCs7p/Hj8PSA9kwS2O6Bao1iI85Jt2Xb6uUXzEFQXt+49l9RogI0SHBqaY6r3NEr+VrRmWF+0LvCD/sSCu+UX5hWobm1HHIe4t0BEpWDuhuhL35GVu6/AXgWyfNag78bq/hptLlV5wspN4I3/y/tL61EOqunhmeLEYxluXN01664VxujkSSA7txviHK9sbFk+1FfuKwsXTGUq7wGzoBK+0LMB8dWDbf5jWMC2YQ7roNoIHiFfW3fHx/wBdmH8M2J7kvzfyo592r0rtAvpZRbnMCquAYE3DoWi60zaXMacDvnHtkNBl2koGyKZCNguznQc3EpqFaynuTRK96pCwMULWeHuZMQwCOnYnaoLH86MiHQUiwk4CLZBNOxhywFuLewmHL0P8jsbHNKoUGw9pkGr2mdFxQ0WwLH3VALdy5QZHuzHAhf1lkOANS7Vp0FmRd2YtUvjZs+hjWB3DXOWA7TA30KrJVNVTPWtyjJ1uAg14WsMMwGbhM/KUesWHr/MWKXf/0t8wNqPD/e9gbPLu6BEvaWahyU52EfS+J4st4oZgzjGRyaf7HE1dkFMMu1bsEX6PwmmyCGkwIrIWcWkps2P2 e+irzEaK nF7W+eYt/1qmZ0tX3jrP2FVme/u0vFe/z4S1fMTOQk6Y6yIKPdS4KeXtjncX7x43Tg/fN/Vl5pxdEYTYUlyy0+jNI5jNVgzfOp8XSDYFw1Felh3a3vKaXqwLkznDIS0pA04CxI3t6SVPxOcL4Q6C72DL7ZBNQzdAd7k3TCGQjTwdXlBNuTDw4aFU3koVawZ42FmxcISZYkFjw+IMNVo0LW9zpmlY43kB713rtyrtQm8CbWm7TAVGIu6chu36S2iPHI+KrHBwo7j/ofxfPsJQsw5Qt34D2gzwq1huVik2uOrx+cxw= 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: The logic for checking if a given madvise() request for a single memory range can skip real work, namely madvise_do_behavior(), is duplicated in do_madvise() and vector_madvise(). Split out the logic to a function and reuse it. Signed-off-by: SeongJae Park Reviewed-by: Lorenzo Stoakes Reviewed-by: Shakeel Butt --- mm/madvise.c | 57 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 611db868ae38..ba006d05c7ea 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1640,6 +1640,31 @@ static bool is_valid_madvise(unsigned long start, size_t len_in, int behavior) return true; } +/* + * madvise_should_skip() - Return if the request is invalid or nothing. + * @start: Start address of madvise-requested address range. + * @len_in: Length of madvise-requested address range. + * @behavior: Requested madvise behavor. + * @err: Pointer to store an error code from the check. + * + * If the specified behaviour is invalid or nothing would occur, we skip the + * operation. This function returns true in the cases, otherwise false. In + * the former case we store an error on @err. + */ +static bool madvise_should_skip(unsigned long start, size_t len_in, + int behavior, int *err) +{ + if (!is_valid_madvise(start, len_in, behavior)) { + *err = -EINVAL; + return true; + } + if (start + PAGE_ALIGN(len_in) == start) { + *err = 0; + return true; + } + return false; +} + static bool is_madvise_populate(int behavior) { switch (behavior) { @@ -1747,23 +1772,15 @@ static int madvise_do_behavior(struct mm_struct *mm, */ int do_madvise(struct mm_struct *mm, unsigned long start, size_t len_in, int behavior) { - unsigned long end; int error; - size_t len; - - if (!is_valid_madvise(start, len_in, behavior)) - return -EINVAL; - - len = PAGE_ALIGN(len_in); - end = start + len; - - if (end == start) - return 0; + if (madvise_should_skip(start, len_in, behavior, &error)) + return error; error = madvise_lock(mm, behavior); if (error) return error; - error = madvise_do_behavior(mm, start, len_in, len, behavior); + error = madvise_do_behavior(mm, start, len_in, PAGE_ALIGN(len_in), + behavior); madvise_unlock(mm, behavior); return error; @@ -1790,19 +1807,13 @@ static ssize_t vector_madvise(struct mm_struct *mm, struct iov_iter *iter, while (iov_iter_count(iter)) { unsigned long start = (unsigned long)iter_iov_addr(iter); size_t len_in = iter_iov_len(iter); - size_t len; - - if (!is_valid_madvise(start, len_in, behavior)) { - ret = -EINVAL; - break; - } + int error; - len = PAGE_ALIGN(len_in); - if (start + len == start) - ret = 0; + if (madvise_should_skip(start, len_in, behavior, &error)) + ret = error; else - ret = madvise_do_behavior(mm, start, len_in, len, - behavior); + ret = madvise_do_behavior(mm, start, len_in, + PAGE_ALIGN(len_in), behavior); /* * An madvise operation is attempting to restart the syscall, * but we cannot proceed as it would not be correct to repeat From patchwork Wed Mar 12 16:47:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 14013692 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 C63AEC28B2F for ; Wed, 12 Mar 2025 16:48:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D96D1280007; Wed, 12 Mar 2025 12:48:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D1E4E280001; Wed, 12 Mar 2025 12:48:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B7036280007; Wed, 12 Mar 2025 12:48:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 98025280001 for ; Wed, 12 Mar 2025 12:48:02 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 99FF7B982E for ; Wed, 12 Mar 2025 16:48:02 +0000 (UTC) X-FDA: 83213481204.23.21A662F Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf04.hostedemail.com (Postfix) with ESMTP id 01B4A40017 for ; Wed, 12 Mar 2025 16:48:00 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ny47xZvm; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741798081; a=rsa-sha256; cv=none; b=rRf4We1WG7eilWMEGyDTpswZwT+wy8tCScOsgyJfd6QzQsfdFYdW0eQRzymOJ1U8nHe1/d QZI5KFvGFP7bsVsudh6o2c+rG5a+N/CTn0KwJRqD8BVkBTowa+jq25Oo/mLSigd2yUdWzW vpPb9s5MnXcIqscRffOSH5HM2xo1EEw= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ny47xZvm; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sj@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741798081; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=cM16TAOuVVtKKP3QrkRW1nnC5wwiHTfkUzYVvNhoMqA=; b=r3rv+2AFdRuwArHFOWMRXzE4BO12+yHEhJiMv6eZ3H+omyjiiSPLOd/ULJUyvylsqK1Bkt 7rx0FdHl+bcoMtEgyBWUlxhYgQ9J+WPIDX1ucu1kU/aEZwaqPQ5XjyGpe1y/UMFHRkfHGi RVq+UZ0+9N0wYxp+jIQbN1X1Prd2acU= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 6CA0D5C5CF2; Wed, 12 Mar 2025 16:45:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D44FBC4CEF0; Wed, 12 Mar 2025 16:47:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741798080; bh=rKIbFCwS48nnM6gxh3wFYLS526gq2KkVNyyi1h5+1tk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ny47xZvmQKh38wEZdbd3uE0N8ConIG5EFPo1F10FYLNBMl2IB7y1AwcvcMRRJNiCN 6DsaZj+4A+UAe1nWjY/dJ0cEkcnv2ElAewCEm5yRbK0LJ43cOpTWGMc3DLvjIVuwGZ C4CjRpAl0cXtZCgpM0ZJTk0XgnENCfBZNf1f08D3wl7jRV5okrmFCDVt9FKQ37CqxV ie/m5SCf8rDIfPHAr2XDJ5enChHf6IQ8fy6VADpoYh7VuZWaEBgQ6LKivy8SdaDysn sJU5R5O8Qm6vfYacjyZ2KlaOsDamPhHJmb2N0i+USWfjhepz+7RyyS9jm+RB1cUKl9 ktIavjNMuGU+A== From: SeongJae Park To: Andrew Morton Cc: SeongJae Park , "Liam R. Howlett" , David Hildenbrand , Lorenzo Stoakes , Shakeel Butt , Vlastimil Babka , kernel-team@meta.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 4/4] mm/madvise: remove len parameter of madvise_do_behavior() Date: Wed, 12 Mar 2025 09:47:50 -0700 Message-Id: <20250312164750.59215-5-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250312164750.59215-1-sj@kernel.org> References: <20250312164750.59215-1-sj@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 01B4A40017 X-Rspamd-Server: rspam05 X-Stat-Signature: u1684i4f6yc7ty8xkc5nwj4hc7ynibs8 X-HE-Tag: 1741798080-784235 X-HE-Meta: U2FsdGVkX19xylINYky5O8uRggbrMv38QAtMtvv7p4M55sa+5Jk3/v7yL9U0TN0q91Nj0cBTZqDDUlN5As5KDDluLaSjYl8GRxHdFXjvt29ygFMpnawWOaXOT/FcMRn3L0lCp9QwhNXN2x8w3QMfq8Dpp/pv3NTS69qiv4DHI9YiCqRnpo6UN526tvpZEO4dMiF183paHRh1ZXJAM9WJoq7ael5B1glmn+HCIkjHQ6JJCy6oib/lZyOD0sQT4ftXe2s5CCfymGWX1+vi3rroyTF8RzaxDn74Xm4+aWFvEUdbInNGYGshi6i7zaQlt6YKBI8HQOcxjqxDkof1ZtdF08IRX11lRpKYWC2sNz3NgmmwR52Gq+lGplAacOAutnpnhjcOkJU8tP5n18P24lU1KomfzUeX7bOEw3QZTXJjBWvEfzZC0rjfQ0I2biUMpb8P/cvipFxMKAPrmfZA9JCxtIQYzdVg83xL7x+tCHS8G9QhbylAfqmlESw9HLNtrXv3sNaLyMrnrBFIDiI1sM88ZppTyEK9zg15W7w/XcfOY+ZBVfJQdod46HzCnP1ec5j2nolbTuYPU5AgQhYVCzYW/kcmJvERYSFP2QDmUF/YwVMdy+L6st6khuS5CxKe1uFeFuR9nv+tgSLdCS/wtSiDI/XsGgCmBIvB9FuW808a+R0bcFPprZ7exGhdYQf1z5njGovT5cfWz/JIhe8TZukjt5B0xEXSRqF1K+0/hRvzzfnyG2h2ICqebApw7dwvfy9+vNtqYJyTkfyq7HOtzh+7Vw0239uZuhLuDa60BIOjOpov+5uGYrbL7wAiLSCVCP9/RXlfP0NFW1L/HHKhKyQ4Y4qKzmYbyfRay1Fflkn4AuV3UxK0mo9XLTGF+3DE0+CUY0nuWqFO1c6r/NeGLi49cPb3q7PIaewQDGXsyzyBkD6CrlY6HsBfhe3SjZo/cqAe359vlt44nV12BcMDjgV jNX9vA/4 G88t7AQo7IKNY8PxKzH6mPdVUienKRk7jVnvNg1WXbMSxNGw2RsiaXQWG+inwS0yY+gvEWDD1XtOszgjncjFU8d+YT1QlZUh+cdPoki64ysoMlETrj6emmwfWdYPisJG3MF2ZMEL4D+1Nhom4Xi1Tc/omhsD7Uqp8KhCsFe3PfYg9I2N7Y115DxKJLrjkkFNEa+rNX5oEAoDrVS81kcfuxdd77pOZargttfUOmYaHzv+pu2bBs3P9qbrGOaQ9XbIZvCBQLtRflInel3py90TImDt0+74go0NEub2gHe9hegHTBn6fNqBaddgp/g== 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: Because madise_should_skip() logic is factored out, making madvise_do_behavior() calculates 'len' on its own rather then receiving it as a parameter makes code simpler. Remove the parameter. Signed-off-by: SeongJae Park Reviewed-by: Lorenzo Stoakes Reviewed-by: Shakeel Butt --- mm/madvise.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index ba006d05c7ea..b17f684322ad 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1677,7 +1677,7 @@ static bool is_madvise_populate(int behavior) } static int madvise_do_behavior(struct mm_struct *mm, - unsigned long start, size_t len_in, size_t len, int behavior) + unsigned long start, size_t len_in, int behavior) { struct blk_plug plug; unsigned long end; @@ -1686,7 +1686,7 @@ static int madvise_do_behavior(struct mm_struct *mm, if (is_memory_failure(behavior)) return madvise_inject_error(behavior, start, start + len_in); start = untagged_addr_remote(mm, start); - end = start + len; + end = start + PAGE_ALIGN(len_in); blk_start_plug(&plug); if (is_madvise_populate(behavior)) @@ -1779,8 +1779,7 @@ int do_madvise(struct mm_struct *mm, unsigned long start, size_t len_in, int beh error = madvise_lock(mm, behavior); if (error) return error; - error = madvise_do_behavior(mm, start, len_in, PAGE_ALIGN(len_in), - behavior); + error = madvise_do_behavior(mm, start, len_in, behavior); madvise_unlock(mm, behavior); return error; @@ -1812,8 +1811,7 @@ static ssize_t vector_madvise(struct mm_struct *mm, struct iov_iter *iter, if (madvise_should_skip(start, len_in, behavior, &error)) ret = error; else - ret = madvise_do_behavior(mm, start, len_in, - PAGE_ALIGN(len_in), behavior); + ret = madvise_do_behavior(mm, start, len_in, behavior); /* * An madvise operation is attempting to restart the syscall, * but we cannot proceed as it would not be correct to repeat