From patchwork Wed Feb 12 06:27:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13971035 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 80002C0219E for ; Wed, 12 Feb 2025 06:32:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 08B94280005; Wed, 12 Feb 2025 01:32:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 03BB2280001; Wed, 12 Feb 2025 01:32:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DF7F6280005; Wed, 12 Feb 2025 01:32:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id BCCF4280001 for ; Wed, 12 Feb 2025 01:32:40 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 7AEE0B0E4B for ; Wed, 12 Feb 2025 06:32:40 +0000 (UTC) X-FDA: 83110324080.16.7EA00AF Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf06.hostedemail.com (Postfix) with ESMTP id 9EA45180002 for ; Wed, 12 Feb 2025 06:32:38 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=aVik6pD2; spf=pass (imf06.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.180 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=1739341958; 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=cyCqO8rpD053xgod9EGtthWwAT9KzKKgkQ9kmE/51BA=; b=VmGmTJ5/zGdxxHHbKwXRuj+BfoYio12P3GFYuHUAyxZocxCOeb1HqXJgfhjaD/eRnnhON1 UfsOVYf7//wxqoQdhcf3F0PEDyca0Yijd01lRogjdlU1JlGoRiKIMicBHrCQrHhNjs42LN QAVy/aDYKMZFE0RE+4Vjf0Xa48sJemk= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=aVik6pD2; spf=pass (imf06.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.180 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=1739341958; a=rsa-sha256; cv=none; b=faDFMNk1zXkgxWOz7n6zJ/KxVS/AleiyMwdv30Be+qNHwKsW53W54WQILAVwXGG76fF7pz gTpRFxrnWbo0f5KZl74W9YgnQpzGeJLevqqjNWLiWR8x9hs7v53mrsTjHQS/mBMnHNmC9x MOEsF3WQyOZK9LdSpX9273AAqxMHnQU= Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-21f61b01630so7534965ad.1 for ; Tue, 11 Feb 2025 22:32:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1739341957; x=1739946757; 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=cyCqO8rpD053xgod9EGtthWwAT9KzKKgkQ9kmE/51BA=; b=aVik6pD2GFQvZqAkZdLxCrmX3teTH1kF9+GE+xEY/J/Qvqb0FJ6buXYzbHYDrh3m2R f6Dzd8tiihp/ivkmOVqp9em9qEWoUFRc3zcfnv2yU2Y1Gyxp6e7P3Z8UCDa8eIU46v3j 9Q5YW5Et4bD9/LyF2Xb8ZEEkaVud4Hx3Cd5dg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739341957; x=1739946757; 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=cyCqO8rpD053xgod9EGtthWwAT9KzKKgkQ9kmE/51BA=; b=MFmQuOp6tLGGoLhO2OvnirWcPCHiNSvovZurhfDh2dpW/pihkOOH1is/mC2rMfHE6X N1Azr0JAtpIpY8GhhCUfglQ/kI9/F6/jcYYqyMI1kD4erQDI6L2OGxffIbdIV7BYZwLx c7PsDbKy0rGZ/YA8A4pLkJPRxLgx9JihTGLSuLV69O0z+piml00MrrH6v92fxtVdwRWd 87VLsivrO9pUD9cy63uKxDmtEWhUrRHbB8h+MQsidhoKfc/EgkUirdo1dIPxCeaqd0n6 d0e3FzjunAgtxX1cBH80HJ9fT0IZmixbXuzXw6JDUWch+ZnOQa0LRko5/gK7W8sCKsYA lavA== X-Forwarded-Encrypted: i=1; AJvYcCU0DcNVXYQmaike910AzB1K8x38EJl6bJPjZCeA75Bgq9OdFS5XW/Y3RDAThwmbZqkUSbI76+wXlw==@kvack.org X-Gm-Message-State: AOJu0YxW+kg7PlIDqpnW15oHDQTQnAScHaHvh7yXn5AP4eNmCKqwl3UP 4WNVRCTzeW9oJ/qmuDIzGzi3NsgjCvz0PINFgOtAOHw8pqtqS2FWSJgxvPiKQg== X-Gm-Gg: ASbGncsJcPTaUmYXkN9yG13Emqm3CEjSQoofBpwETOmtkqiwxudhJpZKqtm5Vm//0gY 6s6KWuvJ1BRbdhu8xHDYOY5qF059c/E7qktQzMbDXJJttx7JFSlMSK4V0LWP6Isn6f2mqInpRlZ mkf3ANGTsM/Cq8zvyyqgC6kGovyaCTLd2DoR9xEryriZz4lQ/mFL0n8hVOMPtm0i+kEqCi18sRk FoEAScXt7q+/EmzyEBE/GPx9tjoJacHHnjLiVBs8XDxZALQfcE6ZYAV13nDagW5aaFY9AszIac1 k7rW1ylXeSaI83FKPg== X-Google-Smtp-Source: AGHT+IEC8Cc8dAP8Ht+pVcdn6EfMAD6X2400PsIqNRPLot1jyPj+LyGyqkVdRWRCN4K6E/Zgz3CsHA== X-Received: by 2002:a05:6a21:150d:b0:1e0:d5be:bf75 with SMTP id adf61e73a8af0-1ee5cf4b707mr3005496637.17.1739341957604; Tue, 11 Feb 2025 22:32:37 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:69f5:6852:451e:8142]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-ad5489a2ddesm5668053a12.53.2025.02.11.22.32.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 11 Feb 2025 22:32:37 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Yosry Ahmed , Kairui Song , Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH v5 07/18] zram: limit max recompress prio to num_active_comps Date: Wed, 12 Feb 2025 15:27:05 +0900 Message-ID: <20250212063153.179231-8-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog In-Reply-To: <20250212063153.179231-1-senozhatsky@chromium.org> References: <20250212063153.179231-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 9EA45180002 X-Stat-Signature: 61y4msceof3uir3kj9cp3koxubay4mex X-HE-Tag: 1739341958-371476 X-HE-Meta: U2FsdGVkX18yXTNW17zln8NgC5JND1tDIsk9SoTrwONUaB167BxCtgHSepqBg713QgdVCbvETS+sT5g1veAM4nR+3nXRe2Man7SRPRq0l3b0WwOP8InwQ3K+M3nx6sicFdovhIaiMKBQ8TYKARTp9S5iqpH8CNZCnb0yP/DXmKPGODn2kW8N4TujYEn9hbr2WoJ5/xKEWrfsO6nKaArv1CGwdF7/RwQAJv+tqUSQu1/jizZIBjjNa2Z8d4+/YOzd90bBst0YdbxTohjpM92g9cuTWv4Xh/W6FBo5sR8GP2uzjYqo217r4EprfyPGygCNKmd/0ZP90J2EXUbkJfuuRTk2stabreT3Fu2HN3hqRZXQuX7TUbIkoytRAb3oANYLMCX+/g+TKFVJoameDUQBEK3c5T80S4HyU8vF3JF3J3Q6MC6dgVl5FQ6F6SqCIGXuNYa1cruBuL07FsKMEV9l75VsirjPUB365WmgBsY/3CV3JOnu8V8LLYRxZ/zI/KqzbmXTxl8nuS6wxj6679b1yBY1Weejh/k0Hn6yBSUR0MKpRnne9UwEbX8UGsJXtSFk6C53JQLFrwQIgxA4vUI0ATYCAKAX5Onv1nVbcPHvYEHoSKF0quG6mIfk+IfVSrdVDQR4KtDCaUJWqpmjiGIjeNL2HKsFpANXBR/eCnmQ9d26fBH7vqwQDcVT5ME5rPAlMNGSb76j1lNlMbnBNcjRF8Dl+5tYI+aXHf26Zl7EezdnLJ70Q+BCAG68EugHAv4oLBG+ksmwUMvInnMlaZJTZdXcZwbRiDI+jpowTGr5TfjRXtp26Dzavz8AM0J6ViGw80LushXTAPfj5LTZE7dH0ZxrJIblWqnps3l+15bGzZYnonyx0PvAMf2UMlDfVK43Lp24NdjNy9TZ9qBX4cIn2W92tebxIqAVDSLe1KBCe8am8/8ckp9PXkAjtPFaWXo2WabV6Ktnunog3tBe7rU 0EO6mh5Q pdwy9Li7LAz6CfuZh/qqzFzoTh/I5baTjgqK5fAbDvvH/iiMdWNNOTzFd91rWK/OwbLRW/cVuq9hW/yg5T8E4ZJrqzeKaBk+CKWeXwEDdS4AG9Jkouir4L2mA6FvxEBNrYIiwix0wT7igIR3sNmXi7MpxH2rPhL913MSzzK8azrM5CLKCGHVs7s/t3U+ZyqwT/2y7V47lQRTTGJM2Us8CaK3C7An3rPeoL1xjKPjsn+SJvYkx0j+73TrhfEDBQh+bkSZwZLGQN+umeCntg23JqEpUKecjdlEh+7qG51t7KrYYZ5gFKxERGk5qIQ6wd8jzgEpxcZ6CbKtCm8OUcdrh0Izycd3yEHgSZ0ZNVQNR3XL1RtU= 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 7e2694079760..27148f3e5ae9 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -2026,16 +2026,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); @@ -2088,7 +2091,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; } } @@ -2116,7 +2119,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; } @@ -2128,6 +2131,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;