From nobody Fri Dec 19 03:10:12 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 464FC1D8A10 for ; Wed, 12 Mar 2025 16:47:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741798077; cv=none; b=iHMC+oa9Rnu1GiucvpX7zKqxJz9FXVAdsdl/DGZKDniy+DGi639a1qyhGplRQs+PgbVX+RE1exMC/eYSGnlKJmEapqqXv6Ma5a2DJs+hyhQv0J6PPFfbtlHMkiFYLTi5W1b3duo8529aD6f3iP+BkqR06ImedI7VKrPUnpuYcl8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741798077; c=relaxed/simple; bh=R+e8CTxMlC5a9+cJIUD2kjg5SVKUgmKQ8eqkhBREN1I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=e9yl11NPLVwH+2H4ljz2afNQVOWEM6lHBBNBDAtdeqZnyW+wV+eokRfJy+eEH+vy7hwLH6nYom+4zv4i5Pu28h5dZRSDTtQvuq+u6XMmBxFohNF2A8lLozvZtBai88HrhDrMfz/xkAR2C9P5oLIOKfKYx4mIoQyM9rPeAfncPJk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=S4ZB8b+W; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="S4ZB8b+W" 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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, =20 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 */ =20 static bool madvise_behavior_valid(int behavior) @@ -1569,24 +1594,6 @@ int madvise_set_anon_name(struct mm_struct *mm, unsi= gned long start, } #endif /* CONFIG_ANON_VMA_NAME */ =20 -#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; =20 -#ifdef CONFIG_MEMORY_FAILURE - if (behavior =3D=3D MADV_HWPOISON || behavior =3D=3D MADV_SOFT_OFFLINE) + if (is_memory_failure(behavior)) return madvise_inject_error(behavior, start, start + len_in); -#endif start =3D untagged_addr_remote(mm, start); end =3D start + len; =20 --=20 2.39.5 From nobody Fri Dec 19 03:10:12 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5A0D5247DE1 for ; Wed, 12 Mar 2025 16:47:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741798078; cv=none; b=uzTwTWFGUmUqbEU3oYgr3B3gHv914G6kmmVRrjZ4c1neti8PY05NA/fVJKUf0P8l6ONKRd/5OOZANNQPtHSxDK/trrNqymdUaBQBtxXbS4F6vo3Byma9LJUoaS0W07sQCxJR8l58ag0/i6tmn2+AXxKuPnQ1VdiynXZu7z3jH8A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741798078; c=relaxed/simple; bh=H37g5zw8JYgcEHcrKgCoScNGY44vZwcAGnWDri47ll4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FVTU9SzSBeijgGnNj8ovHCOZ+CfUqzwcg7j/9FSeU2fO/z8WJ5QyR0pXB2eVy5PkUK32/f8IGfyeyiADL3B8tJdpz2jenVHQNid+LhUI73rfFruaRVYB2AzfpJ/2vZnEy40JHvI/UwUirq2nGlNu+JRhTBQAqStzuIAzjJDKHlY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=R/vD7NQy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="R/vD7NQy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6438C4CEEB; Wed, 12 Mar 2025 16:47:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741798077; bh=H37g5zw8JYgcEHcrKgCoScNGY44vZwcAGnWDri47ll4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R/vD7NQyc6drg6smFF+csAqealwJ9oeCp8RBZuR7gdkEm6tK8IQ8s+pJIAND/ar6p PquW8UddAL7JN0XDsZH2HFLFMoWo5r/oN9cBCPfkqxvHvnJ/p0wIDGaGdOJe07CTx1 orgRMFPr3iwNZd5q7gV5/8pbAVbEctxUSp9NL5rEYQ2t+vvW+7l2FiISNCaI93IeMs rkiorPIVaI6S3a4TTdptzn+1628Vb6MN3dcPlLLZs06TYjWBWAA0BinMGzNouXH9+o /b3FAzYkUDGMgRdI9BPGPkhIacekGiex1o5ZMjQ/Usfed89xuQkdZf/84b7KCgqQlR d2+OCfyvW+pnQ== 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/4] mm/madvise: split out populate behavior check logic Date: Wed, 12 Mar 2025 09:47:48 -0700 Message-Id: <20250312164750.59215-3-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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.lo= cal Signed-off-by: SeongJae Park Reviewed-by: Lorenzo Stoakes Reviewed-by: Shakeel Butt --- 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, si= ze_t len_in, int behavior) return true; } =20 +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 =3D start + len; =20 blk_start_plug(&plug); - switch (behavior) { - case MADV_POPULATE_READ: - case MADV_POPULATE_WRITE: + if (is_madvise_populate(behavior)) error =3D madvise_populate(mm, start, end, behavior); - break; - default: + else error =3D madvise_walk_vmas(mm, start, end, behavior, madvise_vma_behavior); - break; - } blk_finish_plug(&plug); return error; } --=20 2.39.5 From nobody Fri Dec 19 03:10:12 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C71E2505CA for ; Wed, 12 Mar 2025 16:47:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741798079; cv=none; b=lyKQfGDmIM30aN1X744Mq3YYws2G/ltLzkMRQK4yOc2aUPqkNCnMRSgZd92DUUVqw1zmKHzlbM8etj7aUsJieRFxwteC++hHaJ8JmxNDYxy29AvNsnjRd0pnhSPqtuqAy847NwWKwseG4kxPV0qhEBDtMjDFgZ3er0GRyrXH3x0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741798079; c=relaxed/simple; bh=oQN+mH789PvTmGLvlHTcsIxu+Znjze2S0+wMa1s72FE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=J3uU6USs7LhlxE2bRlWIoYkQakAeiXhnioX4DA6IgnPhXKXYv1dRwhaiDv9v+/4K/FKslP49/GL/uaDTEGf3ON/jQf1Z28HBWXLqcKpx31EZxnwTtbk6DPYEA7FKH58ck+zqGUU3vr+wLKG/ogyMWjVTAk2Hj6e5ehxx1jD4b3M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=j0R2BVOR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="j0R2BVOR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5A71C4CEF0; Wed, 12 Mar 2025 16:47:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741798078; bh=oQN+mH789PvTmGLvlHTcsIxu+Znjze2S0+wMa1s72FE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j0R2BVORIe3z3UqUZHwFFZiyYbMSgywv0UHdCOInvRehpN+8M8jbPX0167V/218YG 2qliFJ0mz4oVhqtkYaYWxKe2lkFz02tzY6LYW5mtMnMSptWnh8H3l7geT0gB5ZLYIy GVHYLAUraEAbLRgf+zuN+hUBplGQ45BwMF/QUW8U+Kr4AzUqNkDZ6l84Nf6X9mogRg scc7lFkhIPwaxHi8n6+e02hoWJWOEjkGji4YNe88ubCHrlq87dnOx7cgjqWIJjhXO1 0P3wJu6fSNnOmmCBXgWmWiycwscR3SABGzd9IFDFN6hf8ssnoDlMvK0CSyDomfjHJH ED5w+PmylaquQ== 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 3/4] mm/madvise: deduplicate madvise_do_behavior() skip case handlings Date: Wed, 12 Mar 2025 09:47:49 -0700 Message-Id: <20250312164750.59215-4-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The logic for checking if a given madvise() request for a single memory range can skip real work, namely madvise_do_behavior(), is duplicated in do_madvise() and vector_madvise(). Split out the logic to a function and reuse it. Signed-off-by: SeongJae Park Reviewed-by: Lorenzo Stoakes Reviewed-by: Shakeel Butt --- mm/madvise.c | 57 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 611db868ae38..ba006d05c7ea 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1640,6 +1640,31 @@ static bool is_valid_madvise(unsigned long start, si= ze_t len_in, int behavior) return true; } =20 +/* + * madvise_should_skip() - Return if the request is invalid or nothing. + * @start: Start address of madvise-requested address range. + * @len_in: Length of madvise-requested address range. + * @behavior: Requested madvise behavor. + * @err: Pointer to store an error code from the check. + * + * If the specified behaviour is invalid or nothing would occur, we skip t= he + * operation. This function returns true in the cases, otherwise false. = In + * the former case we store an error on @err. + */ +static bool madvise_should_skip(unsigned long start, size_t len_in, + int behavior, int *err) +{ + if (!is_valid_madvise(start, len_in, behavior)) { + *err =3D -EINVAL; + return true; + } + if (start + PAGE_ALIGN(len_in) =3D=3D start) { + *err =3D 0; + return true; + } + return false; +} + static bool is_madvise_populate(int behavior) { switch (behavior) { @@ -1747,23 +1772,15 @@ static int madvise_do_behavior(struct mm_struct *mm, */ int do_madvise(struct mm_struct *mm, unsigned long start, size_t len_in, i= nt behavior) { - unsigned long end; int error; - size_t len; - - if (!is_valid_madvise(start, len_in, behavior)) - return -EINVAL; - - len =3D PAGE_ALIGN(len_in); - end =3D start + len; - - if (end =3D=3D start) - return 0; =20 + if (madvise_should_skip(start, len_in, behavior, &error)) + return error; error =3D madvise_lock(mm, behavior); if (error) return error; - error =3D madvise_do_behavior(mm, start, len_in, len, behavior); + error =3D madvise_do_behavior(mm, start, len_in, PAGE_ALIGN(len_in), + behavior); madvise_unlock(mm, behavior); =20 return error; @@ -1790,19 +1807,13 @@ static ssize_t vector_madvise(struct mm_struct *mm,= struct iov_iter *iter, while (iov_iter_count(iter)) { unsigned long start =3D (unsigned long)iter_iov_addr(iter); size_t len_in =3D iter_iov_len(iter); - size_t len; - - if (!is_valid_madvise(start, len_in, behavior)) { - ret =3D -EINVAL; - break; - } + int error; =20 - len =3D PAGE_ALIGN(len_in); - if (start + len =3D=3D start) - ret =3D 0; + if (madvise_should_skip(start, len_in, behavior, &error)) + ret =3D error; else - ret =3D madvise_do_behavior(mm, start, len_in, len, - behavior); + ret =3D madvise_do_behavior(mm, start, len_in, + PAGE_ALIGN(len_in), behavior); /* * An madvise operation is attempting to restart the syscall, * but we cannot proceed as it would not be correct to repeat --=20 2.39.5 From nobody Fri Dec 19 03:10:12 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 30CF7255E23 for ; Wed, 12 Mar 2025 16:48:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741798080; cv=none; b=hgfjObVYrjBDQX6YHm+SsJRDEongO7y054RAuJYtEoQb+ACIuaUWmqINOGjF3BNMKd8kz6Gui0pbOgPInGVhnGkQx85eq6sF6pDusrkUbM9YUbnNsEwR8z7RFTyvMh9lYK8AijjuUvvYqSHorn4FmxTK/TnjBxujP40+1LsFLqk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741798080; c=relaxed/simple; bh=rKIbFCwS48nnM6gxh3wFYLS526gq2KkVNyyi1h5+1tk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=r4aMhEbJMHMwkbkPNbLiP4q4y09Ps4Hg9Jc5AHAJ0zMHXq432Ugk4wmSeF0QwAO4zDLTb14p75ZA3OydEW547bkBm1mzRC9igoI0p3Z1ovapxwIHIGLBZilTuoTBGWDwSVDrf3XV1P5x0HFdsfkOr8YVwW2uMO/1uE7FlfczmGQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ny47xZvm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ny47xZvm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D44FBC4CEF0; Wed, 12 Mar 2025 16:47:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741798080; bh=rKIbFCwS48nnM6gxh3wFYLS526gq2KkVNyyi1h5+1tk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ny47xZvmQKh38wEZdbd3uE0N8ConIG5EFPo1F10FYLNBMl2IB7y1AwcvcMRRJNiCN 6DsaZj+4A+UAe1nWjY/dJ0cEkcnv2ElAewCEm5yRbK0LJ43cOpTWGMc3DLvjIVuwGZ C4CjRpAl0cXtZCgpM0ZJTk0XgnENCfBZNf1f08D3wl7jRV5okrmFCDVt9FKQ37CqxV ie/m5SCf8rDIfPHAr2XDJ5enChHf6IQ8fy6VADpoYh7VuZWaEBgQ6LKivy8SdaDysn sJU5R5O8Qm6vfYacjyZ2KlaOsDamPhHJmb2N0i+USWfjhepz+7RyyS9jm+RB1cUKl9 ktIavjNMuGU+A== 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 4/4] mm/madvise: remove len parameter of madvise_do_behavior() Date: Wed, 12 Mar 2025 09:47:50 -0700 Message-Id: <20250312164750.59215-5-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Because madise_should_skip() logic is factored out, making madvise_do_behavior() calculates 'len' on its own rather then receiving it as a parameter makes code simpler. Remove the parameter. Signed-off-by: SeongJae Park Reviewed-by: Lorenzo Stoakes Reviewed-by: Shakeel Butt --- mm/madvise.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index ba006d05c7ea..b17f684322ad 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1677,7 +1677,7 @@ static bool is_madvise_populate(int behavior) } =20 static int madvise_do_behavior(struct mm_struct *mm, - unsigned long start, size_t len_in, size_t len, int behavior) + unsigned long start, size_t len_in, int behavior) { struct blk_plug plug; unsigned long end; @@ -1686,7 +1686,7 @@ static int madvise_do_behavior(struct mm_struct *mm, if (is_memory_failure(behavior)) return madvise_inject_error(behavior, start, start + len_in); start =3D untagged_addr_remote(mm, start); - end =3D start + len; + end =3D start + PAGE_ALIGN(len_in); =20 blk_start_plug(&plug); if (is_madvise_populate(behavior)) @@ -1779,8 +1779,7 @@ int do_madvise(struct mm_struct *mm, unsigned long st= art, size_t len_in, int beh error =3D madvise_lock(mm, behavior); if (error) return error; - error =3D madvise_do_behavior(mm, start, len_in, PAGE_ALIGN(len_in), - behavior); + error =3D madvise_do_behavior(mm, start, len_in, behavior); madvise_unlock(mm, behavior); =20 return error; @@ -1812,8 +1811,7 @@ static ssize_t vector_madvise(struct mm_struct *mm, s= truct iov_iter *iter, if (madvise_should_skip(start, len_in, behavior, &error)) ret =3D error; else - ret =3D madvise_do_behavior(mm, start, len_in, - PAGE_ALIGN(len_in), behavior); + ret =3D madvise_do_behavior(mm, start, len_in, behavior); /* * An madvise operation is attempting to restart the syscall, * but we cannot proceed as it would not be correct to repeat --=20 2.39.5