From patchwork Fri Jan 31 09:06:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13955135 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 60DD7C0218D for ; Fri, 31 Jan 2025 09:07:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E596E28028B; Fri, 31 Jan 2025 04:07:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E08552800EF; Fri, 31 Jan 2025 04:07:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C823328028B; Fri, 31 Jan 2025 04:07:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id A3B302800EF for ; Fri, 31 Jan 2025 04:07:44 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 50AD0C0956 for ; Fri, 31 Jan 2025 09:07:44 +0000 (UTC) X-FDA: 83067169248.25.6FA05B6 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by imf08.hostedemail.com (Postfix) with ESMTP id 6BE6F160007 for ; Fri, 31 Jan 2025 09:07:42 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b="aN/z1WIL"; spf=pass (imf08.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.50 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=1738314462; 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=i68glYQZ+E+noE0wy+Y9J0JFMp7tHf3uQmMwsu8iKww=; b=NXpG5KB6kpiPZAH1XcpM1kMrX4Ykr3vEMVg3EQht7xNSs2nc/owFdWCMGOlg6fTSw96QaT e7PWgtR/++ycZTcLbsyLpQxxjY0y9+T0FejaPqp/V/BiaxqFZIZuN0GAyuqg4ab+lv3VWQ 4CbXv9SgsVQ+AyyZWB2dGEOZ85gpx0s= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b="aN/z1WIL"; spf=pass (imf08.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.50 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=1738314462; a=rsa-sha256; cv=none; b=aBKuOK1tWSAxNdzSarA00l8HroJii+n+KE8XQYld4A2Hb+R3juqMuvLJNO3OPEJu5eul5x Xu9R2C7TSGYAMbpFe+PzzC18Gv5v1fQc7YHq7NSNq4Uj/nOD0jicD5EVmpawyWwkKXAsOa GVmn5Qgr91nxLtf36lVdz5y/zfhW79c= Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2f43d17b0e3so3018201a91.0 for ; Fri, 31 Jan 2025 01:07:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1738314461; x=1738919261; 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=i68glYQZ+E+noE0wy+Y9J0JFMp7tHf3uQmMwsu8iKww=; b=aN/z1WILdx3o3fSl4kEbrNuH/96wih5jnTX2vecyDR/Yb86RsOC64nCc5VmDE/ncTY S7cMuffvr4FH0kxA7quHc4Bn5liKiDDh6HltqQ+jtMmY1C15xjz49h3MEyWC5OmSNCek j8/Xf7V90ccdTpWbJBefbKhZgt4XHfoPrcRnQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738314461; x=1738919261; 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=i68glYQZ+E+noE0wy+Y9J0JFMp7tHf3uQmMwsu8iKww=; b=fTwwRwfrs0dQcJ5L2XHXRPj07vJWicemOe71vsnEz+XX87ycFTU4INBekTP+a22sAy RVq40zFOOW5X0O3T/iXv0CRg2UDwx4NxHw0GpqtCZwFo/875KYYjPDi/+bjNMhSPccQ+ jBefmlwkUZL5lKUV8PDmwRGYw3OEF42qMX98G5fH+O4+iulSpbpbzyJhEmuoM20Fj3nR tgVAKgNzLkoteyQ7DJTY9aUFv2mHQvqs2Hbn0SFyrnIuJ/6lYCSD6IRTPAjr2xPWsBSD abDudsWPpOy8sm+aFCHIWnEnD1Z3VDOdHrhkb8gJxlIa5swDsiZGiR0VF3jV9hH/vuyl 6pmw== X-Forwarded-Encrypted: i=1; AJvYcCU/WsHF3DWsjk49ujNHRutI+K5d5KJr5VqXvInE+imEMJ2eCh3XXpzccWzUxDBF869O5BflqvGWWw==@kvack.org X-Gm-Message-State: AOJu0Yzek658eDYvlTrdsitXlKoSSzwp9SxrY9tpzQomSnWI5TZl4rAp d+TGhM98rRhQNXtFo8MAlpjN8A1rlQBhkA53rlrRF7ObJ6hBMdXqqabzogk3hg== X-Gm-Gg: ASbGnctrSNDJ/M1ahwQocQ6CNOeO5q+6nAVq/54PNOKXAeGI+Z8wj12JOujob0Vvvi6 4sx3Wl7dAyfIHaWgFWfOv0CH4PnuoEtoLTcprk7Xd4xrSwIXa98l6UWwIUx4quDA7uJ/1athZbG P3gdN0vxwSEBGQwitUzuOK6VLwxanHNKBqLe0dzFrK/VZWm2xa3WvJNbJ9eDHgu36ItPNqeElNa RTqOfYDa7402ZNnzS2SCKYJWEBHNwTB5hRmkX9N7suzEnUBEoqfOWHkIgpIHTlTOBqV5JAPBZCC Tnh2xXan+ACvj8ckzg== X-Google-Smtp-Source: AGHT+IEm5A+dR0l39EGWgA22kpqEPsUgTOFh4GGf32kwJ92J5tCR45G0PnUGYdzf2axpCJd9jEM3rw== X-Received: by 2002:a17:90b:2702:b0:2f4:4003:f3ea with SMTP id 98e67ed59e1d1-2f83ac84706mr17607671a91.33.1738314461307; Fri, 31 Jan 2025 01:07:41 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:c752:be9d:3368:16fa]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2f84897a504sm3109092a91.7.2025.01.31.01.07.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 31 Jan 2025 01:07:40 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Minchan Kim , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv4 09/17] zram: limit max recompress prio to num_active_comps Date: Fri, 31 Jan 2025 18:06:08 +0900 Message-ID: <20250131090658.3386285-10-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.362.g079036d154-goog In-Reply-To: <20250131090658.3386285-1-senozhatsky@chromium.org> References: <20250131090658.3386285-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 6BE6F160007 X-Stat-Signature: f7fmp9oj1p1nw1nso7t1wgq4f3h36eeq X-Rspamd-Server: rspam08 X-Rspam-User: X-HE-Tag: 1738314462-816082 X-HE-Meta: U2FsdGVkX18xf0ioc9YDHKQPiWoXbBVhCnEy880MFAAsBv6dHRGZvhurjzjd1aBFUHMaAR9Pb2afS5ehJfXlIfsciA78aMeXXe8kV5cjUQVbAX8mqFgYq/Af/T00iuTGjXzHiMCnxwk9HNmIUQInOJ6Or+95yCpWPka3r48JnY9OavHJ7xAJbjj3H6OU7iEHvumpmuhA1LslSRMjy7hOAw1L3FecVhjXO+RDn82ncpEB4SXIu1XqhsnErTcabP2omLOo0sMfpsvxZRfEXtytDXwzHuXMLYDXhDbQ/0/hTggvWPeJdLnGk7OBGBvEq1GVQqYxHbuiUvo6lzjrUpKy3Gc0UNmGRUrtYCmWuXAgLzYh4ELBE+Fy5MzcHFyc50emOMnOkPzG+YgzeXT7YerJnUaCWYi4JbSwr0iQFkU9E0RLyjrkFyNPWyWLP1W+DfBAbNgjq+BL8TJmGzn+CIo60PsJLGqcGNFKadyhTiA69kU9doDFLgNatrw0qUYPDOT1hElTm1lfHiVuzcDUcSgZ6Q8XDxE49bW+1/WhXnNO2i5nQNeAIzu4wqbJ92vS15EtwEYnGRmmh26QYchlM8FHTsDl2uiXbIlUO4iN8r+/EB8AwWHUo3Sb1euJ+LuRBD1iOBZ0XqL+nJf3pFsDDfxf06Ys8KS8EdiK7CUptetI264sLDq4JfW1v1mp8Y314hErAd1OF5e6jA4Wqb0Z7/JeJJUkqvF6nNEd5Ln+DwhzERyW9QzbnyCePwHRftmkvuIZShrVAZ8mZeQdHy4Aa6FHyDtgwM+cgxzizCBEY8is6kIawbBQ62jtccfeFMU2Y3mcEUnTcGd0GjQ2xZord18kFqd+Bpmot2ev81RZSrRN7PI2d9+mdmL3a0jEcqDcHQsbACFhP536jqQR/LKwcIRcSXa46YdeBosgXTsix3Y7GS5mY8jO8wgcsg218Ix4mldXTnKrpXFywMAYn06rY08 KT/G9/HP uiVfKJBGPhgNMQruP4lFWwumrStPEJABs433Lw2RVN5FSuEPP6vPYIdr82cjNXScfnCKarrtdO1epC4xO2h4KmdNP3jgAMgppGktXBCHAl/00wVOU67HYHX5wTRoZVEFCx0PpU9s/JzORdMsdiIPrMPtS6mylkMbPSDZm9GF+ydS/ivER3fwr0E4F2c9bcLr1ET+55ViHlk7QXvsIAVH34rRtVmGTVmsz2ngOFE1cqVmyXLxculPUTUOH4CflhSCoiQPzUmJRG0iHbCR/V/oBMFtK1ayIIFHIQ7qGVd3oCXA1vWHcj+3+PCBC63f+x/JIYwIXO86zAykp+PjXrWdE4bVCxxvaZZXo0Vqp0NAuo7oHEKA= 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 35fca4c468a7..c500ace0d02f 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -2009,16 +2009,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); @@ -2071,7 +2074,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; } } @@ -2099,7 +2102,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; } @@ -2111,6 +2114,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;