From nobody Tue Dec 16 07:08:45 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