From patchwork Fri Feb 21 22:25:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13986377 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 B4EF5C021B5 for ; Fri, 21 Feb 2025 22:30:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4EDCA280003; Fri, 21 Feb 2025 17:30:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 49DD0280001; Fri, 21 Feb 2025 17:30:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3177B280003; Fri, 21 Feb 2025 17:30:33 -0500 (EST) 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 12871280001 for ; Fri, 21 Feb 2025 17:30:33 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D28FE1A05DF for ; Fri, 21 Feb 2025 22:30:32 +0000 (UTC) X-FDA: 83145397104.23.72766FC Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf04.hostedemail.com (Postfix) with ESMTP id E3C864000B for ; Fri, 21 Feb 2025 22:30:30 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=isdTeKl5; spf=pass (imf04.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.172 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=1740177031; 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=YU0o+JhKC+VY+7R/4gnQD8yLERLPS3tBVJXP0N4K/mY=; b=D9OncaGYOCcUVCGBZAl2ARNMJHiNB5IgPT5dE3UhXKLDC/BCQvaC6/LhYdJ10pgZ7AAbLb 09UqaxmtzBUwsMfm3nNnx4OqCMX4SFTXFesiR7fprm17OS8+lrioaWlSckE0q5VegeEFsA bsjAEsNGN/dIvtHLHOjJC+RGgx3FR5w= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=isdTeKl5; spf=pass (imf04.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.172 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=1740177031; a=rsa-sha256; cv=none; b=3BgFRyCwsEx+nAwNQNUnHNfs1Lzqu8z+iqL8ZJbRYLcBQTt+WKcrkiUZOlwV5RwFtRPL9X iEZ6clD2PPwThflST6v3qkR0d7olpmqqrFYe+rs/vvaZMtCai38+D9qFC+oW7WvntEte+i ABVOlbjS/RJGyLGWhCAn8QgElKjMgLg= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-22185cddbffso60074495ad.1 for ; Fri, 21 Feb 2025 14:30:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740177030; x=1740781830; darn=kvack.org; 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=YU0o+JhKC+VY+7R/4gnQD8yLERLPS3tBVJXP0N4K/mY=; b=isdTeKl5a4b5szryACzg1Y7SoD8QLQrF6YPnkUcuN2OrJhWeUEiCWx62654L5d0f0k FfasIDnNS3daKfI3mDGTKB6iE+++/ysCXMlHmsmoCxxKKlKRCZfWAB5Bl/g9XZ+jFo9k JCIHttYGhQ+zZled6ub5wpisMEIpKtdGrYYVg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740177030; x=1740781830; 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=YU0o+JhKC+VY+7R/4gnQD8yLERLPS3tBVJXP0N4K/mY=; b=RhDIUj84lkVjozg/y5gm7jT2JQn3V2lcPEgFtvz8Mbz77G2JyABnX36f9ihYkVJiof haOEYHRfwrNezxoXgcyQDfEIzFrAEbcxXY1DKPZ4GtaIvh+u8gDrtEvMUMpxLnCVclFj iWKwFhu1AfjosVmZDcbRfBxzpjqH9LKUy9PgWqDa/Ta3A5fTSyx/Wh5H8yExK9XeJR1V K6ARlR3u0YgNrOgXQpWNoyP0V9ubMAiLRwlPtbjWYFnwEujZJ22SopX+pWauGhB91Ezo VGj0GqBW6/HtSKwFZe6BaF6oBcD6ehx3NApysXeNv0MDoSlQBjPYMwfvSy17zas+bSb1 hTPg== X-Forwarded-Encrypted: i=1; AJvYcCUfBOkr+Lcb5Q+RxVfQLN1cMY2G3e6pPxhpmxWEt3dFyCz6PZIxHMO+HFZ6r+NnetW2zOYqessMSA==@kvack.org X-Gm-Message-State: AOJu0Yxh3G1zp4DUFDSh2NJPYZtAuBeEVX0N9Ylr9UslUv3WcQk5i73J yMSD8bxCq3cHf10nYcY6rOxMp7Khq/uW8MQ4Lc29gJWYGWx36sGeN5Hi+qzsyg== X-Gm-Gg: ASbGnctfM9Oir6gE1p832Wg0Tv+iWrKWRksaysqX9DauuXIpMcWnhjDUwigDM6eXEaV y9Es1VaeHx/29VrgtdcInDf2hMwg/stj1u8kKq5izBG9+Sfn0R220hDTqHvdRKc77KdbTUdZJOQ 8OlnmWza/MIKd8VbvclmClBsCQavoa2peJXeoWV5+WTPtRkzQdy3RUCb8iVIA5PMlH0dtKED/Wd 9zKsknJfmb8NJqksmPggZDvLf+bMSN7XNtS3rwdNEVyElloEeRJIWlKaPbR4jrVr2PT2SDCnKes SYEAMacCpneCbFmxO9FQhtW+97M= X-Google-Smtp-Source: AGHT+IFsYHSiiFTmNB7pEYKwqN7LmyvESgmGisHi9uPcT6wi7vp4qO6vSYkBBqsRRkgNdkoxHrI4ww== X-Received: by 2002:a05:6a00:3d10:b0:734:a78:2f36 with SMTP id d2e1a72fcca58-73425cde0d6mr7726805b3a.12.1740177029789; Fri, 21 Feb 2025 14:30:29 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-73262567338sm12684434b3a.49.2025.02.21.14.30.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 14:30:29 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Sebastian Andrzej Siewior , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v8 04/17] zram: remove max_comp_streams device attr Date: Sat, 22 Feb 2025 07:25:35 +0900 Message-ID: <20250221222958.2225035-5-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221222958.2225035-1-senozhatsky@chromium.org> References: <20250221222958.2225035-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: 9a65oy8gqy3aj7f1jh4nfkitq3ucso5d X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: E3C864000B X-HE-Tag: 1740177030-517862 X-HE-Meta: U2FsdGVkX183qeniol6rgzEVPrBjSst8CDq4DQBop4gAaISdR+ALwtTf/DDJuIPPBBIhvBdu0bEwVVf7+oyeXJHUfA9e3GJI/HhR5hvgqmjVaYSV4ohywRdfi+uA9b8TPrm8qGsMPxoWQq8XqVjHDhfDh6pptj9UgfLIUGaeUwSHB5J27nJMsUj/raN4zzLSTQcsGMZFA+/yozPT77/xxXlEABNpyY8riKzFLmR0BOOcaHNRJsgchO4xVKCVvxwcGXHdYG7VmswBeFOhlIimxZjsS1fRNJOE5By1OfuX6U8SYzRO1h5HvUvlqI85114c/6LtFkiOOYBirveGlzhcKuHomkqu2hHCaWUPfJsrXj+BGEGwj7Z6FY9tZnkH3PNwJbLY00R1ShWcxYT5QcWJXY9PrqU+tgL2B6z6dGwLuWz++eU0ZPArBRSu3hXrtPViQ20txVmVf+bUenLbhq1WJ8c+1El/S5OxOGOFvP3W4dv0KMJwLkG7WIXA3rGUeIa8Sfx/Z47gT3MVZ3i7fEYcbzoJcr6LmjbhQw638UMVjofIswYyi1ZiVanB4qipa43LncZshW7L7uadBmvnyO+VOn8LuM//JXvAiS4WG8ujwMA1xx//9u6sdiohIP9syTSQq9nqxx0z4jHPnYIyZtQP+wHijmNW6VN7ora0huJSFUJ/V+SXmzc+ejClD9bjNJM0kX80ZmPpnQqFRo5F5OWVLMctq7ZsL83Ki9G3IjueGvy2YZWGRgc71K8xxPTwX+UniBHqBvATMATZRA4I/gTITFYp7Fpya4+osTM4HVaxRx1HFA4TR3rbFwG2s3Io3hEBI7Oz7V9EnMKdYU3m5FZCrGFDgH/kltUekdjJIUNRLV3XGLAiBLG90Mm4FmHFRiMYXR5aMwww6kRSSL2RsCB1Jex+luwKAoMCEnR/lrsKDInfFdho31l57I37Skd27w5aVZwZGCfA9KRaGzeMN51 eYOYIZOq cVSDnqNW/HWW0DZbTyo/kBjVCIXJt+A2za4HvuMBMCccl+KhC23pW79+LVy9V5j6gq0Rw8Z+I2T/PQO0XdfGKsdVu2IFW7+mgM17C7DHYifXv/anIKvU87h2km+rfmCO69tk1dM1XnNXrLkhW/cbsjDRwjjT5sID2BmLu6kX0H0kTDRBLCJNtRkXROiuxg1+2MpjVzu/Zg/MQvTlehRSjIZBAqEqONiAYQKDDwxc7EY1Jh3mzQICHEdfkrThO8zkDqh8XQ5GFOmjozj6igmcdeReuklZq3feOId2yVB9sGvKARM7LpRYrg/9VzGXK0zFCdHklzgU3tWcUbsFGcF9nHp09Js4dZ1EFrsX2/hPtjC4Lo+PUoVAhiD9H/sPXIMOEgCcq 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: max_comp_streams device attribute has been defunct since May 2016 when zram switched to per-CPU compression streams, remove it. Signed-off-by: Sergey Senozhatsky --- Documentation/ABI/testing/sysfs-block-zram | 8 ----- Documentation/admin-guide/blockdev/zram.rst | 36 ++++++--------------- drivers/block/zram/zram_drv.c | 23 ------------- 3 files changed, 10 insertions(+), 57 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-block-zram b/Documentation/ABI/testing/sysfs-block-zram index 1ef69e0271f9..36c57de0a10a 100644 --- a/Documentation/ABI/testing/sysfs-block-zram +++ b/Documentation/ABI/testing/sysfs-block-zram @@ -22,14 +22,6 @@ Description: device. The reset operation frees all the memory associated with this device. -What: /sys/block/zram/max_comp_streams -Date: February 2014 -Contact: Sergey Senozhatsky -Description: - The max_comp_streams file is read-write and specifies the - number of backend's zcomp_strm compression streams (number of - concurrent compress operations). - What: /sys/block/zram/comp_algorithm Date: February 2014 Contact: Sergey Senozhatsky diff --git a/Documentation/admin-guide/blockdev/zram.rst b/Documentation/admin-guide/blockdev/zram.rst index 714a5171bfc0..7ad4c86f8258 100644 --- a/Documentation/admin-guide/blockdev/zram.rst +++ b/Documentation/admin-guide/blockdev/zram.rst @@ -54,7 +54,7 @@ The list of possible return codes: If you use 'echo', the returned value is set by the 'echo' utility, and, in general case, something like:: - echo 3 > /sys/block/zram0/max_comp_streams + echo foo > /sys/block/zram0/comp_algorithm if [ $? -ne 0 ]; then handle_error fi @@ -73,21 +73,7 @@ This creates 4 devices: /dev/zram{0,1,2,3} num_devices parameter is optional and tells zram how many devices should be pre-created. Default: 1. -2) Set max number of compression streams -======================================== - -Regardless of the value passed to this attribute, ZRAM will always -allocate multiple compression streams - one per online CPU - thus -allowing several concurrent compression operations. The number of -allocated compression streams goes down when some of the CPUs -become offline. There is no single-compression-stream mode anymore, -unless you are running a UP system or have only 1 CPU online. - -To find out how many streams are currently available:: - - cat /sys/block/zram0/max_comp_streams - -3) Select compression algorithm +2) Select compression algorithm =============================== Using comp_algorithm device attribute one can see available and @@ -107,7 +93,7 @@ Examples:: For the time being, the `comp_algorithm` content shows only compression algorithms that are supported by zram. -4) Set compression algorithm parameters: Optional +3) Set compression algorithm parameters: Optional ================================================= Compression algorithms may support specific parameters which can be @@ -138,7 +124,7 @@ better the compression ratio, it even can take negatives values for some algorithms), for other algorithms `level` is acceleration level (the higher the value the lower the compression ratio). -5) Set Disksize +4) Set Disksize =============== Set disk size by writing the value to sysfs node 'disksize'. @@ -158,7 +144,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. -6) Set memory limit: Optional +5) Set memory limit: Optional ============================= Set memory limit by writing the value to sysfs node 'mem_limit'. @@ -177,7 +163,7 @@ Examples:: # To disable memory limit echo 0 > /sys/block/zram0/mem_limit -7) Activate +6) Activate =========== :: @@ -188,7 +174,7 @@ Examples:: mkfs.ext4 /dev/zram1 mount /dev/zram1 /tmp -8) Add/remove zram devices +7) Add/remove zram devices ========================== zram provides a control interface, which enables dynamic (on-demand) device @@ -208,7 +194,7 @@ execute:: echo X > /sys/class/zram-control/hot_remove -9) Stats +8) Stats ======== Per-device statistics are exported as various nodes under /sys/block/zram/ @@ -228,8 +214,6 @@ mem_limit WO specifies the maximum amount of memory ZRAM can writeback_limit WO specifies the maximum amount of write IO zram can write out to backing device as 4KB unit writeback_limit_enable RW show and set writeback_limit feature -max_comp_streams RW the number of possible concurrent compress - operations comp_algorithm RW show and change the compression algorithm algorithm_params WO setup compression algorithm parameters compact WO trigger memory compaction @@ -310,7 +294,7 @@ a single line of text and contains the following stats separated by whitespace: Unit: 4K bytes ============== ============================================================= -10) Deactivate +9) Deactivate ============== :: @@ -318,7 +302,7 @@ a single line of text and contains the following stats separated by whitespace: swapoff /dev/zram0 umount /dev/zram1 -11) Reset +10) Reset ========= Write any positive value to 'reset' sysfs node:: diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index c73d8024f48f..c7bc0c9f3f2f 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1109,27 +1109,6 @@ static void zram_debugfs_register(struct zram *zram) {}; static void zram_debugfs_unregister(struct zram *zram) {}; #endif -/* - * We switched to per-cpu streams and this attr is not needed anymore. - * However, we will keep it around for some time, because: - * a) we may revert per-cpu streams in the future - * b) it's visible to user space and we need to follow our 2 years - * retirement rule; but we already have a number of 'soon to be - * altered' attrs, so max_comp_streams need to wait for the next - * layoff cycle. - */ -static ssize_t max_comp_streams_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - return scnprintf(buf, PAGE_SIZE, "%d\n", num_online_cpus()); -} - -static ssize_t max_comp_streams_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t len) -{ - return len; -} - static void comp_algorithm_set(struct zram *zram, u32 prio, const char *alg) { /* Do not free statically defined compression algorithms */ @@ -2546,7 +2525,6 @@ static DEVICE_ATTR_WO(reset); static DEVICE_ATTR_WO(mem_limit); static DEVICE_ATTR_WO(mem_used_max); static DEVICE_ATTR_WO(idle); -static DEVICE_ATTR_RW(max_comp_streams); static DEVICE_ATTR_RW(comp_algorithm); #ifdef CONFIG_ZRAM_WRITEBACK static DEVICE_ATTR_RW(backing_dev); @@ -2568,7 +2546,6 @@ static struct attribute *zram_disk_attrs[] = { &dev_attr_mem_limit.attr, &dev_attr_mem_used_max.attr, &dev_attr_idle.attr, - &dev_attr_max_comp_streams.attr, &dev_attr_comp_algorithm.attr, #ifdef CONFIG_ZRAM_WRITEBACK &dev_attr_backing_dev.attr,