From patchwork Thu Feb 27 04:35:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13993741 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 78766C197BF for ; Thu, 27 Feb 2025 04:37:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0085F28000D; Wed, 26 Feb 2025 23:37:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EA935280005; Wed, 26 Feb 2025 23:37:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D231C28000D; Wed, 26 Feb 2025 23:37:34 -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 AC670280005 for ; Wed, 26 Feb 2025 23:37:34 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 61B0C80204 for ; Thu, 27 Feb 2025 04:37:34 +0000 (UTC) X-FDA: 83164466028.25.03E2328 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by imf16.hostedemail.com (Postfix) with ESMTP id 8C0C818000A for ; Thu, 27 Feb 2025 04:37:32 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=APJoduKT; spf=pass (imf16.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.46 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=1740631052; a=rsa-sha256; cv=none; b=rKnAzGQcX+ZxjSsBkiCyQhRk+mFGEDusf4WHvA4oXR6rwnUcFSMDad0HGbalhkjaC81TI7 2gUPl0auJjUtLJmQiqwA05+7uX+bh2Dc1WXBEwXFgc2Li680XyWHqAuOgQSywJLoNZ6u+Y vx08p4MHVJzd1RAJpHP+28Eld4tkjKw= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=APJoduKT; spf=pass (imf16.hostedemail.com: domain of senozhatsky@chromium.org designates 209.85.216.46 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=1740631052; 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=atSj686udXXb8naSP/ilX+V3ED7QvGuQ33PoSFmI78o=; b=gLLkeRrYcV95OiS/n7V04T7GfMVkwMnKUQF7e0tT44hz/MY88er1miK0MSnEt2QJ1sh/CW PsoBrfv4DHYUkpQOywuxmQOoip3B/Tx0/ujMI4m/KdR7AxODjL+mQ9yhfhl1w6EWpeZ86l q1Tf+B9yZpDj/PVipaM/C18d6gXE3M4= Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2fea795bafeso257178a91.1 for ; Wed, 26 Feb 2025 20:37:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1740631051; x=1741235851; 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=atSj686udXXb8naSP/ilX+V3ED7QvGuQ33PoSFmI78o=; b=APJoduKTTNHHWFMpH8IM8ppjazeSI3UVeaEZzSWhaYY1y9B4MWUXIyGW8838a9lsjv dcpoxB31Waipd7W1ufp4MY7HVlhuPcTI6eR0rcfLjwQRlFWFCJZiJ344F22+rS1c86b8 Sv2hZe+iyDAwifXegCVPX4l6AWvFIq3+eCRvU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740631051; x=1741235851; 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=atSj686udXXb8naSP/ilX+V3ED7QvGuQ33PoSFmI78o=; b=CsBHpjwZoMKlIlPhi7F+iz0x1I9qPLEfNXmX4bkUyxq7otcFSlgx5c5ZX6rR4GV9NR 6+Bd2B7WSCK8EzuCVFG2IdD7gfdJmUZzpEkGhgGfuZUuC80QVjMiA0/BKTEdZ0t+2bSo agUr0fuGaAa3swlglKTimsaW1P2zzAlMqzGK8G+WtctuPWYNTTRghLB/O1XIllCpd9pY Gk+wD0m4wM4nOBpNqXzL1X+G6ZUY7Yi7S9n5N4Q362jI9pyemx0UxYNpJlE/ufIGKFi8 +rTZ80yNKA8YkUBILBULSf2N5qAp7hWBKTE0uPeIkF7R7E+sSikRDraJax0TNOYN5Sfj JTyg== X-Forwarded-Encrypted: i=1; AJvYcCXIB80o0VJNyYrQPENBeMgtSp37xcrNZwoATpAnA0wIOwWLcT4xOSLV7ibIOoqA298sRPCEEe3eWQ==@kvack.org X-Gm-Message-State: AOJu0Yz1tbqJAjklNWiDE+sVWJ11fu4O14fElgKYGolciezereYQ4inH dcT9omliBKHtWXI27wR6HjDG5zq7wbBwVMyCRdjjcQOYlqmcX5yZnBzKA56M5Q== X-Gm-Gg: ASbGncvv6N7aMHjGs57Kjj+uT2Bj76fDhtZziW8wXFLHQyuHiEHbGNA66CnOcUn74R1 4M/z97MXM3xc5c/fkO1G0rVe43xsJ1yf+pU8oh2WA0ayrBoHnlrSk7hClJrvEbAE8xUNeGPzIiF iclld2/qUIa3ijk9Me1Kwa7yhgYVPo8AlA59bBhyRuA6aD9DZhLH7Q461poWOIuQCb6BMJtIuDZ 0EehhnEFEh1QI4RNv/q3lqh+QoJts3OQ0cqKYbxS3OudiFFDJ8zRdrW+B9pv1gQY7/b149oPI1m 8HkFiI4Pln0v8i1/vmiiMyUjJBlT X-Google-Smtp-Source: AGHT+IEJkvjK9xJSO0CePo42cX0OoaGvyhAPmRkoUPST+KqNGlEPU6xv/EJnWdmaTpIOPBA38FE11Q== X-Received: by 2002:a05:6a21:1515:b0:1ee:c8a4:c329 with SMTP id adf61e73a8af0-1f2e36efeefmr3287648637.0.1740631051528; Wed, 26 Feb 2025 20:37:31 -0800 (PST) Received: from localhost ([2401:fa00:8f:203:a9c0:1bc1:74e3:3e31]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-aee7ddf246bsm411855a12.2.2025.02.26.20.37.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 20:37:31 -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 v9 11/19] zram: move post-processing target allocation Date: Thu, 27 Feb 2025 13:35:29 +0900 Message-ID: <20250227043618.88380-12-senozhatsky@chromium.org> X-Mailer: git-send-email 2.48.1.658.g4767266eb4-goog In-Reply-To: <20250227043618.88380-1-senozhatsky@chromium.org> References: <20250227043618.88380-1-senozhatsky@chromium.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 8C0C818000A X-Stat-Signature: zoy987p7mjmji8nyfbcwhui6y4fahynk X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1740631052-461336 X-HE-Meta: U2FsdGVkX1+5yMf8PgrqMFRwMd1H9KTfkP/5OqND9+nx6Kw/9AUVABHE3skbuP4xifeSmJWFjLqO26NTm+mml5yQw9OLpOqW1mwBsDnTWx5Z9IjvjN+94EcHdWeWrID7b0U5QVToPKvwIOUg1pVNXGKKVo1tSJeARdDPF9s5YdZYXn4uTn9XhZG7INTlL3cBOBqUTZc8MlRV8WEnLZ1ujryG4SBs6RWz7b9ce27wu3BBtnVaRFu6xYAQtU6aFNGUICGEcF0mRi0qrNPIgrhiQnYpu0U9Ro9KQ3yOR84M1UUYg2MVIZeGjVMlsHP3RIv75ksqxOzxePZr5wJzvaIn3biUm8nmeXDcRDTWws6OaPVRylKRaPbVd4Mbs8EHsezNaQRQKBquE4XfPZ9JZuXqTxSUBjV96LxkJg0w9KBLbdocucaRKIAj0XenUMGy3RHR+MUNLlvR4LEpJZX+pD1/VbnW1CdobORnkgxh/busf0hWKZ7tUl9qIzqb1G/QfP4AORGmqV8yIO+by80BeKnD/HM9Uatv0GzaxUo/4XdEzrdZE4GXQbVkA3WbVDlQVGrOCaPUAnYupFceyHi5SwnZOZ7nuQQz/6sYDqsRtvEvVaw5R+dEPAz8awZAtIu1uwH58YZNPGrOd+nNSDrOYmUjMCGRzPxrihre6ANXqWJlGCS4LUVFZb70XFB+rrmdz4MOyq2kEVDcCRMmsNjl8fMdwKiDnBB4tft7KuhbrdiJwwevVkWtRF4vLS4ET2LcWb+LHb4D2CWlHm5/eNK2DodCTxmkKHu7nJqRCK984mIZc+d4kEJwLu5ADrYf9FKGjpeBBtCZ8vgAV99UdFYntfynwPa6rk+ybxizC9VicKTj+fPfQW+GF3wWEHZbgFJYfoBE/5sX7InmmsPxaQPybuXj6bs+C6vawowf24hJbrO9sUON0JpPji8yL4FDb0L8p0fRSb6FwAkWJ/SHFg4jdv0 nK1MrffX Md2ly9rhw1VzR38NpYIP8nB/Fr9TExGVEPanYboQqzNtaRa4qtm6a5F2VRyH90z5EebuakkCNiSYRO111o9/11cnb/TA5oizT1kzpsozmDvpr4Mg7V8dUx7ZRz02rRmr9nLGiBv/FCRvOyKi9AGiolUN+pR7vAHX1M7NQ0uKZ0RLef3f0qPq3do9wtA+9ad8mK9VNQz4WXzTheB+zr1jf9Qunb61beX7nBDFgBNbrETF/I2a3qTilzpmK6rowfGECIkeLHHNny6sNJW2BkxwY74vSkjqk+bspSKu7w5huMD+ulpafJFpYSZdGRtA8qZeVLdY6OU0tdP4H8twcjklr2NQrZojZjpXlZplb 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 6755ca90f737..7ad89df9a304 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; }