From patchwork Fri Feb 14 04:50:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13974469 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 1871DC021A4 for ; Fri, 14 Feb 2025 04:53:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9CEC86B009A; Thu, 13 Feb 2025 23:53:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 958996B009B; Thu, 13 Feb 2025 23:53:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7D1EE280001; Thu, 13 Feb 2025 23:53:00 -0500 (EST) 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 5DEDE6B009A for ; Thu, 13 Feb 2025 23:53:00 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 11594161D25 for ; Fri, 14 Feb 2025 04:53:00 +0000 (UTC) X-FDA: 83117330520.13.CD62034 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf23.hostedemail.com (Postfix) with ESMTP id 31850140005 for ; Fri, 14 Feb 2025 04:52:58 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=j6UEszKl; spf=pass (imf23.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.173 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=1739508778; 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=gJYj+/a+/IqgLXusoRYSgVepNrwhE22l9CBy17XcMXs=; b=2QrsmyfW237wqqYD5NqwzvqqPc7W5YdHQMyxscU56v2fhy9oWcRshWVNn2mwC3A4rvvjuL eEwy8OYi4KJ6XPX8dwfLz2aMxrwlUI6V7VFK6S3B0ztPnZgPs67u6E1ciS6nifXWfVl5fl h2jkFK/GAQfMu1d/qtFTtQ3PszQEH1U= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=j6UEszKl; spf=pass (imf23.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.173 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=1739508778; a=rsa-sha256; cv=none; b=c5CVnHAHilSUURx/aqyHmdd85RLQe+S1dXRu6RnVehEv6ibEExMyBIWQBKDdcAKPRncNs6 r87TYCPMBIA+Ru3gQbJSp20nvPw6BXdo9fcae9ULeKQSBH39MNdGnk3qeyUgKfFQGaDMYI v+5uig9OpHrawMyGb3OS7dfnTgUuy+g= Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-21f3c119fe6so39151105ad.0 for ; Thu, 13 Feb 2025 20:52:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1739508777; x=1740113577; 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=gJYj+/a+/IqgLXusoRYSgVepNrwhE22l9CBy17XcMXs=; b=j6UEszKldFKs6stUpAgruOhaitJGz/Iut9o6GupOyFEwE466maH6/YGis05zPwCQ0H DHcB4WEYcMvoJK+uGbScBMa9FIeNTCmxpCYO/LdCmWqGpVt5UUPgbbk+qslnYKl8huig LDIB1lDr1vik3wKvPRDWNBDOhQ1dybIN2XeB0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739508777; x=1740113577; 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=gJYj+/a+/IqgLXusoRYSgVepNrwhE22l9CBy17XcMXs=; b=afhFStSZg7FeiqroZeQqN93pTAtxXRH0P/1ZNRiX83IeFNiZhWp2W0WH6mVkX6AYnU ckNJ7cUsZk7EyG+rG+G9VPbbO8jZw7JkNuM1ChRqe5IkLRbVePeAXfIdaePJQKiGoSVg 8z9ktXBStS9k5+5sXXM4LJZ4ITm+z/xoLvhw5r8b+XUX0yHFuORaxNQg3RVUBsgT41fd 5Uf1I4BgfCVw2PBdatwe+nC1wGDQFGFhToMnNqIByeDFCAsoaOAJijwxOiki7KaUyAfX 7iiNWikvzyY0LUNxMBKbAFxilJN+M3kQZtNOyZoP9t8qxJgHzgyXuNbfK5IByR+Ur/gZ pkFg== X-Forwarded-Encrypted: i=1; AJvYcCWrDlOnOYcnzLefY0iw2S7KGgGhY72OFYpPoLYq9yOoTJiMFL+Cs0drc0AaXTSqFBlKjTC7P+wq9w==@kvack.org X-Gm-Message-State: AOJu0YwIcVY5mxXVokMaTgP8Spq6FkzcFeV3mTeEPMAWDI8h6Tg0j65l RtbS4599wXTBWwyj8BMNpLBTTg5nV6dgndwX/abm5bxu7tSSQb4M2lonFo8Wgg== X-Gm-Gg: ASbGncuATu4SJhgDdH4L7C/fGQAnkwfy/C6TWYJZTlkKnoVBpILtBY3AnOXBRK4GtR4 FJsmeiJdKqNQ5dDslBpWQiKjNjMWCDcK6Y8ZWPVzHhYnc+nKLtvSb+Qfxsw6Nv4tFTpZ6Abl9NK qCWXdp7NvYJtTnHba4f3UmI5UIouQhAnguX+fwcicVgznveAQnDBipYVtIUVUoWE0beEwkohgMS iuSui32GbeNLWLsu52h5niHlUKIYxywMqa8BcewI2RDpdwNoFJZKn6g4GjmRiH6q3UscA2wl3j5 13V+7bVl6TQyTydaWQ== X-Google-Smtp-Source: AGHT+IFt4PulwuqoCTMVnGkv5xAvCqNUHqsd70C5Y0GLWGm62Ls+ETbNspIM52jswK714tvw53XBug== X-Received: by 2002:a17:902:f68b:b0:21f:1096:7d5 with SMTP id d9443c01a7336-220bbb209camr155241455ad.17.1739508777155; Thu, 13 Feb 2025 20:52:57 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:942d:9291:22aa:8126]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-220d558591asm20952015ad.224.2025.02.13.20.52.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Feb 2025 20:52:56 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Hillf Danton , Kairui Song , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v6 07/17] zram: limit max recompress prio to num_active_comps Date: Fri, 14 Feb 2025 13:50:19 +0900 Message-ID: <20250214045208.1388854-8-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250214045208.1388854-1-senozhatsky@chromium.org> References: <20250214045208.1388854-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 31850140005 X-Stat-Signature: qrdgiqpwndr47i4xkyszhsnd1zmktoys X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1739508778-940154 X-HE-Meta: U2FsdGVkX1/+w8cPFhzy0JykAa2ijReqB5Tachtykvs/VcftR4J4QiYsUj6isPtspxut+vUjSk+6AQN7Ijk5Pok89PCXFOx447MB3BJa++1NMuBMbni4oljHD8xE9TU3jIRqcgo+uQBUruAJAnPtnQZd8ZVX8qAqkncwJu/WazglPjI9xjCh1K5Bp21thv8aeVoqfktRiJYfJnIwVHRy6odTeY8bUSyPnq9/zK6yXU8rj4nGSC0MSrjNhAJzHB0lFE97s7DtFwwyVXJK19yDtD9ZJCqUvl6xCw9b+4imHMn3Hi71VmG17sJrnbr6HORMqkGQ1YvN+2+M5hgKA56L1vj7ZDeL6p86lBsZtEkZvG+rePHYONwyOIlrl+glxPL5dzzEiaVlIStn2QasnldO3VQljzLOAd2i3OqVFFsS0hRLFmio0KUVu9eqFv/TzcQyCsbLGDhwdXJ5A291dGmr11Ec+Lk+vq7bo6v3NWHq2AOdP/TSmKIiTLmt2k/aJfOxYz9CjJ9zkb5n48nN+rJb80HJkhv2PtN4qPMb9ll9yo1r63AYnZ47Z1yxEf4kxfFJ2BnmnWqFbpF/0WAnjsWFiVqQp+VrAgUR2sXnjB/ayK2i4MsxeqrmJwNiFuFLlmaQZa+4Uge92SgKXdH9clU4s5SOdkgqrV+aOeMoZjdmM0lUk0ROUr2ppbPL20SPY+tWC1COCUiWD6IsGdhKi/ZVyLLa+LSeI7zUqx/oJMtL8HGLLeard1qKg7JNIz0WdvfF9hALJ/2a5POCjL2rn9+Zj2FI67GsKWYH94hH1MtZ43deHon8lOujnIbxKECXXCd7s9M1CyThiC0VY7GikYfu+Y95FTPskzCGepins40j95w++0NcZUOD+w5fHLhEh6nRVopqea9QTFhrApYssB6doxzdz1Ma5rgnhi++Pa43q8DWgDncV2++MNMQ2zqImN2QwSpCS6qYoidaID8qIUj jldqOtIk BFEgGmaB3+bKViZukyLKxma9wqvUe5AfNFhtZiGFcITxenqe9Zra64ZVrkxYHMWdNfIDzlBKx0dRw4DOkj/m5D4BAMhKtC3iVO1AIP06SNNOijSdLf5KK6J0UENTqIBtJp2FLvjZdWteZXWjqx2o9j+fOZ7WWnXpfGkZQzL3j86HSqkvfPBd2U8satOIkbmm0kO2Bppxme7exLP4Vfza5FkbIZEjgOauC+Ee4KFEoWB3/1bBvYOvNQetdCTNJRZHGVGLX0x8xiTb8e0bQ0vNCQ6K8wN3lKoSH5JhAlRNOM0j9+iD3a6VdCypUZeMwBbOoZo+i1preYzqaeN46H1E5Qt7F8zPqXV3/vNZIM6Bf+0Xph4o= 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 c28e1b97bf92..c11ed2dc23aa 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -2068,16 +2068,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); @@ -2130,7 +2133,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; } } @@ -2158,7 +2161,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; } @@ -2170,6 +2173,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;