From patchwork Fri May 2 06:49: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: 886916 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 CFEB62673AA; Fri, 2 May 2025 06:49:42 +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=1746168584; cv=none; b=jeBWDRtOMU70+H1qBBU8a3YuqlSOSFkm5U7O+LbtL8BGJ6aK0UhSOp8ZcrDRYd76QACW/SpxpumSyiAJ3gmeveoSsNG3dYsiSAy0kKzd1OQy+Gv3YMysAhFkUtMddRTMzYD2YI0Myi6oe87db5XF7ngR2SDlM1sD462hdJ4X0I8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746168584; c=relaxed/simple; bh=1gnX1QA5x1CbNNvUCSaL1CXeaUCWQ2ixuIV8q/VIwFU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R5lHw4KJeUVASU+CVR2RLdLjcSMd5hzT5QpPMMplWOnet2GaCSW7VanH2QvnGqYahZ+/6P1vMLQTjRP8DIUtDfmPgreEWyA6uX0JTbava90X4WB7GQthBAbP/ktcgJtOdPq7sDuhR88AZiyy4gwg0zwzTpbfdnuUmtiVjPZ733c= 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=cq5A0S9D; 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="cq5A0S9D" 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=A6DrXylWbVeQmEZpWC9MNkt93jfH/DDfytNjBqDDC6k=; b=cq5A0S9DU+QGEIc391X3rxPhCY VsNmADB8cK1MegtAak5kcEjgZ93dVa1+qFn4zhfi7dR6A2k/hnFzYk4V45WE2bFbVdIqCet6cpP4Y 8CbwwbmlUdfYxIEwFKN5gfWQ/Vw1lAvsoiNb5e3xgOJ8YUN4WHeaev5bckZf5RxkQKN+0+Lyy9Mck Vs8Nd2AhxEXRCOE06l8EFtkpXJ/VYYkHIdoUcLvRBAO4rFTgxVXq/5pAMNOgjlT/05Gm7gf6g9oXI HLlwInsEMmsnDbMc2sjlVHmq1+xZcBcQxKENaWx2mj0oSekouaQdKa18YZ4k2ONELJgsphN5QXh9w oR2XB6wA==; Received: from [185.143.37.16] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux)) id 1uAkDN-0000000114T-0K28; Fri, 02 May 2025 06:49:41 +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 Subject: [PATCH 3/7] scsi: make ppa depend on !HIGHMEM Date: Fri, 2 May 2025 07:49:20 +0100 Message-ID: <20250502064930.2981820-4-hch@lst.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250502064930.2981820-1-hch@lst.de> References: <20250502064930.2981820-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 --- 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 Fri May 2 06:49: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: 886915 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 713FE2676EB; Fri, 2 May 2025 06:49:47 +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=1746168589; cv=none; b=Waj2JACj0zghAbike+Whd7sVt2HxKIDGvmykxgn+9AbU0QLrbjkr1bl/TmSHhtcL6XjJp1g089D5WojON8AhFhBAkZL23VG3WYgatu2ow2LvDdi6fe6/lQK311J1sLJCmbBoemZ58S55KO1B+kh2tMzZlnsjQQwf5dwhDFfFVFc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746168589; c=relaxed/simple; bh=EK4ifc2r0IZ2alSl3I8+DcaE9+bdWouYUg+M/fSqqn8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kT+tuPN7j2foJLACmwfx5uzuKrSnLxYp3g11bJWFsIgc+Z4CscOEgKk3dgUH1ufRh9XcNYkpwYs2q9Hm4vyt9c7scuVL9p9VO8Q4WVpXKyOklIbbP98EEIJkNBmlZya5b0HWr40S4XIbmLjXUAGsCis6GlR8Q7c0Bm6fNM2CxnQ= 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=BH+FiiaC; 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="BH+FiiaC" 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=t0yZoIwUV4+inxjNwnVHFH6tBnwOSSgcyj6eYeL50as=; b=BH+FiiaCFjwHqbT8ck0NnC9Rst umcS9ah9p9cWCX4gwNvsnisd/XwF5YyQWtWJzA2L6EGlYqMvEkaaR78cHcioW42Aak7RmOVH+ZSss VUaT6VWYeC34bfnDwi336TPrb2sqXNFDrSkkpLzYejK02mm9MwhGoF1BV5bWvw2RJ+rqutMi6TZ3D ct4wz6yGKFDvcv/vzWA5Qy9jFBqwSysnwf23lYB9kOhJXPupzi5I/bHFof5lOK/om5sidZHJx/V+d yg3PaZrkL1ImhDwaZwZjiRHJKhE8+66fTe0R+8M2dY9xR/v84OcY5IGI31g9+e3eE/NVEyIy7N8wY l/jLCh1g==; Received: from [185.143.37.16] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux)) id 1uAkDR-00000001158-1lb9; Fri, 02 May 2025 06:49: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 Subject: [PATCH 5/7] scsi: remove the no_highmem flag in the host Date: Fri, 2 May 2025 07:49:22 +0100 Message-ID: <20250502064930.2981820-6-hch@lst.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250502064930.2981820-1-hch@lst.de> References: <20250502064930.2981820-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 --- 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 Fri May 2 06:49: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: 886914 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 AF84B266581; Fri, 2 May 2025 06:49:51 +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=1746168593; cv=none; b=am9F7bTeTVM41/d07ecCWxA03G+jczWg1a5tz73xM+8dxv9gWORH9/v1l77+03bMk8nx2MnrmVfOJXMHO1iCZQymLsXHA4fJwHuMMhl14sljwBeQCl3mSsjceJbXiaVOC5njyqwbhjrIWeQsLqYBJp5MLsmXUEm9tlMrRwuVNl0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746168593; c=relaxed/simple; bh=1lWCpmASBkK924/7jJLz5e2c6unvL106KVoor8LqoI8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OLsIPIzyzsR0raZObYeJ5JlKbPUH78AVsHWQJXUzacdFFwwFDLuJcDCErO3BpLgTRfkTBdeT9fyi65lOTTu2eE/6vIraI5LmlwpFaADfLK+nydJDNmOdhGnD6gRhLcHqghOspv+N1ksckNa+n5dEvYLpniNd2vc4ZWVoWk3UmCk= 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=1l/tBuFS; 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="1l/tBuFS" 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=pmkmrZp/v2r7YXacZ37i5GXFUiZ8QGj+39EQV0YIZ1A=; b=1l/tBuFSvjow20r4IxavImVI1G Pqceo77c9f7FzXAOb166YUE98dQOQX57lbMjZvQDFXIP/pgYnpROMt3mqJrZ5UdkqAadKpNBhpoEq dFsHGUBO1LRIayqyEXOLTXNeQ7Rt1HzLdtYB6DT+d/QEbAyVrYsmIkntndecm6FfaT2gZX2ui9Rse zrubul71FfZ4InMrwHtFL5bQr+z8T+rMaBIXcxc7twu6qwpxJ2jhXh0qCcSe8yt30aDhoTU7yzfuU M5kyCND1jhCNLk1m6fyVM6uyc1J8frATpmFdn8hW2IQz9msgRwAUTFxhvaujt+86JQloHAIwA5aLD Ewpmf7MA==; Received: from [185.143.37.16] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux)) id 1uAkDV-0000000117Q-3K8m; Fri, 02 May 2025 06:49:50 +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 Subject: [PATCH 7/7] mm: remove NR_BOUNCE zone stat Date: Fri, 2 May 2025 07:49:24 +0100 Message-ID: <20250502064930.2981820-8-hch@lst.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250502064930.2981820-1-hch@lst.de> References: <20250502064930.2981820-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 --- 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)));