From nobody Mon Dec 1 22:05:41 2025 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 7B430302174 for ; Mon, 1 Dec 2025 09:48:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764582499; cv=none; b=tRyvupgYGLKVTWnut9MXiXb53RG4uNB+8z2j5MWb8sQckVb5h3utVSl9bzYqbuQJK7VPCZU06zy3sVlsN/j1weD8gBA50xGuxj4maZknHbCm77nJB9QSuIcGcgyXkUpn7vN1/NpIAmhFRPtbHY7wifkHglC2gPzPbCIkcfhagR0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764582499; c=relaxed/simple; bh=+u6s6RCpy6sbmxn7iBizLf84Ie3MOO3BbWEG6PneCSE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VoX7OpeWunJzNKYhFeOu0NIU5rCbRkTiE9wt25TyLnKrYchVu3k2irvCX50etG82RD+B0KFaooupFB98rqyM1M2QvxazatqFuuP5/PdF1feJBTldZgXzlVFXI0f/dNzjynogMTv0+7pqtZYj6h6Z/OSQ00bjSBpVKSp+lt4OXII= 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=DKgnL+nd; arc=none smtp.client-ip=209.85.210.180 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="DKgnL+nd" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-7b8eff36e3bso6409082b3a.2 for ; Mon, 01 Dec 2025 01:48:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1764582497; x=1765187297; 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=MFPCMT/DEG4vuNOqo+8qbFXraYHdGAlN+ITtNxeLbtw=; b=DKgnL+ndPxIf6emX0DmB9c8+C/C0FtPgfrHrI14urFloeYecc6SDINhZL7xKyMJcyj mrLloHHibcDXNu4WUetBndgF239ASFS6HqMrlnwr7eMKngvn89b3PXQUurHaZMPPYlKW LdoBvD1S0X2GhQPOijkaQHl0Jjy2fTwf9Z6AU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764582497; x=1765187297; 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=MFPCMT/DEG4vuNOqo+8qbFXraYHdGAlN+ITtNxeLbtw=; b=GGAYOLwfDC9pRFtdUe8NTj05U5ioTcO95IaVvMS7ci+WCzL5bWlGE0eIr5bR76qvO4 +0pvdaq52RsGc+i9ai3cv75+3f2s8wBKYjg1xl1QJ25JC3MwuwaBjX46DPUUeC7ahaIO X5nvMOaQ76Dhyt3c4Y/X+n+OT1KFCbdOwXhZGicKK1SZ7jMZ7Qw0B/YGay/UgcZFbopN m0RsWFriVoUn9COnJ30twrHI15uJqeCUMWotnwtFb1wGatN1R5FMOL6quYBRs9AAKW3M cHaYsJP2P1BZBQ8oDgF3QIlrSU0BQ4Ft7JWBdsl9AuH+iYE8lAPU15+FvCq1sFkbX550 T3NQ== X-Forwarded-Encrypted: i=1; AJvYcCVGZr9fEEUyFk+JI0xBGbzm9xMJ+HRmrqgXyLkZNgPSqNm6ibTLx7RtWg1Uw/ce7inJghmEqtrh8FGxCHE=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/PHQeu6o7X1hT2fHjZywtPDATlQ5l6QGBcHN1gAChEPysgVr8 FwV5Zbw8zMQ6S6Ut3ZY8iZ/W+P+MWvR79iP3Hkp8mG+nx9vFnxrCZsqgWpbSB6hchg== X-Gm-Gg: ASbGncvk0Z9MhzRjnR2P8Et0JtTLPN+FUp8e0DOxJPK88FlQ+Mw1X6KyCM74Odn8Fxt fzNBhfdru2Rm4sK3QV/55sMSlH9LIUK8ZDCGenEn7+l38uSIrJktnyjujbEhZ/8sXAtYmBgqljG TtpSIFXnO0bkf95EF7RJZfwzjcD1PggbU1l8ZJU01GsoFHKmQaQGySCniTM38/Rdgdsn4/h5Dia UA/YH4weYpBqA54k1bND8okr+LzrLGtw1v54qkc9ZXSJQx7tMwZy4WEvLQcEiar1PUZ6VO14Ydy KhFRfR4VTq4XweA4dJx+Wxuj87KZBMWFM/5r8GL/GQ71kEzQlo8GHLuwpv7ehfmeJeZUieYgFXc uj7ryWwiqraW7vvv1hR4Uh5WghhNb+mbjuR9/Ku6tjp9tEABYvfitPnDQ9u5H14BWHtqzJdabzw 4xvq7f4ceIfG2K76Kq7qyToelZVVrJz8hLwQSRnKPoh4bAy6W31HskQQrmkyXWFZwph1GfBczyP A== X-Google-Smtp-Source: AGHT+IFlrnHAUO0MwvM1aa8kkuCDrVgQUWK4lsCQPDK031ojL9Sillo7MDoVjBI+gYL8H8kP47VqCA== X-Received: by 2002:a05:6a00:4b4d:b0:7a2:7a93:f8c9 with SMTP id d2e1a72fcca58-7ca89a6c1d3mr23814778b3a.27.1764582496654; Mon, 01 Dec 2025 01:48:16 -0800 (PST) Received: from tigerii.tok.corp.google.com ([2a00:79e0:2031:6:943c:f651:f00f:2459]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7d15e7db577sm12882074b3a.31.2025.12.01.01.48.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 01:48:16 -0800 (PST) From: Sergey Senozhatsky To: Andrew Morton , Richard Chang , Minchan Kim Cc: Brian Geffon , David Stevens , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-block@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv2 4/7] zram: move bd_stat to writeback section Date: Mon, 1 Dec 2025 18:47:51 +0900 Message-ID: <20251201094754.4149975-5-senozhatsky@chromium.org> X-Mailer: git-send-email 2.52.0.487.g5c8c507ade-goog In-Reply-To: <20251201094754.4149975-1-senozhatsky@chromium.org> References: <20251201094754.4149975-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" Move bd_stat function and attribute declaration to existing CONFIG_WRITEBACK ifdef-sections. Signed-off-by: Sergey Senozhatsky --- drivers/block/zram/zram_drv.c | 48 +++++++++++++++-------------------- 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 3cc03c3f7389..1a0f550219b1 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -539,6 +539,24 @@ struct zram_rb_req { u32 index; }; =20 +#define FOUR_K(x) ((x) * (1 << (PAGE_SHIFT - 12))) +static ssize_t bd_stat_show(struct device *dev, struct device_attribute *a= ttr, + char *buf) +{ + struct zram *zram =3D dev_to_zram(dev); + ssize_t ret; + + down_read(&zram->init_lock); + ret =3D sysfs_emit(buf, + "%8llu %8llu %8llu\n", + FOUR_K((u64)atomic64_read(&zram->stats.bd_count)), + FOUR_K((u64)atomic64_read(&zram->stats.bd_reads)), + FOUR_K((u64)atomic64_read(&zram->stats.bd_writes))); + up_read(&zram->init_lock); + + return ret; +} + static ssize_t writeback_compressed_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t len) @@ -1976,28 +1994,8 @@ static ssize_t mm_stat_show(struct device *dev, return ret; } =20 -#ifdef CONFIG_ZRAM_WRITEBACK -#define FOUR_K(x) ((x) * (1 << (PAGE_SHIFT - 12))) -static ssize_t bd_stat_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct zram *zram =3D dev_to_zram(dev); - ssize_t ret; - - down_read(&zram->init_lock); - ret =3D sysfs_emit(buf, - "%8llu %8llu %8llu\n", - FOUR_K((u64)atomic64_read(&zram->stats.bd_count)), - FOUR_K((u64)atomic64_read(&zram->stats.bd_reads)), - FOUR_K((u64)atomic64_read(&zram->stats.bd_writes))); - up_read(&zram->init_lock); - - return ret; -} -#endif - static ssize_t debug_stat_show(struct device *dev, - struct device_attribute *attr, char *buf) + struct device_attribute *attr, char *buf) { int version =3D 1; struct zram *zram =3D dev_to_zram(dev); @@ -2015,9 +2013,6 @@ static ssize_t debug_stat_show(struct device *dev, =20 static DEVICE_ATTR_RO(io_stat); static DEVICE_ATTR_RO(mm_stat); -#ifdef CONFIG_ZRAM_WRITEBACK -static DEVICE_ATTR_RO(bd_stat); -#endif static DEVICE_ATTR_RO(debug_stat); =20 static void zram_meta_free(struct zram *zram, u64 disksize) @@ -3079,6 +3074,7 @@ static DEVICE_ATTR_WO(mem_used_max); static DEVICE_ATTR_WO(idle); static DEVICE_ATTR_RW(comp_algorithm); #ifdef CONFIG_ZRAM_WRITEBACK +static DEVICE_ATTR_RO(bd_stat); static DEVICE_ATTR_RW(backing_dev); static DEVICE_ATTR_WO(writeback); static DEVICE_ATTR_RW(writeback_limit); @@ -3102,6 +3098,7 @@ static struct attribute *zram_disk_attrs[] =3D { &dev_attr_idle.attr, &dev_attr_comp_algorithm.attr, #ifdef CONFIG_ZRAM_WRITEBACK + &dev_attr_bd_stat.attr, &dev_attr_backing_dev.attr, &dev_attr_writeback.attr, &dev_attr_writeback_limit.attr, @@ -3111,9 +3108,6 @@ static struct attribute *zram_disk_attrs[] =3D { #endif &dev_attr_io_stat.attr, &dev_attr_mm_stat.attr, -#ifdef CONFIG_ZRAM_WRITEBACK - &dev_attr_bd_stat.attr, -#endif &dev_attr_debug_stat.attr, #ifdef CONFIG_ZRAM_MULTI_COMP &dev_attr_recomp_algorithm.attr, --=20 2.52.0.487.g5c8c507ade-goog