From patchwork Fri Feb 21 22:25:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13986384 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 F3921C021B3 for ; Fri, 21 Feb 2025 22:30:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 87140280007; Fri, 21 Feb 2025 17:30:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 81F60280004; Fri, 21 Feb 2025 17:30:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6BFAF280007; Fri, 21 Feb 2025 17:30:49 -0500 (EST) 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 4CE09280004 for ; Fri, 21 Feb 2025 17:30:49 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id D3252120891 for ; Fri, 21 Feb 2025 22:30:48 +0000 (UTC) X-FDA: 83145397776.05.EA9264A Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by imf27.hostedemail.com (Postfix) with ESMTP id D887A4000C for ; Fri, 21 Feb 2025 22:30:46 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=L8B0JbJN; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf27.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.170 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740177047; a=rsa-sha256; cv=none; b=GMZX/ufA/4SpgD3B3r+RdwbaO7eA3Rp3vooz/LBMUkfyZFhGQi10Cw8G4HNyPZOYgoo+bE EOQx5QcBzbRdTYH9R8rR9zmUGVXiKU19FO6t5lZtCGKzcV4yGjfYxn8kcRivbNWevXdX5D jUDnwDgMdgCMbuCHtZH4rR1gj4KWDN4= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=L8B0JbJN; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf27.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.170 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=1740177047; 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=jkJ2PKd3dLF29fHM+CjpZmmQFILFLiIANo+kf0KnLBg=; b=EhtDM629bUp3DTThOwMrlj/1/NC23n3zgDX0gz8Rarsu1E7Yw/zzHrF1iggzjOMHLKiIak Amro/wnjdsygwFEqu2IwrvRSRAm+QTUn1Z18Pbbf/wj6b+ESngQL3rNDkCfugk8ya1p2wd n9CgV3Qgo/i6NOVh7Fqyc/aPGDhbZJo= Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-22104c4de96so47045795ad.3 for ; Fri, 21 Feb 2025 14:30:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740177046; x=1740781846; 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=jkJ2PKd3dLF29fHM+CjpZmmQFILFLiIANo+kf0KnLBg=; b=L8B0JbJN0AssstmZAa/DCYipg6ro0y1qVj8cVww5elZ6foeasE6dzH1v5sIV0xfLEo MZERy4lI9iN3tBS9iXNidsqFd9JkT/LU430NNNjQv4Fy0Hbag1hKObpQdx0mMxi2Ff6X qUzncqx0vX6H9LSCCHi2bEMfOXT4nH25gTiNA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740177046; x=1740781846; 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=jkJ2PKd3dLF29fHM+CjpZmmQFILFLiIANo+kf0KnLBg=; b=ey/BX8d97+4hEMnbKgm5S4sdnDvA9dbWvyynV+4zMpXbyLpAxqeY3yB3MUCUQe4dT9 JG3bX7frzHKCorKkyA9OFBXwyItgBgR/ee2ctgPVCW3vyZ7BEeR4RxCnR5BHHCGUdxvd QdQsCErLCfH79lIF/DxmItoUlsb6ErVnIsG1YVIEg3H3s4fYLb0zk95Jx8Uyb0S7kZf5 1P9hxZ2crmPHPrpexnMZ5JeUuvPat7WqRVzIKOQ2dX7AUB/tBcu30fJMkGe6EaDPKEbZ caxeK0oJ7llBRsi+CPjRGI7KFM6v9oqG4ji7OjjbCS5KOec2XbZqWiaAIJinYmIgRPOa QiCw== X-Forwarded-Encrypted: i=1; AJvYcCWP7k7ZsQb9LDMniiekYJgIAlnD6XUbFTPnImLG3+pxmYs6FCmbQZy/FrMd8Z6lLzjXF2H4e7Dc+A==@kvack.org X-Gm-Message-State: AOJu0Yx0v+YcG+gbtpRmv76nwPVX78kmRKv/79nCRbxVWnV6mtczBYvo GwzKk+bGP5ACZIdOi/M0x5vAbGlL4rQ/Qo93XC8tbUMwrDQjOOlIeHAdfuFTfg== X-Gm-Gg: ASbGnctdPnJH0HiBnG6kVWHZg2Umnor5/O5C3c0AaxtWcOE4bX6RNazQBy+OJtyVMgc 7Y6YyJflEfqynS0wtsj3/izjznSApGDGBsPaNPuvhnVGnA22WfDJksNiD4DVLR9nXpRsScut2gI FhKxpcFu5801L4ZLj19oqIbx0dZp6ZJflKgxW2VDmUQNLnlI9kGXofUzYTlfdOMifoccg7Jl4Tw B6Fr/1NMYnthIST1e23eeG+l4JRIbwtif1alURma/Vbh2PeZRsvJh8dZQj9W0S9vBDQFsMwvlcH EuQQmWuqebCC4gmMTdV4P0dSEJM= X-Google-Smtp-Source: AGHT+IGqcuXdJ7OX1zr/wKQrluVdfXffpe/y2wZBMPKg94p0xgvFz73ixWr3hQi6scgLb0vWrXTzXA== X-Received: by 2002:a17:902:f644:b0:216:6769:9eca with SMTP id d9443c01a7336-2219ffddf80mr74177035ad.37.1740177045827; Fri, 21 Feb 2025 14:30:45 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-220d55963c0sm140523665ad.251.2025.02.21.14.30.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 14:30:45 -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 07/17] zram: limit max recompress prio to num_active_comps Date: Sat, 22 Feb 2025 07:25:38 +0900 Message-ID: <20250221222958.2225035-8-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-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: D887A4000C X-Stat-Signature: qgrqhpn17z6xnsm1d3fq4ow45wkh4pra X-Rspam-User: X-HE-Tag: 1740177046-105059 X-HE-Meta: U2FsdGVkX1/x0HymHt8G5B3zATQNyJIGxribLI/H3MGwSo6G5mBHNC2D3UNgFszBcDx+m+z2isqHIJ1BhmdulM88Lw1injoiAuvXovM2+rcOOuzNXYuediDUA9zfUzqw7gZjBOrSyC0S8oUBFc0up6CZsmyG4FMZX0SLV9zKQbVRIeHhFZrZUgEE1Z9md9GdchhFH6+gpgFz0AYrRDWdeb51AsXo1KG7iX3pOHnS6qAQP6JpPC5ltqXOd+g/WSK8ZFSCd5PqIoTtLmEMGMSNlaXEVBADijlO+AiUCUP/3smnLIlQyPeDQuQdJlkbWdSPPzkJG1qljsXrOzSaAwpZsfFeunIUVz7OIb7whQBRxH1DRx2iza62cyNBF93Su0NLAmxvj0Uq9MHlGCYtVhGAePLeoTHLecOw3HNePveD0hycy4NQJHzxiifyfkf4trz0RFGiT0foRkXNLbaNxP3RcaiOblP45UBOOqiUbq3LL3Hw4DIxmCOyEyBllnL0GautF8IVYyRXKs9rr+Ri6V1aIFlpb9owjx7YexG/eKxYTWAhb3aILeZqrJAkrdxUHj9x8u7AvoFzWRoBmfi9ps1Hi4/YUczzUVf6cTxNiAMwlewxp+NtFv/+Gy+7fHlfSRoy08j3n0awLUPxzxcc5PFrl+4Eqjfx/E9uEAJy1HR7T8YhO8kSjN1LfThflM/1wKtRmx0otC619zS23R7y2I1M/YOmas42LTVi8qwhsoLE7NC/1cbZpacPl3g/5sTY5Li/3LCo24qW+E4zN2+2XEYftMNPITEvn/5IG9T+bN5yewtGEqK+w6dnn4mRiqw+5Bpp7K00YXbX5M8PJyKH5k/Ujm0imuf8o1i/sNFmifiX7E6fQVlZAXsRcDw4VXiiT3FXXT9MjgF0Es89pO1DZwcbWFH5ZsfiXPOHBsQuTgQvRHlVuY5Yb8K/e1d7qgf1Y+0jETMrzpbzcJfkWRkt6HP Zd8sVIBK Jjzs/+8R7Nuw4jQM1lJkE5vQQlgUsp7nI5+EOlrfNvpQbk08WhyV8IGzSNhV76kVd5iTqr13h0hklBoLJtkFm0lBk7aKztp5jLyjEpSxaK+shIbfwVdT0iEHVY+J66xy49eGFLaViW0SOcKUphjn+5j5FrOhbOr2RFb9BRUXoG2xJfh+2QnztiO8+C/WTSeGJ4xFsbAejI6XGBTWOiWD8f1CxPnJiyR3VWEL0lvShaTaZ4YMYKD5lxEUaOxnW20dYMoXz1I3O72rKOE8Xdx6hokzXKPVuPhSJN8Hodq77MkPz/0ueLsynWv5yrMEA/xXMaUxFwnPgDE+ATMipdf93olb14C0CZIiy9NnnmU0J9DTw1iI= 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: Use the actual number of algorithms zram was configure with instead of theoretical limit of ZRAM_MAX_COMPS. Also make sure that min prio is not above max prio. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 710b10c6e336..b32b959046af 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -2031,16 +2031,19 @@ static ssize_t recompress_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t len) { - u32 prio = ZRAM_SECONDARY_COMP, prio_max = ZRAM_MAX_COMPS; struct zram *zram = dev_to_zram(dev); char *args, *param, *val, *algo = NULL; u64 num_recomp_pages = ULLONG_MAX; struct zram_pp_ctl *ctl = NULL; struct zram_pp_slot *pps; u32 mode = 0, threshold = 0; + u32 prio, prio_max; struct page *page; ssize_t ret; + prio = ZRAM_SECONDARY_COMP; + prio_max = zram->num_active_comps; + args = skip_spaces(buf); while (*args) { args = next_arg(args, ¶m, &val); @@ -2093,7 +2096,7 @@ static ssize_t recompress_store(struct device *dev, if (prio == ZRAM_PRIMARY_COMP) prio = ZRAM_SECONDARY_COMP; - prio_max = min(prio + 1, ZRAM_MAX_COMPS); + prio_max = prio + 1; continue; } } @@ -2121,7 +2124,7 @@ static ssize_t recompress_store(struct device *dev, continue; if (!strcmp(zram->comp_algs[prio], algo)) { - prio_max = min(prio + 1, ZRAM_MAX_COMPS); + prio_max = prio + 1; found = true; break; } @@ -2133,6 +2136,12 @@ static ssize_t recompress_store(struct device *dev, } } + prio_max = min(prio_max, (u32)zram->num_active_comps); + if (prio >= prio_max) { + ret = -EINVAL; + goto release_init_lock; + } + page = alloc_page(GFP_KERNEL); if (!page) { ret = -ENOMEM;