From patchwork Wed May 29 11:19:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13678712 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 0AAD8C27C43 for ; Wed, 29 May 2024 11:19:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 231F06B00A3; Wed, 29 May 2024 07:19:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A1846B00A5; Wed, 29 May 2024 07:19:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5C586B00A4; Wed, 29 May 2024 07:19:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id A8D0F6B00A3 for ; Wed, 29 May 2024 07:19:23 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3BE07160A08 for ; Wed, 29 May 2024 11:19:23 +0000 (UTC) X-FDA: 82171187406.22.A19FDE5 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf27.hostedemail.com (Postfix) with ESMTP id 897E34000C for ; Wed, 29 May 2024 11:19:21 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="DzJ/cdoj"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf27.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716981561; 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=abET8lrE4AVrejWdoZuoMbV76D72y0iE8NVlu7Sa3/4=; b=bxnfF7/Q6LXq66AhGm8MEtUj+NmXCnNqOc7hjXhj05RAfyoDP1u2e2d/Z3NfTAzMvkOncu tem81pJcXOLJ4rIxT9AHUosqi5Lsa6X3N6ckEXK0wgdVoKO1OhJ2mm0QPm+UHo6YNHZZqM /ZJYeTz44O1lQqQLrZk733hA5OfSkLU= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="DzJ/cdoj"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf27.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716981561; a=rsa-sha256; cv=none; b=emQGu8B6N8C7Yt2/AaUNO/Efe/fBAQoyceY7pREZoJ6qnbO2Jo3LDzt3uFJ57LiU/arFoz YUO4RwgATYxP8+5kPlARKuTL2Bc6lxyU2WOFYnHg7VR2FGOsPlB8oVhozynF7WDSdJk/5Z 7hpal+ORNeR8aPajmrVSmkOoMwxbK28= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1716981560; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=abET8lrE4AVrejWdoZuoMbV76D72y0iE8NVlu7Sa3/4=; b=DzJ/cdojkPOv+fhRl0MjNKIVcUkk5t2phXR10oPn7zzTLtfahRK7OQJQSzTi8ci+sAejjR xG0AsOiHIO4sCp3964eK1bsSiHYjOh9tBYR/tWqrDM1oZnZe+RoVTXMe+9UTNtZQXyaRpA tzIe8FZXqhS6xZiqrXWwAGY2+3grWMg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-450-4ALCqXkLPimlN9lNjxcdCQ-1; Wed, 29 May 2024 07:19:14 -0400 X-MC-Unique: 4ALCqXkLPimlN9lNjxcdCQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ABCCD101A52C; Wed, 29 May 2024 11:19:13 +0000 (UTC) Received: from t14s.fritz.box (unknown [10.39.193.127]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B28EC15BB1; Wed, 29 May 2024 11:19:11 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , Andrew Morton , "Matthew Wilcox (Oracle)" , Mike Rapoport , Minchan Kim , Sergey Senozhatsky , Hyeonggon Yoo <42.hyeyoo@gmail.com> Subject: [PATCH v2 3/6] mm/zsmalloc: use a proper page type Date: Wed, 29 May 2024 13:19:01 +0200 Message-ID: <20240529111904.2069608-4-david@redhat.com> In-Reply-To: <20240529111904.2069608-1-david@redhat.com> References: <20240529111904.2069608-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Rspamd-Queue-Id: 897E34000C X-Stat-Signature: eoaueyotipbgkwgwe8u4a3mmwamwkno8 X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1716981561-651349 X-HE-Meta: U2FsdGVkX1+W0YRffcLMVIuiWqdchL9xIxQ5gC0sOOz0/ZC/zBlxlcu7P8+TR1SOsLAd/WqEGS3pqx5nQwwyf4Ql8BCa+/G2OPxmqpfhtCQOQRKSy4mylj2jwKmo5C9SLivWYY9v5rgmBedPUIY2pET6RpM2ewJ7m/Q2+7rQAOyUeuAOlTUilgpJgsJps889RWl62lMHV5jnAuXdA6TjnZshhIv3v3js2ngEKEQQ92ep0tTpL+UPEYMFeY0ptwsDRY7/MsqXPj1gq5U5tlRZ/SN1Ilpiq+5tbTSmq+HDeutwhSmpxhRoSFi0u9A9pG3XVVyZe7mKE5rGpDdOszKR8FJdyd3200DGAcVBbiGugwt9nwljH+bvP/Zearrwh5CSrAoVea9EjB8QLAv5UuthVITqo38cM7KJO1fQeduo1cnQZbUvQfFXXOVi3zxYFZI5v4VJC1n/R76B0WInJSOGGDh0afr6LW8FWHz5ua7yumxT+3BxuHD2NiqJ6lhQnk0ATKSXQpgQhdZtUbOmVZuhYHIi2JY6LK/RzyVUPow0fxZl3QiEuPjTVD4IT+Gxwk78u7ijdf1KncgQ+3n4ONYiZoulrE+i0re08yWGxsnkk6unmkHTis1/V2rsbIZe6GupddsTnwgKfP5X3CTwi479IypfQvPgOrCpgHAqOnlxYVl4RChadiCV75YTTwrdk73B/t8OjvlSEIRqzAPI9CLCmQUAk5QHbEoU6GkLjrZr3HlLOun3GxhlPrQeKWADqjULmVXoPaij1/xfHY7rI1G8b5sdnAnETD/TZkWq3t66b8ukIKgoWo2YhhuaqwvfoV4TOgzRv3S87MJ4f/xY0e/HuKzWAogJJrhIPYkFEoAIuicXya+1YCg3cuQkc/W+b3WsYtGLhNfe0451SfqS9VdFJkjbuxAafvXMJJ/tWihacIcHSbA5XLhTChibjGXy/upYJFRRiWYhh1XCVmC1MB+ OLwfQ/iX RRhD1xpF2osRIUD4KLf/Z0pvqcZiUdlREOfFYC0hlqK2sGNwsd/xIxo+UjZtmmO2K3vy6LNoh1tus0tZGRCFIjzDyx9RvWasmsSe3GbM0J7atsNkOREmzQ3afkQHBw3KUR0Fi4CpoAk/lPWBCze24jp1HNml02xKnBUS7juVi4ENmz9i1XzFscvmF0Np67I8wejF6CfT90oBNmCRM9uwV6rmRih+SWIx1E+GIOrgFy66j69j2/gXFWCnDtU+zkFF3sOwG4y/EVmzCIil3p3wiLmonTftVk+SF3U1g0HwjSiN8duqbecnNv4At4NXLFgnyZqUTU+Z/I7NfRus= 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: Let's clean it up: use a proper page type and store our data (offset into a page) in the lower 16 bit as documented. We won't be able to support 256 KiB base pages, which is acceptable. Teach Kconfig to handle that cleanly using a new CONFIG_HAVE_ZSMALLOC. Based on this, we should do a proper "struct zsdesc" conversion, as proposed in [1]. This removes the last _mapcount/page_type offender. [1] https://lore.kernel.org/all/20231130101242.2590384-1-42.hyeyoo@gmail.com/ Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com> Signed-off-by: David Hildenbrand Reviewed-by: Sergey Senozhatsky --- drivers/block/zram/Kconfig | 1 + include/linux/page-flags.h | 3 +++ mm/Kconfig | 10 ++++++++-- mm/zsmalloc.c | 29 +++++++++++++++++++++++++---- 4 files changed, 37 insertions(+), 6 deletions(-) diff --git a/drivers/block/zram/Kconfig b/drivers/block/zram/Kconfig index 6aea609b795c2..40e035468de22 100644 --- a/drivers/block/zram/Kconfig +++ b/drivers/block/zram/Kconfig @@ -2,6 +2,7 @@ config ZRAM tristate "Compressed RAM block device support" depends on BLOCK && SYSFS && MMU + depends on HAVE_ZSMALLOC select ZSMALLOC help Creates virtual block devices called /dev/zramX (X = 0, 1, ...). diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index f060db808102c..3afcbfbb379ea 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -957,6 +957,7 @@ PAGEFLAG_FALSE(HasHWPoisoned, has_hwpoisoned) #define PG_guard 0x08000000 #define PG_hugetlb 0x04008000 #define PG_slab 0x02000000 +#define PG_zsmalloc 0x01000000 #define PAGE_MAPCOUNT_RESERVE (~0x0000ffff) #define PageType(page, flag) \ @@ -1072,6 +1073,8 @@ FOLIO_TYPE_OPS(hugetlb, hugetlb) FOLIO_TEST_FLAG_FALSE(hugetlb) #endif +PAGE_TYPE_OPS(Zsmalloc, zsmalloc, zsmalloc) + /** * PageHuge - Determine if the page belongs to hugetlbfs * @page: The page to test. diff --git a/mm/Kconfig b/mm/Kconfig index b4cb45255a541..67dc18c94448d 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -128,7 +128,7 @@ config ZSWAP_COMPRESSOR_DEFAULT choice prompt "Default allocator" depends on ZSWAP - default ZSWAP_ZPOOL_DEFAULT_ZSMALLOC if MMU + default ZSWAP_ZPOOL_DEFAULT_ZSMALLOC if HAVE_ZSMALLOC default ZSWAP_ZPOOL_DEFAULT_ZBUD help Selects the default allocator for the compressed cache for @@ -154,6 +154,7 @@ config ZSWAP_ZPOOL_DEFAULT_Z3FOLD config ZSWAP_ZPOOL_DEFAULT_ZSMALLOC bool "zsmalloc" + depends on HAVE_ZSMALLOC select ZSMALLOC help Use the zsmalloc allocator as the default allocator. @@ -186,10 +187,15 @@ config Z3FOLD page. It is a ZBUD derivative so the simplicity and determinism are still there. +config HAVE_ZSMALLOC + def_bool y + depends on MMU + depends on PAGE_SIZE_LESS_THAN_256KB # we want <= 64 KiB + config ZSMALLOC tristate prompt "N:1 compression allocator (zsmalloc)" if ZSWAP - depends on MMU + depends on HAVE_ZSMALLOC help zsmalloc is a slab-based memory allocator designed to store pages of various compression levels efficiently. It achieves diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index a2a5866473bb8..44e0171d60036 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -20,7 +20,8 @@ * page->index: 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: first object offset in a subpage of zspage + * page->page_type: PG_zsmalloc, lower 16 bit locate the first object + * offset in a subpage of a zspage * * Usage of struct page flags: * PG_private: identifies the first component page @@ -450,14 +451,28 @@ static inline struct page *get_first_page(struct zspage *zspage) return first_page; } +#define FIRST_OBJ_PAGE_TYPE_MASK 0xffff + +static inline void reset_first_obj_offset(struct page *page) +{ + VM_WARN_ON_ONCE(!PageZsmalloc(page)); + page->page_type |= FIRST_OBJ_PAGE_TYPE_MASK; +} + static inline unsigned int get_first_obj_offset(struct page *page) { - return page->page_type; + VM_WARN_ON_ONCE(!PageZsmalloc(page)); + return page->page_type & FIRST_OBJ_PAGE_TYPE_MASK; } static inline void set_first_obj_offset(struct page *page, unsigned int offset) { - page->page_type = offset; + /* With 16 bit available, we can support offsets into 64 KiB pages. */ + BUILD_BUG_ON(PAGE_SIZE > SZ_64K); + VM_WARN_ON_ONCE(!PageZsmalloc(page)); + VM_WARN_ON_ONCE(offset & ~FIRST_OBJ_PAGE_TYPE_MASK); + page->page_type &= ~FIRST_OBJ_PAGE_TYPE_MASK; + page->page_type |= offset & FIRST_OBJ_PAGE_TYPE_MASK; } static inline unsigned int get_freeobj(struct zspage *zspage) @@ -791,8 +806,9 @@ static void reset_page(struct page *page) __ClearPageMovable(page); ClearPagePrivate(page); set_page_private(page, 0); - page_mapcount_reset(page); page->index = 0; + reset_first_obj_offset(page); + __ClearPageZsmalloc(page); } static int trylock_zspage(struct zspage *zspage) @@ -965,11 +981,13 @@ static struct zspage *alloc_zspage(struct zs_pool *pool, if (!page) { while (--i >= 0) { dec_zone_page_state(pages[i], NR_ZSPAGES); + __ClearPageZsmalloc(pages[i]); __free_page(pages[i]); } cache_free_zspage(pool, zspage); return NULL; } + __SetPageZsmalloc(page); inc_zone_page_state(page, NR_ZSPAGES); pages[i] = page; @@ -1754,6 +1772,9 @@ static int zs_page_migrate(struct page *newpage, struct page *page, VM_BUG_ON_PAGE(!PageIsolated(page), page); + /* We're committed, tell the world that this is a Zsmalloc page. */ + __SetPageZsmalloc(newpage); + /* The page is locked, so this pointer must remain valid */ zspage = get_zspage(page); pool = zspage->pool;