From mboxrd@z Thu Jan 1 00:00:00 1970 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 F30F2C19F32 for ; Mon, 3 Mar 2025 02:25:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6C5A128000C; Sun, 2 Mar 2025 21:25:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 64E10280006; Sun, 2 Mar 2025 21:25:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4C86628000C; Sun, 2 Mar 2025 21:25:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 27B60280006 for ; Sun, 2 Mar 2025 21:25:31 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E59AC1207BA for ; Mon, 3 Mar 2025 02:25:30 +0000 (UTC) X-FDA: 83178648420.08.718653C Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by imf16.hostedemail.com (Postfix) with ESMTP id 03AD918000E for ; Mon, 3 Mar 2025 02:25:28 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=jd9Qo2zB; spf=pass (imf16.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.177 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=1740968729; 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=/kGJl06ulFbB/829XkPkygYoBTQLBZ6+y+IJrZY3g6o=; b=iQfvKkVdk6u9tpxyjWnymRap8liLf3Po1cLIerr82NPw3zBCKA/B/3Wx+egnYfMl78a0KD q56nAfFiud8X8awOkppYolug5TQG4/nUNGdyXekHiCHckxbTFAgkao2lyRvfFnKyuV7Vwj c8/V0VS29DiQ72TJc52BlC4IAvGH6Hw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740968729; a=rsa-sha256; cv=none; b=lXRo3ruWX0QnMsgqnWyGugCSCrBWhrJvllhaAh/NgBV7YGyZrDxWHEn9IJiA8XgAZx5wDJ BX6fvYZqOx45udILhHmjQaPTu2EsnrbSSghuVdEBhdWzk7yAzWHp6swh5OIhZEFyI7irzQ TdkCOe4sHckq9UOed0KO9/60CG7N0XE= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=jd9Qo2zB; spf=pass (imf16.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.214.177 as permitted sender) smtp.mailfrom=senozhatsky@chromium.org; dmarc=pass (policy=none) header.from=chromium.org Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2232aead377so74994095ad.0 for ; Sun, 02 Mar 2025 18:25:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740968728; x=1741573528; 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=/kGJl06ulFbB/829XkPkygYoBTQLBZ6+y+IJrZY3g6o=; b=jd9Qo2zBwJWbMgBLKgDO/dCkIweHyaCFUmzeuNHDEMkXkklbo3WvyqoNZTl6+OSUUL yw+JOJnWmVcfWjYPz+tSpppq4276Ln9ac0MxhxKXhSZag4EnA5ouWH3Itj6pOSBOVrU1 O+258FFbK0R52cwSm5nLcbTHDc8JnN5sr9I+o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740968728; x=1741573528; 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=/kGJl06ulFbB/829XkPkygYoBTQLBZ6+y+IJrZY3g6o=; b=B+K1/8A+L1JWWm3EZHHtzXAAmth3J6U3b1PfJwTHHkXDjbv4nMdNXmn7mww8xqsFaP R4W96hPiAj62Q7OyDq5js3toGxl0CZAagXEJE4S6uUyrC/ik5SCrpQWWaf7v2xreIrJU rG4M5qQgL2oFJhHrd/KpqCdh9qrIgrxdiqeh4M5I/wgNsbUN9rPXdCro9xv3Xvu6/CjU GaCd2LEt8SM6DFzN74maRbZ2vZdB1pAKMhya1vERsm5TU16dTkrUgagnMU7lHOLDpAp/ l2NzsNyLjRtZSBWhFIDJcvGYIfxYUllNcL4kPY+EWAxzWTPJUKUDbkehk9JcChblGiUu 28HQ== X-Forwarded-Encrypted: i=1; AJvYcCVZ79CZkkh9O/Rbyiw7cfxDpeihtW0pmfIH7F5doWKVBtlC+AuN4NapA+kq3/Y5ryeC/k6zJBaHrw==@kvack.org X-Gm-Message-State: AOJu0YyEyD45gkEMVykkZa+1ly6yC4FUMS73BAp4Lh3oFPnvkCjVTz+o ercUfIr59pRnNSDFk+dZgkc7Od6hXQD0lR5HWBFTfDn7poF2XktdQ/sPbDIQ/Q== X-Gm-Gg: ASbGncuoQpG1AK4x+Js31y6Z88FvJ3CB6d6uc0noGczkpLhiVHj0HIRTVd02aWzNIBR hreMfzpo00Q4ml24gBZeLz5yx16qMxWQrnpMO6fMoCV1Wpt3oW6FYOGv/PZXNO96j6oNsW4piIs l+mWDa3UnPB4IThPiK2C6yYyGB9Fj1CGSF9UQXgqzNQsCGcdZ5AVi5n0wSTXdssZYbAgqsyo91j 3Zi/WSzgQr0xuGG1mVlSTKr/FWQRTutZGVJgfCLXt0UOZ0wVDfdUZ1LQ9TwjrsQKtQ01NfGjzoO zRur41kDEhTE+lcq0cug7BZjqrbwRebG58u8mAtOOjm5Pbg= X-Google-Smtp-Source: AGHT+IEugHIYcHEDUOXp58GXQB8o5prMjl8/tvIa3ET7IFiNu4ViKFsWk4lTQ15ZE884fzJ8YzuupA== X-Received: by 2002:a17:903:198e:b0:220:d272:534d with SMTP id d9443c01a7336-22368f92a4dmr206219935ad.22.1740968727919; Sun, 02 Mar 2025 18:25:27 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:1513:4f61:a4d3:b418]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-223504dc489sm66538975ad.159.2025.03.02.18.25.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 02 Mar 2025 18:25:27 -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 v10 11/19] zram: move post-processing target allocation Date: Mon, 3 Mar 2025 11:03:20 +0900 Message-ID: <20250303022425.285971-12-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.711.g2feabab25a-goog In-Reply-To: <20250303022425.285971-1-senozhatsky@chromium.org> References: <20250303022425.285971-1-senozhatsky@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam02 X-Stat-Signature: yndg5mqa7cgnaktz8kkhn4fa1odmdgkt X-Rspamd-Queue-Id: 03AD918000E X-Rspam-User: X-HE-Tag: 1740968728-575 X-HE-Meta: U2FsdGVkX1/wP8w1X9gwb9gg5CHB145xVSLNMcF/QPNfIAiJ0aUwdi0M0f+xD41WDLSc8I2wzh6H8J5sqcvsCh8NbVb30Niajh3Xr9+eB7XQ2yTpT2CZ3Xo0apqzZ6n/HqPUM+Ym5Tgh5kJxpYmD+kqHuBYXMbY2noRYc7oqmX8hh0jp18HlY4gDUwabmogVcP403OtA7SobEh5e1EpTUIbeXn6rNk9a2Yu10a7UVZ7g+tHBoCWh07t/mh2Cyf3f/2mmdmWByZR3hG9Y6Eoqe8OEaOZdKWU58g4jaWLm7AR+lmUCE8rfVaYgeWstRy9brs+79PZf5IbopsyjXHkJNr2ol1jWVSfEa9qiGbxnHJoHuyFBlfiMr+Sx0kLsARlOYFr8Nnfht9W6P4MBa3/ZlmtNGo5abOZ8YvA3/YYddduKjjbdCJFipHp+0xESnW4BVS8ISMUgAyoh1QsrkdxFfb3yloGvbtFo5OI61wXdrHwittWZffedjG2E0jqb5ilaKx3yE3jnayJifVDnZ1BY4yrMCx6Rl9pmxSxpnDktkqkzBFnhJmqAGmlU89C5VqkWQVa1nZ9MuDOjS5q3rtBUwYpKR2xNtuAK60m48NfXt6Oq64JgAVwfDh6mP0rb+PjoVUJBLRGXZBHz+bHJM0+HL/0cSq7gjvUkqdg6tEL7ohHIzmmIrvMYeoPcq07dDARIHwpQN4IZvDUQYAN3sb7IfvA8a9uJQIdDb9x1DtEsjIbBIIDWJMNZBrh4jaR89n8gcfXlePhC1OZKGIH2kEI6wRLnZwTnxyR2rWYR3rcTG9RXkQKEQuGSMdUF0r/dM9C2cXybPi+/VUk9dkPxAR+uHvkg1MUOsnJcxJCb1H08So5p2F/uc2Zm/yRS2o0XmFBgGhho1+giny/4ElTb9g+vvKil089d2efqRooJShj46FWPFDYYZ/aTwbk5Eyryd+ZpYRsTlmNWGKMUQ6OUkhC aw/XcA9W mA3jyxH6wM1uCa2z29BFd1T9cgG5fbWpU2W0+ckizYTL+ec4qk4daFBgQeftMBEqYVlWwegxB1UJO2vJozbxdYb2bwoupYh1fBmi2LFDP1zqtaLHHylOGX1RmYsjLd0wpDKYzYZW1EY+MJ/KJNJ4IIKFvmVq1sdabmsjLEuoFgjBHtEtqbSkx8e0jGxaaE2WMFw6AcoifnII4y1B8wcl9GS+Md9cogmdDJ8gzyz7BW1q+A7kl3z2cBPfMmx8GRleefApyQUiwIZ5BwSVS87Xk4aFMc69J2xYeYDdSuwELErUG4gm9Fvl8Etyrnu6u8zs/iV0xgvLBXVcQyA+WmBKmP0ua7+h77/XK2Fmk 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: Allocate post-processing target in place_pp_slot(). This simplifies scan_slots_for_writeback() and scan_slots_for_recompress() loops because we don't need to track pps pointer state anymore. Previously we have to explicitly NULL the point if it has been added to a post-processing bucket or re-use previously allocated pointer otherwise and make sure we don't leak the memory in the end. We are also fine doing GFP_NOIO allocation, as post-processing can be called under memory pressure so we better pick as many slots as we can as soon as we can and start post-processing them, possibly saving the memory. Allocation failure there is not fatal, we will post-process whatever we put into the buckets on previous iterations. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 50 +++++++++++++++-------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index bb88b63d193b..f6e887f94b71 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -295,15 +295,24 @@ static void release_pp_ctl(struct zram *zram, struct zram_pp_ctl *ctl) kfree(ctl); } -static void place_pp_slot(struct zram *zram, struct zram_pp_ctl *ctl, - struct zram_pp_slot *pps) +static bool place_pp_slot(struct zram *zram, struct zram_pp_ctl *ctl, + u32 index) { - u32 idx; + struct zram_pp_slot *pps; + u32 bid; + + pps = kmalloc(sizeof(*pps), GFP_NOIO | __GFP_NOWARN); + if (!pps) + return false; - idx = zram_get_obj_size(zram, pps->index) / PP_BUCKET_SIZE_RANGE; - list_add(&pps->entry, &ctl->pp_buckets[idx]); + INIT_LIST_HEAD(&pps->entry); + pps->index = index; + + bid = zram_get_obj_size(zram, pps->index) / PP_BUCKET_SIZE_RANGE; + list_add(&pps->entry, &ctl->pp_buckets[bid]); zram_set_flag(zram, pps->index, ZRAM_PP_SLOT); + return true; } static struct zram_pp_slot *select_pp_slot(struct zram_pp_ctl *ctl) @@ -737,15 +746,8 @@ static int scan_slots_for_writeback(struct zram *zram, u32 mode, unsigned long index, struct zram_pp_ctl *ctl) { - struct zram_pp_slot *pps = NULL; - for (; nr_pages != 0; index++, nr_pages--) { - if (!pps) - pps = kmalloc(sizeof(*pps), GFP_KERNEL); - if (!pps) - return -ENOMEM; - - INIT_LIST_HEAD(&pps->entry); + bool ok = true; zram_slot_lock(zram, index); if (!zram_allocated(zram, index)) @@ -765,14 +767,13 @@ static int scan_slots_for_writeback(struct zram *zram, u32 mode, !zram_test_flag(zram, index, ZRAM_INCOMPRESSIBLE)) goto next; - pps->index = index; - place_pp_slot(zram, ctl, pps); - pps = NULL; + ok = place_pp_slot(zram, ctl, index); next: zram_slot_unlock(zram, index); + if (!ok) + break; } - kfree(pps); return 0; } @@ -1827,16 +1828,10 @@ static int scan_slots_for_recompress(struct zram *zram, u32 mode, u32 prio_max, struct zram_pp_ctl *ctl) { unsigned long nr_pages = zram->disksize >> PAGE_SHIFT; - struct zram_pp_slot *pps = NULL; unsigned long index; for (index = 0; index < nr_pages; index++) { - if (!pps) - pps = kmalloc(sizeof(*pps), GFP_KERNEL); - if (!pps) - return -ENOMEM; - - INIT_LIST_HEAD(&pps->entry); + bool ok = true; zram_slot_lock(zram, index); if (!zram_allocated(zram, index)) @@ -1859,14 +1854,13 @@ static int scan_slots_for_recompress(struct zram *zram, u32 mode, u32 prio_max, if (zram_get_priority(zram, index) + 1 >= prio_max) goto next; - pps->index = index; - place_pp_slot(zram, ctl, pps); - pps = NULL; + ok = place_pp_slot(zram, ctl, index); next: zram_slot_unlock(zram, index); + if (!ok) + break; } - kfree(pps); return 0; } -- 2.48.1.711.g2feabab25a-goog