From mboxrd@z Thu Jan 1 00:00:00 1970 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 9B69FC0219B for ; Thu, 6 Feb 2025 06:15:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AE98E6B0088; Thu, 6 Feb 2025 01:15:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9FC5F6B0089; Thu, 6 Feb 2025 01:15:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8EBDA6B008A; Thu, 6 Feb 2025 01:15:24 -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 729D06B0088 for ; Thu, 6 Feb 2025 01:15:24 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 22A1BB1C35 for ; Thu, 6 Feb 2025 06:15:24 +0000 (UTC) X-FDA: 83088507768.07.CD81D12 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf11.hostedemail.com (Postfix) with ESMTP id 6D8F240008 for ; Thu, 6 Feb 2025 06:15:22 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Vuq0xk1G; spf=pass (imf11.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=1738822522; 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=YQ1U7tbqBuRXWxnfwD2FvAQPRZmQE/SHRz70uqZ2C4w=; b=WC8VPL96AAIWx09qBCwhoZXZYZVrmx4Npf+f2l0bfA2OJYzq3ltzAGbtTrNPEsLagZNxdb 5BShIJ7gtuAeq0+dPo1vnV62mdTLkrlc4jhlOncoBK05Xg9jTGCLXQ3vG6Wj6zhfLQm5k9 Tl4peU7A0eio5v89p1LFEaE1+TkD4FA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738822522; a=rsa-sha256; cv=none; b=lRUpoaOuDc/hQrVAfXwas6yY1HHA1i41vizOOxMRj8sASz/jgs74vwkifMNAFF2qwCYqnV gZqsMIiKLFgOAQtXkbDNUJYK9XxErSF83MEKve+dAspbllAuMfVGtBFlC7360gwnGpD0OA MKoU7/IFJbudSCboP6nylA8w6A7cKU0= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Vuq0xk1G; spf=pass (imf11.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 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id E65B85C6F62; Thu, 6 Feb 2025 06:14:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 35113C4CEE0; Thu, 6 Feb 2025 06:15:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738822521; bh=v9imdnw1laUwcaZ0L7TzqeKruhJu/RKKPxXcWFCWS6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vuq0xk1GFf7K7aLeK5IU/IWvtpIglV8lakjb0V1/ii6zxiXGBD7/syJXUxK25irCD iLncnsB2VIC+lM7KH0pa40jsRpBrHH4xRq4h7UeGVNck+6bFLUiZdQOXJxL7AHwzit mc1qT0ZG4agZsNnCC/uog9DbOayV7qesHAV1FG3A4B2dQ3KscqoMUeDSDkQ9sS4KFV yE7O7Ux7EBw1ZLLvXd1SENfTf1iaH7Fh0wvrfuRYu9h1dozqHbZ3wxkitTWgN52j5v LlNfVrlTyxwSeRZ4IRTNGSt7IEN6bwYhHFuPU1D7a8S3YmM4QSF9FXPB0Clld9tlmh t1ZkiV4Tmwafg== From: SeongJae Park To: Andrew Morton Cc: SeongJae Park , "Liam R. Howlett" , David Hildenbrand , Davidlohr Bueso , Lorenzo Stoakes , Shakeel Butt , Vlastimil Babka , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 1/4] mm/madvise: split out mmap locking operations for madvise() Date: Wed, 5 Feb 2025 22:15:14 -0800 Message-Id: <20250206061517.2958-2-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250206061517.2958-1-sj@kernel.org> References: <20250206061517.2958-1-sj@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: wgrk1eppgu7ne1dfhi9hrzi15ozsg7xo X-Rspam-User: X-Rspamd-Queue-Id: 6D8F240008 X-Rspamd-Server: rspam03 X-HE-Tag: 1738822522-989183 X-HE-Meta: U2FsdGVkX19CF2i7ZiPKq/P4RplqA6VT3DgQpXluOpDJOCEvQT0rCoR2EjHw5FGTMjwz1vhNPgW9la9IaRdjc0Rh4aC9rer2bdUgybby7DwQTaLVJeYiORDEZbtc5PH5iCI623Avs2wHTu9SKauV1AUkPbQTi5lDOo68T4X5pk+yziz0gQVQEkwF6swTqp9VuFtstJ6BG3GSOgQsq02/p+Cn37Uaty3KRfAqrHhbQLBYCDMOtSQk9ss0xuJsOZYVnUvCuicMF8TmnEeb5xSKAoBwuhGaBZWFYeOQoL4mH2c1vPMF9liruu3xmHm4fq9POVYXqwBC8tZFG+7q46SoDj4fbfkwR7Cm9z2R/BJYQloYF5HPSK6yWZaDn57d8ZQGOmsVDssHBXov/blkJig8LOdTOJxJhBEFd8mzJBRHP5sHq7VmmxVtZbgADHmI4RWm8GjDAW3I0hWzLuoqygwo1Z31y35/kEnVEbmNK4a75834po5DErAa0Ic1PRiyUMm7PnQ2BXkZcdTm7WQN5G+JuXpNKrNCnmO2RItrcbHhokWfWsBZ3O8cLvqJo7V1rkbWZh29fmUy58ahyTW4HVFT5fCaZuHk5CwTPXSzQjsA2hdGaE+rSCRPdJ0VfFQbWxHTdgsM6+xhXrZ0MusJHzibyTBC6ifv8hf+b4VRYvcuzcmWpi7PYsJYaWx0oH5ZtKFIk25ygKZkyvizHdeQGTr3o8G6pw+qIyntR118yiB97X8yAg8cJe7xub6ll6tplXvMTGfPL0AKFY87fsF1mECVMphRSWZBBLBqqPE31ygYszpq30CumqTc/ssG64QVRJoA7r6wGggCgM6hi7gtnfHQuo6Gqg+I6Dfac40HUEpB+nAMEVmZAmFq0uBh8U+91jq4waSjnAZGUJkc/hBOGqlMelbnN1p/1nGWwidCG9IQuxsn5njy7E7QLj1GGRNo+8MwFm1RItGo8VJlxFcSZy5 vziOWwRR Q51TPik62xuMV3iRHy/5EHxm3i0U17VQZzwybDBn3hU9A0lJm6D6wdjhSSZ30i+P6FguKG5zumkWQQSxeaNEjldzB2feUyVpa8SYw+XUI8g5I5VwSxvicbfLSQ5UgXVdOCWaP+ZftyueKIMw0kRs0HQ5lNHjJ6HLjD1j+L3W42+c4wPy9Y7J0R2ZVgQQh8PnqumM05dAFT0XgOj3RGtEuNWlO0ERuJ23Rmwp0Zbx5jsaU80LtvCFJygL/NvKUGQ8m8ML5Ya+i8mWtZL0yeUTq6nhF5eOBag/NRPK0I9TZeFiGw4pr6ZbJe+ETeA== 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: Split out the madvise behavior-dependent mmap_lock operations from do_madvise(), for easier reuse of the logic in an upcoming change. Reviewed-by: Shakeel Butt Reviewed-by: Lorenzo Stoakes Reviewed-by: Davidlohr Bueso Signed-off-by: SeongJae Park --- mm/madvise.c | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index c8e28d51978a..df5a87a1846a 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1567,6 +1567,33 @@ int madvise_set_anon_name(struct mm_struct *mm, unsigned long start, madvise_vma_anon_name); } #endif /* CONFIG_ANON_VMA_NAME */ + +static int madvise_lock(struct mm_struct *mm, int behavior) +{ + +#ifdef CONFIG_MEMORY_FAILURE + if (behavior == MADV_HWPOISON || behavior == MADV_SOFT_OFFLINE) + return 0; +#endif + + if (madvise_need_mmap_write(behavior)) { + if (mmap_write_lock_killable(mm)) + return -EINTR; + } else { + mmap_read_lock(mm); + } + return 0; + +} + +static void madvise_unlock(struct mm_struct *mm, int behavior) +{ + if (madvise_need_mmap_write(behavior)) + mmap_write_unlock(mm); + else + mmap_read_unlock(mm); +} + /* * The madvise(2) system call. * @@ -1643,7 +1670,6 @@ int do_madvise(struct mm_struct *mm, unsigned long start, size_t len_in, int beh { unsigned long end; int error; - int write; size_t len; struct blk_plug plug; @@ -1665,19 +1691,15 @@ int do_madvise(struct mm_struct *mm, unsigned long start, size_t len_in, int beh if (end == start) return 0; + error = madvise_lock(mm, behavior); + if (error) + return error; + #ifdef CONFIG_MEMORY_FAILURE if (behavior == MADV_HWPOISON || behavior == MADV_SOFT_OFFLINE) return madvise_inject_error(behavior, start, start + len_in); #endif - write = madvise_need_mmap_write(behavior); - if (write) { - if (mmap_write_lock_killable(mm)) - return -EINTR; - } else { - mmap_read_lock(mm); - } - start = untagged_addr_remote(mm, start); end = start + len; @@ -1694,10 +1716,7 @@ int do_madvise(struct mm_struct *mm, unsigned long start, size_t len_in, int beh } blk_finish_plug(&plug); - if (write) - mmap_write_unlock(mm); - else - mmap_read_unlock(mm); + madvise_unlock(mm, behavior); return error; } -- 2.39.5