From nobody Fri Dec 19 06:31:07 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 7BA0350275 for ; Fri, 28 Jun 2024 03:07:15 +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=1719544035; cv=none; b=K6ZhLr1sfgsHRAORjC+nuPwlCt3jQPo/hwnaoT1qJwkvZdV7Iy/nmL7h4jXKp28wm8Tuzbc/aD1O8ajLZC93ZfAd7LFxg+qoXwqw/L2Ma5Hx6IAhrJpLqEkv34piH0O6L6faAOEkHuW644BjJ2mufaYZ3HE82QQOPDoWfYeFxhk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719544035; c=relaxed/simple; bh=6Pm9+ydZIsO5c9qRiniJl+L1KPC6XDYzIyrZkkU9aKI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ffTp9Htq8n9W8drrmgJCYxmi3AF0354hrYe0+l4Ev3VrnLQx/L7vV3a1MCAeMLXLgquRsDCzUFyf1bowjC0Tug133uxtjgI4UTeOTZhKBjCpVRI36d2uCIZ+Us41XWDTV66UIfjY294FNLzh+8H6xoB74rNQvUG9kxGqMYH+jyg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EsLIVXmX; 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="EsLIVXmX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 370D3C2BBFC; Fri, 28 Jun 2024 03:07:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719544035; bh=6Pm9+ydZIsO5c9qRiniJl+L1KPC6XDYzIyrZkkU9aKI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EsLIVXmXFHNSPRxWd3m4+VHHl+VjFRdCHM8BTCvp4ASArnVdJg45eBwEpv1PTcc4+ eEJ1NHhHKtGm0C4A8uG2fnOzsLTe/goC7j/F4+vvDSYh3WgGjhkYDVegoswWQD2w4w prk/ypbbDn0J4scwSNmm3arQFeDX6m7bbKum0YUg/hBmQqvW5hthU1GNKPG49VCX5B 49mb0ZY9H9gEpbKIwx/47UF2WqV/ndYyAlhSva5OnEzxDIigPsBJWNOxaqEhf5HIGL Lxx2fFFVNA5XFHqBlSh73eJ7YpfzwDn8cAGEfxmnV26rCFrqUT3RiR/gVjKJDXYw9s cStrQQm3EJOJQ== 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 Cc: Alex Shi Subject: [PATCH 07/20] mm/zsmalloc: convert obj_allocated() and related helpers to use zpdesc Date: Fri, 28 Jun 2024 11:11:22 +0800 Message-ID: <20240628031138.429622-8-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240628031138.429622-1-alexs@kernel.org> References: <20240628031138.429622-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: Hyeonggon Yoo <42.hyeyoo@gmail.com> Convert obj_allocated(), and related helpers to take zpdesc. Also make its callers to cast (struct page *) to (struct zpdesc *) when calling them. The users will be converted gradually as there are many. Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Signed-off-by: Alex Shi --- mm/zsmalloc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index ee890d513f6f..6efaa6279687 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -847,15 +847,15 @@ static unsigned long handle_to_obj(unsigned long hand= le) return *(unsigned long *)handle; } =20 -static inline bool obj_allocated(struct page *page, void *obj, +static inline bool obj_allocated(struct zpdesc *zpdesc, void *obj, unsigned long *phandle) { unsigned long handle; - struct zspage *zspage =3D get_zspage(page); + struct zspage *zspage =3D get_zspage(zpdesc_page(zpdesc)); =20 if (unlikely(ZsHugePage(zspage))) { - VM_BUG_ON_PAGE(!is_first_page(page), page); - handle =3D page->index; + VM_BUG_ON_PAGE(!is_first_zpdesc(zpdesc), zpdesc_page(zpdesc)); + handle =3D zpdesc->handle; } else handle =3D *(unsigned long *)obj; =20 @@ -1607,18 +1607,18 @@ static void zs_object_copy(struct size_class *class= , unsigned long dst, * return handle. */ static unsigned long find_alloced_obj(struct size_class *class, - struct page *page, int *obj_idx) + struct zpdesc *zpdesc, int *obj_idx) { unsigned int offset; int index =3D *obj_idx; unsigned long handle =3D 0; - void *addr =3D kmap_atomic(page); + void *addr =3D zpdesc_kmap_atomic(zpdesc); =20 - offset =3D get_first_obj_offset(page); + offset =3D get_first_obj_offset(zpdesc_page(zpdesc)); offset +=3D class->size * index; =20 while (offset < PAGE_SIZE) { - if (obj_allocated(page, addr + offset, &handle)) + if (obj_allocated(zpdesc, addr + offset, &handle)) break; =20 offset +=3D class->size; @@ -1642,7 +1642,7 @@ static void migrate_zspage(struct zs_pool *pool, stru= ct zspage *src_zspage, struct size_class *class =3D pool->size_class[src_zspage->class]; =20 while (1) { - handle =3D find_alloced_obj(class, s_page, &obj_idx); + handle =3D find_alloced_obj(class, page_zpdesc(s_page), &obj_idx); if (!handle) { s_page =3D get_next_page(s_page); if (!s_page) @@ -1876,7 +1876,7 @@ static int zs_page_migrate(struct page *newpage, stru= ct page *page, =20 for (addr =3D s_addr + offset; addr < s_addr + PAGE_SIZE; addr +=3D class->size) { - if (obj_allocated(page, addr, &handle)) { + if (obj_allocated(page_zpdesc(page), addr, &handle)) { =20 old_obj =3D handle_to_obj(handle); obj_to_location(old_obj, &dummy, &obj_idx); --=20 2.43.0