From patchwork Mon Sep 2 07:21:15 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: 13786828 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 D8BA7CD13CF for ; Mon, 2 Sep 2024 07:16:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 609588D0087; Mon, 2 Sep 2024 03:16:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5B8B98D002D; Mon, 2 Sep 2024 03:16:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 432E78D0087; Mon, 2 Sep 2024 03:16:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 24FD98D002D for ; Mon, 2 Sep 2024 03:16:50 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id BEC31161949 for ; Mon, 2 Sep 2024 07:16:49 +0000 (UTC) X-FDA: 82518940938.01.3A21EF7 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf09.hostedemail.com (Postfix) with ESMTP id 0D9E314001F for ; Mon, 2 Sep 2024 07:16:47 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=WTSddoPE; spf=pass (imf09.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725261314; 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=nqCAVjVmea9H++VjFGP+WRGCIqqKCdFfoxEev7pkdXY=; b=jgNS6sml+OQOlG0eYgMtAZzx/J1fb/I3sjn/T82UtqerF7fmS8xMCycVqaY0r2c2Qs5Oev iPsKEvPsvB0eXJlbzRcNHRW0jMSfS8tinr2IysZXtE1ztsnUyseSufWyNE1tdXQugNrnss S71VxKSwWmwln0pOz5SKo7B9eDjewYU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725261314; a=rsa-sha256; cv=none; b=QeljrJqYxhHVb+3mE1a4KlUt+f1IhxHhRWiOJ8FsFjotVbdp9OUMipHhEkg7sRY4K2bOZq jSD5e36BFXk0mQ0pZe97sLc1T+RYdCsWZJPIaBC02gAfsN0/fADl14QfuR6ymJZzm5LLRq LT77vc08xgOMXCCkemKiYomj5M1zrK0= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=WTSddoPE; spf=pass (imf09.hostedemail.com: domain of alexs@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alexs@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 897B35C572A; Mon, 2 Sep 2024 07:16:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CFA11C4CEC2; Mon, 2 Sep 2024 07:16:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725261406; bh=XsUVOcBfW2JeyjUAJrM1VbT2++Hcy1Zh8J3Xk4CJ6fs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WTSddoPEbD5kSFh8DW5pYD4ONuFe79WI4ETo4U7BQjI1bST4rPU5bcbMIuyNXKMZN bNkFla+us9idV8Q6bk/xzhSxvRVyFkHC1XBCvLLJiz2CDIof7H2AaHdKdiAlLaEokN FBf1IH1mbZtOu4IsLPkCiWx8lU8624B4xKqIwEZ4Rq2nEwz9qzoAjwwHyk+OQ9GX0Q w1KoJNH5pGaKuNymf+b1bHL7jZPtsXyOW1IZ95yYbVEvJW2K0fsiiB4sYRoL8ZKJkN Dluez4d3GOKyB9AfxW54urTAXehe81vQgiYWrnQ+gUOcMQx3OxbTm7WAbQH498x/4V QUbQiC8L55T9w== 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 v7 04/21] mm/zsmalloc: add and use pfn/zpdesc seeking funcs Date: Mon, 2 Sep 2024 15:21:15 +0800 Message-ID: <20240902072136.578720-5-alexs@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240902072136.578720-1-alexs@kernel.org> References: <20240902072136.578720-1-alexs@kernel.org> MIME-Version: 1.0 X-Stat-Signature: 4ps47ph3giw88goygzfd5ujsgkq3xnzj X-Rspamd-Queue-Id: 0D9E314001F X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1725261407-609665 X-HE-Meta: U2FsdGVkX19dQRHNHBW4FK3iWzoNwsne3wFaIKtNYBnbJaOMku1tqJKED6L/3Rzw7hv6VaMxd8MySgsJnB4gqPBcLRXuHAs8uiOY38NniqrnbYXGDosKEsuk/mGvQycUxqjcgmTOdagIk0mLG17/OGf4I+ZwgyD2MTKKSy/FpwVuqc5KFXh/iHyj7hSRluB19TbSpa+IyglX5/Pm2hAIir6umL3s8Eyu6IcshhSuQtunMRZZRxg7cafvSS+m5AvSO2jNB8rkPp3gMHELI2oH7yJNJeXr412GwlMOkkSmxRB0WIW2NMdgdqz3F/thFjHuuLBelJ4SoNdZYPty/ZmPxIu6eN7C8o4TFNYUyZLiYW458scjJmx7A3O+GyB8FZ2v5xCSxhhUZGv2bRHkFR+TEm3zP0vw45KMJcSfBAsxe11B8w9oeNhf+KNRXHJl1yE0ZNW6ddyGUeMHfa6K/GUpj9BVbNHKPYxbBvxXLBIgly++Df7I9BoXNJApkLEv/VnPzgZBni3FHx7YCS435wBDPvovAVv5md4ldxusfJVY+2T9i0il9uaofN+Cq8AVzPe6smlQuRJEnvjuYZ/CzFCZ3JMx9rclgxwBrw9avwxcmgT04IAecdpJwiZBdnXTk38nS2ltnyE5hbcdEhCv4WK6SKwj7kdA5JVkU3ArMezjlTkxKTiQBu1X3plvlYm6vmMp7I09UgL8ytLlOWlmfYsfLsKVcFf1urvkK8yF+hCAeg9HSu5TbMQaG/cIizoPUsO1Iz8lGd4fE5RXjItSjRH0njKZzkioI41vfEFciubSkWMazT6k7Btxb5xybu7E8pbW/yc7F0CIzlSZqifCFmgm5gJxWO24FvY/kr8dGapGDA5OuAFZWjYkXvZSBiuUJ3kmrGa6zE20KeWR9wbqvwM0pH9v04ZasUDs3rIYfplMmA+yMEYV43dwAwsL997okA7pE1Mg00qJ+gyn73JpA4z lF8f1TGO RJjeM4i0KgVKGPjZa7ffw87pLY2dTpGGpw3WqfaHUJwVS2i0ig+webIUmSeMgY9/7g9BRF5S6nPpIxcpAC0snJDoFcA8fyB/qCd021Ec3zHbHXshBXkVoYCjQwFADUJSvDtK9tiilrt8w5A4Hxqff2F4TnMUTPiSAeMdP0kpYLmlPQHJ38R0/cPkMMivMLZfW5dO0eeUf/qmZSiLa3/ZI/V2oXz7jdNpvf7Wpvgiw1bqGFdcdNaxKfEIxVNJ/VyBi0YMl7QCP/pRFgGJ9ubmj9lfmpw31L2MIEV3GU9nY35Mb0RduBQq04oC4MzlpCQvhQwOFTUJPjgfd4C/l09iavirr4Q== 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 1b49f74fd728..a7e73c0de039 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -767,15 +767,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); } @@ -1201,13 +1201,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; /* @@ -1220,8 +1220,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 @@ -1240,17 +1240,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; @@ -1262,7 +1262,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; @@ -1270,8 +1270,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); @@ -1279,13 +1279,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); @@ -1427,23 +1427,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); @@ -1488,7 +1489,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; @@ -1497,8 +1498,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); @@ -1509,8 +1510,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); @@ -1535,17 +1536,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; } @@ -1784,7 +1785,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;