From mboxrd@z Thu Jan 1 00:00:00 1970 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 AB3BAC05027 for ; Mon, 20 Feb 2023 13:22:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 47CAF6B0073; Mon, 20 Feb 2023 08:22:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 42B826B0080; Mon, 20 Feb 2023 08:22:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2CCE36B0081; Mon, 20 Feb 2023 08:22:56 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 1E8FE6B0073 for ; Mon, 20 Feb 2023 08:22:56 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id E2CE41A03DB for ; Mon, 20 Feb 2023 13:22:55 +0000 (UTC) X-FDA: 80487735510.19.0382D44 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by imf09.hostedemail.com (Postfix) with ESMTP id E8E55140014 for ; Mon, 20 Feb 2023 13:22:53 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=REg86lUB; spf=pass (imf09.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.53 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676899374; 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=Frx0V19P2u8/fSH9cJcDc7e72AJEiktZXhc9Vf+vq7w=; b=mngLpUB8r+Ws4XEElPZ1vRHB2P7n4eNpPzYzl1Wu5zup61R5B2dZgom7Ymqe4TcAmLR/mm RSjcyFq7Df8XCFHYRyc3LhO+W19DcCbOm53FJbmailHElM3qM/BeNCT5ZOQIMNYRstu0Fq EVk8UM++p9wBUxSikEHCsFiuI+GVxG4= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=REg86lUB; spf=pass (imf09.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.216.53 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676899374; a=rsa-sha256; cv=none; b=0cRudKi3h/3WD98nZZkNuG+nrl/K64/Z7J3k20mfXuyYAxZ7yKZMSRDaXIT3RK5K2Mw/t9 CoMNye2fo3d5/MDyu2DPZG/0vs3GiyU0RHc8GxBQ3csI/iERGTPiOnv82oh4zaK63PEFow ZowAMOKRHIpgMi53hyqWRqxr6mwrmmA= Received: by mail-pj1-f53.google.com with SMTP id f9-20020a17090a9b0900b00236679bc70cso1995720pjp.4 for ; Mon, 20 Feb 2023 05:22:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Frx0V19P2u8/fSH9cJcDc7e72AJEiktZXhc9Vf+vq7w=; b=REg86lUBUEMDoIXv47x6hfoYGz7J1yKQe5FYVWd1ue/ZDnw5GFow6FzscMm+YOtMAQ H6LbSCBBF5SUkDqoxTMN09FcR0fMYkRmwiHPV711SUDrHR+2rBgqifcHciTr8n+LRJwT mNnH7EuOLiDCBXk/M2AiwZPJRkrPk1wPmVlVE4RjCFo77BrH1u7aTuu1InGxoPFxXeGF v6NqG678CbZge+ZLjcaCG6U2c7xhCfpvYdyYta8g7b1beSMkyRL4EknkhAKP12onTGs4 4f/e7YV/1mvKZUre8Iav3yjBsqIefxcsvcjSZ3EQH/w0jhDTTIjDWhvgCQ4HFhNE7/GB P4Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Frx0V19P2u8/fSH9cJcDc7e72AJEiktZXhc9Vf+vq7w=; b=vjIpj3CiiY6Jqi3GntOK0Z6XtOiZISwBf7Z1KtqqUgvKQE1WBA/LTQRdyhsCAe1gjm JiPXk2z9v7MURdRanRQcLW+DrfNUtoTQzsf01W6v9phzMD1VYscsd+94oO6/HPyGgVVy 4pGes7jy2u1Kzck1yMFJ32vmwuLkEuXeKDMjEHkk6JsnUGWIpTaRGHc559rCI6e9v8Iy 2N50v65z39BrnwTPeGwjLIcoHMf4fJ25BQp+vGDtH2/WW+ZYYZd18V/F+FeZFa6hOyFb 0fg1Hx8Nrz3ceqPccKVdVGrfWlLSHlTJ4MjVn6BeUhGad/5aIUTi6H4P5SzDVaN6dWdq 80ug== X-Gm-Message-State: AO0yUKXoO0r0psJKVgaQjVMvG5LxMS61Vlm9Q8tIafq9rKIHUntGgAj4 bHkIgKMSIsCYiJzIbp9ILXc= X-Google-Smtp-Source: AK7set9xJRjsYrukRfXWha0pOdMfKLPpIlofZoHPP0fEFSRgYMBvg/1b1LOqw072S4nXx03c8ztgFQ== X-Received: by 2002:a17:902:ce91:b0:19a:82f0:7b0f with SMTP id f17-20020a170902ce9100b0019a82f07b0fmr3488346plg.30.1676899372762; Mon, 20 Feb 2023 05:22:52 -0800 (PST) Received: from test-ha.kr-central-1.c.kakaoi.io ([210.109.63.229]) by smtp.gmail.com with ESMTPSA id x2-20020a170902fe8200b0019c13d032d8sm6125436plm.253.2023.02.20.05.22.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 05:22:51 -0800 (PST) From: Hyeonggon Yoo <42.hyeyoo@gmail.com> To: Minchan Kim , Sergey Senozhatsky , Matthew Wilcox Cc: Andrew Morton , linux-mm@kvack.org, Hyeonggon Yoo <42.hyeyoo@gmail.com> Subject: [RFC PATCH 07/25] mm/zsmalloc: convert obj_to_location() and its users to use zsdesc Date: Mon, 20 Feb 2023 13:22:00 +0000 Message-Id: <20230220132218.546369-8-42.hyeyoo@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230220132218.546369-1-42.hyeyoo@gmail.com> References: <20230220132218.546369-1-42.hyeyoo@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 538kkfwrqbwcr8f9ujdsykqbh8rmpb8f X-Rspam-User: X-Rspamd-Queue-Id: E8E55140014 X-Rspamd-Server: rspam06 X-HE-Tag: 1676899373-23780 X-HE-Meta: U2FsdGVkX19T/O9HOE1Y5X16lNwID0x1aUb/Ja99wV87hrZqWRERqM8mSHoUToG12gXUivxD6AO2kbwcVIuTil9GxSr8CLt/9QxCiazmxxMH3l2ZJpohpH3jTM3aB1tB3NXn16ltswI/5GMVe9x0w7P0yYyJHQGItiRwnTBKMAdvM61bKPuHoF/pSXhAw6WIlEXZDR1SuB9QV3DBUhl1MNappfBwWpU+BYOIFWE2XqdEpesZVO7aprWQMJ9wb5nAoA3olNBKPpED2fGxO5YcTsVoOmSJPXuXr2PX8MuNZUGvM5F1R3/BWlZaweAhpsBt4uvZu3x9+0jowYhh4y53TvIhPLgLxtJd9hJD342Du+rAN9SSpDCapAgHxWC8qv9T9ji9ahkXd8/7fLDJP5D77DPYElAPNG98FYBWqbkC8vh59uVXwyvBjTwI+ekmQDlIfkY1+VLGzx+0Y5EhpPauXygLk2SLJS/StwgPUPD46Srh09CwG3zwGGkE6Gm8ilhCQPP8wa2ap/+vM4ftw1XkiegxZ432uBow3eJfcoawMHMty3xDhid6hTyrPfWfjUTKw7eJZwNoL1/Z7D9rAFnVlOpmfzPk11sq+G+L56GyhVmZhvVidFmaOimivIwslcy4iuApSTDRsDc5V8OEZsILW97mK6W6qjYiZ6vIbD+VJqgfcq2yXEXzVnlY2zaJZoceWUry896utLUJ3bSz3d/7jLT071YB78pvvKo1NAjN3PI+6GvCWC7K/z+cfqvHS+jHI7o99BTpKLhjKZa+tRVmenBeDpqvDYrThMkl15eXHv/NjyiEiM/XRTfb7cPEV9LCYELonaMveeixKknCym/w5BKBcYpqvR1nuCN+sxNAF8dIJoLbl10n/8fUkASBrYn1FtZzeczdsD+MGOs13BS1UW5/pasKe5PCJteygZKcBYWzIGYF1JzNo4YdoUgSYMalQ3ZGihw4cBGAQZKUgMW nO+aQtaM YTkeMdpNPsSeHR8Q/mmysyGpz5G6YUwQSeOmTSZJ9wrhORMopBTyARdFG7AKG9W6aF0dnOt/QGRETM5gl+goGKb+Ec+EVnp0x6jugvpLQMk+LKiyWQ7JvpEXFQ1T3BSL6LXujAZ4dMIVZmaZJrTA2Ko9uRWPOSYYJtT7EFkYOqRLnwhfdXIOSUKQ3U+ELB2+OmRRzvQ2WA8XyC5RrMAVve1n+YyTkkzI3NSbDkwuwklz4LYxCR1l6JsJXokHkuIzUymmPCYzJ4ZcrI5HhK5GATsL/V6IXoIBeCxEtxSNUzKFoSyuZWXo64yqYSXL6i/v9ANhY55nC+5B9MCWjuuJ3aC/CP/IPeZgGbvDwwLx4a30dRfgvIpq3NY98AZyfnFRIEXGfNRC4ITBYsGQibbj5RZZ3xVSiw3Qo5F9EC3OvPyT/B2OgFMz6TwerqOjuWEwnGnaVN6fGtgqk5bs2iRkF281PgqvNzLqdbpmvHEoyInIBhFgWvDunQDz2XcJYPVg5BsRc+ZJiRkhF6QSAwcIM9BBFdepVpTDAnsebXrQjCb9O2fKnxJeJFUnfiqGsJR7wSR6t8d+aHclf427Rx+PLoENVb9ghsyiDHdYe 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: Convert obj_to_location() to take zsdesc and also convert its users to use zsdesc. Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> --- mm/zsmalloc.c | 80 +++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 821d72ab888c..56cb93629c7f 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1007,16 +1007,16 @@ static __maybe_unused struct zsdesc *get_next_zsdesc(struct zsdesc *zsdesc) } /** - * 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 + * @zsdesc: zsdesc 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 zsdesc **zsdesc, unsigned int *obj_idx) { obj >>= OBJ_TAG_BITS; - *page = pfn_to_page(obj >> OBJ_INDEX_BITS); + *zsdesc = pfn_zsdesc(obj >> OBJ_INDEX_BITS); *obj_idx = (obj & OBJ_INDEX_MASK); } @@ -1498,13 +1498,13 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle, enum zs_mapmode mm) { struct zspage *zspage; - struct page *page; + struct zsdesc *zsdesc; unsigned long obj, off; unsigned int obj_idx; struct size_class *class; struct mapping_area *area; - struct page *pages[2]; + struct zsdesc *zsdescs[2]; void *ret; /* @@ -1517,8 +1517,8 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle, /* It guarantees it can get zspage from handle safely */ spin_lock(&pool->lock); obj = handle_to_obj(handle); - obj_to_location(obj, &page, &obj_idx); - zspage = get_zspage(page); + obj_to_location(obj, &zsdesc, &obj_idx); + zspage = get_zspage(zsdesc_page(zsdesc)); #ifdef CONFIG_ZPOOL /* @@ -1561,18 +1561,18 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle, area = this_cpu_ptr(&zs_map_area); area->vm_mm = mm; if (off + class->size <= PAGE_SIZE) { - /* this object is contained entirely within a page */ - area->vm_addr = kmap_atomic(page); + /* this object is contained entirely within a zsdesc */ + area->vm_addr = zsdesc_kmap_atomic(zsdesc); 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]); + /* this object spans two zsdescs */ + zsdescs[0] = zsdesc; + zsdescs[1] = get_next_zsdesc(zsdesc); + BUG_ON(!zsdescs[1]); - ret = __zs_map_object(area, (struct zsdesc **)pages, off, class->size); + ret = __zs_map_object(area, zsdescs, off, class->size); out: if (likely(!ZsHugePage(zspage))) ret += ZS_HANDLE_SIZE; @@ -1584,7 +1584,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 zsdesc *zsdesc; unsigned long obj, off; unsigned int obj_idx; @@ -1592,8 +1592,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, &zsdesc, &obj_idx); + zspage = get_zspage(zsdesc_page(zsdesc)); class = zspage_class(pool, zspage); off = (class->size * obj_idx) & ~PAGE_MASK; @@ -1601,13 +1601,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 zsdesc *zsdescs[2]; - pages[0] = page; - pages[1] = get_next_page(page); - BUG_ON(!pages[1]); + zsdescs[0] = zsdesc; + zsdescs[1] = get_next_zsdesc(zsdesc); + BUG_ON(!zsdescs[1]); - __zs_unmap_object(area, (struct zsdesc **)pages, off, class->size); + __zs_unmap_object(area, zsdescs, off, class->size); } local_unlock(&zs_map_area.lock); @@ -1750,16 +1750,16 @@ static void obj_free(int class_size, unsigned long obj, unsigned long *handle) { struct link_free *link; struct zspage *zspage; - struct page *f_page; + struct zsdesc *f_zsdesc; unsigned long f_offset; unsigned int f_objidx; void *vaddr; - obj_to_location(obj, &f_page, &f_objidx); + obj_to_location(obj, &f_zsdesc, &f_objidx); f_offset = (class_size * f_objidx) & ~PAGE_MASK; - zspage = get_zspage(f_page); + zspage = get_zspage(zsdesc_page(f_zsdesc)); - vaddr = kmap_atomic(f_page); + vaddr = zsdesc_kmap_atomic(f_zsdesc); link = (struct link_free *)(vaddr + f_offset); if (handle) { @@ -1771,14 +1771,14 @@ static void obj_free(int class_size, unsigned long obj, unsigned long *handle) if (likely(!ZsHugePage(zspage))) link->deferred_handle = *handle; else - f_page->index = *handle; + f_zsdesc->handle = *handle; #endif } else { /* 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_zsdesc->next = NULL; set_freeobj(zspage, f_objidx); } @@ -1836,7 +1836,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 zsdesc *s_zsdesc, *d_zsdesc; unsigned int s_objidx, d_objidx; unsigned long s_off, d_off; void *s_addr, *d_addr; @@ -1845,8 +1845,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_zsdesc, &s_objidx); + obj_to_location(dst, &d_zsdesc, &d_objidx); s_off = (class->size * s_objidx) & ~PAGE_MASK; d_off = (class->size * d_objidx) & ~PAGE_MASK; @@ -1857,8 +1857,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 = zsdesc_kmap_atomic(s_zsdesc); + d_addr = zsdesc_kmap_atomic(d_zsdesc); while (1) { size = min(s_size, d_size); @@ -1883,17 +1883,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_zsdesc = get_next_zsdesc(s_zsdesc); + s_addr = zsdesc_kmap_atomic(s_zsdesc); + d_addr = zsdesc_kmap_atomic(d_zsdesc); 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_zsdesc = get_next_zsdesc(d_zsdesc); + d_addr = zsdesc_kmap_atomic(d_zsdesc); d_size = class->size - written; d_off = 0; } @@ -2200,7 +2200,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 zsdesc *dummy; void *s_addr, *d_addr, *addr; unsigned int offset; unsigned long handle; -- 2.25.1