Received-SPF: pass (google.com: domain of linux-kernel+bounces-125334-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: Dexuan Cui <decui@microsoft.com>
To: hch@lst.de,
	m.szyprowski@samsung.com,
	robin.murphy@arm.com,
	zhangpeng362@huawei.com,
	iommu@lists.linux.dev,
	mhklinux@outlook.com
Cc: linux-kernel@vger.kernel.org,
	Dexuan Cui <decui@microsoft.com>,
	stable@vger.kernel.org
Subject: [PATCH] swiotlb: Do not set total_used to 0 in swiotlb_create_debugfs_files()
Date: Fri, 29 Mar 2024 12:28:09 -0700
Message-Id: <20240329192809.17318-1-decui@microsoft.com>
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: SA3PR21MB3915:EE_|SN7PR21MB3937:EE_
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
	+0Ruw7LmJYx7VHhQJ8eX65wvdVu720279FH7kG0/dN+qEmeSMczQqTQRblFcqjeflC1Yz7tecFeZf9p0PjsdfzipAh7OwfM2vwzoHu0xy3O5IUUUkAHYjU4NJrG2Sry53/DaME7v4W5Hl7BdrlkN676mUp2a98WOiOgIKop4rot2elZ8UJLZQkaDmGDzpq1mM9IO5WZmyfxFA6GiNoRmA8LTuChNtmD1OFZh1lZgvkJ0xs99RazlOBKaQKsqXDqMbh4kMRMQY5XjaogoLEnM2Psn8xyhqt7EEb5PVGmXSSW62pRQw91Vizr4vlLvCiovXHo+CIQ1l3SlkEzUQ+AI+j4N5dR1I69F7MSadcFcp6wbv5chIWIHNNcBGl0ct7JVk+xsDklWlrX6rlrRTkioSPhShnz2oo5sQQSyWOEwf7bKv2xXjaQls2XEOppbzZkkwESEgqcaar/CiveAFh6Jj5/O62OZw9W29Irz4ntVmU56XthAz33a/On1+EUJsjlKlkX+76v/aJ5ei66DtyQWjGaYTwOovvN2jyr4KGVQDN+Y/xjSom16qGDhmayE+FjkDBcjhFWP3W0kqLClq6GhgOYBKMRBd4GIFRVkZyekN0PY6z10m8javhLOhuu8lWhIs/1Ju9+mhjQrNsaNG0qjttdn6lbZ3BWcQIUjHjnwzME=
X-Forefront-Antispam-Report:
	CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SA3PR21MB3915.namprd21.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376005)(52116005)(1800799015)(366007);DIR:OUT;SFP:1102;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?ATrlUO8UR5PCb22221JBNknSHNiLoUqlR0oH3JoYwCoEpft3tT0/2VNMLi59?=
 =?us-ascii?Q?J0ca89Ipg12MkbJ+fxOsq+6Cb0uj/X3RQodJNo/Bvq09cU/mjgJxQ4JbUJY1?=
 =?us-ascii?Q?vugKIZZVIG2R8CULrOfEpGBnhamGimaQAZOylSKszYG5fhKig63XBMc88ShS?=
 =?us-ascii?Q?Q8GriY9nXYNxZy8DFiaL8brCtiD2bpMCnq4E/afYr1kYQ4EMW1Ie11mgdio2?=
 =?us-ascii?Q?ZDADZhIVs90nQF70njmnvnulihyTUhXe29MujbVO+mxpscIo23+N7RHqULqW?=
 =?us-ascii?Q?BjJ5IViNYcDE1Iu8Kd4HvWMO5HCCrCRE5zNH0SuXGGlIz3wlbmyBRteeT+Vm?=
 =?us-ascii?Q?263hrv6oB6bBHDDyXTIdy7fipAwcGEnRN1W5dflZOqGazOSireG5UPOIrVlS?=
 =?us-ascii?Q?lO/oVTRJ8guMNa6l7lOBCaVB+nUzaNzFT4a2T7KGmQnnTizQkZcuzF7g+AQm?=
 =?us-ascii?Q?QUb+LPw2gHKt/OjkEAnNqBcF7G0CReMVphoro/UGoep98ATTKNP28gHdhypr?=
 =?us-ascii?Q?XINsJCYT+diPy4xAz+PJ9NsI+3D4oUzKf34BkzU+RjZyJ4VWGltC2cfpniZN?=
 =?us-ascii?Q?10CQ/zlBNl6xYRpuD5pe+GsPgxt4UmeAq1PAF9uyHBNu+ApzZqLl7VikxG2O?=
 =?us-ascii?Q?Y4IHFH09WH/fo0C4o0CZp71fWT5kI889n/rGb5tL8rOpTjmUqZE+4d5KEI91?=
 =?us-ascii?Q?jNyVTR3q3NUg36H3pjwsoQOYuqgRxLue2nhZ5JVuYWbh3WgWg6zbgZl32P61?=
 =?us-ascii?Q?Y+0oKeOj+nIoj90Rln9OCQx/PguqYoA+RrHUkb3MGLCqnhgikTATtGdPrV2F?=
 =?us-ascii?Q?hV3B2Ozp0BZrEq0C3YDos/fDjHa5+Lz895XSQCRn6nSGktC3E/+u3TgiISiM?=
 =?us-ascii?Q?60sTpehNF99/7hW3ioFWx8u5/Ea/I17piEv7IaNnxxPwxM3Ac7f9t/CyY7SB?=
 =?us-ascii?Q?WXd3Tyhri/PEoux3G39uBPWzNy+80aN6vhQ8nJdlbQ6uAIWejJmwhHygCMM9?=
 =?us-ascii?Q?nOquv3c1lbCNz4UqLtaBal8eff0qfUePM2uk4/dIPpQOFw8Qe4D1LxgvQvBT?=
 =?us-ascii?Q?Ms5NabCP8wTqQx6T9f966eTAdT6z7dXM9Fxiu+IIG+TedDcJXbyTIYo9t1FV?=
 =?us-ascii?Q?8QQVdvPRUPZ/ersV/TAMIP3iTiSMhUivnpw9hpW09RKDICT+R3oynpO68gM2?=
 =?us-ascii?Q?tkm8SvkbhPqdhIYKGP9Dk6SSzrPtDxYsxlxTekfF1zZd/mqvA6pTzAFiKeyl?=
 =?us-ascii?Q?wVFoNWbjX710r5GEwecJMuZFugxvuq3JQfYz3iXBMdmJ1VSu12njtfO6M549?=
 =?us-ascii?Q?Tz44d8SqlpP5j3R8CkeQuLIIllZtw4VkaK4nL/s/kVYEfo8y0RETDRJjS3vx?=
 =?us-ascii?Q?4khil76iqO7vrYBEtzHVxdj2KaMwTLXdfiDxUdMOueXRL7NPpCGEXJAlRWEY?=
 =?us-ascii?Q?9AxBTd7OdaeWSQhpHsC4qp6t/fj5hDPjpanmRERuxFjGQxXwET57htvMx6Sf?=
 =?us-ascii?Q?9PB/E6K3q6dOQYO3X3Z8uCtVVZPh1TeOZfEGiabbeMRPRL8WIgTBC5KgPisP?=
 =?us-ascii?Q?MXEuHZYtP603lxJ4D78vWZSMrokGLl834rQU2qRLo36im6OJbRzQOp6MjlUW?=
 =?us-ascii?Q?/unJbmcWI30/VrXB1oC59OtWoEYeLZSk2W5CaN9WxwYb?=
X-OriginatorOrg: microsoft.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ebaa8205-6460-4a4f-757b-08dc50266fa5
X-MS-Exchange-CrossTenant-AuthSource: SA3PR21MB3915.namprd21.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Mar 2024 19:28:39.7101
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Wse6Y018XX2Ym6yLlTAF5y+pqVyvbbtaN/0g9T1GVIIA6jP9DRKuJtiAuN0qYBaN4EMJ8RrlRSRAZ1/yWmuMAg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR21MB3937

Sometimes the readout of /sys/kernel/debug/swiotlb/io_tlb_used and
io_tlb_used_hiwater can be a huge number (e.g. 18446744073709551615),
which is actually a negative number if we use "%ld" to print the number.

When swiotlb_create_default_debugfs() is running from late_initcall,
mem->total_used may already be non-zero, because the storage driver
may have already started to perform I/O operations: if the storage
driver is built-in, its probe() callback is called before late_initcall.

swiotlb_create_debugfs_files() should not blindly set mem->total_used
and mem->used_hiwater to 0; actually it doesn't have to initialize the
fields at all, because the fields, as part of the global struct
io_tlb_default_mem, have been implicitly initialized to zero.

Also don't explicitly set mem->transient_nslabs to 0.

Fixes: 8b0977ecc8b3 ("swiotlb: track and report io_tlb_used high water marks in debugfs")
Fixes: 02e765697038 ("swiotlb: add debugfs to track swiotlb transient pool usage")
Cc: stable@vger.kernel.org
Signed-off-by: Dexuan Cui <decui@microsoft.com>
---
 kernel/dma/swiotlb.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index 86fe172b5958..4a9f02c13da6 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -1647,9 +1647,6 @@ DEFINE_DEBUGFS_ATTRIBUTE(fops_io_tlb_hiwater, io_tlb_hiwater_get,
 static void swiotlb_create_debugfs_files(struct io_tlb_mem *mem,
 					 const char *dirname)
 {
-	atomic_long_set(&mem->total_used, 0);
-	atomic_long_set(&mem->used_hiwater, 0);
-
 	mem->debugfs = debugfs_create_dir(dirname, io_tlb_default_mem.debugfs);
 	if (!mem->nslabs)
 		return;
@@ -1660,7 +1657,6 @@ static void swiotlb_create_debugfs_files(struct io_tlb_mem *mem,
 	debugfs_create_file("io_tlb_used_hiwater", 0600, mem->debugfs, mem,
 			&fops_io_tlb_hiwater);
 #ifdef CONFIG_SWIOTLB_DYNAMIC
-	atomic_long_set(&mem->transient_nslabs, 0);
 	debugfs_create_file("io_tlb_transient_nslabs", 0400, mem->debugfs,
 			    mem, &fops_io_tlb_transient_used);
 #endif
-- 
2.34.1