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;