From nobody Mon Dec 15 21:46:50 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 C688125A62F for ; Fri, 17 Jan 2025 01:31:07 +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=1737077468; cv=none; b=OVrpXDBAbHZzJQGn8E0Hvha862dPMt4pW1Wp3UZKSGwSBempcRV+O1V3vRltNDq5F0UGc9zX/m4NNFwDongF7Xrxoyg7Xpo75pCeyViOPzL/F5WT1Gk+dihnZKEJmIWxuUY7f/ylX+JSD9jdGhtfSMh4zkxu4nZk7Eo+trC7Ay4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737077468; c=relaxed/simple; bh=Gf6phLdwpHMJaDpy+vZUWVIeNkMlWtEQYgiasVzanO4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YXvfC3UjNzrzL9ZKzj6djPYhTlMoAdVaB3SY6iQXCrzRSeT0HGnQfGx528T+IwDxG/pfQf+kueEq3I5kRDGD/enjTfU2FOJrAhixxmTNmNv7VRIAodK1lcQKhlUaOCWKDOVIWYzrpZO59/btfW6FPykpwiGfMVYWLU/ZG4pbKZY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TVs9VIbj; 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="TVs9VIbj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0AEE0C4CEDF; Fri, 17 Jan 2025 01:31:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737077467; bh=Gf6phLdwpHMJaDpy+vZUWVIeNkMlWtEQYgiasVzanO4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TVs9VIbjk5xpy7aaORGBQQYXuvE+DvECCkKs4rZOuHtgv4IBA6xZy70nkNmI43FW4 r/RrhOJds7U9o5P9/gCQCcMB6QYjlkgoTlkW29bdNvDUxnzseHx6dFGF/jv/Rkhzyy LdfgS8HO2gZgLF8JjxFXalOkAWcqKy9avq4mBYHndUdNdpx4FBoDsjugxdGx8DALFf 7nU5lMD7+4yNbD2ogWdDTzups6cVsp3qxDEdDSFrc4pwFIrizADabFWhDAvPzCBW9r kwoDGvMiUWwxfdKwLxS2YRzTynpgL5ALRTvV4c6wY2uiYB87nR6MTC0n9v128ZQ09P QvM/OxLks/rvg== From: SeongJae Park To: Cc: SeongJae Park , "Liam R. Howlett" , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Shakeel Butt , Vlastimil Babka , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH v2 1/4] mm/madvise: split out mmap locking operations for madvise() Date: Thu, 16 Jan 2025 17:30:55 -0800 Message-Id: <20250117013058.1843-2-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250117013058.1843-1-sj@kernel.org> References: <20250117013058.1843-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" Split out the madvise behavior-dependent mmap_lock operations from do_madvise(), for easier reuse of the logic in an upcoming change. Signed-off-by: SeongJae Park Reviewed-by: Lorenzo Stoakes Reviewed-by: Shakeel Butt --- mm/madvise.c | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 49f3a75046f6..ae0964bc4d88 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1565,6 +1565,33 @@ int madvise_set_anon_name(struct mm_struct *mm, unsi= gned 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 =3D=3D MADV_HWPOISON || behavior =3D=3D 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. * @@ -1641,7 +1668,6 @@ int do_madvise(struct mm_struct *mm, unsigned long st= art, size_t len_in, int beh { unsigned long end; int error; - int write; size_t len; struct blk_plug plug; =20 @@ -1663,19 +1689,15 @@ int do_madvise(struct mm_struct *mm, unsigned long = start, size_t len_in, int beh if (end =3D=3D start) return 0; =20 + error =3D madvise_lock(mm, behavior); + if (error) + return error; + #ifdef CONFIG_MEMORY_FAILURE if (behavior =3D=3D MADV_HWPOISON || behavior =3D=3D MADV_SOFT_OFFLINE) return madvise_inject_error(behavior, start, start + len_in); #endif =20 - write =3D madvise_need_mmap_write(behavior); - if (write) { - if (mmap_write_lock_killable(mm)) - return -EINTR; - } else { - mmap_read_lock(mm); - } - start =3D untagged_addr_remote(mm, start); end =3D start + len; =20 @@ -1692,10 +1714,7 @@ int do_madvise(struct mm_struct *mm, unsigned long s= tart, size_t len_in, int beh } blk_finish_plug(&plug); =20 - if (write) - mmap_write_unlock(mm); - else - mmap_read_unlock(mm); + madvise_unlock(mm, behavior); =20 return error; } --=20 2.39.5 From nobody Mon Dec 15 21:46:50 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 C6902D530 for ; Fri, 17 Jan 2025 01:31:08 +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=1737077468; cv=none; b=su7Pzrq0r9EgNvVU+3YwyocqHItXBB1Gbn/7t3s6cSlT1++G4SxgW6ye/ER4TdcqxyrXEORVDwuMosb7SLIacjXId/0UEnGSvmNKgIUbp3ePipfTAvmuMqQsevDRlvUKD3v3ATVRAWlI+Sc0J6xji7fpIBBfFCavXU7TZijWH+U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737077468; c=relaxed/simple; bh=DjxKujI4JGXMt2ixtDL0O5/UiHpIa+TfTVLg8eL2qoo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=m52/zvHfyq5qkpqxibZ7qjhNOT7H9wsEnftxhOeQPbNYC4fO1pdA1Uc9RmYcjI3Io6ZFUoGfdPusuUFcQLVCHnYglk7qHyodYWZi14TUfJ3IjWpURLxekikJ9O0C1HRZIfcc+siq3JxwPLntRmNE50aitvsbIwDYnusI1EqLFmg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qN8HbqYN; 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="qN8HbqYN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 287E3C4CEE1; Fri, 17 Jan 2025 01:31:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737077468; bh=DjxKujI4JGXMt2ixtDL0O5/UiHpIa+TfTVLg8eL2qoo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qN8HbqYNv+0BPFVp7MR/Cln6d72dSLPk4HTE+KFIH1uUdIH632Yk5mBAOWx6ZC3o2 hBlyt4o+gP3uJHBnhLeCvC+GxEOgdlwWaB8a44jYRBCgaMgT3l3ElZ1iszVtpY00gz jrwBxDxUNo9160DThKvjn3nrldDSGMf5Bzpw/N2cciwv7ohZCdCvV9Vn8V6TYPQOpv FsEkq4FDBdLzpJfq40a1+h0KJ4qoXzxXZBFDBG1vnhKtKPKfIM/tW+rxgMwNl0SuZj 7Qac9aAKUD/p3mV6mOu2HJNOezPm7HSBIr3f1HQmoDUuhIkQgswLsS8PNeXiwgErF6 VT1m8GqIhSSyQ== From: SeongJae Park To: Cc: SeongJae Park , "Liam R. Howlett" , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Shakeel Butt , Vlastimil Babka , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH v2 2/4] mm/madvise: split out madvise input validity check Date: Thu, 16 Jan 2025 17:30:56 -0800 Message-Id: <20250117013058.1843-3-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250117013058.1843-1-sj@kernel.org> References: <20250117013058.1843-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" Split out the madvise parameters validation logic from do_madvise(), for easy reuse of the logic from a future change. Signed-off-by: SeongJae Park Reviewed-by: Davidlohr Bueso Reviewed-by: Lorenzo Stoakes Reviewed-by: Shakeel Butt --- mm/madvise.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index ae0964bc4d88..9cc31efe875a 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1592,6 +1592,27 @@ static void madvise_unlock(struct mm_struct *mm, int= behavior) mmap_read_unlock(mm); } =20 +static bool is_valid_madvise(unsigned long start, size_t len_in, int behav= ior) +{ + size_t len; + + if (!madvise_behavior_valid(behavior)) + return false; + + if (!PAGE_ALIGNED(start)) + return false; + len =3D PAGE_ALIGN(len_in); + + /* Check to see whether len was rounded up from small -ve to zero */ + if (len_in && !len) + return false; + + if (start + len < start) + return false; + + return true; +} + /* * The madvise(2) system call. * @@ -1671,20 +1692,11 @@ int do_madvise(struct mm_struct *mm, unsigned long = start, size_t len_in, int beh size_t len; struct blk_plug plug; =20 - if (!madvise_behavior_valid(behavior)) + if (!is_valid_madvise(start, len_in, behavior)) return -EINVAL; =20 - if (!PAGE_ALIGNED(start)) - return -EINVAL; len =3D PAGE_ALIGN(len_in); - - /* Check to see whether len was rounded up from small -ve to zero */ - if (len_in && !len) - return -EINVAL; - end =3D start + len; - if (end < start) - return -EINVAL; =20 if (end =3D=3D start) return 0; --=20 2.39.5 From nobody Mon Dec 15 21:46:50 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 DA4325464E for ; Fri, 17 Jan 2025 01:31:09 +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=1737077469; cv=none; b=k+K2WIDm4GMAPU/Wvfwhsa2Oaj6E2jNn77kVKcZFKlmJ/t2gsOWlfkd+DLbqTv1XP/ArvwayOcBvu3L0/rK871smeY3o/QGwaum6VpbUfU7/gGmalP8ZlgOaP5hoG+GCghdXpURx5v/BjxW9NYY268tJU/u7dENd5hWwjVVLz2M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737077469; c=relaxed/simple; bh=kwZzbvixIZEJHWiCRUl/KCUq+QQFe5aGtgrwZ2gLoJg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SNYhJUeYmJ2VenjeNVSE+BYr1NmKDrcGLYxfEr3W9FB++5gPUboQRXDH3v1epy5q8QG+HcXgNe9qAW3jAI7eWSh+dF+yNGzMa0A2eNM3YaWM/934q26MkDZIPMz9+5Dkn7/xcxDxI1JHxHgjJ9b2zUyZDPpwtleQSe0/LnEn5EQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LaQoBjWA; 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="LaQoBjWA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 488AEC4CEDF; Fri, 17 Jan 2025 01:31:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737077469; bh=kwZzbvixIZEJHWiCRUl/KCUq+QQFe5aGtgrwZ2gLoJg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LaQoBjWAhd/EZqsQlNeeWk8Iq3YfhRWsz6t9O3+vGwhYiSbDIUeBcwX5LHqcLSsjv t8ol4WiiNn4qz92p4G27mXp6HGL1MaI/dWr9q6MAvm1laS5nkwsEN+Cm2QCjEd6z/L 6A6p4QuxQ81N8R9kVLQ5RWpZNXbYUBFXqknxScIda+VnhJlOuC3KzFOeDNDNwh+cjk c2a031uobFUPFKbiuy28X0pyr4Mjb8HlZa8Ky6DRCGmGYEnaYfUqs80Nox2PQCPPnK /pUZTG4iY5Y+8Gm3OPFYblxubRvjqZNiUKAgJHnVcQ5piFykpazRKWKEZWy2gFWgVh ZmjwsOn/eXpBQ== From: SeongJae Park To: Cc: SeongJae Park , "Liam R. Howlett" , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Shakeel Butt , Vlastimil Babka , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH v2 3/4] mm/madvise: split out madvise() behavior execution Date: Thu, 16 Jan 2025 17:30:57 -0800 Message-Id: <20250117013058.1843-4-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250117013058.1843-1-sj@kernel.org> References: <20250117013058.1843-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" Split out the madvise behavior applying logic from do_madvise() to make it easier to reuse from the following change. Signed-off-by: SeongJae Park Reviewed-by: Lorenzo Stoakes Reviewed-by: Shakeel Butt --- mm/madvise.c | 53 +++++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 9cc31efe875a..913936a5c353 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1613,6 +1613,35 @@ static bool is_valid_madvise(unsigned long start, si= ze_t len_in, int behavior) return true; } =20 +static int madvise_do_behavior(struct mm_struct *mm, + unsigned long start, size_t len_in, size_t len, int behavior) +{ + struct blk_plug plug; + unsigned long end; + int error; + +#ifdef CONFIG_MEMORY_FAILURE + if (behavior =3D=3D MADV_HWPOISON || behavior =3D=3D MADV_SOFT_OFFLINE) + return madvise_inject_error(behavior, start, start + len_in); +#endif + start =3D untagged_addr_remote(mm, start); + end =3D start + len; + + blk_start_plug(&plug); + switch (behavior) { + case MADV_POPULATE_READ: + case MADV_POPULATE_WRITE: + error =3D madvise_populate(mm, start, end, behavior); + break; + default: + error =3D madvise_walk_vmas(mm, start, end, behavior, + madvise_vma_behavior); + break; + } + blk_finish_plug(&plug); + return error; +} + /* * The madvise(2) system call. * @@ -1690,7 +1719,6 @@ int do_madvise(struct mm_struct *mm, unsigned long st= art, size_t len_in, int beh unsigned long end; int error; size_t len; - struct blk_plug plug; =20 if (!is_valid_madvise(start, len_in, behavior)) return -EINVAL; @@ -1704,28 +1732,7 @@ int do_madvise(struct mm_struct *mm, unsigned long s= tart, size_t len_in, int beh error =3D madvise_lock(mm, behavior); if (error) return error; - -#ifdef CONFIG_MEMORY_FAILURE - if (behavior =3D=3D MADV_HWPOISON || behavior =3D=3D MADV_SOFT_OFFLINE) - return madvise_inject_error(behavior, start, start + len_in); -#endif - - start =3D untagged_addr_remote(mm, start); - end =3D start + len; - - blk_start_plug(&plug); - switch (behavior) { - case MADV_POPULATE_READ: - case MADV_POPULATE_WRITE: - error =3D madvise_populate(mm, start, end, behavior); - break; - default: - error =3D madvise_walk_vmas(mm, start, end, behavior, - madvise_vma_behavior); - break; - } - blk_finish_plug(&plug); - + error =3D madvise_do_behavior(mm, start, len_in, len, behavior); madvise_unlock(mm, behavior); =20 return error; --=20 2.39.5 From nobody Mon Dec 15 21:46:50 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 0CE2F139D1B for ; Fri, 17 Jan 2025 01:31:10 +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=1737077471; cv=none; b=R2KsN43MOREnflzBNlgSk9WJkFHOG8xv+/WD0l1lfvAt89VqixzPaYAaqniUiwSjHZpX8TFQLJ28qvKAMTSCmzAx6jDZGfh3I/qRiJEYMDp5ud7RhqwMD6qTxuIErOAKe3s7j+7ktREb7nuQp9QnQodiCFGTpeHkUF/qCOjmBkw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737077471; c=relaxed/simple; bh=E41yb3derXfi0u00Nrf+03FhBriw1gS2QNY0ZO6tnXY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QdbxxHhtS56QkzROXnPSbGNLmVffLpASURUbaqEdwY4xkcaB+trbooPAewrIoLjbXkTvHkhh6Y/Qi/M3gv5qABGfwZHbQApzhsNPKOPuhcJGqi+Q5dsvugQhxxDbSSI/tMtocfM7Iqj1VXSHo06Z893Sn6TCU54DrjYI94FJ9yo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=i1LgonO2; 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="i1LgonO2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EE7EC4CEE1; Fri, 17 Jan 2025 01:31:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737077470; bh=E41yb3derXfi0u00Nrf+03FhBriw1gS2QNY0ZO6tnXY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i1LgonO2IFisFxXpOtYWRGWHbaU6RQ+sSLEZ/49a3dliUM8D5Q9j3NgynM6OAWyDn I8NEz3h6ZPWoO7CYSdLy7t6seEbz1AY+8K7MrWWSMVjVkFxLaOyyeXWfy9pOwn7zdG HJtqneNclvmwIYiCDnagVmQQkzh2nqSkm3AmN5u3wIU4YCM3tmRG9OT7c2aCw0cB2h 4m/zPi+JDb7K28wxwE6XkVT1AawSjgG1awi2EkrnoJl2x86ddyAvQe5T1CgCUZCyr2 JzkfjJiGghIwGi8GQG3GTDN9EHMwR4YAFhP50jL3XMCHx+PEsljy4JxF4cZffknNT7 Ig1TJ+Y8Gv7fg== From: SeongJae Park To: Cc: SeongJae Park , "Liam R. Howlett" , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Shakeel Butt , Vlastimil Babka , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH v2 4/4] mm/madvise: remove redundant mmap_lock operations from process_madvise() Date: Thu, 16 Jan 2025 17:30:58 -0800 Message-Id: <20250117013058.1843-5-sj@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250117013058.1843-1-sj@kernel.org> References: <20250117013058.1843-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" Optimize redundant mmap lock operations from process_madvise() by directly doing the mmap locking first, and then the remaining works for all ranges in the loop. Signed-off-by: SeongJae Park Acked-by: Davidlohr Bueso Reviewed-by: Shakeel Butt --- mm/madvise.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 913936a5c353..1a796a03a4fb 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1752,9 +1752,26 @@ static ssize_t vector_madvise(struct mm_struct *mm, = struct iov_iter *iter, =20 total_len =3D iov_iter_count(iter); =20 + ret =3D madvise_lock(mm, behavior); + if (ret) + return ret; + while (iov_iter_count(iter)) { - ret =3D do_madvise(mm, (unsigned long)iter_iov_addr(iter), - iter_iov_len(iter), behavior); + 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; + } + + len =3D PAGE_ALIGN(len_in); + if (start + len =3D=3D start) + ret =3D 0; + else + ret =3D madvise_do_behavior(mm, start, len_in, len, + behavior); /* * An madvise operation is attempting to restart the syscall, * but we cannot proceed as it would not be correct to repeat @@ -1776,6 +1793,7 @@ static ssize_t vector_madvise(struct mm_struct *mm, s= truct iov_iter *iter, break; iov_iter_advance(iter, iter_iov_len(iter)); } + madvise_unlock(mm, behavior); =20 ret =3D (total_len - iov_iter_count(iter)) ? : ret; =20 --=20 2.39.5