From patchwork Mon Mar 10 17:23:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 14010443 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 7004DC282DE for ; Mon, 10 Mar 2025 17:23:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A8AFC280017; Mon, 10 Mar 2025 13:23:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A11E728000B; Mon, 10 Mar 2025 13:23:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 866D1280017; Mon, 10 Mar 2025 13:23:29 -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 6A1D228000B for ; Mon, 10 Mar 2025 13:23:29 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id DE663C12E8 for ; Mon, 10 Mar 2025 17:23:29 +0000 (UTC) X-FDA: 83206312938.25.E424764 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf19.hostedemail.com (Postfix) with ESMTP id 872741A0005 for ; Mon, 10 Mar 2025 17:23:27 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=QLodKnMG; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf19.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=1741627407; a=rsa-sha256; cv=none; b=cxrJtN6aTwVrCO0LGgfbTXiPslSyRfn2EGnl+K2khRVKSCGGKOGn2O8TPunTowJToYmBds Js7vApn46aKLafY3EPO2TrIbMK5tYWtEdmmgwNaAPaQeOtADmVaVNunmTzpVI1cCUBBshs MR0JJE/LIEz0kiD/tSRHtsJcu7Bgmc8= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=QLodKnMG; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf19.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=1741627407; 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=0tixeGrzJIcyGhtY0onfJYjZJKuBi5YtkfsORYDChEQ=; b=VIf784oPETnCQRldrzR3gLlezTSKAZKe7u2bU89kq93qfcIK6ZjhVethqhKnlqxN6umawG SaWKSKYBLRiDWdp8ZyeHR1DX6zU/fWyXLGLhygybNtA9osHj9FE6UTrT6jloLwtGHx4vdR XJAgdRcRo+KrYkWCxqa5YZ6mdE5ufoo= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id CC0D15C5438; Mon, 10 Mar 2025 17:21:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15460C4CEE5; Mon, 10 Mar 2025 17:23:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741627406; bh=M9/wAyNFr4MzyO45yCxu/y9IRXgOWJVU4DhwCYnIYO8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QLodKnMGunZymOsXhiHwJL3CZN56ph7GyHUBQSnqvbfDZM4FdddyE6UwjyywHRHS1 cQupnW2BYiokTpHo7gTlm1+TlGjayuwf2a+xu80NDLVwzT7QoRMat5a/pBCcLPviUG I2u/9J8exOAV+qOehvNS3kdd/WwNK1e2uTbFksC+1ZA2Dd+i1z2axiZf4RF4O72SYs rRuDT2HOdcp+kQiTqlDhnnFIhMVXzyLGCSCcIu6/KGDv+TdsZi4dur6hETHZOeiWVw q0K7MtgfIqjtRTafPny8uDtlEfc/dSMYN9Pd++aK1UcAwdsXxrPKtRSMlm5C0KuB18 Lwmc/eOHDhANA== 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/9] mm/madvise: split out populate behavior check logic Date: Mon, 10 Mar 2025 10:23:11 -0700 Message-Id: <20250310172318.653630-3-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250310172318.653630-1-sj@kernel.org> References: <20250310172318.653630-1-sj@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 872741A0005 X-Rspamd-Server: rspam11 X-Stat-Signature: 4ghjz96f1qyaqg34kexzcot4s4ajpog4 X-Rspam-User: X-HE-Tag: 1741627407-522445 X-HE-Meta: U2FsdGVkX1/RNGREavaApH+pXXIFrM+TFAYFmCYJA/ld2d4ONkpjOeKSNxp8Xu92vOeT43Vd2fdecqx7z9bL7EDk7O4Off3TycmNGCVlv1ZmVb9GiME2zLL68Y4hskQ3nqnqGHyZCNZd6sHkUios8K219yCK3oKJpd8ThMe2rL1AUgcNFA+8hxuAUiJV3H81YWZ/CHNouag/MDYVhOB3DyE4yY1yhraaHA0TPao5k7JAt2WRXCdoolmUQscEj0KfG6tv7hN6UwUJgLuuRhwhzPKlsX83fDTbcov0YgicDUigcRG7zsPaal9PBCIs1Q0xRbbeizOHRDIrj3tAYDHLouUt/uv5xp9VQvpWR4EzwJSEUecDxc4HLDeUJJtGxpsF1KQY/ziP+g8Hiuwc8eu4miwD3z67Vu3WXMviUKFrVwWF6B3t0Yh8mncb7JLzRX61sccw0T1VeGSXgPcaSD7BRqFXa/uejlbiAPdOyf6geNiNRHBks1YN1DtnDsnZXph1U09URcc6AIkNswBtJ9DiEwIfAyVErXIirABBV1gStDAqqrBDH8ht2l7LQqfuPHcDnubf+DMWSomWz9QqG1EgGj5syPMqmGkbV7bORILfkBcU++SUWzKxi1lGTgmknyfxe9VYEeKeyOCEQC6/z6kIZQEfRUmrR2Z+MHzxLXT5OoBE0WrQUmgOamcwopwrhkfBcWiRdRcb1z4oBcetOHRsgAIjJ1P8pmxlZK1Acw/7RYfKT+A+bVmbKT4e1833DH24xSf+BZbKlNWavgX96fGrFi4tVBWJZY2nZ5Xj7LoOx6lguI5+sAvdb+870gt0qFraFIoxKvM8ZB/CTqUTquu0slKkOZ4T3pajWwlJ3pvBeDU8iJimQ9ynvFKUfHe/AL+IDSYi0f1earieZvuiGMy5tkqmD6SLAx3fBUL37irsFddVKeqVZirHxZLIadPosdj9BcukRrJqQbHnikEvuVc h4odslYq xuzMQeFDjdnkynVDg5p4riRYWxDARTr8hPBmSA/bNl9yc63BWmms4H1MWqisZixMlwEWoADSmkKkA9+wArikxNitocb9GvGDny4o//zVhZHhD5A8xM4XebBBtTO1Bbtwiub1mCQywHkBDerwjs9EmAKYPAginmRO1lldSOLioeL8OOlbwqfPH5eVfyMpE01nmCV5abYkV0k7o8dRlWcMxkhujgIYtFQlI36nEXb/hBQip3Jg= 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 --- 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; }