From nobody Tue Feb 10 10:59:15 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 47CE6223DC1 for ; Sat, 15 Nov 2025 02:35:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763174121; cv=none; b=OSXH0kMl9ZKLb4YFZsIlDqdMezau9rNQd79wpqUBN9AGWesI1eG4B374EW0bOHhUUOh+rJU4GjuErQQDBJkUWTApwSEHnQfNGCNfSVG6n8xd99RtqsOUSxN36+85r/6FqKuR62wVFmmPsOrPUxmkAvtUR2WM1fC2fjEI3wmBmPA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763174121; c=relaxed/simple; bh=Rz8KWpOT2ndvIDkVBobKDwBDCHXj3WRK7sMmSaWxLC8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DThgWLUbRitTNP0K/4NxRFQnfDbi6oXhq+E4oO2bHdrrdJYbgNiT99oF6C4Ctas7co87SbmjNW7Oo1Bt8IxylPCmQibhpRh1tWmmBmVdeQag0Ww4IWibL7YvzNqIGflZOffgVZdp7GcALA2kLBBjHWTrpDJ+bLG8Sl0NPZt/zqE= 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=oNq4l35W; arc=none smtp.client-ip=209.85.214.171 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="oNq4l35W" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-297ec50477aso19327355ad.1 for ; Fri, 14 Nov 2025 18:35:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1763174119; x=1763778919; 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=b4c/dqlofQQ1Cq0Pw+ZOefCVsG4PeXoReJklWLO52f0=; b=oNq4l35WTBo8aXmcPQUBIFqbTTWOnBieCw1Y999IGc6jhhXIxayJUzrOxOPzUSH3uv INqhLmY0s7TkeZIncOU+W8hm+4SyIDXvngdBGssC0RB3ahzmxrSdemt1s7PIO8mDYzY/ HwlmVv1vizCSjp6w55CijHGFOyvZ77wXyuvGw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763174119; x=1763778919; 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=b4c/dqlofQQ1Cq0Pw+ZOefCVsG4PeXoReJklWLO52f0=; b=H2gCfLS3ftTb4135m9HJpsLzIeObxo8qzxp7kd6nEkSx41OPnpJZ4s9RvnBBl2R7Rh Nmz9Ncneh5wYjLN336XcVi2zCDGNhEVz40mdt5iqtPMzRwh9RqPe2crFJM2bJ405XwqF fsSF9Mwoxizn/aE7HIx7c9abDa3JgR8VfSafDVmSqjvIJNSibaw+fwjpOw2fbOvfmhKy x4fJLC1BGlhLFEpw92gaPWC++LqMYYn1nYNqip3w7kzNMz/KjRIJE54YWlp0/cyV46sh Fff2c99ej9WeyyUzJle201fj5teUhT7isnqCyszdLUd3nbolr9J+zMJJh95Ni6Narx8a DcSg== X-Forwarded-Encrypted: i=1; AJvYcCULG/8Bw9ujK5FA/nNMWJ+hXr7W/wD6mLKbULZvyVPWsTawCIqQL1lgudyDXl9XJhmbgbunvTBHzTxADSA=@vger.kernel.org X-Gm-Message-State: AOJu0YxAVuL69csIdM99Hgr7z3QZr5xfit1He5JbUdwk/uB51g6V+dt4 Zn18XQBtrS/UNB8d0A/MW/biyh60aeijCjIZ9ARjMPQJkC+nI6i727RgUHsbb0C33g== X-Gm-Gg: ASbGnctWGm5pVWDwwYMecaWH4itaVAyea1W/NxiyW9l+wdViMQPIhecOFrGMiAYzyxp PSXcuNj5WogNsRcTdRfT4+nbhRSKLayDyNy7Ol37EGv73JFRlMCCV0V+7K4r8EJdA31r0P0Tf4W kQb5K/BFSI81TVjvA7pkKgpVl4MjEB4qeM44waXU91Xxj1mDBvRVbAfYxPIxIU8WXa8XR0S+y3f ei17cQtO+x6f99Gw19WtZaphr/bYXe7hUVMoYjqeiOvzmZGwE3MHRjU/V17q5aOms3FlTi9IcCp 0pjQO/uVyrdj9QjHfhB338L9KuoViIWgtnsFL8+cfXjWEBXa2JZ8dAxKLmaFq2tdpgcy9ul/eKB Nz6tbrB2Jp/v+oyn3WjvrpON4wAq2LUvK9OE82qwRWrlhC2xpXqFYf5yPH3UK0+fdB4HBNc4hlD vGz+ScJPu3X9cX0RSZJylsWISe9CdYpypTKi3aAw== X-Google-Smtp-Source: AGHT+IErO2AnZLN2sgTOQ83bbSpiNbBMpGFTea0Uu0P8ZBl3yHBz5eWOR7rGBCRpubc/taMzYWS5Lg== X-Received: by 2002:a17:903:11c7:b0:281:fd60:807d with SMTP id d9443c01a7336-29867ec97d1mr58658215ad.2.1763174119552; Fri, 14 Nov 2025 18:35:19 -0800 (PST) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:b069:973b:b865:16a1]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2985c2b1088sm68641555ad.57.2025.11.14.18.35.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Nov 2025 18:35:19 -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: [PATCHv3 4/4] zram: drop wb_limit_lock Date: Sat, 15 Nov 2025 11:34:47 +0900 Message-ID: <20251115023447.495417-5-senozhatsky@chromium.org> X-Mailer: git-send-email 2.52.0.rc1.455.g30608eb744-goog In-Reply-To: <20251115023447.495417-1-senozhatsky@chromium.org> References: <20251115023447.495417-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 --- 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 76daf1e53859..bc268670f852 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -530,9 +530,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 @@ -547,9 +545,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); @@ -567,9 +563,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 @@ -577,15 +571,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); @@ -864,18 +856,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) @@ -990,13 +982,10 @@ static int zram_writeback_slots(struct zram *zram, =20 blk_start_plug(&io_plug); 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 select_idle_req(wb_ctl); @@ -2942,7 +2931,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.rc1.455.g30608eb744-goog