From patchwork Tue Aug 13 08:45:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexs@kernel.org X-Patchwork-Id: 13761553 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C368C52D7B for ; Tue, 13 Aug 2024 08:41:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A4AC36B0085; Tue, 13 Aug 2024 04:41:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9FFA46B00A0; Tue, 13 Aug 2024 04:41:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 84DD26B00A1; Tue, 13 Aug 2024 04:41:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 64A186B0085 for ; Tue, 13 Aug 2024 04:41:25 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id DB76BA749B for ; Tue, 13 Aug 2024 08:41:24 +0000 (UTC) X-FDA: 82446578088.23.6CB6986 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf10.hostedemail.com (Postfix) with ESMTP id 39B96C0006 for ; Tue, 13 Aug 2024 08:41:23 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ATf69V+r; spf=pass (imf10.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723538448; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=WbDWaoconi0g0luVfxDcAgmb3q9wgcC4jngmvATF3bs=; b=PJ0DafiuwPnYJXss09uFtsaIPNf47E8fBmSwfsp5CxzQjnfc6FgTnjJZqgulqZCzD3rfs1 rgDS6Jbw924vA+zm0wm1tdNPMVdbGHGzL/9mjohz8hSSuOKYSYSZGcItjJDqm1qsVqLfLA EQ4steiNxEuKsG9uIPDPGSqktNH+mAc= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ATf69V+r; spf=pass (imf10.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723538448; a=rsa-sha256; cv=none; b=6fxq6P5/wzLr9IiYljF7rmic9fTlrjJ+0Kaoo699Zhbw2/9ZZCjee2dLjhcLf1x+2jEE4D FmGBuG5E/tt2Tb3C09GZuGa5kcbRknT+pdid3dcHVdK90/7KAQiTdmzZjEhVKpGTaHNsQY P02NnWoNmkqYjccqcJrwGezFS1zZCzw= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 5C384615A4; Tue, 13 Aug 2024 08:41:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B392EC4AF09; Tue, 13 Aug 2024 08:41:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723538482; bh=3JFITvoM2vdTLh0S1hX/hhJAVedfseKmbRV8MWLijFE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ATf69V+rkNHvcKEhZ4OMbfXyaIRrEgDaD3lPd3b2uhkn1uq3GX1I8PMUccr/8Po8M 0iZBkgTgW9zR333lSv5o+jCu5k9uX8zsChDh8AduidPjulDTLd5m1xAcPaXGCTdyYy TVJugJwFoO3juUkYtS5OGZk7tSTQAXO5h2QTpKSbtz9cA5E0Yq5+medYMzAwjWjUnD HkJybZOkjGucGmSQG3ReLrhCS2/qUELtVCIZz6IvrblljdqCeMtbplf3PZ7gCIG+Wj 7Q9oepphR0IgGUEh5B7utLIJbHJp1jLlBvNMCmg9G1nLHZ1O3/2Hy8E7V51l2FQi2P 834YXy5qSA1hA== 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 v6 04/21] mm/zsmalloc: add and use pfn/zpdesc seeking funcs Date: Tue, 13 Aug 2024 16:45:50 +0800 Message-ID: <20240813084611.4122571-5-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240813084611.4122571-1-alexs@kernel.org> References: <20240813084611.4122571-1-alexs@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 39B96C0006 X-Stat-Signature: t95mc91k4q1or38uapecwftz7ee4brn5 X-HE-Tag: 1723538483-66970 X-HE-Meta: U2FsdGVkX1+HOBj5Z9Q7Zv5WUive0gOOyL+hxdZqBhIo19x2KjNsBEF+NHxU95Hb/B0teO6fculeDD4wogIopgg0CpiiJmisD+d7nN4PWrmqPHKjCPjniiQhQVPsB1VqI8gwg5oU0f1gA/8524zGIW4BKlUwng8ar/DK9I/8lCdGL10SwKB/9SeQCqSM3jMAsRoeP77YrQ/neZfFlAAOofzQfeGvviy1Ak8e1OvvD/f2822luyeUI5faxNOeGupRRf3tI1GCWHleMD7ZMIL8XJNm/Y+S0CCEr5f8WSibBTmpsCPmpEWiYxFKtR+RomEb2eNJg3MT/hgKVSLhWNRdOlmso6xeKatcI9nbh31m9m5kUECXMM2au8bp7PF4v0aLW5ZNH6D7tV6ppS/3j3y6HsIJLZp2NG5EX4C6uyjPi9CHo/SjcE0a2hkapjz6kBhi0t/1AZ4TOIhv0v6B0NH8gwy2a01L0KG13uLzq3DUmc46z8SdqdOKTzeaUTiRW1Jj8fY8FLSNfLBbJCdXp1a6on37v16G+BgSuUzPhv+L5lb8zTuIWbXj0XDTDjG8FoeDkMy8BnDL6d2fV/w4yXAnvL7qf87Mn2hqvyQBc337T5g4gx6rbdfKnF18IxNizqAHV3OMA5ntPWwwa3qHyNNtQO3Cb2QRwmki8Mtc9THPmEmY67yTDlh67OEnRZR+zdu+u8jTXjCxRHJl/1eS5cmnYMgIelZcDG0QPED/IDGw8yx5snasIYbEMk970QFrrDiph1XhWel+VPif+WU/EJn1BgZ7UXaHcNVxsy87GfrBRvD/b9sYV0csgv7RE1t2eNAwYLWXMRu2zhhBv3E7XhwDZ+PTkJHtUjWdU6vUOpxuwMIkvuH1LMAgDgtmmCJvDCacKhVQXyYsLig5I6WuQdmi7iks5DggW661UMwq/hsusdQJlkXDp2DqFymgLJyH97NhuORCFpHF8tnFtnTTHO4 lqP7EcqU VcSSZ7d0sXWi4TT/Xz5kVLHoMag0LEeq4KjFBgYULqxBaWRy/W7f23lAutsk0JYge+MNWjnZ63ImTKTLFbnBJYsVEFAzvBGfTpE9EJMEizKlrjJBppbkOvPZHkZ2rkugiG6ZGCA2uP+Mln5beTxO575rOAHcY/maBtay4rw+c/aeWp57m7yqsfJUcPpJaDl5tGZ3Z2VKemKFopIuELoGXjZejcfAx0lk9pD/jeKby/Lk3TDiYpSHLrAUMO7j+d2EVMBVJO0YDPYl71UOn6sYUX7TAic38062jhvqce7C+ngUTzDbifmQXI/5zsrzjjoLnUGWWayVExUuTZe4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Hyeonggon Yoo <42.hyeyoo@gmail.com> Add pfn_zpdesc conversion, convert obj_to_location() to take zpdesc and also convert its users to use zpdesc. Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Signed-off-by: Alex Shi --- mm/zpdesc.h | 9 +++++++ mm/zsmalloc.c | 75 ++++++++++++++++++++++++++------------------------- 2 files changed, 47 insertions(+), 37 deletions(-) diff --git a/mm/zpdesc.h b/mm/zpdesc.h index 782b5ad67cda..11083a1c2464 100644 --- a/mm/zpdesc.h +++ b/mm/zpdesc.h @@ -99,4 +99,13 @@ static inline void zpdesc_put(struct zpdesc *zpdesc) folio_put(zpdesc_folio(zpdesc)); } +static inline unsigned long zpdesc_pfn(struct zpdesc *zpdesc) +{ + return page_to_pfn(zpdesc_page(zpdesc)); +} + +static inline struct zpdesc *pfn_zpdesc(unsigned long pfn) +{ + return page_zpdesc(pfn_to_page(pfn)); +} #endif diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index b9b5e2824f2c..384a5ba49788 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -773,15 +773,15 @@ static struct zpdesc *get_next_zpdesc(struct zpdesc *zpdesc) } /** - * obj_to_location - get (, ) from encoded object value + * obj_to_location - get (, ) from encoded object value * @obj: the encoded object value - * @page: page object resides in zspage + * @zpdesc: zpdesc object resides in zspage * @obj_idx: object index */ -static void obj_to_location(unsigned long obj, struct page **page, +static void obj_to_location(unsigned long obj, struct zpdesc **zpdesc, unsigned int *obj_idx) { - *page = pfn_to_page(obj >> OBJ_INDEX_BITS); + *zpdesc = pfn_zpdesc(obj >> OBJ_INDEX_BITS); *obj_idx = (obj & OBJ_INDEX_MASK); } @@ -1208,13 +1208,13 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle, enum zs_mapmode mm) { struct zspage *zspage; - struct page *page; + struct zpdesc *zpdesc; unsigned long obj, off; unsigned int obj_idx; struct size_class *class; struct mapping_area *area; - struct page *pages[2]; + struct zpdesc *zpdescs[2]; void *ret; /* @@ -1227,8 +1227,8 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle, /* It guarantees it can get zspage from handle safely */ read_lock(&pool->migrate_lock); obj = handle_to_obj(handle); - obj_to_location(obj, &page, &obj_idx); - zspage = get_zspage(page); + obj_to_location(obj, &zpdesc, &obj_idx); + zspage = get_zspage(zpdesc_page(zpdesc)); /* * migration cannot move any zpages in this zspage. Here, class->lock @@ -1247,17 +1247,17 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle, area->vm_mm = mm; if (off + class->size <= PAGE_SIZE) { /* this object is contained entirely within a page */ - area->vm_addr = kmap_atomic(page); + area->vm_addr = zpdesc_kmap_atomic(zpdesc); ret = area->vm_addr + off; goto out; } /* this object spans two pages */ - pages[0] = page; - pages[1] = get_next_page(page); - BUG_ON(!pages[1]); + zpdescs[0] = zpdesc; + zpdescs[1] = get_next_zpdesc(zpdesc); + BUG_ON(!zpdescs[1]); - ret = __zs_map_object(area, (struct zpdesc **)pages, off, class->size); + ret = __zs_map_object(area, zpdescs, off, class->size); out: if (likely(!ZsHugePage(zspage))) ret += ZS_HANDLE_SIZE; @@ -1269,7 +1269,7 @@ EXPORT_SYMBOL_GPL(zs_map_object); void zs_unmap_object(struct zs_pool *pool, unsigned long handle) { struct zspage *zspage; - struct page *page; + struct zpdesc *zpdesc; unsigned long obj, off; unsigned int obj_idx; @@ -1277,8 +1277,8 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle) struct mapping_area *area; obj = handle_to_obj(handle); - obj_to_location(obj, &page, &obj_idx); - zspage = get_zspage(page); + obj_to_location(obj, &zpdesc, &obj_idx); + zspage = get_zspage(zpdesc_page(zpdesc)); class = zspage_class(pool, zspage); off = offset_in_page(class->size * obj_idx); @@ -1286,13 +1286,13 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle) if (off + class->size <= PAGE_SIZE) kunmap_atomic(area->vm_addr); else { - struct page *pages[2]; + struct zpdesc *zpdescs[2]; - pages[0] = page; - pages[1] = get_next_page(page); - BUG_ON(!pages[1]); + zpdescs[0] = zpdesc; + zpdescs[1] = get_next_zpdesc(zpdesc); + BUG_ON(!zpdescs[1]); - __zs_unmap_object(area, (struct zpdesc **)pages, off, class->size); + __zs_unmap_object(area, zpdescs, off, class->size); } local_unlock(&zs_map_area.lock); @@ -1434,23 +1434,24 @@ static void obj_free(int class_size, unsigned long obj) { struct link_free *link; struct zspage *zspage; - struct page *f_page; + struct zpdesc *f_zpdesc; unsigned long f_offset; unsigned int f_objidx; void *vaddr; - obj_to_location(obj, &f_page, &f_objidx); + + obj_to_location(obj, &f_zpdesc, &f_objidx); f_offset = offset_in_page(class_size * f_objidx); - zspage = get_zspage(f_page); + zspage = get_zspage(zpdesc_page(f_zpdesc)); - vaddr = kmap_atomic(f_page); + vaddr = zpdesc_kmap_atomic(f_zpdesc); link = (struct link_free *)(vaddr + f_offset); /* Insert this object in containing zspage's freelist */ if (likely(!ZsHugePage(zspage))) link->next = get_freeobj(zspage) << OBJ_TAG_BITS; else - f_page->index = 0; + f_zpdesc->next = NULL; set_freeobj(zspage, f_objidx); kunmap_atomic(vaddr); @@ -1495,7 +1496,7 @@ EXPORT_SYMBOL_GPL(zs_free); static void zs_object_copy(struct size_class *class, unsigned long dst, unsigned long src) { - struct page *s_page, *d_page; + struct zpdesc *s_zpdesc, *d_zpdesc; unsigned int s_objidx, d_objidx; unsigned long s_off, d_off; void *s_addr, *d_addr; @@ -1504,8 +1505,8 @@ static void zs_object_copy(struct size_class *class, unsigned long dst, s_size = d_size = class->size; - obj_to_location(src, &s_page, &s_objidx); - obj_to_location(dst, &d_page, &d_objidx); + obj_to_location(src, &s_zpdesc, &s_objidx); + obj_to_location(dst, &d_zpdesc, &d_objidx); s_off = offset_in_page(class->size * s_objidx); d_off = offset_in_page(class->size * d_objidx); @@ -1516,8 +1517,8 @@ static void zs_object_copy(struct size_class *class, unsigned long dst, if (d_off + class->size > PAGE_SIZE) d_size = PAGE_SIZE - d_off; - s_addr = kmap_atomic(s_page); - d_addr = kmap_atomic(d_page); + s_addr = zpdesc_kmap_atomic(s_zpdesc); + d_addr = zpdesc_kmap_atomic(d_zpdesc); while (1) { size = min(s_size, d_size); @@ -1542,17 +1543,17 @@ static void zs_object_copy(struct size_class *class, unsigned long dst, if (s_off >= PAGE_SIZE) { kunmap_atomic(d_addr); kunmap_atomic(s_addr); - s_page = get_next_page(s_page); - s_addr = kmap_atomic(s_page); - d_addr = kmap_atomic(d_page); + s_zpdesc = get_next_zpdesc(s_zpdesc); + s_addr = zpdesc_kmap_atomic(s_zpdesc); + d_addr = zpdesc_kmap_atomic(d_zpdesc); s_size = class->size - written; s_off = 0; } if (d_off >= PAGE_SIZE) { kunmap_atomic(d_addr); - d_page = get_next_page(d_page); - d_addr = kmap_atomic(d_page); + d_zpdesc = get_next_zpdesc(d_zpdesc); + d_addr = zpdesc_kmap_atomic(d_zpdesc); d_size = class->size - written; d_off = 0; } @@ -1791,7 +1792,7 @@ static int zs_page_migrate(struct page *newpage, struct page *page, struct zs_pool *pool; struct size_class *class; struct zspage *zspage; - struct page *dummy; + struct zpdesc *dummy; void *s_addr, *d_addr, *addr; unsigned int offset; unsigned long handle;