From patchwork Mon Jul 8 06:33:25 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: 13726192 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 24C00C3271E for ; Mon, 8 Jul 2024 06:29:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AA3446B009D; Mon, 8 Jul 2024 02:29:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A53346B009E; Mon, 8 Jul 2024 02:29:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8CB3A6B009F; Mon, 8 Jul 2024 02:29:02 -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 6E5596B009D for ; Mon, 8 Jul 2024 02:29:02 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 31B35140874 for ; Mon, 8 Jul 2024 06:29:02 +0000 (UTC) X-FDA: 82315607724.18.BAF9266 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf09.hostedemail.com (Postfix) with ESMTP id E6CF3140017 for ; Mon, 8 Jul 2024 06:28:59 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Bs2Uv9IC; 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=1720420126; 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=7uzdzqM6ON93bhIv0ePH2hYz+dV873VySOwQ95FWc0s=; b=f6d/RbDfc+YtOsGR6B59UsyP9NtG3GA6/0iZZ1mktjmaC11DciVICvuNk1CeF2Cc6gtVP4 nvQG8QTlY7yyooq/teBb8JtN/fnnSWUiz+Qc9HVU7infetk0b9JHxWqgR4jRoFR1mF7hEl aG4i4/Abmbd1kNEv2HRg+vWoz8XqhQw= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Bs2Uv9IC; 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=1720420126; a=rsa-sha256; cv=none; b=VNvDUhYv3vtvRXIKx/VmYZPpIY4BOVu1xucX4UQUSXYORKkH1l8TYzKpaajk++g0cs6SNw W0C6gkLyPnKu/2Kg6cyx34TD/n7N+CUd/yQI8tlexKpPZEDuXtnycu22pW5Fm8ddhEAC0K PF45JuX0So3lENKJM6m68CzrUNw3YM8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 0541ECE0A89; Mon, 8 Jul 2024 06:28:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A694C4AF0B; Mon, 8 Jul 2024 06:28:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720420136; bh=83jcf8H2ELpZcgLjgz32nYRKXID3GsZDqOi1CXzndR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bs2Uv9ICcXS8Sew+dSWNGK1eSMFRpY70r/3FWCgrZS6JN0tiH0+a5nxvKN3Yl+YtJ gE6Yz+5wSlHjGep1v2dYdKBlMunZqqBAcDd/GvG4acDD0vI6Wh6K8moqosV4r+F101 swVXn7hn2qMzhAygustSXm0WSTAGmTgHatJjzn5dtzR2Xz8f3cmGuh78nTxuRQAtSR wjFMhlS7jRFJS2gaRYSZEWKnYaraHCvpp+LwayujCyA0Vdiw5RWRlgNOGpBn98TUwj vE+qHsptRfzPeVDJXYFkB94b5EiWwl1ZPQvgc6vnBTsk1dG/FJYPxo+LpP8AkKwCIB guhs8FMg1J+Hw== 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 v3 04/20] mm/zsmalloc: add and use pfn/zpdesc seeking funcs Date: Mon, 8 Jul 2024 14:33:25 +0800 Message-ID: <20240708063344.1096626-5-alexs@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240708063344.1096626-1-alexs@kernel.org> References: <20240708063344.1096626-1-alexs@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: E6CF3140017 X-Stat-Signature: 3ikob8793yju5sewps8jhz8ung7n9974 X-HE-Tag: 1720420139-721843 X-HE-Meta: U2FsdGVkX181GPbTIzYP8Ooe390USAC1aKbfAxiXm0j00TioiD9bcgrCk0wSyI8yn2/gaqSfeS11ijzeLf+UjNkcpb8axj+uoGKkVb130Wx49AfaHRPLblBau58q7ofr6/qS7WNpj9PT5SsdVEi5Ynd150Sxt3ul1aRG4B2OM1kfjfqc+PFLzAvJ3UqwHRpuSvU7ddpnlPdJdP5WMi1HwzlUnnbXyJ5xod66stnr07zQI5zUOFwDO74eYhCZSszXpEMjcee8r1QlWMmr0PR8qr6A/U2k7oyuJVyfVF1PjojO8GhHyHfleo70oe9qSE6yLH0ciAXhEIRVv2Uytw2hnHPRbbMseQXK5Dbs9CFX7dVIIYNhQj0hr8q5jPnhranqhJNM1kRhP3+KQkZuTO2eQJHyT3y5j54GzYPUr2WPXn2FBao+g3N3Ztq7589F+t+X1kzjWwPDg51l88Q4WSJzVHioQl1EvXzpvxYVk4zbr8CkNpK/WuW1gKmydcvfiZo83bsrofdAX8AQEkZPG0QlTgHcioJnGjIUzWWLu51IeFNcfaiM0maPcWcXEfmSBoEeqASIj7YQ8wWVt+Gbt/gN/dgD7/i2Dlj/00hNHlOPKZaEGfwxxIL2gs2SvJwdLl5g19k6y6BTBDSkc/uaQOpn3tei4+X0RE8FR8iFJd6nLJt9Vd9e1kHwDr0ttGys+aDyWtrgc6L7MzWsSOLGv7NmytQrmXz5Jzd5nYrxwdIOG48UlEi1sJY038X77lxiOINuzuU58dxfOx8RRY56K+KEmbyKQOPKei1yihs7CqVmLNC7G3X1KXIXR+7zzEREJfWFe5ZcOkj4YF7JuWEL9EkXT24IBaeMegaHMDxNXQHe+vfbGqTZPb3/4coOVR8gnKA1DuYOhuyqq0ZyiEaX1i1o2nUiCm9IjGshCYbc4alWqWhZqDjaovWYjwnvxUuKHjhv8XIH6M+NZCIHaywBE8b P++D3VIN xSyg2sBAqjc8RxnScMU/SP2awWn1lrFkz4KlzYfbEQg7D2qNZT1cnKXOmZlS5IOhAifyO+jq8vQMpd5NtrfTvqj5PNxXkuMgaXC8CyBb9befN5L31Z4Wn76B85K25UiMrBpdQqd1+hCgnxmVt0t0SfPwX9TYKDHOLhB06UihCKraYx5i8cUJw5loAqHuhn29Toaz53XgC03WZSpazUTsKaf0gGMWpWC1LlH2S3s16Rv87O7YZFV5UcN1uWrWTrziEL2OgRjAxXganAUy1AxGCZqWVLkActu/tOWSeg/XFB/SB1gqkjGqWcR/jhAUs5Yn8YVXOj49LDkMwAHI= 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 (Tencent) --- 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 3b04197cec9d..79ec40b03956 100644 --- a/mm/zpdesc.h +++ b/mm/zpdesc.h @@ -93,4 +93,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;