From nobody Tue Dec 2 01:27:23 2025 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 2A3F62F2913 for ; Sat, 22 Nov 2025 07:40:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763797260; cv=none; b=MDOm01U2dg8Vb/m5WQFJlAo+DBK4skcAce/acuy59OhCKazTdwokuyeJEAHyIfi9HSM55yVr8nFrm6hisnn792TNj/+GlfhDu7BmBpdVTlXPG/iB4jhF+fdF//sv9BZTDDvWY/IU2BW1n0st/IKL8/FADkAt6GprNkOkhs2Qs5E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763797260; c=relaxed/simple; bh=M4NcAMNdRfN7Xt9x5oF1s3PQb07UktRGrwZu7+yxoxs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eK6hPqE45KU5u708+tcIUwyu192vxMi1vLhwlM4UerT08TI1aNsm3LSeI8IuDY/wC++pqQWsam9B3Q7xLLuQVRlhWviKvyKe14ZIb9HFnnTBOElgd8wbGlu6/D8JxqfGKpLt06Y2U4M9RvXcikURYtNM1ChCyXY9bV0v/A8G8Cg= 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=Nl6y5+B/; arc=none smtp.client-ip=209.85.216.46 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="Nl6y5+B/" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-34585428e33so2752585a91.3 for ; Fri, 21 Nov 2025 23:40:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1763797258; x=1764402058; 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=OgbFFpUkfI22QXU79O82s8Mc2xvY4Nv+z0knw2TCbpE=; b=Nl6y5+B/WymHcsX89hKKDKjS9uj4il9DheYH7TTFELBByM7rfVBHJypYdfhH+EQVYd JdWBIMzzjt6sZAnXaBPQkVrc32ZR9WFe9rLWa51LLiE50qQi5J8jXlOB8AY4YQgtjgLF ql7jWA/SeelQ3f4zYX7c0pU7I3yEok2tWWSdY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763797258; x=1764402058; 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=OgbFFpUkfI22QXU79O82s8Mc2xvY4Nv+z0knw2TCbpE=; b=CYfmC31S8GMYvuAwq4h1bog/cHzBPf6Nq2EZk/6UAUb85VeVnAikm7CoqSUXuMYdnP QsOZ5/MAT/GQEGM62m7NW5cJre/X2azyhbtVIZegQw1OVhGlFDg+EJxTCjj4DXIBtNwy 8n9jzLE66PLzdWDJBv9lc2T6BsgFO6J7CabJKBzzFmX9MhmSZwtsuWmqhiqSuYxbdc1B l8Dm++hcL+qcWMIYSy1196ioLIjrgkyoWi2NS7UmB0Z/37yTdGt4y0ypW7TWKScuf548 x6GvSNSCt9hdDO/V1yOpvvomrvxxHufDvoNp4bJ1bEW+3CP7zWw1nRtPj6x24ezO+/x5 faMQ== X-Forwarded-Encrypted: i=1; AJvYcCWHDWTGmYWhoqJlrTDzCd+wLyX6lX8EgKj6WGlC5fUnrJcZuMTT1/Q7AnzZiuOpqutWmH/Hph2Ie0aoOOw=@vger.kernel.org X-Gm-Message-State: AOJu0YwtCISbuRR1AkQOAmhNHuKB8BCT5WBBliJemm5YM7Ezn0p4P5vj Azo31aTVyG9y9OaxYlwhAeSqDErXPhOv8PK8EVhqVW2FUFFkRzMHugFPlm+wOMDtdA== X-Gm-Gg: ASbGnctmlxi1FgQ2U5IxCfA7jkkne4gA/50ZcvXW84+jwmk9P9olgouF/WJHe3J48O2 s1xq0v1IO49HHYzS8xXyL57x4OsysxR5rfokuHLKjD96TEStDLnaqlSw0qoOFcnp4JpfJnoHvwJ DNoBVuV3cChah/XpvA7EMX8J6iPZChLDwq3I3g/B+ijNtOcL4QaP0vYaQSKGTGx+A1pkmAIjilP ndQ4k4mnBRvFaRYEYoKbpmStzmZPcIXSt8pcXLkvOTMCsgfH1Y0GdVj7mP8MDNX3mZHLpM89d74 OSGUcJeHE5bKkUcleXOBDYdKRB8VxRemPgQVgKazDHB55WMc+tiIRVnE45PI7EKKs5lxI3/Jpwj IqUpXkgJNdYnMQAqWyE3LmWMVqL76II6kPV0O7DenI68s0jeJ+Q1aEu5TSUzTP7c75TlRxjRNV6 J//1eWOasa3+p8IjDQHrHXBv1pjfy9ZjDkay0PF9sFYy/VyvCYZ8cuOyFX2aannBgFIu+uh8QcJ A== X-Google-Smtp-Source: AGHT+IHHl8vDZNN4ihdi/Rw6H5hLCSLd9BU7mCbrs0a2xeos0HXBVBYR3WSbjHwRbViXwwzjKXzfdA== X-Received: by 2002:a17:90b:3d90:b0:33e:2d0f:4793 with SMTP id 98e67ed59e1d1-34733e4c735mr5306539a91.11.1763797258406; Fri, 21 Nov 2025 23:40:58 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Nov 2025 23:40:58 -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 4/6] zram: drop wb_limit_lock Date: Sat, 22 Nov 2025 16:40:27 +0900 Message-ID: <20251122074029.3948921-5-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" We don't need wb_limit_lock. Writeback limit setters take an exclusive write zram init_lock, while wb_limit modifications happen only from a single task and under zram read init_lock. No concurrent wb_limit modifications are possible (we permit only one post-processing task at a time). Add lockdep assertions to wb_limit mutators. While at it, fixup coding styles. Signed-off-by: Sergey Senozhatsky Reviewed-by: Brian Geffon --- drivers/block/zram/zram_drv.c | 22 +++++----------------- drivers/block/zram/zram_drv.h | 1 - 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 8dd733707a40..806497225603 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -532,9 +532,7 @@ static ssize_t writeback_limit_enable_store(struct devi= ce *dev, return ret; =20 down_write(&zram->init_lock); - spin_lock(&zram->wb_limit_lock); zram->wb_limit_enable =3D val; - spin_unlock(&zram->wb_limit_lock); up_write(&zram->init_lock); ret =3D len; =20 @@ -549,9 +547,7 @@ static ssize_t writeback_limit_enable_show(struct devic= e *dev, struct zram *zram =3D dev_to_zram(dev); =20 down_read(&zram->init_lock); - spin_lock(&zram->wb_limit_lock); val =3D zram->wb_limit_enable; - spin_unlock(&zram->wb_limit_lock); up_read(&zram->init_lock); =20 return sysfs_emit(buf, "%d\n", val); @@ -569,9 +565,7 @@ static ssize_t writeback_limit_store(struct device *dev, return ret; =20 down_write(&zram->init_lock); - spin_lock(&zram->wb_limit_lock); zram->bd_wb_limit =3D val; - spin_unlock(&zram->wb_limit_lock); up_write(&zram->init_lock); ret =3D len; =20 @@ -579,15 +573,13 @@ static ssize_t writeback_limit_store(struct device *d= ev, } =20 static ssize_t writeback_limit_show(struct device *dev, - struct device_attribute *attr, char *buf) + struct device_attribute *attr, char *buf) { u64 val; struct zram *zram =3D dev_to_zram(dev); =20 down_read(&zram->init_lock); - spin_lock(&zram->wb_limit_lock); val =3D zram->bd_wb_limit; - spin_unlock(&zram->wb_limit_lock); up_read(&zram->init_lock); =20 return sysfs_emit(buf, "%llu\n", val); @@ -869,18 +861,18 @@ static struct zram_wb_ctl *init_wb_ctl(struct zram *z= ram) =20 static void zram_account_writeback_rollback(struct zram *zram) { - spin_lock(&zram->wb_limit_lock); + lockdep_assert_held_read(&zram->init_lock); + if (zram->wb_limit_enable) zram->bd_wb_limit +=3D 1UL << (PAGE_SHIFT - 12); - spin_unlock(&zram->wb_limit_lock); } =20 static void zram_account_writeback_submit(struct zram *zram) { - spin_lock(&zram->wb_limit_lock); + lockdep_assert_held_read(&zram->init_lock); + if (zram->wb_limit_enable && zram->bd_wb_limit > 0) zram->bd_wb_limit -=3D 1UL << (PAGE_SHIFT - 12); - spin_unlock(&zram->wb_limit_lock); } =20 static int zram_writeback_complete(struct zram *zram, struct zram_wb_req *= req) @@ -1005,13 +997,10 @@ static int zram_writeback_slots(struct zram *zram, u32 index =3D 0; =20 while ((pps =3D select_pp_slot(ctl))) { - spin_lock(&zram->wb_limit_lock); if (zram->wb_limit_enable && !zram->bd_wb_limit) { - spin_unlock(&zram->wb_limit_lock); ret =3D -EIO; break; } - spin_unlock(&zram->wb_limit_lock); =20 while (!req) { req =3D zram_select_idle_req(wb_ctl); @@ -2962,7 +2951,6 @@ static int zram_add(void) init_rwsem(&zram->init_lock); #ifdef CONFIG_ZRAM_WRITEBACK zram->wb_batch_size =3D 32; - spin_lock_init(&zram->wb_limit_lock); #endif =20 /* gendisk structure */ diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h index 1a647f42c1a4..c6d94501376c 100644 --- a/drivers/block/zram/zram_drv.h +++ b/drivers/block/zram/zram_drv.h @@ -127,7 +127,6 @@ struct zram { bool claim; /* Protected by disk->open_mutex */ #ifdef CONFIG_ZRAM_WRITEBACK struct file *backing_dev; - spinlock_t wb_limit_lock; bool wb_limit_enable; u32 wb_batch_size; u64 bd_wb_limit; --=20 2.52.0.460.gd25c4c69ec-goog