From nobody Sun Feb 8 17:56:17 2026 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 BEFFF54656 for ; Tue, 6 Aug 2024 02:18:54 +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=1722910734; cv=none; b=HmHFf2soARxvA/NxvzHbWzLVBj8vDneJNHwd0rGdxcpUV5gcOr6OBQZgvqpCrDeI8tYcovx4srBfJB9UDiUyb3XO+4OC8Cu7pzcdTcZfTjNmgsHkawgzutg8hZtqe8fBwxsEJf1LmMrsEhi/a+cXw3mSWuMVX8pwGq9XKmHEmeg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722910734; c=relaxed/simple; bh=dtYWibYOHtP7k2L7bRrRJ0o8M+qJDQY9usNXaIwbwBY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=spVTFBDfhfuyiGXS3hO7f2IqK5Yzn1XYb5J06tA1mxeMvKS+SZojex+3JbTRVTszKLc/b53xEfA/IYe+uaeXEJeeZmIrdCXrBXsOp1ZHbhhgBFipvFR1sQ6clppzSefydmRCw83AzOp+X+g+tsvIXvc80l5P3EbaTXhCmk7nxCQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lO72cahT; 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="lO72cahT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 79ED9C32782; Tue, 6 Aug 2024 02:18:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722910734; bh=dtYWibYOHtP7k2L7bRrRJ0o8M+qJDQY9usNXaIwbwBY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lO72cahTLoWkgC7Fa1GVC+0hzqrLY7guqKdalHp+19GYloDBXVGgnVMkA6OEbgxLz I0omHi39eDE1hwAIsmiyNC3lQerM4A6pVo0uXUNxZeUyQTI5Rll9kQOReJhxdbTnse 3riuCQoqgpy1oFQmmD0ZEN/HioRasC0sVhguV0gCV6kwUReZeO65WOweOVH7DebCig buBiZCpWOGWi7uSflgP1duhhn/JiZAMVXhBSAcntuFNtApPZZlo5fb18wvMFe1NzvE xLJCqvCx1jHwdpI7Qb+YpqvafIVMoIj7yj4TEfqqTAuyAcFqW0znvZNr7xRenq/Hh5 ERruHjKKT35BA== From: alexs@kernel.org To: Vitaly Wool , Miaohe Lin , Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, minchan@kernel.org, willy@infradead.org, senozhatsky@chromium.org, david@redhat.com, 42.hyeyoo@gmail.com, Yosry Ahmed , nphamcs@gmail.com Cc: Alex Shi Subject: [PATCH v5 16/21] mm/zsmalloc: convert SetZsPageMovable and remove unused funcs Date: Tue, 6 Aug 2024 10:23:03 +0800 Message-ID: <20240806022311.3924442-17-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240806022311.3924442-1-alexs@kernel.org> References: <20240806022143.3924396-1-alexs@kernel.org> <20240806022311.3924442-1-alexs@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" From: Alex Shi Convert SetZsPageMovable() to use zpdesc, and then remove unused funcs: get_next_page()/get_first_page()/is_first_page(). Originally-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Signed-off-by: Alex Shi --- mm/zsmalloc.c | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 7ae98d048590..1c53a58e6473 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -448,11 +448,6 @@ static DEFINE_PER_CPU(struct mapping_area, zs_map_area= ) =3D { .lock =3D INIT_LOCAL_LOCK(lock), }; =20 -static __maybe_unused int is_first_page(struct page *page) -{ - return PagePrivate(page); -} - static inline bool is_first_zpdesc(struct zpdesc *zpdesc) { return PagePrivate(zpdesc_page(zpdesc)); @@ -469,14 +464,6 @@ static inline void mod_zspage_inuse(struct zspage *zsp= age, int val) zspage->inuse +=3D val; } =20 -static inline struct page *get_first_page(struct zspage *zspage) -{ - struct page *first_page =3D zpdesc_page(zspage->first_zpdesc); - - VM_BUG_ON_PAGE(!is_first_page(first_page), first_page); - return first_page; -} - static struct zpdesc *get_first_zpdesc(struct zspage *zspage) { struct zpdesc *first_zpdesc =3D zspage->first_zpdesc; @@ -767,16 +754,6 @@ static struct zspage *get_zspage(struct zpdesc *zpdesc) return zspage; } =20 -static struct page *get_next_page(struct page *page) -{ - struct zspage *zspage =3D get_zspage(page_zpdesc(page)); - - if (unlikely(ZsHugePage(zspage))) - return NULL; - - return (struct page *)page->index; -} - static struct zpdesc *get_next_zpdesc(struct zpdesc *zpdesc) { struct zspage *zspage =3D get_zspage(zpdesc); @@ -1950,13 +1927,13 @@ static void init_deferred_free(struct zs_pool *pool) =20 static void SetZsPageMovable(struct zs_pool *pool, struct zspage *zspage) { - struct page *page =3D get_first_page(zspage); + struct zpdesc *zpdesc =3D get_first_zpdesc(zspage); =20 do { - WARN_ON(!trylock_page(page)); - __SetPageMovable(page, &zsmalloc_mops); - unlock_page(page); - } while ((page =3D get_next_page(page)) !=3D NULL); + WARN_ON(!zpdesc_trylock(zpdesc)); + __zpdesc_set_movable(zpdesc, &zsmalloc_mops); + zpdesc_unlock(zpdesc); + } while ((zpdesc =3D get_next_zpdesc(zpdesc)) !=3D NULL); } #else static inline void zs_flush_migration(struct zs_pool *pool) { } --=20 2.43.0