From patchwork Fri Jun 28 03:11:16 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: 13715388 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 17AAEC30658 for ; Fri, 28 Jun 2024 03:07:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6926B6B009A; Thu, 27 Jun 2024 23:07:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 63E996B009B; Thu, 27 Jun 2024 23:07:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 490256B009C; Thu, 27 Jun 2024 23:07:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 261FC6B009B for ; Thu, 27 Jun 2024 23:07:00 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id D4962161493 for ; Fri, 28 Jun 2024 03:06:59 +0000 (UTC) X-FDA: 82278810558.27.48633E1 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf17.hostedemail.com (Postfix) with ESMTP id 8D58740013 for ; Fri, 28 Jun 2024 03:06:57 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=C87rd9lC; spf=pass (imf17.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=1719544004; 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=pliznEXsoNx12JLUTI50q2lt5Ms5yprwYwyCL/gWicQ=; b=34JgNnkGxhPCFVwoX2ztOgDZzPzqnihG0uiwWV9bqSMoR7qJp2FWee607CrYsZij/g/NH8 Hxf8Y7zUqpT9ZJxFTpWt/pR+bkknoUC6jLNOIxxSH2a6UtrP/+sxT2664ngSYdGsuXO4GZ 4DnEMXUWgzgULtoNIV9DOiih11mcjFc= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=C87rd9lC; spf=pass (imf17.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=1719544004; a=rsa-sha256; cv=none; b=aS7r8X/Dim+ZIF2GLX0SnICDIckMCrJsGRP/zXBE/BEDsu9FtVJlVwZV7y1G6L61sEvbi5 5jG0pusmbxic6FIephgJriuVN6Hhx4HhD+sDutBojndfFpnv/ZQaMacCkCBa3kX14WAQAt tuyovIx/FPmx2jbucCAckq+bZQ5EX6w= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 317ACCE3396; Fri, 28 Jun 2024 03:06:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01F3FC4AF09; Fri, 28 Jun 2024 03:06:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719544012; bh=Cr0rk228Nf4Ejmcf123tMGr+wVgBtKk7ChztlR6oqcc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C87rd9lCAIEm3gmgN1HsqdNpdHVQnk+7Q4Nv5dOer+u/gx8+vllp84o4qmsNwEaZg +Fe1YLW2saEdNkRrbeqC8q7l72FvR+c0OCa5xkz+05L0MavtAPM7hr/UDfktBh/QSb oJjlWdO597SbcB/MMgnDSkhzMxI2B6jMBPx9yG08XhP6Go5Ay+7NS4e/baBvqUc1sO eFslcQG/0/9QdUnqkjnahncWxOulT4eXMZVUN0hMXgwqy8SzeqVX0Aj7BXIoByXD3F WgfD365aGDEcOL1toHZ63a0fAY+j4Rit+f8tKukzw1F/O63OwIGXMV+jk/g1251juN woROqUiGIiSlQ== 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 01/20] mm/zsmalloc: add zpdesc memory descriptor for zswap.zpool Date: Fri, 28 Jun 2024 11:11:16 +0800 Message-ID: <20240628031138.429622-2-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-Stat-Signature: 7bfygdptskwex137tntkbankdwgxfo65 X-Rspam-User: X-Rspamd-Queue-Id: 8D58740013 X-Rspamd-Server: rspam02 X-HE-Tag: 1719544017-767013 X-HE-Meta: U2FsdGVkX18EfclkF/XKpPD7/Otnfgei/lVx4O6Er8ZPwe8lO/smvwb8oz9gWJfdD9fx1i+zpW5CNmF2YrMlRln1LhgHDXmZsUlYzmka1otsqTKSwSbo/KJ3gnSm/ZNgKGEXoTIxCQH9AFgivRUjzK7ERrO4s30DIA7HUY7RfNz9+spjH8rrrwYn7LwrxaQYg+uWYC1buv2dEsYpDNkwvaUSml4nzpAOiYT+jCNPaMjTZg0J+/MGDAl8GWFJafRLGgeDEiM41RkT3/2EwtlKJ6Sdyb5DCEUdGaaMKlhI/1D/XKVvRyDy9+n9AHIZMCJRIxGQO2Qg/sxQ8Cv80/pMZ0/s1wW7352nd+dgD15W1qREioKDz7QyCusRWf18Qt+FpYCdATI1W8cgxnMKF+2C4/0+EnvXCADYy+tYNDeo3WFL8QJjZqFpyVT6dioMnwdB+DRvXjR8TprJHw95JrP4jqrq+Wdy/1gKwOIcf4fU7SE9WtsFogBVpO1US7hO8riGOaoPTF7RmR2sAdv7nPOGngrfOrsEj4T8uts7SDpMXTzLrnDz86LN9Vm/Y2GkVdfOcn7S6YZorBHabUUSdCyCTg5sAYSYeX/o3Im5eQLGpxhaf1U1PHkBk4G6ArRuaqYFapiNLqcGE/9tA6DXT0AWxyYOI7mdPPX63P6fiy/vx4chBXbIdP1jKTCN7Wqf8PJx6pNp5B/kJs7IgzoMkRZFYO1MpwvTB145XAjcxtvH+vYzvJ2yImlvsYXDffSMCoVgXHXknKBCXPRBps2wTUL5vEknOecMsxvUBL0bf53xHY/qz2cD+LTf6W6Kk7cqNx1Fr/2YIb15cNcFGYYluwOuZ/FgHZV74GO+AyJHUoAcMGwblQBeMg5gFNgn1ZEL9rg1ugWxV2qlbFKOogNxeAWyc1dxxTffs4QuND69n53ylFvT8IbdTjkVGle/+ByDFy9C8sfBA1NWT9wEdmSIyAT 9qPuaifq xIjA7NSd3A3l2f5kdNgemDalGshn+7OT43gcyoOUaKsZhZspfRVge9QUkQdKVpZqNDPDQGGw0b3liBAktVUBwaJkP9zAqQDfEdmYm62g3PQrMXs6j4/i5WkU0LSbIf3Ad9o8tOi0KByY+c7jFhScCB+2r6kMaXvtiLzRLkXT4CNTwQ9TXT8uaXogOyGVLXzD36lsk1jO/grzAbfeI+C1KljDG1Re6nDST4i8XmfNfXOSMJi6rbNY7SKUwTx2dC55cunwPfcAweHGpOC1q0d3ZrMpFLLtQFH6QGA9XbzwJLMptd8qPakC+leWvvMgQhZpeRjWjdtA3DjqX7kk= 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: Alex Shi The 1st patch introduces new memory decriptor zpdesc and rename zspage.first_page to zspage.first_zpdesc, no functional change. Originally-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Signed-off-by: Alex Shi --- mm/zpdesc.h | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ mm/zsmalloc.c | 19 ++++++++--------- 2 files changed, 66 insertions(+), 9 deletions(-) create mode 100644 mm/zpdesc.h diff --git a/mm/zpdesc.h b/mm/zpdesc.h new file mode 100644 index 000000000000..a1ab5ebaa936 --- /dev/null +++ b/mm/zpdesc.h @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* zpdesc.h: zswap.zpool memory descriptor + * + * Written by Alex Shi + * Hyeonggon Yoo <42.hyeyoo@gmail.com> + */ +#ifndef __MM_ZPDESC_H__ +#define __MM_ZPDESC_H__ + +/* + * struct zpdesc - Memory descriptor for zpool memory, now is for zsmalloc + * @flags: Page flags, PG_private: identifies the first component page + * @lru: Indirected used by page migration + * @next: Next zpdesc in a zspage in zsmalloc zpool + * @handle: For huge zspage in zsmalloc zpool + * @zspage: Pointer to zspage in zsmalloc + * + * This struct overlays struct page for now. Do not modify without a good + * understanding of the issues. + */ +struct zpdesc { + unsigned long flags; + struct list_head lru; + unsigned long _zp_pad_1; + union { + /* Next zpdescs in a zspage in zsmalloc zpool */ + struct zpdesc *next; + /* For huge zspage in zsmalloc zpool */ + unsigned long handle; + }; + struct zspage *zspage; +}; +#define ZPDESC_MATCH(pg, zp) \ + static_assert(offsetof(struct page, pg) == offsetof(struct zpdesc, zp)) + +ZPDESC_MATCH(flags, flags); +ZPDESC_MATCH(lru, lru); +ZPDESC_MATCH(index, next); +ZPDESC_MATCH(index, handle); +ZPDESC_MATCH(private, zspage); +#undef ZPDESC_MATCH +static_assert(sizeof(struct zpdesc) <= sizeof(struct page)); + +#define zpdesc_page(zp) (_Generic((zp), \ + const struct zpdesc *: (const struct page *)(zp), \ + struct zpdesc *: (struct page *)(zp))) + +#define zpdesc_folio(zp) (_Generic((zp), \ + const struct zpdesc *: (const struct folio *)(zp), \ + struct zpdesc *: (struct folio *)(zp))) + +#define page_zpdesc(p) (_Generic((p), \ + const struct page *: (const struct zpdesc *)(p), \ + struct page *: (struct zpdesc *)(p))) + +#endif diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index fec1a39e5bbe..67bb80b7413a 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -13,17 +13,17 @@ /* * Following is how we use various fields and flags of underlying - * struct page(s) to form a zspage. + * struct zpdesc(page) to form a zspage. * - * Usage of struct page fields: - * page->private: points to zspage - * page->index: links together all component pages of a zspage + * Usage of struct zpdesc fields: + * zpdesc->zspage: points to zspage + * zpdesc->next: links together all component pages of a zspage * For the huge page, this is always 0, so we use this field * to store handle. * page->page_type: PG_zsmalloc, lower 16 bit locate the first object * offset in a subpage of a zspage * - * Usage of struct page flags: + * Usage of struct zpdesc(page) flags: * PG_private: identifies the first component page * PG_owner_priv_1: identifies the huge component page * @@ -64,6 +64,7 @@ #include #include #include +#include "zpdesc.h" #define ZSPAGE_MAGIC 0x58 @@ -253,7 +254,7 @@ struct zspage { }; unsigned int inuse; unsigned int freeobj; - struct page *first_page; + struct zpdesc *first_zpdesc; struct list_head list; /* fullness list */ struct zs_pool *pool; rwlock_t lock; @@ -448,7 +449,7 @@ static inline void mod_zspage_inuse(struct zspage *zspage, int val) static inline struct page *get_first_page(struct zspage *zspage) { - struct page *first_page = zspage->first_page; + struct page *first_page = zpdesc_page(zspage->first_zpdesc); VM_BUG_ON_PAGE(!is_first_page(first_page), first_page); return first_page; @@ -948,7 +949,7 @@ static void create_page_chain(struct size_class *class, struct zspage *zspage, set_page_private(page, (unsigned long)zspage); page->index = 0; if (i == 0) { - zspage->first_page = page; + zspage->first_zpdesc = page_zpdesc(page); SetPagePrivate(page); if (unlikely(class->objs_per_zspage == 1 && class->pages_per_zspage == 1)) @@ -1325,7 +1326,7 @@ static unsigned long obj_malloc(struct zs_pool *pool, link->handle = handle; else /* record handle to page->index */ - zspage->first_page->index = handle; + zspage->first_zpdesc->handle = handle; kunmap_atomic(vaddr); mod_zspage_inuse(zspage, 1);