From nobody Fri Dec 19 20:00:38 2025 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6B29188704 for ; Fri, 14 Feb 2025 04:52:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739508779; cv=none; b=iBjM1cLG3ssdUL1m2lnflHC5lihGi5XFssRFNZtLrfmLWOvBEYrac6nD/aMRr7T2ZRyZA87AP5larC5vyCOdN+u0hMf/c07071upU/tBYjELBZRhl/mj4xWDZ/ACI2avRqT4n21q8II8mT2KXxlDsQHfIkqD+kkYPlYXvxdNp/g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739508779; c=relaxed/simple; bh=o6yg0Rm1JkZpxLVpaNCkKzt7lYA5VMorFqotjBdLMOk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K6coBTOnxPofD7yudzsdzpv3uIhV/xDaW7m9MEgSVESOFHUom96BdcaDCeogsKrnGr6zMl/R3eIAOAbsii/l1hFM+n2aE9fyoxVcShSALNhYU6puKfahl3iiMg89Njz/ixTssrKkCbyIGra6ixDtPEAF7eB/OD6HP5nj5JJDkdI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=balfzeqK; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="balfzeqK" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-21f7f1e1194so41043555ad.2 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=vger.kernel.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=balfzeqK/iy8QgMIeJHdbvjJEfrMMPBrmacnt24lAuIrTNIJ5gc3920EwptazJ3q/M sHkMeSmgof2y62da/odHp/wr2cjXfwdU7eG+oeicE+yS8IVXrMStfTry/V5CDUuVh/WU iHic7JpedPWbw/mU8iFlx4OtPkxSj6dehuiXM= 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=Evkk7eFTobXRAZVuWMnp+xIicpwfN7o11By+z9ShOHjhoo69RAxbkYNyPcZem0ZkM/ pC6esMwM16WDE82oItA/Kz6EM5oUM+ycVagY2ZmXyOPtRz24E+93J9zr6ntuQbfuDLTe lR5jQ9aHvuXsg84tTcTVcKgEbkLzE/05gnIutypjaWP3bAF0sMVT+MSu/38veer5JP+V ipEdPXorYpEY6GLL18NC2lMTsVEOPB4tG1aiMsImK5M5I7jQc/QAyZf4e1u3fFygQR0g q91Ng9qZdNt0Pt11MO1V3dhbY8e7NWQdNrohaZyTMi03OOYfbUBviqoI2PbL5yLKdKRE Km2A== X-Forwarded-Encrypted: i=1; AJvYcCULGj9QOhxLDoeobUvMeatYUS2+NQtXzfBXmKR0/+0qBpTWwgs0RTutXWlh2QBgs5OSMF+WxqnrqjqN4ZQ=@vger.kernel.org X-Gm-Message-State: AOJu0Ywlv9ftW1xxsstHg2rfaCyrLMLWPP8G0RJuf1l9ryCKU6nxrODG BudeDRQVL9HFNqyRd8ETdMAGUawa//2A/l8aI7afIUk7wld4zQgekJ51YCH0Sw== X-Gm-Gg: ASbGncsx4u1/+kwMtOsL6MBua9Rgczf+LXBzciZIx/3qzcYGF0AHwmEqXK9i8Ft0qvz vQfRiA7/eEV2HRh/rnJjXOQrLEeBY5JWB841ztE95h/mCnRov8Ma59yOj+7lZT33FGKQBeS5KI7 SDx3mtu+JKY62M8FdKIKDDbw6kF3zEi0TWJAOztSkMEfMcWBFoJx3KzTKiptN1tJVT+XZ0YhZnW Xm7UeZB7Oh9lufx5O2wVel0KTtMt7J3U1eMQdNuozIb9N6U/+1rV9Ca6teof7dgNrhzVGYZf1X+ eBEqvxKgNCpyiFS2jw== 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 =3D ZRAM_SECONDARY_COMP, prio_max =3D ZRAM_MAX_COMPS; struct zram *zram =3D dev_to_zram(dev); char *args, *param, *val, *algo =3D NULL; u64 num_recomp_pages =3D ULLONG_MAX; struct zram_pp_ctl *ctl =3D NULL; struct zram_pp_slot *pps; u32 mode =3D 0, threshold =3D 0; + u32 prio, prio_max; struct page *page; ssize_t ret; =20 + prio =3D ZRAM_SECONDARY_COMP; + prio_max =3D zram->num_active_comps; + args =3D skip_spaces(buf); while (*args) { args =3D next_arg(args, ¶m, &val); @@ -2130,7 +2133,7 @@ static ssize_t recompress_store(struct device *dev, if (prio =3D=3D ZRAM_PRIMARY_COMP) prio =3D ZRAM_SECONDARY_COMP; =20 - prio_max =3D min(prio + 1, ZRAM_MAX_COMPS); + prio_max =3D prio + 1; continue; } } @@ -2158,7 +2161,7 @@ static ssize_t recompress_store(struct device *dev, continue; =20 if (!strcmp(zram->comp_algs[prio], algo)) { - prio_max =3D min(prio + 1, ZRAM_MAX_COMPS); + prio_max =3D prio + 1; found =3D true; break; } @@ -2170,6 +2173,12 @@ static ssize_t recompress_store(struct device *dev, } } =20 + prio_max =3D min(prio_max, (u32)zram->num_active_comps); + if (prio >=3D prio_max) { + ret =3D -EINVAL; + goto release_init_lock; + } + page =3D alloc_page(GFP_KERNEL); if (!page) { ret =3D -ENOMEM; --=20 2.48.1.601.g30ceb7b040-goog