From patchwork Wed Jul 3 04:05:54 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: 13721074 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 8259FC31D97 for ; Wed, 3 Jul 2024 04:01:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0B5226B0092; Wed, 3 Jul 2024 00:01:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 03C046B0095; Wed, 3 Jul 2024 00:01:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD0066B0093; Wed, 3 Jul 2024 00:01:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B61DB6B008A for ; Wed, 3 Jul 2024 00:01:29 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 71581A072E for ; Wed, 3 Jul 2024 04:01:29 +0000 (UTC) X-FDA: 82297091898.22.F74ADF7 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf07.hostedemail.com (Postfix) with ESMTP id 3AEF740014 for ; Wed, 3 Jul 2024 04:01:26 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=QNbHJxK4; spf=pass (imf07.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=1719979256; 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=dc9AQUlRtwCbY9FgFRAy2KqIgbNBk/ZlKyjpYriuOkA=; b=7FwKxvA3OODQ1jP8buxOmKMpITwpSocdI2tJL1r7sPNy1ROWYgeIGVE731lvAXetw+Ttl0 7zMdY9SsRZA9cePs2gwQtbxDsMM1Bm3pT4Ytbzcj+eqbll1Ef8vyWr3OaJPH3FYlW04tJs EUv0WT/9iG9ZR6JIr4oNCsU8yNyMR8U= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=QNbHJxK4; spf=pass (imf07.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=1719979256; a=rsa-sha256; cv=none; b=ls2SsslTWYg/8yV2lVfQApwYqXkmrtnEiKExAqpJv7nDUdFNZygTKVTTgkvsD3K4NXPhE/ 7eRndbnNUVxDCWIOCtegZ5W82VwN7IbiMJS0qy7kg9qmb4wCbxSQnR8PemH9yQttVIA72l l8Bk2UKyqmHyLCIA1pfrkR0h6KJmH4U= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 6B3D4CE0E1E; Wed, 3 Jul 2024 04:01:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7079CC4AF0A; Wed, 3 Jul 2024 04:01:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719979283; bh=1lHtFt8ZtGmaai/qGPIEUZAmHxJr0sOHHO8xZgO8IhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QNbHJxK4D6ImP2YzB0FOoQm3eGnBS+mZMAHPctPm0Ee21F3ECLriusqxrK3WCcuBx j1uedLH/jQcFqFam1Pi73yNj+PUAvGE5uysX/xNPmPiDCguFqG4F7NL8MXbZMhehtH ujUyVDOrH7NOM/L8nNAhdmsn4JET++rVfKxdTdPe0uwEQewgTlPAJIgdESwevnP6iC nAukgNgU+uUI//YtUBEgMtJH4A2ICHYlwmj2s2uRNYdAJyBl1BfYuU/6imKmtohjpR w4zdLzppZBMQCbgWGjAKg+VLvML+I0IpPi7TS9qicMsbP+vF6q4waqCBsyR5CfSrtO xtz9bmUDuPS2A== 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 v2 04/20] mm/zsmalloc: add and use pfn/zpdesc seeking funcs Date: Wed, 3 Jul 2024 12:05:54 +0800 Message-ID: <20240703040613.681396-5-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240703040613.681396-1-alexs@kernel.org> References: <20240703040613.681396-1-alexs@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 3AEF740014 X-Stat-Signature: 8g4btc1djiwtyae6ii5q1ct5sjzs7ft7 X-Rspam-User: X-HE-Tag: 1719979286-142155 X-HE-Meta: U2FsdGVkX18JPNO2TYSQOq2bQJpIEEycqciVrqIIoCwCto23E+Is/dkIzFC8FWadoEc5jaMfxHztrkzZOutszGGSyv77aFmwM1ffquOpdUByU5YTpBfyjnz6QWEcQSep6C52CFF2eYx92Q2KiXPZbcf8aUDhHRTmVxhXcCSdCOdjElrzid0UVisK5d/k7mGVueJlJO5/D3s3Sx/CGP8pJT4lqD0Xh9KMzcCBevpdZEM4MUv04YhzLCXfRSrPrzg+dlgFrvUeEmgiBUfGMokJrpOz1yT8MHmOmFB0mUjkbUjO1RvWQ2s4JrcBve1rEk2LpGQl7my0UclYWI8f60DVs//ag20yejRV0jKovZ2O7y2F67ZnNUfPnc3HdIFZFgnPe63N7dLiK/MmaHOSt2hk5OeN/omt2N1nlPnpC2LV1X9NulHnamnuSSdMCu8Nwi1ypat2bdPmvZQtPNcP8TknzhqBOT2H7DfhIQFIQcrp2H2w15ROepMKd9+QkZ2Av3yvG+vkAMzhGP9OZWDgSttoINT+og63Qe8aXvHgfSdk45Jbd9VdFFu0VbYKLf99KFzWQog9cGL4FU1VIjaDQeqX3HPvLp6CmUwo4zz47RSl/jgLzOhQoZiVcoYbe+rGYJkAu2o1yqANaW2dWIP5PUIjAlevRvScc0j1kQMJcj/pIi1DxhYTT1YVUxLWNHYQY2h7cChW2iS/DnyLYFm3XceQBoweNkhpnkaUTpoyL1XBBTlpSmljeEI3YUxr5jZN9UVn1akRoGyVflrfdpmhJE9OK8CQm2QB+rrRjWQhby3KGIUgPVH9bGq3rdow4OkfA+Amu5XDuaMCN2RwA40WIUQdt/BYf4JPU1+h5rJv7LPQSLO2lW5qq7Yy9bm7laLGLicvqGhNoEIxTsrcddt4gNiTxaAGMslORpsrd3o+QyetlZXE5BbECNJ8RQJXT+SnyGP35d3aNEgQKv80E586rR4 BNtqBPmi TiNx2cFvkeinMRA7/HNgHR542HxNRmo+ED8bu7JnVGVHW/ja71ETYFz5529nzN8QJESNkKGWTcKLI7GdEP3M6iFlbHgp0FJgbbqtykZZT5rfiv+SFGBAOL9VnGlKSomuye1yJI652smTy7MZcijPNrVDJ8aTtUOcgUcZj7uL/XU8ubWT8uEjhBd9WObYR6sGK+yU3S6qwYPm7JHAoKoLMtt8WU9rNR+HE9hEUIMlAUb5wxrFI+DqKdvhlqNVtENzYgSqlPdX3YOCwgdgvOmzL+lQzXrTA/j8bs1kMd9eucIBacWx0gX2MYXh7fTGLdCaN+53cAOZClWylkjk= 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 8a359d228507..96b9ce80ea49 100644 --- a/mm/zpdesc.h +++ b/mm/zpdesc.h @@ -91,4 +91,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 68a39c233d34..149fe2b332cb 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;