From patchwork Tue Feb 11 06:32:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeongJae Park X-Patchwork-Id: 13969509 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 0DD45C0219E for ; Tue, 11 Feb 2025 06:32:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B206B6B0088; Tue, 11 Feb 2025 01:32:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id ACDA66B0089; Tue, 11 Feb 2025 01:32:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 96EAF280005; Tue, 11 Feb 2025 01:32:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 73B2F6B0088 for ; Tue, 11 Feb 2025 01:32:13 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 184598102C for ; Tue, 11 Feb 2025 06:32:13 +0000 (UTC) X-FDA: 83106694146.07.6EE7705 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf12.hostedemail.com (Postfix) with ESMTP id 8E58540003 for ; Tue, 11 Feb 2025 06:32:11 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ZKW9spiD; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf12.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=1739255531; a=rsa-sha256; cv=none; b=zqNSaJL0XDnkpwk0t1FtFdOk6+5gle5BAziJLF/vRhCo0oyjjCRkHiTRtl0JZa5mLnxjsc XsbAGsOE4W58Y/n7MnIm8ozu5anqldq322rXOkF47HIyBdYAvxLBu7dPgVE9WLqpUq71Si Y9WJ2Ar0IbSZJRnucZjuvdaLjqWlcF0= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ZKW9spiD; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf12.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=1739255531; 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:references:dkim-signature; bh=RfjXiRnEnvrl6i2GbHO7jAdIZVL7dDG4deLH96Ms3wE=; b=rxiXEKtuJ87it/pJ3WfBUUHb9Go+jOJkQGPdd5nMcFG83HXFy9/3ARClKVvSZiwWvR4fml 1tctdMEAG10Tzjc8lvaEW5Jmf5MgnUImVcSwvwnz9mKHITseP4tYJ4rskW+n+CrJrv13nm eRDf7BLsu2CIFsfYFhyBcKf7a+lI/YE= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 11FD5A40211; Tue, 11 Feb 2025 06:30:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A90DC4CEDD; Tue, 11 Feb 2025 06:32:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739255530; bh=jf2t+9h6qec9RLmajAa53yPZiZPc9KBBRZ5a/b1UHAE=; h=From:To:Cc:Subject:Date:From; b=ZKW9spiD5zdEDRsTGijztXIljRwnw1V8SaV6Lpeal8XYN6ixRr5AkZUt55pDmiFq9 q9hEOkDvaSAmICAwBbSraHE99piICtB6QG3unsgw8hJK+O2hA/1RAv1BD4wVL981UC o0c1q3/Ej/1vEFo8JB2KHbpiez8qlwBa/XBN/yOuSLCVeb60JeMCl4Me0TY9IWE73o GPtjZnnDQNd9769r69ge/S0tQsd9VZnq385/BkU0c75L7BJwcPF4SDpf+oEZG0MFcl /nZIT0f5yRrCjANQfI+g29xguzU+ynIFO3sPXbBufkgKVImb9XNW5osQ7uCWe3+1RQ qIUqusaPlhk7g== From: SeongJae Park To: Andrew Morton Cc: SeongJae Park , "Liam R. Howlett" , Davidlohr Bueso , Lorenzo Stoakes , Shakeel Butt , linux-kernel@vger.kernel.org, linux-mm@kvack.org, "Lai, Yi" Subject: [PATCH mm-unstable] mm/madvise: handle MADV_{HWPOISON,SOFT_OFFLINE} from madvise_unlock() Date: Mon, 10 Feb 2025 22:32:01 -0800 Message-Id: <20250211063201.5106-1-sj@kernel.org> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 8E58540003 X-Stat-Signature: xd9q6kuxi681fp71nhm4t3mmxtsxtbe5 X-Rspam-User: X-HE-Tag: 1739255531-73459 X-HE-Meta: U2FsdGVkX1+ucE3N6L/LPQfogJUu4R+NufuqiUa3JArDUEE0AshgS1e2c0n5Z/PyHNK1/5qGSQkFrbASo4xfrx7diu5hcRoF3xwgVkwTKfuhMfX1A3y6Lf/gB6cBizxoWHvfklyd5JDBfQOY/XD6E8e4KO8c9Ls//aCeOf9ngoKQuY2nFhI0I3fjorXPuc8xKt4vRs0BAMmYdmMmtID2dyWmcagVtofYxJpoJ4dgIFwhiMLgVGTX3GWjwePtVZ2FaOnfz5pX5/oKvWQ51fZVTSsF4RuSEVAgtUAMNRJfWrmZVKOMGTSh22TpHTs6BCWW7shrHMiQOZ46LTFg97NOkXlUdKZf5Z9ZgAqpjLGUCAYAovirlyJMj5qWHpFFnD21GfMBmaQ+LCNLGTLY9NLDQpVblCX8VdR2iALjDKWRKjbxFTtsnmUS7hL0J4LmvUcnUJXsChyuDWIlQGNp6oeDTh0274uO0rU2ImwUw83To4dZrhxsGiiaKxO9ONmnO0sYPBs4m3PBmGyAw9K3DymfUyTJGVDrxtw1hwBFykyFdfDq8Lijui5+11sDBUgoDuB/3SYjNa6aaMxkt1arMRAqMF0Cx8U16RhG4Gn4FRoVflClpPVgnpDD/AhJH9KJHxtppYogpl7lvzIrYdb40sK83lKs9rVOG/ACaoyhWOU8Cxb5US6Jpnv+9GaNIBbIpdsVJzObh+I3EYuj/3LexekO6v8fuJQjdl7VmCitlHDc85cw1F+ATcQwqQClqHu9xEQmqirQTAaGI+y7oPK4Gy1h//JVG8u7OviN2hdraiLU0k4HYzD6g80SeLflxtbBFgGEllPTuG0oREy0FOv94rh9WGqGCpn5x4d5QaQO/r0fKQuVZp4ht/6UP0p/7P8wak/B+PmUvdu7Fdsx3G6e0d8bxpd1ly8wjgRod/7gL3ZlDp1QVEnda6RCfvpq5Bts7CX00KU6COv6vHrN85eJ3B8 47D4VTP1 wTuqadJrL9eIRPyN1wAVcRc3zrZrJ/XtEWalcB86E2me7hd8M+hLaJMmtbmzaJXydF875gF34baMp8NYoLyQN2x+fOObedJDKidw8dnlGW1iVtiTD9w3HZMVPBriTU40GglqugZJQrBrLtXbFq+8Jpg/JNleOeOh0/D3/ShRt8p2mujFn6r/JytXZNqPno2jOP6iXaJzTUsCJ16SwKZjwe6cIoTIu9JIg4DWC5Fxv0EkQTZOLVp6t2P6q/UaCcdfXf/jEgjHvuMhl06q215wgG16bBA1GoRAFA0RWPUartiFOhT8= 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_lock() does nothing for MADV_HWPOSION and MADV_SOFT_OFFLINE behavior, but madvise_unlock() does mmap_lock unlocking regardless of the behavior. Commit 948a0a9ea070 ("mm/madvise: split out mmap locking operations for madvise()") in mm-unstable, which introduced the wrong function didn't cause a real problem because do_madvise() was not calling madvise_unlock() for the behavior. Later, commit f19c9d7b57cf ("mm/madvise: split out madvise() behavior execution") in mm-unstable made do_madvise() to call madvise_unlock() even for the two behaviors. As a result, the kernel tries to unlock unlocked mmap_lock. Fix the issue by handling the two behaviors in madvise_unlock(). For the two behaviors, do nothing but just return. Also remove an unnecessary blank line in madvise_lock(). Technically speaking this patch fixes commit f19c9d7b57cf ("mm/madvise: split out madvise() behavior execution"). But since the broken commit is not in the mainline yet, squashing this fix into commit 948a0a9ea070 ("mm/madvise: split out mmap locking operations for madvise()") would make more sense, so adding Fixes: tag with it. Fixes: 948a0a9ea070 ("mm/madvise: split out mmap locking operations for madvise()") # mm-unstable Reported-by: "Lai, Yi" Closes: https://lore.kernel.org/Z6rgiVp7221r4JZ5@ly-workstation Signed-off-by: SeongJae Park Signed-off-by: Lorenzo Stoakes Reviewed-by: SeongJae Park Tested-by: SeongJae Park --- mm/madvise.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) base-commit: 8bf30f9d23eb5040d37e6e712789cee8e71e1577 diff --git a/mm/madvise.c b/mm/madvise.c index b5ef8e03d8b0..b8969457f3ef 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1577,7 +1577,6 @@ int madvise_set_anon_name(struct mm_struct *mm, unsigned long start, static int madvise_lock(struct mm_struct *mm, int behavior) { - #ifdef CONFIG_MEMORY_FAILURE if (behavior == MADV_HWPOISON || behavior == MADV_SOFT_OFFLINE) return 0; @@ -1595,6 +1594,11 @@ static int madvise_lock(struct mm_struct *mm, int behavior) static void madvise_unlock(struct mm_struct *mm, int behavior) { +#ifdef CONFIG_MEMORY_FAILURE + if (behavior == MADV_HWPOISON || behavior == MADV_SOFT_OFFLINE) + return; +#endif + if (madvise_need_mmap_write(behavior)) mmap_write_unlock(mm); else