From patchwork Mon May 5 08:11:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 887732 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0963915574E; Mon, 5 May 2025 08:11:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746432708; cv=none; b=kBZbvMw8SG2Gc2tBXj2OIdZeBOlqMq4UbjfaE9/JCdRYTnSB2k335rlhaAxmLQQjVHqyvlBjsJjrHkfYralobb9LyZZxCOTNYFDvF74X7MdBgRNrxAZw3P4FIpSk5e/QNQq1L+/abqewEsi3jjKe/irh/5VbYIuOoIMhErhYQSs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746432708; c=relaxed/simple; bh=cxPlgOwR5R2Nazk97EPxSq0hCMprdwGLNM9SrdOgNvc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rUA3BahRflnNkw2jnjXEkIOD8uY0jOh6UpNktXF0Sv1XDJjZhwVqoCXQKkqFx7dIG9lUiDbOXikGQOkr4O0n5ylXziNeoGn53HmA0EM9q1DK4mR6sHAjJAk8IDlPfB17hk4SdMj590b2SO2pKq0izQ2N9yWX+PiDkjpIZ/F5uCI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=rYJgjJT2; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="rYJgjJT2" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=6XEbUoueC1gHPxeSLnipQtnbtK806iU6jTCT9j8NDXQ=; b=rYJgjJT26IoZy7YlUKRsP2EBES oPNCH5iY9WcCi0PEKb4+Xdi4d9tOzqETSIvgxElc3/rBSqhzi40cLN+LXUsV6+3z9s00kzc8wF+FA JwUNapXcPMZ/rsvQaTmX3ZNeQoQLFQRmzg4QXjgjTYXxHrvLN13+bGL5UXwl9G4NtPL3lzB0N4ucq cfjfbjiAklYUiv5noWqfxLxTkMuzQS8s3zjUcfPNuVnZnHITVs42zVe7xLzRSQB5TJUhvp1sm1iiR qpvHNSk1h9XZFdh1WE3vhYMgGOsSvNvTtawLLF1y1OB+gVDO1DHtnnxJlJoptmJmH1z5IytzL+x3n qubEwZKQ==; Received: from 2a02-8389-2341-5b80-f2ef-69c9-6274-23a2.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f2ef:69c9:6274:23a2] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux)) id 1uBqvQ-00000006kT7-45L0; Mon, 05 May 2025 08:11:45 +0000 From: Christoph Hellwig To: Jens Axboe Cc: "Martin K. Petersen" , "Juergen E. Fischer" , Alan Stern , Andrew Morton , linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net, linux-mm@kvack.org, Hannes Reinecke Subject: [PATCH 1/7] scsi: make aha152x depend on !HIGHMEM Date: Mon, 5 May 2025 10:11:20 +0200 Message-ID: <20250505081138.3435992-2-hch@lst.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250505081138.3435992-1-hch@lst.de> References: <20250505081138.3435992-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html This is one of the last drivers depending on the block layer bounce buffering code. Restrict it to run on non-highmem configs so that the bounce buffering code can be removed. Signed-off-by: Christoph Hellwig Reviewed-by: Hannes Reinecke --- drivers/scsi/Kconfig | 1 + drivers/scsi/aha152x.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 5a3c670aec27..c89e6991e934 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -403,6 +403,7 @@ config SCSI_ACARD config SCSI_AHA152X tristate "Adaptec AHA152X/2825 support" depends on ISA && SCSI + depends on !HIGHMEM select SCSI_SPI_ATTRS select CHECK_SIGNATURE help diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c index 4276f868cd91..e94c0a19c435 100644 --- a/drivers/scsi/aha152x.c +++ b/drivers/scsi/aha152x.c @@ -746,7 +746,6 @@ struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *setup) /* need to have host registered before triggering any interrupt */ list_add_tail(&HOSTDATA(shpnt)->host_list, &aha152x_host_list); - shpnt->no_highmem = true; shpnt->io_port = setup->io_port; shpnt->n_io_port = IO_RANGE; shpnt->irq = setup->irq; From patchwork Mon May 5 08:11:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 887731 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C53411E492D; Mon, 5 May 2025 08:11:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746432717; cv=none; b=HFN23y5S21oPSBdP0S1QDbHpXJSr8UxVEYnCoEhAPiGMA6CjEExx2uwY8pktVwML2fOTG5wp6QrW5f/+Z/q4pEVQdfCZUsE4ny9kMXcpn8vGv9kM/PFPzKbvfJc6DnhU+4g/WxYFyuQ5bl2tlP704bK8HyWfFLYx1VPf4zLDYP4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746432717; c=relaxed/simple; bh=tyfmDu5RrzffKFNQcLgFbOa6tMwHBnGv88RxwnSg0T0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EoN+nzW8X0lozh59pI4aLK7X57IJ9bH5ZY6plD7Aka2iyjq4dc/1PEef/bjqcCapCj6ZDzXFhvifC0zQuPSYmUY2YyLXfqcyZ1E4IZNZkhngFIA0fCgMg+RQXSdxMlO3rhPNoUjnkD+4tMDEsqGTk5ZCGQkIsLuEVTfoJnNYfzo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=uObhKkX7; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="uObhKkX7" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=kDizabCCdyxATU2dAD2Y+usEvCItNB58jVxVeM+hLcw=; b=uObhKkX7At4AvsencfrX7YgoFu 6FmMzb0W3bP7dDCfc6XSNvnt42ntFFqiHuXbkITE18e5n9sH3wleToP6s8jpsLMAj1YVAEBxq6A/G tneiLWJdcNJYLWUYXHjneumOOs09EfldhcxSVDzfeJhjCxOYsXjfNDTHpgjUTjAc5A5OS3wLFK01a AwzOJlwJ53uQxZrcWSMribfZFl0n2bmL30nhJEtcuJf9MZ77zdwwlmyiVTEdQJyMSSfzo5XlB+e6D lcsa/vD3hxtXaY1NfH1XoerPXZ6kELw9Xfl7Zwaau91ZNertkfJlLdYh3YK0lOnIeheMLcMrAuHjI CBij4OsQ==; Received: from 2a02-8389-2341-5b80-f2ef-69c9-6274-23a2.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f2ef:69c9:6274:23a2] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux)) id 1uBqvY-00000006kUY-2Cre; Mon, 05 May 2025 08:11:53 +0000 From: Christoph Hellwig To: Jens Axboe Cc: "Martin K. Petersen" , "Juergen E. Fischer" , Alan Stern , Andrew Morton , linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net, linux-mm@kvack.org, Hannes Reinecke Subject: [PATCH 3/7] scsi: make ppa depend on !HIGHMEM Date: Mon, 5 May 2025 10:11:22 +0200 Message-ID: <20250505081138.3435992-4-hch@lst.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250505081138.3435992-1-hch@lst.de> References: <20250505081138.3435992-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html This is one of the last drivers depending on the block layer bounce buffering code. Restrict it to run on non-highmem configs so that the bounce buffering code can be removed. Signed-off-by: Christoph Hellwig Reviewed-by: Hannes Reinecke --- drivers/scsi/Kconfig | 1 + drivers/scsi/ppa.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 82e0b7eaed4c..5522310bab8d 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -796,6 +796,7 @@ config SCSI_PPA tristate "IOMEGA parallel port (ppa - older drives)" depends on SCSI && PARPORT_PC depends on HAS_IOPORT + depends on !HIGHMEM help This driver supports older versions of IOMEGA's parallel port ZIP drive (a 100 MB removable media device). diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c index a06329b47851..1ed3171f1797 100644 --- a/drivers/scsi/ppa.c +++ b/drivers/scsi/ppa.c @@ -1104,7 +1104,6 @@ static int __ppa_attach(struct parport *pb) host = scsi_host_alloc(&ppa_template, sizeof(ppa_struct *)); if (!host) goto out1; - host->no_highmem = true; host->io_port = pb->base; host->n_io_port = ports; host->dma_channel = -1; From patchwork Mon May 5 08:11:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 887730 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8C7DA1F03DA; Mon, 5 May 2025 08:11:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746432720; cv=none; b=HWNB6+YVCKdjZODelgPC8/gkL2dnz1C9d4YzXTFO05gamrCIgaT5v+vsh5FIaE2Kyb9iTR5Fj7B5pscdGWvA870Cq3Q0LhHCDkE2MeCbNlEzb4geJMyeLl0vAZQIenL86qF7N2kSVPxWEEl9LSZppRxi8r4XTQqiGKc1IETAIdo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746432720; c=relaxed/simple; bh=0cE3jj+Ir0XL+wHPsYyWxyqeQilhFZ/6F8O9mWVJOMM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QqCQ0PHp2kXqKWyysEzQVfPJQaVzX6R1FGp3Kxrdcn3o6Q1TM3P7udVY2U5x9JEJluNXSIlE8Ayfi4vVD1KwyWnh6zf7BgF6AwZDbzSat84wJ92RD6/z1c4PKf5RZZ6dgtFQGOT4xwcKJpX3Ndw7mJ3S/5ZZITCOiwR855ttr4A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=Ma23w4e1; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="Ma23w4e1" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=hVlNKlTiWcKWvQE8hDK2imIjySObLEfLFt6NJgg5UfE=; b=Ma23w4e1Pe/gas5w5H6/iRWCOw CKRA2ETeQCHEB1a4YjUuj2YyB6RAc//POSpE3PbyN8NuxyARuDIIOF2y4GdwwEdvRB3+Cj1jdyZz7 DfWVtF49hrC7r16yyqo7+HDfa9vpmHEtEdYtTbUBgzXoIjdDtqFhY76rRv5oWsTcT2dr1TbZIHI8Z b7DIZMFnT6VjxjXXHewgyB5Kdm2BPBzskivKoPUsrWrYoWe3Hgjz9sV8fD1KSGOcG2C1AEEIUkQP+ koOWvhBJnGngwDEGTc9mSUPyYw3Xg6r5bEgcC4ZQvpujP/jz/TTSuM6dyeorMNX9m6fwNn5/S+ol3 8/T1fSdg==; Received: from 2a02-8389-2341-5b80-f2ef-69c9-6274-23a2.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f2ef:69c9:6274:23a2] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux)) id 1uBqvd-00000006kYK-3FIY; Mon, 05 May 2025 08:11:58 +0000 From: Christoph Hellwig To: Jens Axboe Cc: "Martin K. Petersen" , "Juergen E. Fischer" , Alan Stern , Andrew Morton , linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net, linux-mm@kvack.org, Hannes Reinecke Subject: [PATCH 5/7] scsi: remove the no_highmem flag in the host Date: Mon, 5 May 2025 10:11:24 +0200 Message-ID: <20250505081138.3435992-6-hch@lst.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250505081138.3435992-1-hch@lst.de> References: <20250505081138.3435992-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html All users are gone now. Signed-off-by: Christoph Hellwig Reviewed-by: Hannes Reinecke --- drivers/scsi/scsi_lib.c | 3 --- include/scsi/scsi_host.h | 2 -- 2 files changed, 5 deletions(-) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 0d29470e86b0..39320dccbdd5 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -2000,9 +2000,6 @@ void scsi_init_limits(struct Scsi_Host *shost, struct queue_limits *lim) lim->dma_alignment = max_t(unsigned int, shost->dma_alignment, dma_get_cache_alignment() - 1); - if (shost->no_highmem) - lim->features |= BLK_FEAT_BOUNCE_HIGH; - /* * Propagate the DMA formation properties to the dma-mapping layer as * a courtesy service to the LLDDs. This needs to check that the buses diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 26bc23419cfd..c53812b9026f 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -670,8 +670,6 @@ struct Scsi_Host { /* The transport requires the LUN bits NOT to be stored in CDB[1] */ unsigned no_scsi2_lun_in_cdb:1; - unsigned no_highmem:1; - /* * Optional work queue to be utilized by the transport */ From patchwork Mon May 5 08:11:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 887729 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ED6191F1936; Mon, 5 May 2025 08:12:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746432726; cv=none; b=HzKkl5s4IFqVgdva1Oq4fJKUGtjYyFQGFR2CEjjZElZKf4iNBTV5yxVVYUvHAePs0isnCjqBC++SKmXqR5UOQbiHb0Rt6w8isSx8dmfEgsaB/ZIr+5jTLISwaucxDRZQ9gWI+Q2vHGYwr/Gd+28Zz1w+WL6a1eocp3cB9gUl2Mo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746432726; c=relaxed/simple; bh=1zVN+xIjzBc6r95Ek2ZLZ6eKl04IQcO8Ingr9kQRn0o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LMrN+lsVOpsy/Xx6MFTkx4980QSUwo/uqI9dimclc0zTUi5rCMIK7GbTKbvuY00y93NWmXQbIv4IBjd37+x2X5K3Oh/2G46g6A1SsO/ZXhBwM1toxFPFgdUwVwrtdEPXUR/M/WZSNCX75xJozjeWC3dCrG0mKL8Iut8LuGoMZk8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=iHhzDuj3; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="iHhzDuj3" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=wODqmHTHx7WBWPwc1/eP5FfzwUfd9WEhL1rHfNg6Hgc=; b=iHhzDuj3hAaxNoGYCzKKu+ZYTV 8LYcYy6IW/jGQu/ddFeYW6eRXb1suNkIwVP+TfS2/FYOJLDFDIEevqlwFqpCOZrnGekRo3QixTiPW uVeRoZStlr/DEtkbnmcvFTophuZU9ozZ2ZRD6KpSX9mAjvtJyn60BxUusDEckK7eFy81+rLvun2Lx tdeHQEceZxQypxZTu8yUI0ekx1twbdWN8BVi7cFb+ZUgZCjw9+Je+KkfbSBkdNis/PuQAJMWdNfVq opLcHr/a8nk13DMmytZD+FXtRgwlcMHykByvyaO6eiBlRCZOAAqQ5c5U79lwmV4JbTqCwiaExIEvw mFRtAqCQ==; Received: from 2a02-8389-2341-5b80-f2ef-69c9-6274-23a2.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:f2ef:69c9:6274:23a2] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux)) id 1uBqvi-00000006kZi-3rFk; Mon, 05 May 2025 08:12:03 +0000 From: Christoph Hellwig To: Jens Axboe Cc: "Martin K. Petersen" , "Juergen E. Fischer" , Alan Stern , Andrew Morton , linux-block@vger.kernel.org, linux-scsi@vger.kernel.org, linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net, linux-mm@kvack.org, Hannes Reinecke Subject: [PATCH 7/7] mm: remove NR_BOUNCE zone stat Date: Mon, 5 May 2025 10:11:26 +0200 Message-ID: <20250505081138.3435992-8-hch@lst.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250505081138.3435992-1-hch@lst.de> References: <20250505081138.3435992-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html The stat is always 0 now, so remove it and hardwire the user visible output to 0. Signed-off-by: Christoph Hellwig Reviewed-by: Hannes Reinecke --- drivers/base/node.c | 2 +- fs/proc/meminfo.c | 3 +-- include/linux/mmzone.h | 1 - mm/show_mem.c | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/base/node.c b/drivers/base/node.c index cd13ef287011..618712071a1e 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -468,7 +468,7 @@ static ssize_t node_read_meminfo(struct device *dev, nid, K(node_page_state(pgdat, NR_PAGETABLE)), nid, K(node_page_state(pgdat, NR_SECONDARY_PAGETABLE)), nid, 0UL, - nid, K(sum_zone_node_page_state(nid, NR_BOUNCE)), + nid, 0UL, nid, K(node_page_state(pgdat, NR_WRITEBACK_TEMP)), nid, K(sreclaimable + node_page_state(pgdat, NR_KERNEL_MISC_RECLAIMABLE)), diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 83be312159c9..bc2bc60c36cc 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -120,8 +120,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) global_node_page_state(NR_SECONDARY_PAGETABLE)); show_val_kb(m, "NFS_Unstable: ", 0); - show_val_kb(m, "Bounce: ", - global_zone_page_state(NR_BOUNCE)); + show_val_kb(m, "Bounce: ", 0); show_val_kb(m, "WritebackTmp: ", global_node_page_state(NR_WRITEBACK_TEMP)); show_val_kb(m, "CommitLimit: ", vm_commit_limit()); diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 6ccec1bf2896..b1c459f7a485 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -148,7 +148,6 @@ enum zone_stat_item { NR_ZONE_WRITE_PENDING, /* Count of dirty, writeback and unstable pages */ NR_MLOCK, /* mlock()ed pages found and moved off LRU */ /* Second 128 byte cacheline */ - NR_BOUNCE, #if IS_ENABLED(CONFIG_ZSMALLOC) NR_ZSPAGES, /* allocated in zsmalloc */ #endif diff --git a/mm/show_mem.c b/mm/show_mem.c index 6af13bcd2ab3..5acb51a9fc49 100644 --- a/mm/show_mem.c +++ b/mm/show_mem.c @@ -223,7 +223,7 @@ static void show_free_areas(unsigned int filter, nodemask_t *nodemask, int max_z global_node_page_state(NR_SHMEM), global_node_page_state(NR_PAGETABLE), global_node_page_state(NR_SECONDARY_PAGETABLE), - global_zone_page_state(NR_BOUNCE), + 0UL, global_node_page_state(NR_KERNEL_MISC_RECLAIMABLE), global_zone_page_state(NR_FREE_PAGES), free_pcp, @@ -341,7 +341,7 @@ static void show_free_areas(unsigned int filter, nodemask_t *nodemask, int max_z K(zone->present_pages), K(zone_managed_pages(zone)), K(zone_page_state(zone, NR_MLOCK)), - K(zone_page_state(zone, NR_BOUNCE)), + 0UL, K(free_pcp), K(this_cpu_read(zone->per_cpu_pageset->count)), K(zone_page_state(zone, NR_FREE_CMA_PAGES)));