From patchwork Thu Feb 27 04:35:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13993738 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 2B65AC197BF for ; Thu, 27 Feb 2025 04:37:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AB49328000A; Wed, 26 Feb 2025 23:37:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A635C280005; Wed, 26 Feb 2025 23:37:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8DE1F28000A; Wed, 26 Feb 2025 23:37:18 -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 6E0A4280005 for ; Wed, 26 Feb 2025 23:37:18 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 2C62CA15B5 for ; Thu, 27 Feb 2025 04:37:18 +0000 (UTC) X-FDA: 83164465356.22.1023E57 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by imf23.hostedemail.com (Postfix) with ESMTP id 4EB45140004 for ; Thu, 27 Feb 2025 04:37:16 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=czxF1PRv; spf=pass (imf23.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.181 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=1740631036; 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=zkdYQ64vEruCdUV2Hjk4Cody4qJgi72PfTkPf6ILG94=; b=sYjZAFqFaCelzEdPeGzXdVAF5ZcZ2MV9HVhUM+WmWmv3ba3KJ7H+EvO8EU893ZHxwk7x3B Zv79k3TV0bXsNt1VXl5IrV71kHehoazVSvH++HH+e6XW4WpOQxy5Akous98R83gMBie0uQ eqTRpxHTweV1RdTFLzLgFiGOEEn+/Fk= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=czxF1PRv; spf=pass (imf23.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.181 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=1740631036; a=rsa-sha256; cv=none; b=JmrjoVe3gJhbLKHbPSW84QjVdBHXJOVqFERCmn3l4r90xShCyYkGF8CIkKfxrcPy/4jMC4 r6NXAkulW5zf6I4AeDcBW86J79wEPc+kyBew8TdIm7X60kdf1++6NxHMw9lOC2QrONvJQ0 ImqyU4QL3hg1zkfPASX3jFQO1mdizbU= Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-219f8263ae0so8209315ad.0 for ; Wed, 26 Feb 2025 20:37:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631035; x=1741235835; 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=zkdYQ64vEruCdUV2Hjk4Cody4qJgi72PfTkPf6ILG94=; b=czxF1PRvtXqu1OpfgQsR3YB+OorFbQSgtRxiL99cFi7ot1xen+tdEKbPPyFN0dhHeE LMyFKQFDYCAuoDTuQYY4H0Qh1cS7nHrAPYbHP8RZGev6lcSl9sCIad+Jd8cGe+UzRr0W 5wgt+ZFps2e9c5F9ahi56Um/gEZcaGA4FncgA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631035; x=1741235835; 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=zkdYQ64vEruCdUV2Hjk4Cody4qJgi72PfTkPf6ILG94=; b=MoI7PPepFVr9T+wdv9KRJcgXsbDshM04NbwgTcYdg6KF2hNX8tQjzHO6a5ZmzM8u7p kbxdg4DLPYlz6NJ9VvIukQlacZFguFzsDognkqaygcU1ruleIWGM+o6ilwWSgefEI3Fc PvLCtgm4alWmOpXU3vZU179KER2Zd9dv6ZrXL0sPT1e7xvpZ+F/cxNHwAPwCVWRwbAMf OFKEgYeDFBeeIO8wkHkUjpaD0PvnEKMJg7WxC8nuy0Z6Vh9aSwW4wEHJGdprK7o10FWm mSMBB4PN53fbMe0aL/bReq5FxaupqiL8b5xHWcA/BMCBEryXoE2Tn2d67RiFP1DpaIc1 AHEA== X-Forwarded-Encrypted: i=1; AJvYcCU3yiH9/OCse984X+1ODiDokVh5kbc7KJc7gvju0Y6WIlC2/kWaoj1UMORPLltrEyiGmY+E/AsMcQ==@kvack.org X-Gm-Message-State: AOJu0YwqMBOdoYf5y65wJjNKcpRRd7MsKIrLBMSHg926kzVHjZNWJML3 u0rvnNWsYDqdhRuEmzypxLVmXdy13x6FGG/+fXezORc3OBCl7AyWgJslr/tneA== X-Gm-Gg: ASbGncvVxjUGoRTwW/r98GSs3xqb2mrYUvkmMtOzvFCYisNmSFC6EoNjHdTKaVeyKv8 n2ja+wYSOHPFHXY2GjFWt2SO1Wi751//mZAAD1ZiVxsyGPLQjA+/nMCS2tge80Mv8U15VMUq5px hDReHfKv77yBghJjdFo+QcIkcdycvVOaMB0ZJwyQBqvMZoN0mTdYjjy+eIdSIv0EFZXvrjw/2RJ HCrxrtM1Wp9mpjS3EAYbL/bzJ7cDpqCFGmhVxRxzqpdUyRLPq7cMaHu9VlxuOevIEBjrA+pIgj1 gr7ElOEHsICZUBYew5LiaC4EG3xv X-Google-Smtp-Source: AGHT+IG7ihHLtTFv8mxg66ATtd7LlmNyi9F2oOAdH3uY5mBvX7qlHeuZ1UTku6FwKKmo5fi5m1btJw== X-Received: by 2002:a17:902:f681:b0:220:cd9f:a180 with SMTP id d9443c01a7336-221a11db956mr390915765ad.53.1740631035318; Wed, 26 Feb 2025 20:37:15 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-223501f98a3sm5049295ad.63.2025.02.26.20.37.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:37:14 -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 v9 08/19] zram: limit max recompress prio to num_active_comps Date: Thu, 27 Feb 2025 13:35:26 +0900 Message-ID: <20250227043618.88380-9-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.658.g4767266eb4-goog In-Reply-To: <20250227043618.88380-1-senozhatsky@chromium.org> References: <20250227043618.88380-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 4EB45140004 X-Stat-Signature: zqwiq78g4x6rqgfwe3s6moudg73iojde X-Rspam-User: X-HE-Tag: 1740631036-895312 X-HE-Meta: U2FsdGVkX1+Yf+A799NiJn0gwE79iQQnHLNAGjr/uja1WIwpWLd4WMPP0AL5a2qUiI3LRqM6QhSqqxsaYd5UV0YybkZE6tEKf6mrR5DPgUUeaWOIDACb1hfeVGyBgHGHCfTScp9gDn0NyqelTqwdOpayVPKOxlW6DVyAOVAuPl0ir0SDcS0euF7C/NBFP08RCUeUkEz2xIn7LQUxQo80OkYv5CqVMyZI0TQLP5PkokvQNUUBNjr2Y18q7LxvaMSl2TPeJfNGT4idGe1EMXAKUxObzkhqrqRZAMHV61sKDqDX3nJPtmU0TU94vDF/7Yn3/Jy2/nduhMWqz9QXcqa0JTY2v9G3qalAELUMO+IP/7Jm+tlIeZpluH3SwDvm7c9aqaV8XJ6VBE/rKAxCKxaXj0zY/crK4v1yKOprnKXOruzt6ZnmkN/hBe795DeQ0vIwLc+B+2Etu/jSJ2XOPlYz06/Pj3rabkUJWVGFBRJUfT4BEVsra++4QmXlsw6yVGXw9wrb///nqiR6vQCNc2PzV+/qp0LlzsiiokJSs/Pl6JEfmgXojLyp5J3Gqwq3PSDQJ0jo8NzSnfVI2AVmmWmjfEzNV6jAhRGY5ql6yHex8PcrOHZqdm+WlzXxo4S7etiIXNZTSvlPssQwzJ+KmsYlIDSzpWD1U4/2OGh+rQe8F/huib0AC/VPnHt1X0pYSfokKv2udDJgkDLfMaGfjCp3aN8uXcgWQD2NsAM7Hc8V6yL98KCKDcWcAE6KPCQyE1+R35Sn1QG9xIQ7+1kMducQswCSsY3ig2Tk4RaNOwDAiahQGhKmUQKgzl9xxvZE9X6sMMia9T+jFAcFRK72NGDfyHSoRRosaNDtqpCaL9O835guA7clacerpX5YG6cQbohS90zHD+JxGJXq63J/QUc3SNiZn00yugFjmJ2KHZL+EIyChuehpDWsmNU1+YcAO7vvO6ehxc1wHXWNkVNtpcm kodcEy4/ voVY9O3dUt+u3ik7tMAD/heORl3WmKmkY/83IGY7/7CivJqCVxvZECDFyG0459Au5C3t5S6XTqhCENC7Xkex8gwM1D3CsXiWB5hP96j6fbPa9KZRlNq/EXY6w+hHfxSGDpTl9KJrS7x6ussR6M0pk9qQp09pI9g1K0IkO6Cx4/4hKj2BOeOvLPNAYwEObAd12Y4v/KRua85UntXOEgEY79MODPrFVyiTy/XX1aoAJpxLTybsp3vgfvxHYWbJSCJAY2NQaZ9BSv+EUEj2hb/RoLl6LDwXnFrwXhpKlYbVMr6SQQFm0a+EbWGE91/3HSB22S/8QJ2dZgNX2WwCqPYWA0sSAnWvUxm4QORbZ8zL/Mom6evo= 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 6266884de1d0..12b99a557667 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -2027,16 +2027,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); @@ -2089,7 +2092,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; } } @@ -2117,7 +2120,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; } @@ -2129,6 +2132,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;