From patchwork Fri Feb 21 09:38:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13985083 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 A54EFC021AA for ; Fri, 21 Feb 2025 09:39:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 39EBB280006; Fri, 21 Feb 2025 04:39:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 34F08280004; Fri, 21 Feb 2025 04:39:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2168E280006; Fri, 21 Feb 2025 04:39:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 02B4D280004 for ; Fri, 21 Feb 2025 04:39:24 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id AEFFBB20B7 for ; Fri, 21 Feb 2025 09:39:24 +0000 (UTC) X-FDA: 83143453848.11.E97FB3A Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by imf21.hostedemail.com (Postfix) with ESMTP id D11071C0008 for ; Fri, 21 Feb 2025 09:39:22 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=RzymTe55; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf21.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.52 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740130762; a=rsa-sha256; cv=none; b=qt6VxR2q5rGD1ZQ6WuU3j/BP2RPh5R9E7yiwlnyRgmbHnBGlb9ANxYf8vSILHvcUrNwIjS 4P8ZCRlnVhkd6i1es9YrWsV5asLvF3n/2ENj5RZu2O8/YcKo//xawYAoeKkVEr88R8f+nl nr1IMRisMre+n4KUyS1q5wIIIwwdlIM= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=RzymTe55; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf21.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.52 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=1740130762; 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=YiO1FosDR2lrWYSluoJ0c1MfeSV2ozE15nkpwKYw8aM=; b=dNUSe3ySOCnb1eHDlp36y3mfSNxNssaAHiszFxroQgxhyx0egGdwAaYTiSTChi2WZVH9fH 8S0WH9hM5IdGcULx5BW85CUSYJDlq3PVGco5bKs4ha6fC1L3anFzGdHZNC6eA6eF6fKOh1 8JpKXVAQHsPsnnSSWf6sk0DgqSXSzDM= Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-2fa5af6d743so3036803a91.3 for ; Fri, 21 Feb 2025 01:39:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740130762; x=1740735562; 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=YiO1FosDR2lrWYSluoJ0c1MfeSV2ozE15nkpwKYw8aM=; b=RzymTe55e0f4TU34TqtLnBbJn1l3YN7IORsQEZ5KDISBZEtAWN+JZngXS3xFZs/vmx P3gBElQfzTYdBZDzdEL9FNqtRpJ5awMuEROFeIctFjTKNvmnZ9CRVrPjXVzqAKL6c5tm VEA/jWvNBYKgWnxbbeFSeSMDlJfzDItDxz4ys= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740130762; x=1740735562; 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=YiO1FosDR2lrWYSluoJ0c1MfeSV2ozE15nkpwKYw8aM=; b=Lsu5d46/A2QOMB7DujRoUdqFFYZLQkU0Gr4CXwqj37Fhk0I+W9euMxsK+JNoyQSvH/ ZKkZygKklw1i7BRUqqUpBJ9dJmvrExss4J8fTY/GgVVZ5MXMqkOoR/mm7K6UENcleAW8 Jj9uWGw9Is+6ZH6mZe8ghWvGm5V0Z9sN2dKPzMRE4YqDZoAM+0G32D+81wLduSrwyVK/ GWZhEwa4TUG7r/gjrWNhKDz720nkFkQVtp7G+1V5OxSXb1JvHEMHcDXz64UW5ndGrE5E Hee8mRYkXKzzQEe4OqQF3ruEABGcSMM4VQRwdfia1snb6E6Spp3/ghYNYpub/1dPkxxj Abtg== X-Forwarded-Encrypted: i=1; AJvYcCXLJHTjZJ4+ma6iArhOZanmWRyx9qWqCMVSp/HrycYwMOZs8AtwRmChsZhGWT4OU6GjAn53Ekub3w==@kvack.org X-Gm-Message-State: AOJu0YzthnByMDlkZhJQDUkwoCmN16W1e6O1+12R0GEpOJUNAgoUokfO t2P7ETez4PjyFGmaX6IM1r0PSCBHDiifO6b0sO6wpv2TtVmRu2nmigHe74vurQ== X-Gm-Gg: ASbGncvl/6EMmxI/iqnDbVBgN0W2gczpv3+Uy8GOzt4caiqx53phS6wONcrxhPPlYK/ 6sVntAlcTiT4P9ZDWZc0fZMTneekFIT2HnJVwf6cQ2P1phaMgiB4+Yh97DNjWgQ+V6BWHvQcf78 YQFvtBOKAN+ER7C60Fx/2WXjY6eo2jjeIyUyq4Fx3HC1Z46c7H1R+UQEE721IFX5pM4xL74Ly6k 8e+w0BcyT2FPSql70bIB6VXLnWLMa69MQBox2JnvZ9OGX0D/mhwbSbxXjOVmwRLGny2BtCODwNa tmrQdX27uySvCYhKiNTQgoJtoPA= X-Google-Smtp-Source: AGHT+IFFEglapRmDrpRV77iwnKxQ9APz+Jgfl7/ScCUUMY+lOfpVb4pqyKKGcqHkCqH1z6i+q1OeRw== X-Received: by 2002:a17:90b:3d0e:b0:2ea:37b4:5373 with SMTP id 98e67ed59e1d1-2fce78aec58mr4681268a91.10.1740130761841; Fri, 21 Feb 2025 01:39:21 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:f987:e1e:3dbb:2191]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2fceb065299sm981337a91.29.2025.02.21.01.39.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Feb 2025 01:39:21 -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 v7 07/17] zram: limit max recompress prio to num_active_comps Date: Fri, 21 Feb 2025 18:38:00 +0900 Message-ID: <20250221093832.1949691-8-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog In-Reply-To: <20250221093832.1949691-1-senozhatsky@chromium.org> References: <20250221093832.1949691-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: D11071C0008 X-Stat-Signature: qwcteffig49ab7ygjwa34rau43opxzw3 X-Rspam-User: X-HE-Tag: 1740130762-874313 X-HE-Meta: U2FsdGVkX18vD9ttRXRmnDQmq1kNU5hcf9f3eineeVNuFunIX1tW83j2kBpjpxl58ekVMfOZJHdfOirLgcLlJ1HWENSXTWmQR+c9Ww9bqWKGhSVBdPYvBN4CdrgKe9kR5t+aSKkTEsCoirOtBp77DzoSe70alRGLWq86n28H37uu9KFXqtDJgxigDBj7UORS4JinYBbNX2v1ZxVFh+2svGRbOtlrQTk+8WE7lmhXYuE7+EQPRjvjWMiKEcKE9li6LUD9+QuozsZVybCLcTpLutrNw2BSzATyVyYZyw8Ao4G4d4paYrWapZFAr9UHurLTjxIkd2ze7YtYc2x+K7R7mffvWgmTtih4UtDfYP+yFhS65jfNm7wurjoPyM3N3xtO5qP5BXRetnZ+B5Ok/GdPhAfFgxA2EVM0QetxaC5PjBUUi/D3RbLi6edhave5JRX1FxNLzUuFgo/s00/aXGkPpbJknQQiT9bPhUjod9q+dfq0vOUEyZgsjzNtt4fd8k98HybKeJcuyLkrfoTum7gQokxTAf8BSA5BwR4j7gr/jUGwrn8W3WSLHTM3y+QXvCLYdj8dfThV9kvbN8BY37IgkXJMuLQAa22Q3dn876O6gpPae6n4M7rvua+xfJUxTMo8/SSIPbcq0ehvBFesemzc1UDOxVU/ttVTaYITa1eYSBxjxdJ2hPdPIj+ABFF9aj5KOZIPebV4MKIZ6vrfIoZIJ6AQZTvW1/2FjVHiGgyuoMb4HKyGgy2lalIKo8hT2ghUetEagAJyFSu48CucLJ2/NJiahW140K9uc5PuBL1ENrmac4BeRsSxGu+mjoquiipyuIo1x9Sf95KEBDxejW9G0lYLwM7WoGoKpzwK0dg2u9uQzpnb03dlYvcjgNb11i2Cii6Qkc4++dTGzKgtmGJqqtBDNjahYvBKcYL9OVZUQ2/YgqX9vYOY8oJ4jgni61r7Q3tLM68qxqjsQkD3z8/ fbQKYXbS bCccgsEK9mYoFCmoKAO7urcFuQg4GBYbGo4+tXpnvpfw0QK3n8XB7+JR76AppEX5BIoCBOHL5xiIUoJh/TYw/ltgbPA2hhEbGVKgjaRbujuA8Pnl6UrKyLtWT7SdAUEZeoxn8jlvh7s8xQobhsl3GOmiPhxmn2ApTz0AWARmBTnK/OB7sPVm7sQCxXFj4HFUCru2y6tyC8vwq+ZDJcsXYQqon5yW3lcuzwQw8EZ/8TjxCUS1QVDwAYT0U6CIEByEP7thjPOb3NQ8eckIGpQ/E7Cg362f5ySY3EwInfcyre2HhSB34ok+upPx/E/gd+XW4DXHdpuas4DyAKYCJfxW4qzU70kitvIHVv5KsPG38Ukz/yUA= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000025, 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 f59fea0f04ec..a886827f0b3c 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;