From patchwork Mon Oct 31 05:41:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13025390 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 A5842FA3745 for ; Mon, 31 Oct 2022 05:41:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 048016B0073; Mon, 31 Oct 2022 01:41:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F3B0F8E0001; Mon, 31 Oct 2022 01:41:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E02C16B0075; Mon, 31 Oct 2022 01:41:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id B58E06B0073 for ; Mon, 31 Oct 2022 01:41:21 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 44C73160499 for ; Mon, 31 Oct 2022 05:41:21 +0000 (UTC) X-FDA: 80080146762.23.C15D762 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by imf23.hostedemail.com (Postfix) with ESMTP id D2CE6140008 for ; Mon, 31 Oct 2022 05:41:20 +0000 (UTC) Received: by mail-pf1-f175.google.com with SMTP id 17so5533988pfv.4 for ; Sun, 30 Oct 2022 22:41:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=9v+j7YIhXu2E5hbe6+G2o2cWhQoPLQTweQOnVfkUv2E=; b=HHA2qvPEXFBXVL0y35D/gKbkMA3J8JE7u+qse7jccRNYRVFeZl1ZI8qGbNMOVHXSHf v40uZihi/8P1v4QSHUvJCAjLlzOeQ9qeN0ngXzT5Xo41WcZ2vMNTKZiUV4bOmY+SSXQ3 Byk0Lm156jYYKOSKcsI020PV+WW+rdYOEU3jQ= 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=9v+j7YIhXu2E5hbe6+G2o2cWhQoPLQTweQOnVfkUv2E=; b=Hd5bQ4+ya0RPostL9OEpGeTbAKpNDel+xMHd8x0mNKFtehGxF38wlhhNHnETisjDE0 lzgU8gkCa1su1D5bEDSsVHxIjPLjF+uFyI9uFXV+RpjqGvWjwsxALpXZz7XgRYWbobuJ o5766iPrenFdPjXvYbRAzqYUAmoFsBRr+57+DPkVc91MrDQNrV0zB9T8OSDOvMpgWgLD cGvL7ZBinUbXRYpsLZF7mlEV+cfnDQjR8gdKN/SEGikZJo1kKwkh7p//2yOppMhth5AJ 9VVMc92RLEHszuUQmnf0zJjGAYZ3qGA4Hyk8jnrHN8no5UUEKPos7dVDrViQlgnclRoj QUxg== X-Gm-Message-State: ACrzQf024GJ8aDeECB/CVJbJcqDp0V5wNdJUHB52ayu35ynq6IkcufRR WiyaQG3qFAyZvMUi+iIXd3JFXA== X-Google-Smtp-Source: AMsMyM729ihr9fgmUqPg4KMVep0S/XyIpWy1ij2ONm3nVQwOjuSAsnZN6ZOCyx8QyEgYr7CDgaOUiA== X-Received: by 2002:a62:e40e:0:b0:56b:add7:fc22 with SMTP id r14-20020a62e40e000000b0056badd7fc22mr12547815pfh.63.1667194879706; Sun, 30 Oct 2022 22:41:19 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:7616:afe0:ba6c:96f4]) by smtp.gmail.com with ESMTPSA id w12-20020aa79a0c000000b0056befcd7958sm3573308pfj.84.2022.10.30.22.41.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 22:41:19 -0700 (PDT) From: Sergey Senozhatsky To: Andrew Morton , Minchan Kim Cc: Nitin Gupta , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexey Romanov , Sergey Senozhatsky Subject: [PATCHv4 1/9] zram: add size class equals check into recompression Date: Mon, 31 Oct 2022 14:41:00 +0900 Message-Id: <20221031054108.541190-2-senozhatsky@chromium.org> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog In-Reply-To: <20221031054108.541190-1-senozhatsky@chromium.org> References: <20221031054108.541190-1-senozhatsky@chromium.org> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667194880; 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=9v+j7YIhXu2E5hbe6+G2o2cWhQoPLQTweQOnVfkUv2E=; b=mYIq84Z740Wz2dx/pb571GdjuzdLePrlTAVYJifkIMz+5HMzzY+8Sc/OOWY6CF6TajXXFd 7ZP6Nx6DICCvqbxe2Htr5d7xKuZw3E8//WPzvkgmioGVed3nMHOFzlK/Z9uWOwVn+4fxBy MsqX+lKXLPyJF2p61IbK5al+wWmzsSE= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=HHA2qvPE; spf=pass (imf23.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.210.175 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667194880; a=rsa-sha256; cv=none; b=P3YDmSuDXPs676HNhqZU38r+ZcHYqw8fqxTjwrpnUrThFQyImVqN1tHMZ+R88QbTrHt04S LOzBw6olE0uZqmLwprz9bfJ8BMZex6PfpVsJQnb29lmYk15DA1fpibMV8VdOGnXkg9fPxz heh3zqOUb5/nsGU64MYP2UsThjr6X2o= X-Stat-Signature: yoxdadhok1p5csjoru1gzdducqfinhfi X-Rspamd-Queue-Id: D2CE6140008 X-Rspam-User: Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=HHA2qvPE; spf=pass (imf23.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.210.175 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-Rspamd-Server: rspam04 X-HE-Tag: 1667194880-244460 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: From: Alexey Romanov It makes no sense for us to recompress the object if it will be in the same size class. We anyway don't get any memory gain. But, at the same time, we get a CPU time overhead when inserting this object into zspage and decompressing it afterwards. Signed-off-by: Alexey Romanov Reviewed-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 5 +++++ include/linux/zsmalloc.h | 2 ++ mm/zsmalloc.c | 21 +++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 364323713393..fd31beb6491a 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1632,6 +1632,8 @@ static int zram_recompress(struct zram *zram, u32 index, struct page *page, unsigned long handle_next; unsigned int comp_len_next; unsigned int comp_len_prev; + unsigned int class_index_prev; + unsigned int class_index_next; struct zcomp_strm *zstrm; void *src, *dst; int ret; @@ -1656,6 +1658,8 @@ static int zram_recompress(struct zram *zram, u32 index, struct page *page, ret = zcomp_compress(zstrm, src, &comp_len_next); kunmap_atomic(src); + class_index_prev = zs_lookup_class_index(zram->mem_pool, comp_len_prev); + class_index_next = zs_lookup_class_index(zram->mem_pool, comp_len_next); /* * Either a compression error or we failed to compressed the object * in a way that will save us memory. Mark the object so that we @@ -1663,6 +1667,7 @@ static int zram_recompress(struct zram *zram, u32 index, struct page *page, */ if (comp_len_next >= huge_class_size || comp_len_next >= comp_len_prev || + class_index_next >= class_index_prev || ret) { zram_set_flag(zram, index, ZRAM_RECOMP_SKIP); zram_clear_flag(zram, index, ZRAM_IDLE); diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h index 2a430e713ce5..a48cd0ffe57d 100644 --- a/include/linux/zsmalloc.h +++ b/include/linux/zsmalloc.h @@ -55,5 +55,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle); unsigned long zs_get_total_pages(struct zs_pool *pool); unsigned long zs_compact(struct zs_pool *pool); +unsigned int zs_lookup_class_index(struct zs_pool *pool, unsigned int size); + void zs_pool_stats(struct zs_pool *pool, struct zs_pool_stats *stats); #endif diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index d03941cace2c..065744b7e9d8 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1205,6 +1205,27 @@ static bool zspage_full(struct size_class *class, struct zspage *zspage) return get_zspage_inuse(zspage) == class->objs_per_zspage; } +/** + * zs_lookup_class_index() - Returns index of the zsmalloc &size_class + * that hold objects of the provided size. + * @pool: zsmalloc pool to use + * @size: object size + * + * Context: Any context. + * + * Return: the index of the zsmalloc &size_class that hold objects of the + * provided size. + */ +unsigned int zs_lookup_class_index(struct zs_pool *pool, unsigned int size) +{ + struct size_class *class; + + class = pool->size_class[get_size_class_index(size)]; + + return class->index; +} +EXPORT_SYMBOL_GPL(zs_lookup_class_index); + unsigned long zs_get_total_pages(struct zs_pool *pool) { return atomic_long_read(&pool->pages_allocated); From patchwork Mon Oct 31 05:41:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13025392 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 27A07FA3740 for ; Mon, 31 Oct 2022 05:41:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8102C8E0002; Mon, 31 Oct 2022 01:41:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7C0138E0001; Mon, 31 Oct 2022 01:41:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 661A58E0002; Mon, 31 Oct 2022 01:41:26 -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 39FB68E0001 for ; Mon, 31 Oct 2022 01:41:26 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id ED65F120149 for ; Mon, 31 Oct 2022 05:41:25 +0000 (UTC) X-FDA: 80080146930.01.FB01589 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by imf07.hostedemail.com (Postfix) with ESMTP id 6B2474000C for ; Mon, 31 Oct 2022 05:41:24 +0000 (UTC) Received: by mail-pl1-f169.google.com with SMTP id y4so9847588plb.2 for ; Sun, 30 Oct 2022 22:41:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=3t+2U4oymRETQLfWsFIy7oUT4aEsjQJ2d8KM7HrwZlo=; b=L4rUPJZ98rg6T8HBwQPxMu2mPUCPtOdrHP+01h2AXUlEaRUUhYB5W0GAoS7rCYONw+ 7qmUHXM1PB2C7I9Yos4xfxi8x1s4Lpg8mLIMlKNG7rhp0jG7Dh5OpCVFIJsYtWKRl+SR hpCoEUa7d3ZWV6gAVAG6n6fNwcZV5fL9QU2PA= 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=3t+2U4oymRETQLfWsFIy7oUT4aEsjQJ2d8KM7HrwZlo=; b=b3YqT2Mpdv/RUAmpECtBxHFEQLGhxyjBy6YddwAhf0osQlUn/iYXKOM82lSFoBO3y4 TAtW/P+hoSGQaiUnMJdbJWiKj3Ih4ninLcegHeS5jUB26dsFQiUJnDjrc2MTcY9+xFTX vZQh1KuX7rNPofMpKQuzAR2VMnXJuKMusy+klKUuxynFTU5a0/nPHFJpKBhP+phedTqv CibaJ4PK2yYzB8gv3r1t+RgL4AzoCrl/QOtiJF7VX10rrJSy02HUobZ4ArD1m6EuAHfa dxV8QzQTT9AVsMAe473nMO2Pp8hp8Aqw4j2YsA6co8s4iUpx7GQhLZuzsnMPYYu5YmcU CU4w== X-Gm-Message-State: ACrzQf2UxcLMU7ju0pzlGNqN59MH0jeLY7NKusqwMaFJIxX9wfox6F1N 2DIF14KsV2/bOlua1bVTbXaNyA== X-Google-Smtp-Source: AMsMyM58AP7xk+WL9yxr98nCa9PMvj9U9eej+MncwZJviOWnp+yCmovYnQWg12yrkFEF/O6VclLh8g== X-Received: by 2002:a17:90b:1642:b0:213:f368:648b with SMTP id il2-20020a17090b164200b00213f368648bmr1057816pjb.173.1667194882600; Sun, 30 Oct 2022 22:41:22 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:7616:afe0:ba6c:96f4]) by smtp.gmail.com with ESMTPSA id w12-20020aa79a0c000000b0056befcd7958sm3573308pfj.84.2022.10.30.22.41.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 22:41:22 -0700 (PDT) From: Sergey Senozhatsky To: Andrew Morton , Minchan Kim Cc: Nitin Gupta , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Sergey Senozhatsky Subject: [PATCHv4 2/9] zsmalloc: turn zspage order into runtime variable Date: Mon, 31 Oct 2022 14:41:01 +0900 Message-Id: <20221031054108.541190-3-senozhatsky@chromium.org> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog In-Reply-To: <20221031054108.541190-1-senozhatsky@chromium.org> References: <20221031054108.541190-1-senozhatsky@chromium.org> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667194884; 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=3t+2U4oymRETQLfWsFIy7oUT4aEsjQJ2d8KM7HrwZlo=; b=p77eZWkBk/p2GQ+RUzoYFLh+jO4sCsVxbjr9LP+2OmHJ6lXjTDnxue7ZVazFQuHZEFQ7Rj 4Th9qmPNL4hg4GVXiv3t7NfZPzry/rPmXDYmq1kbxT7i2pRdKFMIZS+eb7eoQqy1QGwsVf eQNSJPnM0BSuPrAg2fLVZ/oL5CIJUYQ= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=L4rUPJZ9; spf=pass (imf07.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.169 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667194884; a=rsa-sha256; cv=none; b=oCWgccH9FJeWe6urvBjqr5si9NEsWdkDlycBhrwQ4zHZbCQ2aoUkx+4cvDMLYoHpDjZoVn oXP1YbQ/cetDfQyrDLNDv4Wy1PT098XJ9V7yza+0tA5EYNv4ZnMvif557vVob7dDc1eE+Q wNWm3dgjtvabKlLDvO6Un0d98l+lU0M= Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=L4rUPJZ9; spf=pass (imf07.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.169 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-Rspam-User: X-Rspamd-Queue-Id: 6B2474000C X-Rspamd-Server: rspam03 X-Stat-Signature: 7ahupwh13z6zg19kpr4rkxgrhtyap8tx X-HE-Tag: 1667194884-229708 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: zsmalloc has 255 size classes. Size classes contain a number of zspages, which store objects of the same size. zspage can consist of up to four physical pages. The exact (most optimal) zspage size is calculated for each size class during zsmalloc pool creation. As a reasonable optimization, zsmalloc merges size classes that have similar characteristics: number of pages per zspage and number of objects zspage can store. For example, let's look at the following size classes: class size almost_full almost_empty obj_allocated obj_used pages_used pages_per_zspage freeable .. 94 1536 0 0 0 0 0 3 0 100 1632 0 0 0 0 0 2 0 .. Size classes #95-99 are merged with size class #100. That is, each time we store an object of size, say, 1568 bytes instead of using class #96 we end up storing it in size class #100. Class #100 is for objects of 1632 bytes in size, hence every 1568 bytes object wastes 1632-1568 bytes. Class #100 zspages consist of 2 physical pages and can hold 5 objects. When we need to store, say, 13 objects of size 1568 we end up allocating three zspages; in other words, 6 physical pages. However, if we'll look closer at size class #96 (which should hold objects of size 1568 bytes) and trace get_pages_per_zspage(): pages per zspage wasted bytes used% 1 960 76 2 352 95 3 1312 89 4 704 95 5 96 99 We'd notice that the most optimal zspage configuration for this class is when it consists of 5 physical pages, but currently we never let zspages to consists of more than 4 pages. A 5 page class #96 configuration would store 13 objects of size 1568 in a single zspage, allocating 5 physical pages, as opposed to 6 physical pages that class #100 will allocate. A higher order zspage for class #96 also changes its key characteristics: pages per-zspage and objects per-zspage. As a result classes #96 and #100 are not merged anymore, which gives us more compact zsmalloc. Of course the described effect does not apply only to size classes #96 and We still merge classes, but less often so. In other words classes are grouped in a more compact way, which decreases memory wastage: zspage order # unique size classes 2 69 3 123 4 191 Let's take a closer look at the bottom of /sys/kernel/debug/zsmalloc/zram0/classes: class size almost_full almost_empty obj_allocated obj_used pages_used pages_per_zspage freeable ... 202 3264 0 0 0 0 0 4 0 254 4096 0 0 0 0 0 1 0 ... For exactly same reason - maximum 4 pages per zspage - the last non-huge size class is #202, which stores objects of size 3264 bytes. Any object larger than 3264 bytes, hence, is considered to be huge and lands in size class #254, which uses a whole physical page to store every object. To put it slightly differently - objects in huge classes don't share physical pages. 3264 bytes is too low of a watermark and we have too many huge classes: classes from #203 to #254. Similarly to class size #96 above, higher order zspages change key characteristics for some of those huge size classes and thus those classes become normal classes, where stored objects share physical pages. Hence yet another consequence of higher order zspages: we move the huge size class watermark with higher order zspages, have less huge classes and store large objects in a more compact way. For order 3, huge class watermark becomes 3632 bytes: class size almost_full almost_empty obj_allocated obj_used pages_used pages_per_zspage freeable ... 202 3264 0 0 0 0 0 4 0 211 3408 0 0 0 0 0 5 0 217 3504 0 0 0 0 0 6 0 222 3584 0 0 0 0 0 7 0 225 3632 0 0 0 0 0 8 0 254 4096 0 0 0 0 0 1 0 ... For order 4, huge class watermark becomes 3840 bytes: class size almost_full almost_empty obj_allocated obj_used pages_used pages_per_zspage freeable ... 202 3264 0 0 0 0 0 4 0 206 3328 0 0 0 0 0 13 0 207 3344 0 0 0 0 0 9 0 208 3360 0 0 0 0 0 14 0 211 3408 0 0 0 0 0 5 0 212 3424 0 0 0 0 0 16 0 214 3456 0 0 0 0 0 11 0 217 3504 0 0 0 0 0 6 0 219 3536 0 0 0 0 0 13 0 222 3584 0 0 0 0 0 7 0 223 3600 0 0 0 0 0 15 0 225 3632 0 0 0 0 0 8 0 228 3680 0 0 0 0 0 9 0 230 3712 0 0 0 0 0 10 0 232 3744 0 0 0 0 0 11 0 234 3776 0 0 0 0 0 12 0 235 3792 0 0 0 0 0 13 0 236 3808 0 0 0 0 0 14 0 238 3840 0 0 0 0 0 15 0 254 4096 0 0 0 0 0 1 0 ... TESTS ===== Test untars linux-6.0.tar.xz and compiles the kernel. zram is configured as a block device with ext4 file system, lzo-rle compression algorithm. We captured /sys/block/zram0/mm_stat after every test and rebooted the VM. orig_data_size mem_used_total mem_used_max pages_compacted compr_data_size mem_limit same_pages huge_pages ORDER 2 (BASE) zspage 1691791360 628086729 655171584 0 655171584 60 0 34043 1691787264 628089196 655175680 0 655175680 60 0 34046 1691803648 628098840 655187968 0 655187968 59 0 34047 1691795456 628091503 655183872 0 655183872 60 0 34044 1691799552 628086877 655183872 0 655183872 60 0 34047 ORDER 3 zspage 1691803648 627792993 641794048 0 641794048 60 0 33591 1691787264 627779342 641708032 0 641708032 59 0 33591 1691811840 627786616 641769472 0 641769472 60 0 33591 1691803648 627794468 641818624 0 641818624 59 0 33592 1691783168 627780882 641794048 0 641794048 61 0 33591 ORDER 4 zspage 1691803648 627726635 639655936 0 639655936 60 0 33435 1691811840 627733348 639643648 0 639643648 61 0 33434 1691795456 627726290 639614976 0 639614976 60 0 33435 1691803648 627730458 639688704 0 639688704 60 0 33434 1691811840 627727771 639688704 0 639688704 60 0 33434 Order 3 and order 4 show statistically significant improvement in `mem_used_max` metrics. T-test for order 3: x order-2-maxmem + order-3-maxmem N Min Max Median Avg Stddev x 5 6.5517158e+08 6.5518797e+08 6.5518387e+08 6.551806e+08 6730.4157 + 5 6.4170803e+08 6.4181862e+08 6.4179405e+08 6.4177684e+08 42210.666 Difference at 95.0% confidence -1.34038e+07 +/- 44080.7 -2.04581% +/- 0.00672802% (Student's t, pooled s = 30224.5) T-test for order 4: x order-2-maxmem + order-4-maxmem N Min Max Median Avg Stddev x 5 6.5517158e+08 6.5518797e+08 6.5518387e+08 6.551806e+08 6730.4157 + 5 6.3961498e+08 6.396887e+08 6.3965594e+08 6.3965839e+08 31408.602 Difference at 95.0% confidence -1.55222e+07 +/- 33126.2 -2.36915% +/- 0.00505604% (Student's t, pooled s = 22713.4) This test tends to benefit more from order 4 zspages, due to test's data patterns. zsmalloc object distribution analysis ============================================================================= Order 2 (4 pages per zspage) tends to put many objects in size class 2048, which is merged with size classes #112-#125: class size almost_full almost_empty obj_allocated obj_used pages_used pages_per_zspage freeable ... 71 1168 0 0 6146 6146 1756 2 0 74 1216 0 1 4560 4552 1368 3 0 76 1248 0 1 2938 2934 904 4 0 83 1360 0 0 10971 10971 3657 1 0 91 1488 0 0 16126 16126 5864 4 0 94 1536 0 1 5912 5908 2217 3 0 100 1632 0 0 11990 11990 4796 2 0 107 1744 0 1 15771 15768 6759 3 0 111 1808 0 1 10386 10380 4616 4 0 126 2048 0 0 45444 45444 22722 1 0 144 2336 0 0 47446 47446 27112 4 0 151 2448 1 0 10760 10759 6456 3 0 168 2720 0 0 10173 10173 6782 2 0 190 3072 0 1 1700 1697 1275 3 0 202 3264 0 1 290 286 232 4 0 254 4096 0 0 34051 34051 34051 1 0 Order 3 (8 pages per zspage) changed pool characteristics and unmerged some of the size classes, which resulted in less objects being put into size class 2048, because there are lower size classes are now available for more compact object storage: class size almost_full almost_empty obj_allocated obj_used pages_used pages_per_zspage freeable ... 71 1168 0 1 2996 2994 856 2 0 72 1184 0 1 1632 1609 476 7 0 73 1200 1 0 1445 1442 425 5 0 74 1216 0 0 1510 1510 453 3 0 75 1232 0 1 1495 1479 455 7 0 76 1248 0 1 1456 1451 448 4 0 78 1280 0 1 3040 3033 950 5 0 79 1296 0 1 1584 1571 504 7 0 83 1360 0 0 6375 6375 2125 1 0 84 1376 0 1 1817 1796 632 8 0 87 1424 0 1 6020 6006 2107 7 0 88 1440 0 1 2108 2101 744 6 0 89 1456 0 1 2072 2064 740 5 0 91 1488 0 1 4169 4159 1516 4 0 92 1504 0 1 2014 2007 742 7 0 94 1536 0 1 3904 3900 1464 3 0 95 1552 0 1 1890 1873 720 8 0 96 1568 0 1 1963 1958 755 5 0 97 1584 0 1 1980 1974 770 7 0 100 1632 0 1 6190 6187 2476 2 0 103 1680 0 0 6477 6477 2667 7 0 104 1696 0 1 2256 2253 940 5 0 105 1712 0 1 2356 2340 992 8 0 107 1744 1 0 4697 4696 2013 3 0 110 1792 0 1 7744 7734 3388 7 0 111 1808 0 1 2655 2649 1180 4 0 114 1856 0 1 8371 8365 3805 5 0 116 1888 1 0 5863 5862 2706 6 0 117 1904 0 1 2955 2942 1379 7 0 118 1920 0 1 3009 2997 1416 8 0 126 2048 0 0 25276 25276 12638 1 0 128 2080 0 1 6060 6052 3232 8 0 129 2096 1 0 3081 3080 1659 7 0 134 2176 0 1 14835 14830 7912 8 0 135 2192 0 1 2769 2758 1491 7 0 137 2224 0 1 5082 5077 2772 6 0 140 2272 0 1 7236 7232 4020 5 0 144 2336 0 1 8428 8423 4816 4 0 147 2384 0 1 5316 5313 3101 7 0 151 2448 0 1 5445 5443 3267 3 0 155 2512 0 0 4121 4121 2536 8 0 158 2560 0 1 2208 2205 1380 5 0 160 2592 0 0 1133 1133 721 7 0 168 2720 0 0 2712 2712 1808 2 0 177 2864 1 0 1100 1098 770 7 0 180 2912 0 1 189 183 135 5 0 184 2976 0 1 176 166 128 8 0 190 3072 0 0 252 252 189 3 0 197 3184 0 1 198 192 154 7 0 202 3264 0 1 100 96 80 4 0 211 3408 0 1 210 208 175 5 0 217 3504 0 1 98 94 84 6 0 222 3584 0 0 104 104 91 7 0 225 3632 0 1 54 50 48 8 0 254 4096 0 0 33591 33591 33591 1 0 Note, the huge size watermark is above 3632 and there are a number of new normal classes available that previously were merged with the huge class. For instance, size class #211 holds 210 objects of size 3408 and uses 175 physical pages, while previously for those objects we would have used 210 physical pages. Signed-off-by: Sergey Senozhatsky --- include/linux/zsmalloc.h | 12 +++++++ mm/zsmalloc.c | 73 +++++++++++++++++++++++----------------- 2 files changed, 54 insertions(+), 31 deletions(-) diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h index a48cd0ffe57d..6cd1d95b928a 100644 --- a/include/linux/zsmalloc.h +++ b/include/linux/zsmalloc.h @@ -33,6 +33,18 @@ enum zs_mapmode { */ }; +#define ZS_PAGE_ORDER_2 2 +#define ZS_PAGE_ORDER_4 4 + +/* + * A single 'zspage' is composed of up to 2^N discontiguous 0-order (single) + * pages. ZS_MAX_PAGE_ORDER defines upper limit on N, ZS_MIN_PAGE_ORDER + * defines lower limit on N. ZS_DEFAULT_PAGE_ORDER is recommended value. + */ +#define ZS_MIN_PAGE_ORDER ZS_PAGE_ORDER_2 +#define ZS_MAX_PAGE_ORDER ZS_PAGE_ORDER_4 +#define ZS_DEFAULT_PAGE_ORDER ZS_PAGE_ORDER_2 + struct zs_pool_stats { /* How many pages were migrated (freed) */ atomic_long_t pages_compacted; diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 065744b7e9d8..a9773566f85b 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -74,12 +74,7 @@ */ #define ZS_ALIGN 8 -/* - * A single 'zspage' is composed of up to 2^N discontiguous 0-order (single) - * pages. ZS_MAX_ZSPAGE_ORDER defines upper limit on N. - */ -#define ZS_MAX_ZSPAGE_ORDER 2 -#define ZS_MAX_PAGES_PER_ZSPAGE (_AC(1, UL) << ZS_MAX_ZSPAGE_ORDER) +#define ZS_MAX_PAGES_PER_ZSPAGE (_AC(1, UL) << ZS_MAX_PAGE_ORDER) #define ZS_HANDLE_SIZE (sizeof(unsigned long)) @@ -124,10 +119,8 @@ #define ISOLATED_BITS 3 #define MAGIC_VAL_BITS 8 -#define MAX(a, b) ((a) >= (b) ? (a) : (b)) -/* ZS_MIN_ALLOC_SIZE must be multiple of ZS_ALIGN */ -#define ZS_MIN_ALLOC_SIZE \ - MAX(32, (ZS_MAX_PAGES_PER_ZSPAGE << PAGE_SHIFT >> OBJ_INDEX_BITS)) +#define ZS_MIN_ALLOC_SIZE 32U + /* each chunk includes extra space to keep handle */ #define ZS_MAX_ALLOC_SIZE PAGE_SIZE @@ -141,12 +134,10 @@ * determined). NOTE: all those class sizes must be set as multiple of * ZS_ALIGN to make sure link_free itself never has to span 2 pages. * - * ZS_MIN_ALLOC_SIZE and ZS_SIZE_CLASS_DELTA must be multiple of ZS_ALIGN - * (reason above) + * pool->min_alloc_size (ZS_MIN_ALLOC_SIZE) and ZS_SIZE_CLASS_DELTA must + * be multiple of ZS_ALIGN (reason above) */ #define ZS_SIZE_CLASS_DELTA (PAGE_SIZE >> CLASS_BITS) -#define ZS_SIZE_CLASSES (DIV_ROUND_UP(ZS_MAX_ALLOC_SIZE - ZS_MIN_ALLOC_SIZE, \ - ZS_SIZE_CLASS_DELTA) + 1) enum fullness_group { ZS_EMPTY, @@ -230,12 +221,15 @@ struct link_free { struct zs_pool { const char *name; - struct size_class *size_class[ZS_SIZE_CLASSES]; + struct size_class **size_class; struct kmem_cache *handle_cachep; struct kmem_cache *zspage_cachep; atomic_long_t pages_allocated; + u32 num_size_classes; + u32 min_alloc_size; + struct zs_pool_stats stats; /* Compact classes */ @@ -523,15 +517,15 @@ static void set_zspage_mapping(struct zspage *zspage, * classes depending on its size. This function returns index of the * size class which has chunk size big enough to hold the given size. */ -static int get_size_class_index(int size) +static int get_size_class_index(struct zs_pool *pool, int size) { int idx = 0; - if (likely(size > ZS_MIN_ALLOC_SIZE)) - idx = DIV_ROUND_UP(size - ZS_MIN_ALLOC_SIZE, + if (likely(size > pool->min_alloc_size)) + idx = DIV_ROUND_UP(size - pool->min_alloc_size, ZS_SIZE_CLASS_DELTA); - return min_t(int, ZS_SIZE_CLASSES - 1, idx); + return min_t(int, pool->num_size_classes - 1, idx); } /* type can be of enum type class_stat_type or fullness_group */ @@ -591,7 +585,7 @@ static int zs_stats_size_show(struct seq_file *s, void *v) "obj_allocated", "obj_used", "pages_used", "pages_per_zspage", "freeable"); - for (i = 0; i < ZS_SIZE_CLASSES; i++) { + for (i = 0; i < pool->num_size_classes; i++) { class = pool->size_class[i]; if (class->index != i) @@ -777,13 +771,13 @@ static enum fullness_group fix_fullness_group(struct size_class *class, * link together 3 PAGE_SIZE sized pages to form a zspage * since then we can perfectly fit in 8 such objects. */ -static int get_pages_per_zspage(int class_size) +static int get_pages_per_zspage(u32 class_size, u32 num_pages) { int i, max_usedpc = 0; /* zspage order which gives maximum used size per KB */ int max_usedpc_order = 1; - for (i = 1; i <= ZS_MAX_PAGES_PER_ZSPAGE; i++) { + for (i = 1; i <= num_pages; i++) { int zspage_size; int waste, usedpc; @@ -1220,7 +1214,7 @@ unsigned int zs_lookup_class_index(struct zs_pool *pool, unsigned int size) { struct size_class *class; - class = pool->size_class[get_size_class_index(size)]; + class = pool->size_class[get_size_class_index(pool, size)]; return class->index; } @@ -1431,7 +1425,7 @@ unsigned long zs_malloc(struct zs_pool *pool, size_t size, gfp_t gfp) /* extra space in chunk to keep the handle */ size += ZS_HANDLE_SIZE; - class = pool->size_class[get_size_class_index(size)]; + class = pool->size_class[get_size_class_index(pool, size)]; /* class->lock effectively protects the zpage migration */ spin_lock(&class->lock); @@ -1980,7 +1974,7 @@ static void async_free_zspage(struct work_struct *work) struct zs_pool *pool = container_of(work, struct zs_pool, free_work); - for (i = 0; i < ZS_SIZE_CLASSES; i++) { + for (i = 0; i < pool->num_size_classes; i++) { class = pool->size_class[i]; if (class->index != i) continue; @@ -2129,7 +2123,7 @@ unsigned long zs_compact(struct zs_pool *pool) struct size_class *class; unsigned long pages_freed = 0; - for (i = ZS_SIZE_CLASSES - 1; i >= 0; i--) { + for (i = pool->num_size_classes - 1; i >= 0; i--) { class = pool->size_class[i]; if (class->index != i) continue; @@ -2173,7 +2167,7 @@ static unsigned long zs_shrinker_count(struct shrinker *shrinker, struct zs_pool *pool = container_of(shrinker, struct zs_pool, shrinker); - for (i = ZS_SIZE_CLASSES - 1; i >= 0; i--) { + for (i = pool->num_size_classes - 1; i >= 0; i--) { class = pool->size_class[i]; if (class->index != i) continue; @@ -2215,11 +2209,27 @@ struct zs_pool *zs_create_pool(const char *name) int i; struct zs_pool *pool; struct size_class *prev_class = NULL; + unsigned long num_pages; pool = kzalloc(sizeof(*pool), GFP_KERNEL); if (!pool) return NULL; + num_pages = 1UL << ZS_DEFAULT_PAGE_ORDER; + /* min_alloc_size must be multiple of ZS_ALIGN */ + pool->min_alloc_size = num_pages << PAGE_SHIFT >> OBJ_INDEX_BITS; + pool->min_alloc_size = max(pool->min_alloc_size, ZS_MIN_ALLOC_SIZE); + + pool->num_size_classes = + DIV_ROUND_UP(ZS_MAX_ALLOC_SIZE - pool->min_alloc_size, + ZS_SIZE_CLASS_DELTA) + 1; + + pool->size_class = kmalloc_array(pool->num_size_classes, + sizeof(struct size_class *), + GFP_KERNEL | __GFP_ZERO); + if (!pool->size_class) + goto err; + init_deferred_free(pool); rwlock_init(&pool->migrate_lock); @@ -2234,17 +2244,17 @@ struct zs_pool *zs_create_pool(const char *name) * Iterate reversely, because, size of size_class that we want to use * for merging should be larger or equal to current size. */ - for (i = ZS_SIZE_CLASSES - 1; i >= 0; i--) { + for (i = pool->num_size_classes - 1; i >= 0; i--) { int size; int pages_per_zspage; int objs_per_zspage; struct size_class *class; int fullness = 0; - size = ZS_MIN_ALLOC_SIZE + i * ZS_SIZE_CLASS_DELTA; + size = pool->min_alloc_size + i * ZS_SIZE_CLASS_DELTA; if (size > ZS_MAX_ALLOC_SIZE) size = ZS_MAX_ALLOC_SIZE; - pages_per_zspage = get_pages_per_zspage(size); + pages_per_zspage = get_pages_per_zspage(size, num_pages); objs_per_zspage = pages_per_zspage * PAGE_SIZE / size; /* @@ -2328,7 +2338,7 @@ void zs_destroy_pool(struct zs_pool *pool) zs_flush_migration(pool); zs_pool_stat_destroy(pool); - for (i = 0; i < ZS_SIZE_CLASSES; i++) { + for (i = 0; i < pool->num_size_classes; i++) { int fg; struct size_class *class = pool->size_class[i]; @@ -2348,6 +2358,7 @@ void zs_destroy_pool(struct zs_pool *pool) } destroy_cache(pool); + kfree(pool->size_class); kfree(pool->name); kfree(pool); } From patchwork Mon Oct 31 05:41:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13025391 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 B6912FA3744 for ; Mon, 31 Oct 2022 05:41:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5519F8E0003; Mon, 31 Oct 2022 01:41:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4DEFD8E0001; Mon, 31 Oct 2022 01:41:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 35EB78E0003; Mon, 31 Oct 2022 01:41:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 0D78E8E0001 for ; Mon, 31 Oct 2022 01:41:27 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A9A0C160499 for ; Mon, 31 Oct 2022 05:41:26 +0000 (UTC) X-FDA: 80080146972.21.3AC8B98 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by imf15.hostedemail.com (Postfix) with ESMTP id 2A520A000F for ; Mon, 31 Oct 2022 05:41:25 +0000 (UTC) Received: by mail-pj1-f50.google.com with SMTP id d59-20020a17090a6f4100b00213202d77e1so14963060pjk.2 for ; Sun, 30 Oct 2022 22:41:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=q47a/PNtxAlJKL8yCX3+cfAOXZEGpDh+HXwifBH5lKc=; b=OYKyQePuyQDoHhgCchBV4FMDx0nWgF7FRbwlJg+5H3agLccnKM3iywpXD9Ad6WlB9e 2hKoZcKk5G/boerau0bifRUyl66HD3wpSCWk/agkmOsrg0WbI+yuve3bQQODeG1tBhlr jW9CV4MIvC/C7cUB7KWXWdWNpbLLs4wlJYM+Y= 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=q47a/PNtxAlJKL8yCX3+cfAOXZEGpDh+HXwifBH5lKc=; b=2fuOwfaejjOUod5uY6iV526wnn8Q+MFe+/cdaOdVtL4+vUaewBPX74kF1RbsHQKE9C Pe8cC2NOCRlxpAhxMHGTl4LL/Dp8HZVpxwYThBj06vo0Y8vpp2sMEobXWr+K6IT+AC5X 7mXoyCK2wIY5UX2pEjxR60Bvkzp99Ul98RJ0Ep6DQecKZh3Yymh2w8ivuO+HEWi3l5fm K6gKTnJF0TVJ5tPV6v2e7HtRMyC0cMQ1qRObqrrnE+ZDsq566By4rSXfQ/WdoaDLfvYz U6+mEmbj5vOYhAR/TbcFrGna3QHxSRXpcPaTxs81Q/UvtRAG8+QR9DljA3zSUtaWLFsl jvyQ== X-Gm-Message-State: ACrzQf2KJdgPLLyC6971ZZzW6EAsKjM3kPcoqk5MHzKof/S+t7XTYJYP HYz9efW3YKQTgradHfMv0LzRRQ== X-Google-Smtp-Source: AMsMyM7lIE25lBRCfac1jIjiko+Si6xCOBbIGSlmJaY3ParCu8pVW0pf03O7dc9ImI+Po6W9R2fxGg== X-Received: by 2002:a17:903:4d7:b0:178:8564:f754 with SMTP id jm23-20020a17090304d700b001788564f754mr12779632plb.60.1667194885017; Sun, 30 Oct 2022 22:41:25 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:7616:afe0:ba6c:96f4]) by smtp.gmail.com with ESMTPSA id w12-20020aa79a0c000000b0056befcd7958sm3573308pfj.84.2022.10.30.22.41.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 22:41:24 -0700 (PDT) From: Sergey Senozhatsky To: Andrew Morton , Minchan Kim Cc: Nitin Gupta , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Sergey Senozhatsky Subject: [PATCHv4 3/9] zsmalloc: move away from page order defines Date: Mon, 31 Oct 2022 14:41:02 +0900 Message-Id: <20221031054108.541190-4-senozhatsky@chromium.org> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog In-Reply-To: <20221031054108.541190-1-senozhatsky@chromium.org> References: <20221031054108.541190-1-senozhatsky@chromium.org> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667194886; 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=q47a/PNtxAlJKL8yCX3+cfAOXZEGpDh+HXwifBH5lKc=; b=tYPegehsOpDzP3igrVpGm41RPWin4n31iwJ2XN/mUg8tgE7avFu4y4jr3SRZZGR13U+xLn 3P8c+O0Cr8tTKNpvYQTfbE5qAbBUXYiUXr4+4Xr6ZndCKYpoVAFEO6/NDmMNfzaGVoQJdo QjTH8ovjf5xnelNfn5mQ3r/kQKOq8bY= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=OYKyQePu; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf15.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.50 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667194886; a=rsa-sha256; cv=none; b=pkvdkSRJlc2n28YERjEcGrr1/VDqqLOz7ooiWj3NUtxZyW6DvthTn4v9zxl2Fmn+L3t68o +lBJb5iJAnfllknnRvN3dlrQp4ruLiKB4+SBngMD6Nx8D4cdXrRbddengHZrtFvDj9I/w2 g6fIonN62kzuN4Np+h3rlkCsXUe6/0g= X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 2A520A000F X-Rspam-User: Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=OYKyQePu; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf15.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.50 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org X-Stat-Signature: bqkowkijwuzpbk8mt6yt4gfuckn5nix6 X-HE-Tag: 1667194885-626636 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: There is no reason for us to require pages per-zspage to be a power of two. Rename macros and use plain limit numbers there instead of 2 ^ N values. This will let us to have more tunable limits. Signed-off-by: Sergey Senozhatsky --- include/linux/zsmalloc.h | 16 +++++++--------- mm/zsmalloc.c | 4 +--- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h index 6cd1d95b928a..b6b8654a2d45 100644 --- a/include/linux/zsmalloc.h +++ b/include/linux/zsmalloc.h @@ -33,17 +33,15 @@ enum zs_mapmode { */ }; -#define ZS_PAGE_ORDER_2 2 -#define ZS_PAGE_ORDER_4 4 - /* - * A single 'zspage' is composed of up to 2^N discontiguous 0-order (single) - * pages. ZS_MAX_PAGE_ORDER defines upper limit on N, ZS_MIN_PAGE_ORDER - * defines lower limit on N. ZS_DEFAULT_PAGE_ORDER is recommended value. + * A single 'zspage' is composed of up to N discontiguous 0-order + * (single) pages. ZS_MAX_PAGES_PER_ZSPAGE defines upper limit on N, + * ZS_MIN_PAGES_PER_ZSPAGE defines lower limit on N. + * ZS_DEFAULT_PAGES_PER_ZSPAGE is a recommended value. */ -#define ZS_MIN_PAGE_ORDER ZS_PAGE_ORDER_2 -#define ZS_MAX_PAGE_ORDER ZS_PAGE_ORDER_4 -#define ZS_DEFAULT_PAGE_ORDER ZS_PAGE_ORDER_2 +#define ZS_MIN_PAGES_PER_ZSPAGE 1 +#define ZS_MAX_PAGES_PER_ZSPAGE 16 +#define ZS_DEFAULT_PAGES_PER_ZSPAGE 4 struct zs_pool_stats { /* How many pages were migrated (freed) */ diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index a9773566f85b..5f79223e7bfe 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -74,8 +74,6 @@ */ #define ZS_ALIGN 8 -#define ZS_MAX_PAGES_PER_ZSPAGE (_AC(1, UL) << ZS_MAX_PAGE_ORDER) - #define ZS_HANDLE_SIZE (sizeof(unsigned long)) /* @@ -2215,7 +2213,7 @@ struct zs_pool *zs_create_pool(const char *name) if (!pool) return NULL; - num_pages = 1UL << ZS_DEFAULT_PAGE_ORDER; + num_pages = ZS_DEFAULT_PAGES_PER_ZSPAGE; /* min_alloc_size must be multiple of ZS_ALIGN */ pool->min_alloc_size = num_pages << PAGE_SHIFT >> OBJ_INDEX_BITS; pool->min_alloc_size = max(pool->min_alloc_size, ZS_MIN_ALLOC_SIZE); From patchwork Mon Oct 31 05:41:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13025393 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 477E8FA3740 for ; Mon, 31 Oct 2022 05:41:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D8F798E0005; Mon, 31 Oct 2022 01:41:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D175E8E0001; Mon, 31 Oct 2022 01:41:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BE19C8E0005; Mon, 31 Oct 2022 01:41:29 -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 99B618E0001 for ; Mon, 31 Oct 2022 01:41:29 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 3B31C8021F for ; Mon, 31 Oct 2022 05:41:29 +0000 (UTC) X-FDA: 80080147098.27.A251724 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by imf17.hostedemail.com (Postfix) with ESMTP id C859A40006 for ; Mon, 31 Oct 2022 05:41:28 +0000 (UTC) Received: by mail-pj1-f43.google.com with SMTP id f5-20020a17090a4a8500b002131bb59d61so11862023pjh.1 for ; Sun, 30 Oct 2022 22:41:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=xz2a6Gnxa0VzNk+aaf7V7ldsdawrXx9L2Y2yVCyV3wk=; b=hpb9n1tc4pH+/W4WEarHdEJTdKB8Ai2ziveapp1wFdmhGqQdaw2eIO47MVgU9X5z/x ksPR6wC6yaqkhc/7Gjw5j1+OxfdJ2fX7sdKnVGFSvnb2tH2Ewj3HO0DYDPUMqb3x5NBE XbPIXzjLvbXmstz37m4M+DFTtqlVUc/uSW7QM= 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=xz2a6Gnxa0VzNk+aaf7V7ldsdawrXx9L2Y2yVCyV3wk=; b=hVGKhmCQEuBx8E2QtlrKA/W8maYf0XEfPvaBf3yWaIzUilhhXNvhWMhyeuQnJ5bdgL NhUoRtdLWFkada92faORtNTn8ijo/7gWFNQ+pV2lveJN8RUBh/4VMS/JT5GamtOcg/IG Xu5MeDI6LYh0CkEOci0lF54NxtTxTpPWs1DbwVi6K2TCcrEWsnpEfY+wYYMrUFr6Fwp4 F6iomLNonWgQuWlcH0DdC0SbqjKgHfLDMpnmz8S5Z5o5OtMd6GG9cDHomVZ+CAhYHhxz qnWBhrXCJwq5EUdeZRK5gb+/mS8DD3mRjA4yZsdAiU81+yc4YMafGzFfD11EPeLEIquB 5V2A== X-Gm-Message-State: ACrzQf36dqhCcc0DlPNqmTr0WiHnDJOQzHlqkIXmA4Ms2mW2HSkriv52 HId6qLyEVsqT1Lx64bP8gCGnRg== X-Google-Smtp-Source: AMsMyM45I96pdiy6HLkp/Z+GW+ilK0vuA9XKCeCbpdBf2Nywu1yDwQlomYdS/WX51GnDSZg3i4eLcA== X-Received: by 2002:a17:903:1211:b0:178:9353:9e42 with SMTP id l17-20020a170903121100b0017893539e42mr12657945plh.45.1667194887696; Sun, 30 Oct 2022 22:41:27 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:7616:afe0:ba6c:96f4]) by smtp.gmail.com with ESMTPSA id w12-20020aa79a0c000000b0056befcd7958sm3573308pfj.84.2022.10.30.22.41.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 22:41:27 -0700 (PDT) From: Sergey Senozhatsky To: Andrew Morton , Minchan Kim Cc: Nitin Gupta , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Sergey Senozhatsky Subject: [PATCHv4 4/9] zsmalloc: make huge class watermark zs_pool member Date: Mon, 31 Oct 2022 14:41:03 +0900 Message-Id: <20221031054108.541190-5-senozhatsky@chromium.org> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog In-Reply-To: <20221031054108.541190-1-senozhatsky@chromium.org> References: <20221031054108.541190-1-senozhatsky@chromium.org> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667194888; a=rsa-sha256; cv=none; b=SeZCpY9PWAYvwzlgSPtcBBpmWO0AOp7XF+ifMpmGAo+SbnRsdjVo0ITtovc+DcfINCsS1y 8sqUKteZDof668jBQij5cHKreBRk7dz1/GHqeZAZnfbhHQN/jYbtnUisy4lB8e6hQcSEwr 1n63XW4+Cjo5/BXn5AOhbYQAiLXsc1g= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=hpb9n1tc; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf17.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.43 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667194888; 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=xz2a6Gnxa0VzNk+aaf7V7ldsdawrXx9L2Y2yVCyV3wk=; b=mcGj0xk6OV6uurkYCaa1OZagEn/2h+vNwbOUep/fhExDFBBS8tZfib8TfVFGT6+ac/rA2L PQll+SwL1kYcCyF6hs6MfKnihCbci++dPBx5b+kRehphg2zrPmHJhsHoiS4dQ3ohe97zMi NS0Nn8MgQnyQXvt7tkPsvnV29kkw2Y8= X-Stat-Signature: 7b4ebgqabqwpnorynu7pxqryg6m1k943 X-Rspamd-Queue-Id: C859A40006 X-Rspam-User: Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=hpb9n1tc; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf17.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.43 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org X-Rspamd-Server: rspam09 X-HE-Tag: 1667194888-725375 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: We will permit per-pool configuration of pages per-zspage value, which changes characteristics of the classes and moves around huge class size watermark. Thus huge class size needs to be a per-pool variable. Signed-off-by: Sergey Senozhatsky --- mm/zsmalloc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 5f79223e7bfe..d329bd673baa 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -178,7 +178,6 @@ static struct dentry *zs_stat_root; * (see: fix_fullness_group()) */ static const int fullness_threshold_frac = 4; -static size_t huge_class_size; struct size_class { spinlock_t lock; @@ -227,6 +226,7 @@ struct zs_pool { u32 num_size_classes; u32 min_alloc_size; + size_t huge_class_size; struct zs_pool_stats stats; @@ -1350,7 +1350,7 @@ EXPORT_SYMBOL_GPL(zs_unmap_object); */ size_t zs_huge_class_size(struct zs_pool *pool) { - return huge_class_size; + return pool->huge_class_size; } EXPORT_SYMBOL_GPL(zs_huge_class_size); @@ -2262,8 +2262,8 @@ struct zs_pool *zs_create_pool(const char *name) * endup in the huge class. */ if (pages_per_zspage != 1 && objs_per_zspage != 1 && - !huge_class_size) { - huge_class_size = size; + !pool->huge_class_size) { + pool->huge_class_size = size; /* * The object uses ZS_HANDLE_SIZE bytes to store the * handle. We need to subtract it, because zs_malloc() @@ -2273,7 +2273,7 @@ struct zs_pool *zs_create_pool(const char *name) * class because it grows by ZS_HANDLE_SIZE extra bytes * right before class lookup. */ - huge_class_size -= (ZS_HANDLE_SIZE - 1); + pool->huge_class_size -= (ZS_HANDLE_SIZE - 1); } /* From patchwork Mon Oct 31 05:41:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13025394 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 A05AAFA3740 for ; Mon, 31 Oct 2022 05:41:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 419198E0001; Mon, 31 Oct 2022 01:41:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3A12380007; Mon, 31 Oct 2022 01:41:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 26A2A8E0006; Mon, 31 Oct 2022 01:41:32 -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 0310D8E0001 for ; Mon, 31 Oct 2022 01:41:31 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 9CDB9A0BCB for ; Mon, 31 Oct 2022 05:41:31 +0000 (UTC) X-FDA: 80080147182.28.557CA58 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by imf08.hostedemail.com (Postfix) with ESMTP id 45BB5160011 for ; Mon, 31 Oct 2022 05:41:31 +0000 (UTC) Received: by mail-pl1-f174.google.com with SMTP id 4so9869155pli.0 for ; Sun, 30 Oct 2022 22:41:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=4A6bhxNpojaEfPLcsnRmMeXdGP9le8JW2bwOtY/TXkw=; b=mVTml/Dy4+8p9+6rmaolR4vBzjYW7UCec/5EMJ+idSZbvLmxXWLwMeDUDy8NMfmSjx qH5MGu1oQ1A7u43SxQHdT0a+55WaYPhC5BtaEix7UtY1PUPttIA1tLy0w29dES+LR692 yWCf2+X19RD7iNSYK+TgQm6wZYQBsbJ2q97Gs= 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=4A6bhxNpojaEfPLcsnRmMeXdGP9le8JW2bwOtY/TXkw=; b=qEoE2wUg0/4ceFokIDmUUyqK9mdDjULWnlD3QYHKrRK5jGmSpG1w4BIe0E3tBrgw6j tB1BIOMX9IRUpDtofQJIJxyV+OXDMMMGvmGBIBeZ+w7xw0Cd3FdzYMNtEjOOWGsMeQyn hM8xs+CRLekk39MhHbvsU3GbvnapShIv3/treCr3gVDXGNHkOJWBegpzkXfY9P5a9ZC6 2QcA40ma7/l9kMl4S6HhzFuXkfKdo8zlITEwtnfQo2n/5pZsJkQo19iNE+I8d0EPjIMG LY5Zy9ALjp4hJB7k3SGs8dP+JuU4YLJgoEkW8X4u3aDuzSISq7mh5bIANFwJpdQZtEyQ asLA== X-Gm-Message-State: ACrzQf1z8uDG280xcu8kNJ8n8WOqcPRCkNAUBUJIbGwxwZqIwRxYYaFh WPrPfeJBrngmFzQmbhybyIsI63XpYlib7Q== X-Google-Smtp-Source: AMsMyM5/Tqjv38wC3ib39unJG1knEpYCMVX+0dvSVs/aWk6fGK7Xl5OBbYQvU4RkIQhQKqzo4LbOTQ== X-Received: by 2002:a17:90b:1e43:b0:213:1efe:9815 with SMTP id pi3-20020a17090b1e4300b002131efe9815mr13311203pjb.164.1667194890154; Sun, 30 Oct 2022 22:41:30 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:7616:afe0:ba6c:96f4]) by smtp.gmail.com with ESMTPSA id w12-20020aa79a0c000000b0056befcd7958sm3573308pfj.84.2022.10.30.22.41.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 22:41:29 -0700 (PDT) From: Sergey Senozhatsky To: Andrew Morton , Minchan Kim Cc: Nitin Gupta , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Sergey Senozhatsky Subject: [PATCHv4 5/9] zram: huge size watermark cannot be global Date: Mon, 31 Oct 2022 14:41:04 +0900 Message-Id: <20221031054108.541190-6-senozhatsky@chromium.org> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog In-Reply-To: <20221031054108.541190-1-senozhatsky@chromium.org> References: <20221031054108.541190-1-senozhatsky@chromium.org> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667194891; a=rsa-sha256; cv=none; b=gWq0T7FuqOXjGx2gRFTdWcjeEEzi0EK1SehIOuMXVl3ppadO4q9ERydejS2QU9nkpym32W f07NEaH4JTcjela0yd3b2ClZ+B8A847VcNGvFSjs5TJHXWHdQEeO8TfezWQiFnoz5FnoFd RyyHcRJYX1sJkA+HycH2YhddKs5PXU8= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b="mVTml/Dy"; spf=pass (imf08.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.174 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667194891; 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=4A6bhxNpojaEfPLcsnRmMeXdGP9le8JW2bwOtY/TXkw=; b=JlDS4ace29EKoq9/DtZiG8F6RJNaIQOxYlAvd/Wt4LoK2OblvZZz9tBqdU2UPie3xtQGFm 0yZ5r+u8/vjKE7ZYDOP66WqVBiOgSo7/t9luMWr2buprsNCwMm3SO/STDbuSrPo90TOhNI Yi+1ws4CgqvyAhGf0qxg4FAXKJQdWhE= X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 45BB5160011 X-Rspam-User: X-Stat-Signature: d1bbyjac85uywdtmrridt7g1ffus91aq Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b="mVTml/Dy"; spf=pass (imf08.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.174 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-HE-Tag: 1667194891-916959 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: ZRAM will pass pool specific limit on number of pages per-zspages which will affect pool's characteristics. Namely huge size class watermark value. Move huge_class_size to struct zram, because this value now can be unique to the pool (zram device). Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 13 +++---------- drivers/block/zram/zram_drv.h | 5 +++++ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index fd31beb6491a..90b0c66bbd5b 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -50,12 +50,6 @@ static const char *default_comp_algs[ZRAM_MAX_ZCOMPS] = { /* Module params (documentation at end) */ static unsigned int num_devices = 1; -/* - * Pages that compress to sizes equals or greater than this are stored - * uncompressed in memory. - */ -static size_t huge_class_size; - static const struct block_device_operations zram_devops; static void zram_free_page(struct zram *zram, size_t index); @@ -1259,8 +1253,7 @@ static bool zram_meta_alloc(struct zram *zram, u64 disksize) return false; } - if (!huge_class_size) - huge_class_size = zs_huge_class_size(zram->mem_pool); + zram->huge_class_size = zs_huge_class_size(zram->mem_pool); return true; } @@ -1488,7 +1481,7 @@ static int __zram_bvec_write(struct zram *zram, struct bio_vec *bvec, return ret; } - if (comp_len >= huge_class_size) + if (comp_len >= zram->huge_class_size) comp_len = PAGE_SIZE; /* * handle allocation has 2 paths: @@ -1665,7 +1658,7 @@ static int zram_recompress(struct zram *zram, u32 index, struct page *page, * in a way that will save us memory. Mark the object so that we * don't attempt to re-compress it again (RECOMP_SKIP). */ - if (comp_len_next >= huge_class_size || + if (comp_len_next >= zram->huge_class_size || comp_len_next >= comp_len_prev || class_index_next >= class_index_prev || ret) { diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h index 09b9ceb5dfa3..9d6fcfdf7aa7 100644 --- a/drivers/block/zram/zram_drv.h +++ b/drivers/block/zram/zram_drv.h @@ -120,6 +120,11 @@ struct zram { */ u64 disksize; /* bytes */ const char *comp_algs[ZRAM_MAX_ZCOMPS]; + /* + * Pages that compress to sizes equal or greater than this are stored + * uncompressed in memory. + */ + size_t huge_class_size; /* * zram is claimed so open request will be failed */ From patchwork Mon Oct 31 05:41:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13025395 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 E8844FA3740 for ; Mon, 31 Oct 2022 05:41:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4418780008; Mon, 31 Oct 2022 01:41:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3A12780007; Mon, 31 Oct 2022 01:41:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2690B80008; Mon, 31 Oct 2022 01:41:34 -0400 (EDT) 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 F28DA80007 for ; Mon, 31 Oct 2022 01:41:33 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A66EDC0B72 for ; Mon, 31 Oct 2022 05:41:33 +0000 (UTC) X-FDA: 80080147266.23.EE8C3A8 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by imf15.hostedemail.com (Postfix) with ESMTP id 419A3A000E for ; Mon, 31 Oct 2022 05:41:33 +0000 (UTC) Received: by mail-pj1-f50.google.com with SMTP id d59-20020a17090a6f4100b00213202d77e1so14963232pjk.2 for ; Sun, 30 Oct 2022 22:41:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=VFR0j+YHx2uepPKlT+sIE6AyjijOgidhHUVwtVRcfQ8=; b=OsAM7e9gpky/PEpM6ussXnheiEIyAvoyhxEKv4YeN/y8428flisIoxqVDVQ/Z5NMre D5X/AKopD/9c9t4iyXFDie1MqC4kbMjkn2bPY7QhKi1M3jJRRwADtpxzFPYqbiKC4lsG L5Ihy/ujEO9g3F150Tblm3TeaA8a+A20XJX98= 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=VFR0j+YHx2uepPKlT+sIE6AyjijOgidhHUVwtVRcfQ8=; b=xn3cC/y6j5x/xnZNNGmn08gU1eGsJcDhItYOw8lry96nTha9C+ETXzy+YIVaqiDZR1 BiRUtR+RDQ//O3PpeOM4IjVZVvZM9+2VhAfLyC99H6ivYKh4rP4TlLP4oSyJ5e1a4UoL DIxpOD5KKsdlHJYk095HZ38gdACY2o+oYZaKRosm4FPRdAOFA03M1poADdhRsnRMaWNr knSwAZxeD8er8Nc7BjsbE3+oTuByMjGAm3diXLlrQ3sG5VlmpuzF5Zjs4Bm5pydarl1G v55BMYqwphLVRBqyUk7TrlvKSoCX9jMb6XC1urw+1KnRa2ZcOtjieGjiSXiZ/uCFRiYc 7EAw== X-Gm-Message-State: ACrzQf2pcVZLJpinlQ+VI+5S8mpYoNNTvZcmQ4oenTQRaHsv8E59ZPC/ 9qOUkVpv875HocGnU+xti56MBIGVZfE0hw== X-Google-Smtp-Source: AMsMyM4naYgrzZsBUcVNory6T4TNl8WUIPDEeh31C5BordS6k/33LBC4k0wlPp/qKRKbgdkdntEu6g== X-Received: by 2002:a17:90b:2705:b0:20a:b4fa:f624 with SMTP id px5-20020a17090b270500b0020ab4faf624mr13010028pjb.124.1667194892609; Sun, 30 Oct 2022 22:41:32 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:7616:afe0:ba6c:96f4]) by smtp.gmail.com with ESMTPSA id w12-20020aa79a0c000000b0056befcd7958sm3573308pfj.84.2022.10.30.22.41.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 22:41:32 -0700 (PDT) From: Sergey Senozhatsky To: Andrew Morton , Minchan Kim Cc: Nitin Gupta , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Sergey Senozhatsky Subject: [PATCHv4 6/9] zsmalloc: pass limit on pages per-zspage to zs_create_pool() Date: Mon, 31 Oct 2022 14:41:05 +0900 Message-Id: <20221031054108.541190-7-senozhatsky@chromium.org> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog In-Reply-To: <20221031054108.541190-1-senozhatsky@chromium.org> References: <20221031054108.541190-1-senozhatsky@chromium.org> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667194893; 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=VFR0j+YHx2uepPKlT+sIE6AyjijOgidhHUVwtVRcfQ8=; b=CW4DqSKR16UC14WanMN+y1Rlq3ZsWQANXQZD5HPdDs+uWNs3ueSllP7OkNDdpTEplukTCB pRI3UvYAzf5UyLkD0gSzXV7XNPpS8LF85BvQARREvYB7xSBAYGg7nCPHTqrPZfiptbHc3D 9ANNZwBi6UrE2RL66jPIVz3F1yf5l9U= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=OsAM7e9g; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf15.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.50 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667194893; a=rsa-sha256; cv=none; b=2wokFjjd6tqGjTudlB/Kg/cwLchQy5M8a5j+AfLEzsDx7z7c2z2cTixCU8FzDAKRCxlvxP 1VTd3OTpgCn530QCvWxAJMP/FEgPfU2jRE+Qx5wSV485kGz7AqiAapW9PqR9cmItJUDFX3 11ARlHFDdM8v/hxbNyONlpHmJzrGvsw= X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 419A3A000E X-Rspam-User: Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=OsAM7e9g; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf15.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.50 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org X-Stat-Signature: 3gq91nu9i4r3h761aw4qrixp6rt9xwoy X-HE-Tag: 1667194893-397681 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: Allow zsmalloc pool owner to specify max number of pages per-zspage (during pool creation), so that different pools can have different characteristics. By default we pass ZS_DEFAULT_PAGES_PER_ZSPAGE which is 4 (matches the current order 2 zspages limit). Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 3 ++- include/linux/zsmalloc.h | 2 +- mm/zsmalloc.c | 11 +++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 90b0c66bbd5b..bec02f636bce 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1247,7 +1247,8 @@ static bool zram_meta_alloc(struct zram *zram, u64 disksize) if (!zram->table) return false; - zram->mem_pool = zs_create_pool(zram->disk->disk_name); + zram->mem_pool = zs_create_pool(zram->disk->disk_name, + ZS_DEFAULT_PAGES_PER_ZSPAGE); if (!zram->mem_pool) { vfree(zram->table); return false; diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h index b6b8654a2d45..28f2b9cb1c47 100644 --- a/include/linux/zsmalloc.h +++ b/include/linux/zsmalloc.h @@ -50,7 +50,7 @@ struct zs_pool_stats { struct zs_pool; -struct zs_pool *zs_create_pool(const char *name); +struct zs_pool *zs_create_pool(const char *name, unsigned long num_pages); void zs_destroy_pool(struct zs_pool *pool); unsigned long zs_malloc(struct zs_pool *pool, size_t size, gfp_t flags); diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index d329bd673baa..42987a913f45 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -366,7 +366,7 @@ static void *zs_zpool_create(const char *name, gfp_t gfp, * different contexts and its caller must provide a valid * gfp mask. */ - return zs_create_pool(name); + return zs_create_pool(name, ZS_DEFAULT_PAGES_PER_ZSPAGE); } static void zs_zpool_destroy(void *pool) @@ -2195,6 +2195,7 @@ static int zs_register_shrinker(struct zs_pool *pool) /** * zs_create_pool - Creates an allocation pool to work from. * @name: pool name to be created + * @num_pages: maximum number of pages per-zspage * * This function must be called before anything when using * the zsmalloc allocator. @@ -2202,18 +2203,20 @@ static int zs_register_shrinker(struct zs_pool *pool) * On success, a pointer to the newly created pool is returned, * otherwise NULL. */ -struct zs_pool *zs_create_pool(const char *name) +struct zs_pool *zs_create_pool(const char *name, unsigned long num_pages) { int i; struct zs_pool *pool; struct size_class *prev_class = NULL; - unsigned long num_pages; + + if (WARN_ON(num_pages < ZS_MIN_PAGES_PER_ZSPAGE || + num_pages > ZS_MAX_PAGES_PER_ZSPAGE)) + return NULL; pool = kzalloc(sizeof(*pool), GFP_KERNEL); if (!pool) return NULL; - num_pages = ZS_DEFAULT_PAGES_PER_ZSPAGE; /* min_alloc_size must be multiple of ZS_ALIGN */ pool->min_alloc_size = num_pages << PAGE_SHIFT >> OBJ_INDEX_BITS; pool->min_alloc_size = max(pool->min_alloc_size, ZS_MIN_ALLOC_SIZE); From patchwork Mon Oct 31 05:41:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13025396 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 91D23C38A02 for ; Mon, 31 Oct 2022 05:41:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 32E3580009; Mon, 31 Oct 2022 01:41:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2DD0280007; Mon, 31 Oct 2022 01:41:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 17EA480009; Mon, 31 Oct 2022 01:41:37 -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 E3EF380007 for ; Mon, 31 Oct 2022 01:41:36 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 905E6409F4 for ; Mon, 31 Oct 2022 05:41:36 +0000 (UTC) X-FDA: 80080147392.30.4C4B5F1 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by imf03.hostedemail.com (Postfix) with ESMTP id 22B9C20008 for ; Mon, 31 Oct 2022 05:41:35 +0000 (UTC) Received: by mail-pj1-f49.google.com with SMTP id m14-20020a17090a3f8e00b00212dab39bcdso15006592pjc.0 for ; Sun, 30 Oct 2022 22:41:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=+Nf0+I2pfgnRZzXVFRfDlyfCUhznpUvJ315tu0OUOiI=; b=MbpTgPIBDUbHWkS+9YopOfHoRnV74v+JNz6BX6X//rBB/LmgPIElbp4GRlLTwjJzxc alebDGyAW4DJc/zlleAs/HRTGa9HptGICD/6ejNkUbdmk/vWUa3Ai/OhOrukv76eLsnd na8Fa3d+5bCIlVErli3M7VEvFks54n/u5Xz0I= 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=+Nf0+I2pfgnRZzXVFRfDlyfCUhznpUvJ315tu0OUOiI=; b=E/hUjENMjnlKbQaE7lVE94VSnWTXZZOUDU3mqP9QeQW10mfjod1rJIaQY8asV8WdDk 90H/gqpPnmWkdU3CriDZ76aC+RnsBI4Jx33w/5xFWvHLdhEaeW5K1eEXR7nEEe/+r2jM JzUMZhSLEIOtBv02rx/6lRCyX+ao8qr+aMSIDowY7Sc2BOGcvEw0YAvrTCk9Ib1SyE13 7InOwRDNeipYimFEyW0C5vsXo5P//XNz8PRSATm+JINPOxr7i7R1zEJI+VZbfIXXbklI XFG33xMRgmomy01X1k0ZnQ1yJCgbfb3YLkD0/QuoHzU8Od3Hka558J5/zoUe2VYoEuMk liiA== X-Gm-Message-State: ACrzQf1Po18pdvxpLP05FElZHD88TqgRLK0B0gzK2v865rjhAVARLVbB h+yjd1C+fzZvPwperZ33thZJ3fGMlEsjeA== X-Google-Smtp-Source: AMsMyM6aj/ay4NFqqeS6lMD0qg9sOyjXe4OVHq+CQp3TJTjjwqL7C30ANPBoUZZhZIHNH3n4pSp/5w== X-Received: by 2002:a17:90b:1bca:b0:213:c9ce:dad4 with SMTP id oa10-20020a17090b1bca00b00213c9cedad4mr7600860pjb.205.1667194895001; Sun, 30 Oct 2022 22:41:35 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:7616:afe0:ba6c:96f4]) by smtp.gmail.com with ESMTPSA id w12-20020aa79a0c000000b0056befcd7958sm3573308pfj.84.2022.10.30.22.41.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 22:41:34 -0700 (PDT) From: Sergey Senozhatsky To: Andrew Morton , Minchan Kim Cc: Nitin Gupta , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Sergey Senozhatsky Subject: [PATCHv4 7/9] zram: add pages_per_pool_page device attribute Date: Mon, 31 Oct 2022 14:41:06 +0900 Message-Id: <20221031054108.541190-8-senozhatsky@chromium.org> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog In-Reply-To: <20221031054108.541190-1-senozhatsky@chromium.org> References: <20221031054108.541190-1-senozhatsky@chromium.org> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667194896; a=rsa-sha256; cv=none; b=7gsXrJitsE7BNJ0leOL+WXt+ZR8+FccQ7xiM3qGYTA/aK7iGGobAhV0ea7lqfDdahcdY0G 5IWMmNzGRWIC0t2AMcS1VpT5etgUvi17/oE2b60hziNwVEMDJzAUd9KnPzOFOHrLtOXmp1 iCdbA1lePPlvgfjgE0bctCkCAlDMWBk= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=MbpTgPIB; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf03.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.49 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667194896; 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=+Nf0+I2pfgnRZzXVFRfDlyfCUhznpUvJ315tu0OUOiI=; b=SMd5SsXzCKgbv6od+DLNeglr9SpxokxSc6nFiY6hre311NCFC7S2xo6G5q9hEmSgOAPE8e +V+45tUKirx7CBykr1BzBb7xqnL23MxQsgPHP/6QI8yOyN9xwM25XCHCpBDlOy5y5Z7p9H cplxhQrFkF3R1Y7NU4u5UTWQ5i6CdiQ= X-Stat-Signature: jjjm3qdwj158nwifs5un34ghjprdbfdu X-Rspamd-Queue-Id: 22B9C20008 X-Rspam-User: Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=MbpTgPIB; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf03.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.49 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org X-Rspamd-Server: rspam09 X-HE-Tag: 1667194895-478895 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: Add a new sysfs knob that allows user-space to set zsmalloc pages per-zspage limit value on per-device basis. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 44 ++++++++++++++++++++++++++++++++++- drivers/block/zram/zram_drv.h | 2 ++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index bec02f636bce..cf9d3474b80c 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1180,6 +1180,45 @@ static ssize_t mm_stat_show(struct device *dev, return ret; } +static ssize_t pages_per_pool_page_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + u32 val; + struct zram *zram = dev_to_zram(dev); + + down_read(&zram->init_lock); + val = zram->pages_per_pool_page; + up_read(&zram->init_lock); + + return scnprintf(buf, PAGE_SIZE, "%d\n", val); +} + +static ssize_t pages_per_pool_page_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct zram *zram = dev_to_zram(dev); + u32 val; + + if (kstrtou32(buf, 10, &val)) + return -EINVAL; + + if (val < ZS_MIN_PAGES_PER_ZSPAGE || val > ZS_MAX_PAGES_PER_ZSPAGE) + return -EINVAL; + + down_read(&zram->init_lock); + if (init_done(zram)) { + up_read(&zram->init_lock); + return -EINVAL; + } + + zram->pages_per_pool_page = val; + up_read(&zram->init_lock); + + return len; +} + #ifdef CONFIG_ZRAM_WRITEBACK #define FOUR_K(x) ((x) * (1 << (PAGE_SHIFT - 12))) static ssize_t bd_stat_show(struct device *dev, @@ -1248,7 +1287,7 @@ static bool zram_meta_alloc(struct zram *zram, u64 disksize) return false; zram->mem_pool = zs_create_pool(zram->disk->disk_name, - ZS_DEFAULT_PAGES_PER_ZSPAGE); + zram->pages_per_pool_page); if (!zram->mem_pool) { vfree(zram->table); return false; @@ -2174,6 +2213,7 @@ static DEVICE_ATTR_RW(writeback_limit_enable); static DEVICE_ATTR_RW(recomp_algorithm); static DEVICE_ATTR_WO(recompress); #endif +static DEVICE_ATTR_RW(pages_per_pool_page); static struct attribute *zram_disk_attrs[] = { &dev_attr_disksize.attr, @@ -2201,6 +2241,7 @@ static struct attribute *zram_disk_attrs[] = { &dev_attr_recomp_algorithm.attr, &dev_attr_recompress.attr, #endif + &dev_attr_pages_per_pool_page.attr, NULL, }; @@ -2238,6 +2279,7 @@ static int zram_add(void) goto out_free_idr; } + zram->pages_per_pool_page = ZS_DEFAULT_PAGES_PER_ZSPAGE; zram->disk->major = zram_major; zram->disk->first_minor = device_id; zram->disk->minors = 1; diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h index 9d6fcfdf7aa7..bdfc9bf0bdd5 100644 --- a/drivers/block/zram/zram_drv.h +++ b/drivers/block/zram/zram_drv.h @@ -120,6 +120,8 @@ struct zram { */ u64 disksize; /* bytes */ const char *comp_algs[ZRAM_MAX_ZCOMPS]; + + u32 pages_per_pool_page; /* * Pages that compress to sizes equal or greater than this are stored * uncompressed in memory. From patchwork Mon Oct 31 05:41:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13025397 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 0136CC38A02 for ; Mon, 31 Oct 2022 05:41:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 920C68000A; Mon, 31 Oct 2022 01:41:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8D14480007; Mon, 31 Oct 2022 01:41:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 74A758000A; Mon, 31 Oct 2022 01:41:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 4DA3480007 for ; Mon, 31 Oct 2022 01:41:39 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E66F38094C for ; Mon, 31 Oct 2022 05:41:38 +0000 (UTC) X-FDA: 80080147476.20.81F91E0 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by imf22.hostedemail.com (Postfix) with ESMTP id 906F7C0004 for ; Mon, 31 Oct 2022 05:41:38 +0000 (UTC) Received: by mail-pl1-f171.google.com with SMTP id g24so9837385plq.3 for ; Sun, 30 Oct 2022 22:41:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=qzo+UO6rKhGS8H3i9OK87Ngl18bf6HViCqWtuB03u/E=; b=QRDjYTAa+Msioavw2AlKW7FO+YjBklxX0gbCjIerT/q6sgi8l09+WqL5NncXeQx8HR PnpF5DB5BqOsiTGvYpsH7rM3Fl8J6lOQwfY44y+wCYfe8j//qW941wMUIO8QV/BUIVpj 6ckxz/ZqCZaUcEhZmAgLkZHCEIGZ391OlshRI= 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=qzo+UO6rKhGS8H3i9OK87Ngl18bf6HViCqWtuB03u/E=; b=3AUVS1SlUvnjdipLnoQk37wJTGvuhcexPtx63CwhG2RCr6oDd2cD42S225tGniv5ew SgcGqq9xVhdnSsju+5IXCsxRhtjiAZb18hN1nOk+7BiJdbarUCoNO30IXIs/LXXaqHtJ xUKNfwLBDJiWIX8xe56mBt84lnvfsA4UQ9CI+HSNruiKE4I9xXlQI93NUSLY5NlNooAz f7Zp7pCUgruMaXueJH3BS41d9ju+L6/cvcz4/HMENDxS3kOl1syYiEZPrCOg5vZ3pl4M SRIFfvZbmX8dAsseMZ0KEFuRM3dZPUvTjjac2tSDM9QQlabFdRWNimHqO87GTJFCAw2S +muQ== X-Gm-Message-State: ACrzQf2xuQTNDPPtZ5R7Cv7LkTmiCrwLcqvirWftCkXYjDLatFNz7NYW yhesAKLdv6rino/cqDke0srH2A== X-Google-Smtp-Source: AMsMyM7RMqnJKcNesc8xRgpLESfPOrmIQondTpLCG88+n4Qycd5Ej9QZbYthOOomLsB9/+hUELa8gw== X-Received: by 2002:a17:90b:1c88:b0:203:8400:13a9 with SMTP id oo8-20020a17090b1c8800b00203840013a9mr13324117pjb.46.1667194897457; Sun, 30 Oct 2022 22:41:37 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:7616:afe0:ba6c:96f4]) by smtp.gmail.com with ESMTPSA id w12-20020aa79a0c000000b0056befcd7958sm3573308pfj.84.2022.10.30.22.41.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 22:41:37 -0700 (PDT) From: Sergey Senozhatsky To: Andrew Morton , Minchan Kim Cc: Nitin Gupta , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Sergey Senozhatsky Subject: [PATCHv4 8/9] Documentation: document zram pages_per_pool_page attribute Date: Mon, 31 Oct 2022 14:41:07 +0900 Message-Id: <20221031054108.541190-9-senozhatsky@chromium.org> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog In-Reply-To: <20221031054108.541190-1-senozhatsky@chromium.org> References: <20221031054108.541190-1-senozhatsky@chromium.org> MIME-Version: 1.0 ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=QRDjYTAa; spf=pass (imf22.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.171 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667194898; a=rsa-sha256; cv=none; b=QwCogBb8dLnnbqUwhBZsYSsdccDKgnz+ZApy4hX7b9pnV67/Eid4KVzgC7Doxbpk/TkPq9 bPzUXW3D6CG/g/iG5L9C90lahPZuSRTdJ2uV1iwpJD0QGZ/pLAs7uWwR00QoT4PQTUcstI 7m/un9rAhkw3T+SQD7LNgpqbXY7oCL4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667194898; 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=qzo+UO6rKhGS8H3i9OK87Ngl18bf6HViCqWtuB03u/E=; b=Aa9T04iohs5AtCySRE3fN57uwRAiKH29qnp3sz5GsCa7T+rqMNyI6swbKaCKjiRUoCZI5S KvGZo79u/qkcPTNBoZVoeP0jKLsz65zHg3fRxJxGba04RI1uTAuuy5OPvka3RhcCHrNJZK H0Sht+31RCNly2HTgaE6VjqEojw1X84= X-Rspam-User: X-Rspamd-Queue-Id: 906F7C0004 Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=QRDjYTAa; spf=pass (imf22.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.171 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-Stat-Signature: 56y4hqha9zodo5ugtqoooa4d6f4358mq X-Rspamd-Server: rspam10 X-HE-Tag: 1667194898-19491 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: Provide a simple documentation for pages_per_pool_page ZRAM device attribute. Signed-off-by: Sergey Senozhatsky --- Documentation/admin-guide/blockdev/zram.rst | 38 ++++++++++++++++----- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/Documentation/admin-guide/blockdev/zram.rst b/Documentation/admin-guide/blockdev/zram.rst index 010fb05a5999..4cb287520d45 100644 --- a/Documentation/admin-guide/blockdev/zram.rst +++ b/Documentation/admin-guide/blockdev/zram.rst @@ -112,7 +112,29 @@ to list all of them using, for instance, /proc/crypto or any other method. This, however, has an advantage of permitting the usage of custom crypto compression modules (implementing S/W or H/W compression). -4) Set Disksize +4) Set pages per-pool page limit: Optional +========================================== + +zsmalloc pages can consist of up to ZS_DEFAULT_PAGES_PER_ZSPAGE (single) +physical pages. The exact number is calculated for each zsmalloc size +class during zsmalloc pool creation. ZRAM provides pages_per_pool_page +device attribute that lets one adjust that limit (maximum possible value +is ZS_MAX_PAGES_PER_ZSPAGE). The default limit is considered to be good +enough, so tweak this value only when the changes in zsmalloc size classes +characteristics are beneficial for your data patterns. The limit on the +pages per zspages (currently) should be in [1,16] range; default value +is 4. + +Examples:: + + #show current zsmalloc pages per-pool page limit + cat /sys/block/zramX/pages_per_pool_page + 4 + + #set zsmalloc pages per-pool page limit + echo 8 > /sys/block/zramX/pages_per_pool_page + +5) Set Disksize =============== Set disk size by writing the value to sysfs node 'disksize'. @@ -132,7 +154,7 @@ There is little point creating a zram of greater than twice the size of memory since we expect a 2:1 compression ratio. Note that zram uses about 0.1% of the size of the disk when not in use so a huge zram is wasteful. -5) Set memory limit: Optional +6) Set memory limit: Optional ============================= Set memory limit by writing the value to sysfs node 'mem_limit'. @@ -151,7 +173,7 @@ Examples:: # To disable memory limit echo 0 > /sys/block/zram0/mem_limit -6) Activate +7) Activate =========== :: @@ -162,7 +184,7 @@ Examples:: mkfs.ext4 /dev/zram1 mount /dev/zram1 /tmp -7) Add/remove zram devices +8) Add/remove zram devices ========================== zram provides a control interface, which enables dynamic (on-demand) device @@ -182,7 +204,7 @@ execute:: echo X > /sys/class/zram-control/hot_remove -8) Stats +9) Stats ======== Per-device statistics are exported as various nodes under /sys/block/zram/ @@ -283,15 +305,15 @@ a single line of text and contains the following stats separated by whitespace: Unit: 4K bytes ============== ============================================================= -9) Deactivate -============= +10) Deactivate +============== :: swapoff /dev/zram0 umount /dev/zram1 -10) Reset +11) Reset ========= Write any positive value to 'reset' sysfs node:: From patchwork Mon Oct 31 05:41:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13025398 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 025E8C38A02 for ; Mon, 31 Oct 2022 05:41:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 63B2F8E0005; Mon, 31 Oct 2022 01:41:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5EBA480007; Mon, 31 Oct 2022 01:41:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4B2C78E0006; Mon, 31 Oct 2022 01:41:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 28BE68E0005 for ; Mon, 31 Oct 2022 01:41:42 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id AE359C0B81 for ; Mon, 31 Oct 2022 05:41:41 +0000 (UTC) X-FDA: 80080147602.04.63427B4 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by imf10.hostedemail.com (Postfix) with ESMTP id 53184C003B for ; Mon, 31 Oct 2022 05:41:41 +0000 (UTC) Received: by mail-pj1-f49.google.com with SMTP id h14so9481633pjv.4 for ; Sun, 30 Oct 2022 22:41:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=Y5bXC0243vzIlXmqJuaoPsZumfjC8+KlYBqtOKgOSLQ=; b=lFlf2oVxRN2VsF9XNYteCD5RC9CGXPs9NIzyXxdrHmGL3x5ZbjCN4GvZDcPFRlnVBR daPvQtBhbBGUiA1cThKv+Xl9u3TMaERvo6NWER2YakMLm4rZdmtKCnSpTsLeGXVGwzvT mABpkqu6zE8My3T25QD1KwXgG5k6ux50h9GNw= 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=Y5bXC0243vzIlXmqJuaoPsZumfjC8+KlYBqtOKgOSLQ=; b=E+BHtLCGw33I0+8n+e/MqzTdq4BpzgoTKjIxvTethzpowztUYTvdAC+4M+OI6K0wPk n+YUiC4bv5zcbBVsTfLYWWgUDQ1T9ozpheGMzIFybPlBg/vgTWMsX4c3zTcRuHQESNhl WSAydlSiPLgoBYPNPeiY8F7UIb1121kEHzTMuW/2/M3Qz+VNsMk9lHyJ8+hFiDscEXpQ Pk6ki5P0iqh8gSUCafsGmE5Vj2qjsZ3vGbp3hVft1gD/CiDy7wtenqpV1eO3fZUCoRMg M52Epf5nb0H2GtsHTBLUCGqbIgaFIs5Ac14ZN+OJFTnYOoiv0RkvuR87WdRdIYUHLc0r nVFg== X-Gm-Message-State: ACrzQf0G3cKqB5ASGwCimwRFSwT3/vXzkUAVkTbwPFKSGsbrpPz1ncjf cv6wnd1H/VpJfv3H+BMJ3RmIjA== X-Google-Smtp-Source: AMsMyM5yLDOwBAxqEWKyf/6OjNRVMOVOjTuyZ5Dx6UE1GoL0Kq3F+BX0jGcCoqraaPa30JhwhLf2zQ== X-Received: by 2002:a17:902:e402:b0:186:6f1d:b463 with SMTP id m2-20020a170902e40200b001866f1db463mr12461840ple.23.1667194900136; Sun, 30 Oct 2022 22:41:40 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:7616:afe0:ba6c:96f4]) by smtp.gmail.com with ESMTPSA id w12-20020aa79a0c000000b0056befcd7958sm3573308pfj.84.2022.10.30.22.41.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 22:41:39 -0700 (PDT) From: Sergey Senozhatsky To: Andrew Morton , Minchan Kim Cc: Nitin Gupta , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Sergey Senozhatsky Subject: [PATCHv4 9/9] zsmalloc: break out of loop when found perfect zspage order Date: Mon, 31 Oct 2022 14:41:08 +0900 Message-Id: <20221031054108.541190-10-senozhatsky@chromium.org> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog In-Reply-To: <20221031054108.541190-1-senozhatsky@chromium.org> References: <20221031054108.541190-1-senozhatsky@chromium.org> MIME-Version: 1.0 ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=lFlf2oVx; spf=pass (imf10.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.49 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667194901; a=rsa-sha256; cv=none; b=kd02AxCz5smkfdw/xUXCVGXRtX67a61LcLWaWj91DzHxUA/rFw7QM0S678sAhpj/0Ca8wT STTkZOeXeNhZXu/iWgsnjdzc9rn9MqIy7yv508CBJMYyekp0KYgZqwO4VDSk82eQ/sW2/Z vRl6HDBO8Jz4QHsnYDq4m7XHPb1+Gyk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1667194901; 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=Y5bXC0243vzIlXmqJuaoPsZumfjC8+KlYBqtOKgOSLQ=; b=KssiCkadU9z8wdlw+Ecvxbyx5G4YUDUCnYzV0aS/g6gCreUrmGa8UR5lrw0UG6ShhdyEVZ aZB4D2c0pJOKCfP/ZcpB0C3JEsQKjE7GEYCaosF4G+UYS7EHuTVBJOA97pM2M/j8inxjuL viUUermFjVBPyqyTWHgqkFsJ3YBEji8= X-Rspam-User: Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=lFlf2oVx; spf=pass (imf10.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.49 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org X-Rspamd-Server: rspam07 X-Stat-Signature: p86791pa7q5hra56rsbtd4rw31fo9x66 X-Rspamd-Queue-Id: 53184C003B X-HE-Tag: 1667194901-891120 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: If we found zspage configuration that gives us perfect 100% used percentage (zero wasted space) then there is no point it trying any other configuration Signed-off-by: Sergey Senozhatsky --- mm/zsmalloc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 42987a913f45..a40c548520d3 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -787,6 +787,9 @@ static int get_pages_per_zspage(u32 class_size, u32 num_pages) max_usedpc = usedpc; max_usedpc_order = i; } + + if (usedpc == 100) + break; } return max_usedpc_order;