From nobody Tue Dec 2 01:27:23 2025 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D87D2DC34F for ; Sat, 22 Nov 2025 07:41:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763797263; cv=none; b=J2vUuUI8ohFT9Mg3ZxUghXTeXjSOfXFuYwd0KMNZP6EaTa16aPI4blpG/r4KPLCUqlr6frqYIWKyOUv9XBqsq26bnS0AwCsBvMjhmu2qU54SddcGBc9k6R4l4leRFCqOP/wLO53YYe9gsOqo5ZwIdmfI5oT2q/1WXQr/ALw3fBA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763797263; c=relaxed/simple; bh=qDK3/KDP2yGyLUfSxb9ErGoYh406S27gFyX0GJy3yrI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TQTsk/mpARb1YX7X7k9beLGtSeTW8or/ccZ/y6n8UyeKraDEcu3Rc8hN6pnDidP9i9wSxaUOCxP2jqYDunL8sSjeZb3L8tUL28WKTI/Ez6koMizbJpLYxCKmd2EApmNm8l4W1RckiHvM8RaHZPIr5p3RR8pkAdcOVTyt5klnqLs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=kKpTt6Zv; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="kKpTt6Zv" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-29516a36affso39237065ad.3 for ; Fri, 21 Nov 2025 23:41:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1763797261; x=1764402061; darn=vger.kernel.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=eqXmvB06Z2fB+k4+MBqw/8L077gQXIHuVUXIRxAoKgE=; b=kKpTt6ZvwrNmZa+0BzJ2BlB4gskRWkG8l3MoCNcJBuCpdwHWK1o5xemPEV0HgQFkMb 82v0gKyoGc6Snk2123g/Q2/rDZJgHWP+gZEVWZQCCWH3TsmR41f+EyiEWtppvm7bZaQp 3ZTrTGiAFJJkGU3oM0mwW2fv9LXEk+3LJxnEA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763797261; x=1764402061; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=eqXmvB06Z2fB+k4+MBqw/8L077gQXIHuVUXIRxAoKgE=; b=FbcBfTQOVErYXrm5wK4lbKjmLTByBph5DSjk0x7Ci69eRAjVx/ZccDCAWWAnFj5PsQ ZQDE6kYPNMRuGMJkwoZShtG8aAo+D40rzYJYB8jax4n/KKx7l97r0iQ2x5L5FOxtZ3a7 2MhMmuIQPGGnjX3136rQKLEfV4vykkHaqGqaBskLePjCxDv50crcMA8MaDnllQC0fDzO QwgruPJCQqvkkaSqgHeltFXg7BsDbaq16lgIhz2ct5geIei1If0NoDx2YNemtxOAnbAW 1y0AvV1epSp6H2OXVTcTqY2zwAW6U1YHRUj2UpXsG9H1+lq+Xs8y8i2WiZCPm81OoTqN Q7PA== X-Forwarded-Encrypted: i=1; AJvYcCWJJrPU6/p4DpY1BWC2VCOmh9NiHcsiZw2w73UN7lhm+xzCdvVp1nNX0fpcwkdduM45KkeV6eqOcvhXQn0=@vger.kernel.org X-Gm-Message-State: AOJu0YwhJ9Kmgoa4g/vchVdrh3FKhxnmFxBaW+FY1YZGHF9mVpNRIUyd lyf77teVjMbylq8YWPAd1WGIjaf8aYl7auP0RPRfmFmj+babRMlxdIzwQMRwFCghJw== X-Gm-Gg: ASbGncsbn8ewWIa2/9dPGGeFtbtwKLe01CY8a4Ua2H/6pjibWQwLD6RYEdhowPRz83H RkVOqCL8tfpAJDqXzQuVxRgHYEvOhqC/2MUnP/B/8Ht0SYaBNT+KtNgTZfROKbXDfeUo1atBgeU 9bpg3Qkx+F5Hypt3/ZoA2FWzZbY2fxnDFCz7Fe7n1d0uJfF8tk+GM7BK0OCRovHQg8yg3b9UeNf wgnTOrCkzD2ywN3p3Xr9hLji1oESud6t5jYxiS2y/NgAhA9bZF3ntszn75OLWJAP756DCLtIt9L +eImh6CqFfj3iV1/Q5AwClusMNN3CxXwS2jjOp6yjYM1PhF/BPBv2zKQ52XzrREv52aOUAkKHBi fDKUpcaR0CvCoKoEbyK6Ku/4jIPy/VWm/NKd/50fPpagBrEXhKq7wEKxSYYyHy3oOphLLDHdvXX 0pO/hi/gIfP9b2kCG0PHn4VtoXQUR1GSf8YkI35LcfnI6b7MIiIrOkY0okprHY9d3sXpwco4zM7 bmWwWQ2hey+ X-Google-Smtp-Source: AGHT+IFDKI29A6Uqi041LAbC6kcpz5R1IMRKmCudzuYMIMwbcjwLb7vtZ5IKwHJVMEc42d2kp0CPqw== X-Received: by 2002:a17:90b:3cc3:b0:32e:d600:4fdb with SMTP id 98e67ed59e1d1-34733ef71f2mr5625087a91.18.1763797260926; Fri, 21 Nov 2025 23:41:00 -0800 (PST) Received: from tigerii.tok.corp.google.com ([2a00:79e0:2031:6:948e:149d:963b:f660]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29b5b138628sm77771555ad.31.2025.11.21.23.40.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Nov 2025 23:41:00 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton , Minchan Kim , Yuwen Chen , Richard Chang Cc: Brian Geffon , Fengyu Lian , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-block@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv6 5/6] zram: rework bdev block allocation Date: Sat, 22 Nov 2025 16:40:28 +0900 Message-ID: <20251122074029.3948921-6-senozhatsky@chromium.org> X-Mailer: git-send-email 2.52.0.460.gd25c4c69ec-goog In-Reply-To: <20251122074029.3948921-1-senozhatsky@chromium.org> References: <20251122074029.3948921-1-senozhatsky@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" First, writeback bdev ->bitmap bits are set only from one context, as we can have only one single task performing writeback, so we cannot race with anything else. Remove retry path. Second, we always check ZRAM_WB flag to distinguish writtenback slots, so we should not confuse 0 bdev block index and 0 handle. We can use first bdev block (0 bit) for writeback as well. While at it, give functions slightly more accurate names, as we don't alloc/free anything there, we reserve a block for async writeback or release the block. Signed-off-by: Sergey Senozhatsky Reviewed-by: Brian Geffon --- drivers/block/zram/zram_drv.c | 37 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 806497225603..1f7e9e914d34 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -500,6 +500,8 @@ static ssize_t idle_store(struct device *dev, } =20 #ifdef CONFIG_ZRAM_WRITEBACK +#define INVALID_BDEV_BLOCK (~0UL) + struct zram_wb_ctl { /* idle list is accessed only by the writeback task, no concurency */ struct list_head idle_reqs; @@ -746,23 +748,20 @@ static ssize_t backing_dev_store(struct device *dev, return err; } =20 -static unsigned long alloc_block_bdev(struct zram *zram) +static unsigned long zram_reserve_bdev_block(struct zram *zram) { - unsigned long blk_idx =3D 1; -retry: - /* skip 0 bit to confuse zram.handle =3D 0 */ - blk_idx =3D find_next_zero_bit(zram->bitmap, zram->nr_pages, blk_idx); - if (blk_idx =3D=3D zram->nr_pages) - return 0; + unsigned long blk_idx; =20 - if (test_and_set_bit(blk_idx, zram->bitmap)) - goto retry; + blk_idx =3D find_next_zero_bit(zram->bitmap, zram->nr_pages, 0); + if (blk_idx =3D=3D zram->nr_pages) + return INVALID_BDEV_BLOCK; =20 + set_bit(blk_idx, zram->bitmap); atomic64_inc(&zram->stats.bd_count); return blk_idx; } =20 -static void free_block_bdev(struct zram *zram, unsigned long blk_idx) +static void zram_release_bdev_block(struct zram *zram, unsigned long blk_i= dx) { int was_set; =20 @@ -887,7 +886,7 @@ static int zram_writeback_complete(struct zram *zram, s= truct zram_wb_req *req) * (if enabled). */ zram_account_writeback_rollback(zram); - free_block_bdev(zram, req->blk_idx); + zram_release_bdev_block(zram, req->blk_idx); return err; } =20 @@ -901,7 +900,7 @@ static int zram_writeback_complete(struct zram *zram, s= truct zram_wb_req *req) * finishes. */ if (!zram_test_flag(zram, index, ZRAM_PP_SLOT)) { - free_block_bdev(zram, req->blk_idx); + zram_release_bdev_block(zram, req->blk_idx); goto out; } =20 @@ -990,8 +989,8 @@ static int zram_writeback_slots(struct zram *zram, struct zram_pp_ctl *ctl, struct zram_wb_ctl *wb_ctl) { + unsigned long blk_idx =3D INVALID_BDEV_BLOCK; struct zram_wb_req *req =3D NULL; - unsigned long blk_idx =3D 0; struct zram_pp_slot *pps; int ret =3D 0, err =3D 0; u32 index =3D 0; @@ -1023,9 +1022,9 @@ static int zram_writeback_slots(struct zram *zram, ret =3D err; } =20 - if (!blk_idx) { - blk_idx =3D alloc_block_bdev(zram); - if (!blk_idx) { + if (blk_idx =3D=3D INVALID_BDEV_BLOCK) { + blk_idx =3D zram_reserve_bdev_block(zram); + if (blk_idx =3D=3D INVALID_BDEV_BLOCK) { ret =3D -ENOSPC; break; } @@ -1059,7 +1058,7 @@ static int zram_writeback_slots(struct zram *zram, __bio_add_page(&req->bio, req->page, PAGE_SIZE, 0); =20 zram_submit_wb_request(zram, wb_ctl, req); - blk_idx =3D 0; + blk_idx =3D INVALID_BDEV_BLOCK; req =3D NULL; cond_resched(); continue; @@ -1366,7 +1365,7 @@ static int read_from_bdev(struct zram *zram, struct p= age *page, return -EIO; } =20 -static void free_block_bdev(struct zram *zram, unsigned long blk_idx) +static void zram_release_bdev_block(struct zram *zram, unsigned long blk_i= dx) { } #endif @@ -1890,7 +1889,7 @@ static void zram_free_page(struct zram *zram, size_t = index) =20 if (zram_test_flag(zram, index, ZRAM_WB)) { zram_clear_flag(zram, index, ZRAM_WB); - free_block_bdev(zram, zram_get_handle(zram, index)); + zram_release_bdev_block(zram, zram_get_handle(zram, index)); goto out; } =20 --=20 2.52.0.460.gd25c4c69ec-goog