From patchwork Mon Mar 10 17:23:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 14010442 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 15DB1C282DE for ; Mon, 10 Mar 2025 17:23:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 64EF3280004; Mon, 10 Mar 2025 13:23:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5125C280017; Mon, 10 Mar 2025 13:23:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 22EA7280004; Mon, 10 Mar 2025 13:23:28 -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 EDC7F28000B for ; Mon, 10 Mar 2025 13:23:27 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 241A1C130E for ; Mon, 10 Mar 2025 17:23:28 +0000 (UTC) X-FDA: 83206312896.11.8CC5022 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf18.hostedemail.com (Postfix) with ESMTP id 3E57A1C0021 for ; Mon, 10 Mar 2025 17:23:26 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=e1BK93rR; spf=pass (imf18.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 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=1741627406; 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=v2BgPGEjQCF0GcVfOPHe7F1Yx41Rf6juYV4ECA5muQg=; b=YvzEsLI+0P+QZQe1/iRi4DSgxzvr5j5PXCfiXfDHrLoQds24J4N8j+evE4DqQrbXV7mpgz WpHoKMan9GGk/uJUo/AGZ4v49nO2KzL4/WjNERaf/rrGbnDvDVEsDmvs93QmXhiCuQEJWz KbD+xKZK4PuBVUEmMby0o23lmPqtaaw= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=e1BK93rR; spf=pass (imf18.hostedemail.com: domain of sj@kernel.org designates 139.178.84.217 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=1741627406; a=rsa-sha256; cv=none; b=qZ2o5JLjKR5Onhk/d75rAmE7v6AWlUlgyqQte5LOzkGcJs0xsIcLt87f0mH5gk05UXdiki FH5A33xGRPFVmDiI5M4XxDy3nxfiFg1Wkz8vJ6ZUGncMO5VaQc2iVzGktNrapRkHMi6D+F cSFM4z2rwt1yA5vL1+JLXi4LYlK0DcU= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id A4A655C53D2; Mon, 10 Mar 2025 17:21:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF349C4CEE5; Mon, 10 Mar 2025 17:23:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741627405; bh=aKpudoyGMo+z+VXYP9y3gu4MvjeTt1j3Cq/sd3oN+kg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e1BK93rRkUd3fN3j1E7lnnyaxNRQGTW5BEIjfLCMLxhVvoBz+4jSN85j3VHnm26J6 3ZruHED9gH/KJIR2LwXrwm83oumL2S0dnHxf56U2+HlbZZlVPURpjRX5+KJ0dzTjAY WVGyOAvhEvEh2nwRjdApfUatSmV5bdVGpbVs0cfxEwEuf6SyXlKjjW3gtiKAByCuy7 coXHx5hVZzpuPzyjBbvt+Mgxj6vZqqm30Kxl8DKnklVs7qfC/xDvmHJ6KzSBHe0x4z vtTHOMLgSkugJ/9YYnTS2e0AY38HDjWOgp4TvS5tfLyt9gE/ruVGDyrKVtAbKFX7RO GkthFUtl2sOFQ== 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/9] mm/madvise: use is_memory_failure() from madvise_do_behavior() Date: Mon, 10 Mar 2025 10:23:10 -0700 Message-Id: <20250310172318.653630-2-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-Server: rspam06 X-Rspamd-Queue-Id: 3E57A1C0021 X-Stat-Signature: 1kwhqwkrqw6jkfdkc8cex7nkom54s56f X-Rspam-User: X-HE-Tag: 1741627406-486960 X-HE-Meta: U2FsdGVkX18uKXeW4BP3ewS4bpuTLab/A7eq28L4t3kq1aa41kSis7yzEX36louu/3AtMMdoyA8c4/5oOWXlHzJMLQ5FJzgr38geVuvdGH7ra+ZyFbDMygzQdhHOcEVUNMs6rFQxxKCcT02mz/8uBvgNCE+fSLthKnIaqE4hfiv+PA2C7lOWDl1qTL2I3hPRoS9KLMzkvXGnNSa5N2QUaKftFo1oqmiVNCmUmcixJ82V6EWPTfB0zt2vIQqQWiYodNBkRbcSuIF9OH4l9AR3uNRpunZLAqM4/N+ngrmipnr+H3fxb36vvG1fvNlw23q0kqhXF02aRLZqqxlfM5jLeiwvRnbSmO+sXSFmbu5eCKA3mP9uzwro0cKo33zdoL3WGlLYaipgBwuPRi5QNXO5lDrYGkiyVmEsPCToHR9rXjzfT48JDVSS5Dlr8Wcq2Nqoq5xiVRahYxGpDkj8Dv1wwaB0GpOqaNdAfv4DlbRoPy4Rq03ffHcpo1wQURjYy3dCiMksM63oda4w7fKLDHqrpkBxE3Xyxy+0+gacvG8W503J5QHx8hApetHgG+MnUE6o9q0+IoM9Tgy4OZn7MIc56LRB6T0ryXTEdRV2cUH+6q/irVazdDM+ttMrl7fK4BgjGCx1UyCYbJSDtHlidOA+lNufqp5PmzoYP33vuVEbTpKgt/S1wt/J7ODyDqM5YJUIeaqklgXb+4iiz+Xyho2fqQIDwPLNd/A7vkWcs9qCh9Fx89Hs91jVlNepYDYe9Q9VNvbkZSwhf0xxXxMJ+ee6CBvZBCcpDDNRsKLIBEosJn0LjSYddAoovt3G+vVZnrtSHI+uo+FCsPjVkg0VRvKK9vm1nDnvk+S4+JeE+v84Fk3S30FS11/mnVC1OWVtdOtVjPGhztCNajNtSE0/aC0Vyl2qjdpXY/BKiuiEZAJL+h8JuqaP6PPIRhwK67k2oDIHz/8laVGZl/SEJX/AslP 4mZJPT7B A7hjej/xSk2Kv/5t350M/SCJO/xw5uTKc4qzZKDSR5ax4WQADsIrSm/Pp8GWxlnoAg78gfWezaf4tB7GyI5NV+af57T0id/nEOP1yvBjL25wylx5yFQw8TymCCAqy2j32+d1ng41AQ0jvzaC4q0KunISmQksqvqt0t06V/sIqyemzEBUGix3H0JbxynNGLr0Nt0OTaZPA7g2pYxelKhM72Opp3e8d9Z5ELBJ531XDl6uIQXxon+f30flOabDA3pHCC46QEzUxN0hEH9KnOKgdqO7TWQ== 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() has 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 --- 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;