From patchwork Fri Jun 28 03:11:19 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: 13715390 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 DEC9DC30653 for ; Fri, 28 Jun 2024 03:07:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3F62C6B009F; Thu, 27 Jun 2024 23:07:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 381216B00A0; Thu, 27 Jun 2024 23:07:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1F9486B00A1; Thu, 27 Jun 2024 23:07:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id F24916B009F for ; Thu, 27 Jun 2024 23:07:09 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id AF0C3A1463 for ; Fri, 28 Jun 2024 03:07:09 +0000 (UTC) X-FDA: 82278810978.12.85F7734 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf09.hostedemail.com (Postfix) with ESMTP id 6733914000E for ; Fri, 28 Jun 2024 03:07:06 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=R5F7BJaN; spf=pass (imf09.hostedemail.com: domain of alexs@kernel.org designates 145.40.73.55 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=1719544019; 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=NUXIPcUELjl7+6r4pYaHnzKbzhbwxFjnqXe/6x1pDeQ=; b=hcOk4T5Nad6Evpl254Btadifga0SNs9FKtA0/vabm5OA+yBIozcgWuLeBnxpNVZhE0EqIK GY9ovzXXa4aIc8lQaWj6WUTU4/mmbhpmpBHaAe0H3FDWWyTvL0K5hJ/w1azfUH9O3UkGCe boCjH+OIDdD2xk7J6DbgfSAniqetHZ0= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=R5F7BJaN; spf=pass (imf09.hostedemail.com: domain of alexs@kernel.org designates 145.40.73.55 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=1719544019; a=rsa-sha256; cv=none; b=pefKFPIodBVCPcHdRTzX6n5qBsMzSo+eHEJNWUZK8s4JwRcYOcaceKPhZxh/0SxYe4mDfV n3HFmX0FAcsXKQ9NuXfFkO68ddUJ12g3l5sHt8/owDsKHazrAX86EwkoJGVsyk4150IHnp 6+Pn/1tvdW3RZgm8Xdp6SqIQhgPsSHs= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id AD50DCE1390; Fri, 28 Jun 2024 03:07:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04EBFC32789; Fri, 28 Jun 2024 03:07:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719544024; bh=Lq3Glkac4UQFmimamfx1rDNuTCRcH+b9V+Y0ngU8Y20=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R5F7BJaN3GA1L3ByUBwnS7JM2lJN1vZN2c9HhkzE/Knj//eX18PCVW+lJuPlcT35H Iodhqv5pltSEAMkGC+6DjTEXr5R/GE4wHanKSeG5Ve4n4uNJMu2DUsG7MPVSUVKab9 MN3HrGqv5T8xa+asV67FicGmnNgJXTGEH5M6QrH6ku1wgYja7QO+IB8lwxePqvcG/q zGq9JPJHhUehDaQp14KK4n2LvR7iWqOriqHcMFzQMWpClHFxNvzk05tMzk/VMyc1Ua SjQPZBjwy4zMx4VtSi9X1IqbtrTV2Wt0KTVwt4ecKnVIiCXM9o75u3xgKWvv2C7bUq GYAjfC8JgH6zA== 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 04/20] mm/zsmalloc: add and use pfn/zpdesc seeking funcs Date: Fri, 28 Jun 2024 11:11:19 +0800 Message-ID: <20240628031138.429622-5-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> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 6733914000E X-Stat-Signature: w1q9fyem5sgw9q6fagby5p5qhsk6jfgh X-HE-Tag: 1719544026-415372 X-HE-Meta: U2FsdGVkX19l7HJyPtL2bnf0RkVt3Q/4VdYBL+Y1rQ7IM38kVMWFPxcpVUIAhezmti6wXeWsQl4MyxkFEXxQwW2c6r9ZOuyAERzOKfeICYbVCYNGhSo3M1fvfXCZuyASJ6cjmAIndN+iYgkCZ6VU3xAOrVrw5ApO9/0kNuwxkd0CP1wcNFBCjUFNzmCUBtDCbu0azj2uOksFnhFJAeJQWl65XlpnArUPefVBsBIATgysL4pS/UfROMqSyz8+hgYYorE8KJI0jEtet5uYhDBQuWVp0+rL49ABLH3lbPkoTrXHQO0KE5ioKKwHADR2o2bLk56y+lFeSHsJ7q/uxPUVYqLZjQXaWmFnsyQtZd/I+dP4vFKbWTu6SzUCd/c9Dco7EEbIDrcATxq7+55Kt/cL+y+EzzwIAd4Qv5ZjUzMuznCpHWMv+rQsIwl/4C123ovSeAwIyY4cPjfrRiLitZl++nBZKtuJEcr4VApUdDS76IZR16o4Mqynq0rlaCaxDEhSGuPmU0vxkgP4s+AVajDGkhWFZPhFnHcqwoIoH75klNIqd5bsPZbXWa2Y7VljPFBic5ZYJzlx8J0aSy7EMvdNk7N2YeFL95yjJpSX8Neb0ZPNBIMtGkGdATUR+FnsG6adeXGViPk5dRIPTCloWqIWg1zS9j1GmNDg3AXjBuzodLbW424zqP/qFZEbgRuRmyJPJxfKHdfN6QM7oS6597CClpLJi2YCuuleN03OVc7NnQ3RMEiqM5ewyawg662I0Asm1g9RLHPfvTu4EsDY8aE/ftGex1d894xLocalA39pYi2FRToHR+yd4Sc5gJP5nSl/RFlR3sljfHQA3w1IAq3924CbA61sBy1jAjrF28qZB7+OCVDax5oYKdN9ErDjXH4iCqKXK6t3r6vXlUQkkTFi2EmjoINRRL85pnSSq/ypUYE5tgKQzcRUZFgP4SefpWhxxgEyGNqvgupqIfpoV1i QxuRauJ1 QchZq5DfiCGKXb21f2GAKU5G7bwofchFkTIeYIgAR+3rMyStX+oLIdBNKRpOo2xfEkBEmmxQpZtvZH5C31VYpOpD18twcHiWEa4/s34tMvuNbCvnAQY2laOj5bYLHDDrfR/eszB2MM6y4G8fQVPgDF/jHmxjW4NRGfYLADguo+9FR79YcvETWoe6/w3aG73H9cdYSKcyfNHEAIlm4vJTN3cjqs2lIrMa2rla9pUMJHfR5/zgiyTNbeyh58xT1eH7GgrrriO+Pioy6gUU0SQSIOiY1lYwunQ1RfJ67byDcaKeNbuiqI7Ar1aSu8SP749wX7c2JSH1VkKxwNUk= 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 fd95277843d5..3c0ebdc78ff8 100644 --- a/mm/zpdesc.h +++ b/mm/zpdesc.h @@ -83,4 +83,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 cedd3dfb9124..efb1d58b3c36 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -775,15 +775,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); } @@ -1210,13 +1210,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; /* @@ -1229,8 +1229,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 @@ -1249,17 +1249,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; @@ -1271,7 +1271,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; @@ -1279,8 +1279,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); @@ -1288,13 +1288,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); @@ -1438,23 +1438,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); @@ -1499,7 +1500,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; @@ -1508,8 +1509,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); @@ -1520,8 +1521,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); @@ -1546,17 +1547,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; } @@ -1796,7 +1797,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;