From nobody Tue Dec 2 02:58:12 2025 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 DA396303CBF for ; Tue, 18 Nov 2025 07:30:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763451028; cv=none; b=Q3rSN4/pnpegxITnWSru9GF1jKLXkkLUwwtaJfInboFEpfc448IcRgpT6QvnvyeLDQzJOVGbNdx2S05+PSkC7PiR2gwDk3WdptEvXlsW0xk3tnadtTITniq3lK3X70j9AXdSTstKZDowpJoUijFFFd7/eyuZ+aoO0zIK2sal3Vs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763451028; c=relaxed/simple; bh=wmywxqnED32HJVGKR47kqa9PyXCMZnodT2U0NloKWRc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e3Kr0hn3+81cTz7t1o5b26lRnasY/HOHRDSAZLl0YJ4ynOmj7Ab6q/IjslR+7wZtOopVQ0OE+fKqwmPnF//vixbLshj9uW2sHu4kyHeo/EmBUjK+hNKFljy3u9veQaSgrX98yjTsHn9jpTpFUXVdxnlkEyn18rRL88lUgAtWmW0= 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=f7RCcnS4; arc=none smtp.client-ip=209.85.214.170 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="f7RCcnS4" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2981f9ce15cso65662685ad.1 for ; Mon, 17 Nov 2025 23:30:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1763451024; x=1764055824; 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=Y5s1n8emEbRVEeKrAhj4AgcEk08attFm4KUuCDQvhIk=; b=f7RCcnS4P6QkDgw7nfv/kpyvweLcO8vDcLA2AQn+BALqyCgL7y//6SiQAV9D6DyMAU dIHrrhl2bzQeHfZt0p8MHed04UhoxZiFBT1zcdkOdToxQ8o52yyP8nSAkxPHAc/lOBba ry/IR2hdG8zuRdiqvcafdt+8E9YBanBAbdRb0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763451024; x=1764055824; 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=Y5s1n8emEbRVEeKrAhj4AgcEk08attFm4KUuCDQvhIk=; b=nUAw46x8RPmTYQpBHltd7JaSvKlz3/HfFZZQP/Y1AqderoHXqW6qhfX73JXw8WCGZh t6SihEGy8CPeldAUd9gAg0vdiLRS/yxLVpsJpe7lUfjfCDVGZvMXWukceIT1oY4m0uLv th62xubJ0TepSthWxLVVOG8Wrq7wOKogZDqnR817SWk6oE+1HOR11ruPmRw4Buhdwccd ySB63Q9VjfnKmj8ETmSVMACTARrq4d3JiNqsnIuYYcd60Xn2m6jgMXqN6LrJMCCFKOF4 lnGM1ffHsD103mZ0OJDzeJopg/aYxMGWl8E3qPdo6W8Q3UWH2YpEsvt2juOVTELyljo/ G/aQ== X-Forwarded-Encrypted: i=1; AJvYcCW1gl3QrWFDJj6+taX38jdGeyi0WqKFecMjDFxV0mXtxdP5ICH8+wTLt0loZsCV84bM4E4EW+Unla9hWeE=@vger.kernel.org X-Gm-Message-State: AOJu0Yzk0eIXN5QNrKusfZv7opHlnrJEDFlpxS49gm05e4vTSOwFzRdQ ujRbzqKBMOMMKFlaItwi8ofp9Ad3tDjGPKJKv0s+aSowhHHorkYEIrRr5Si6SyVLaQ== X-Gm-Gg: ASbGnctVecSz/L/I44tXyZR12+6x7wXYMlDfAYKQ9DoaxVcgpGbolrYK2uV5pDJqQdi VXVfKac4xbgVz090izp2sCd1i3rk6CUshfK5pPelCg4AMYCoPo5yJJHY5Xu33k3Gg7wKp9/JCTf yGWlYZvWHWWiWxKlVB0I+EaPkXhqog+3q47oOgappxR2H7WwF20Qhz7p6EkrBRdbgXV5VuGYxTi UX5L5ZWHIrqlfbAHxMfjjzobzsI3eV21PhHTWIl+X9hmqgiEUjetls7eKnnKwy6PnY8ci9pQqkA 54ZhRvoNSxOkD39JpAs4Ukv+93V5AfacE9c/JixlPr+UNvHPyM59D9uYdxauybjUJRkKl5h9O2K d4tC21ySlys5uBgeh2u6KzeSubgBB6vV9AjF+A3tEeTe+Vplp+rvEoeEWuSnwPVby9zOIkM98Mw 2LcIjlvU0rmkgqtJbyTNFpGz1L6Ps= X-Google-Smtp-Source: AGHT+IEFUxpDM4RZB/8QnapGp2d+TGrwoXbvzGp7l35DJ9jW3FWtnGNox8kM6z3lPxn7O64J6J5u/w== X-Received: by 2002:a17:902:f64b:b0:297:c638:d7ca with SMTP id d9443c01a7336-2986a6bf2damr172314225ad.14.1763451024123; Mon, 17 Nov 2025 23:30:24 -0800 (PST) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:beba:22fc:d89b:ce14]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2985c2568ccsm163926215ad.50.2025.11.17.23.30.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Nov 2025 23:30:23 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton Cc: Minchan Kim , Yuwen Chen , Richard Chang , Brian Geffon , Fengyu Lian , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-block@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv4 4/6] zram: drop wb_limit_lock Date: Tue, 18 Nov 2025 16:29:58 +0900 Message-ID: <20251118073000.1928107-5-senozhatsky@chromium.org> X-Mailer: git-send-email 2.52.0.rc1.455.g30608eb744-goog In-Reply-To: <20251118073000.1928107-1-senozhatsky@chromium.org> References: <20251118073000.1928107-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 073a12132cb3..1cfb58516a8e 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) @@ -992,13 +984,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); @@ -2947,7 +2936,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