Fast kernel headers: split linux/mm.h
Subsystems (58)
v6 cover Fast kernel headers: split linux/mm.h
This patch set aims to clean up the linux/mm.h header and reduce dependencies on it by moving parts out.
The goal was to eliminate dependencies on linux/mm.h from other popular headers such as highmem.h and dma-mapping.h, and I started by checking which symbols were really used and moved those declarations to separate slim headers.
This patch set borrows the name "fast kernel headers" from Ingo Molnar's effort a few years ago. While this kind of refactoring does indeed improve build times because the amount of code that has to be processed in each compilation unit is reduced, build speed is the least important advantage.
Much more important is that this gives us greater confidence that the code is correct: if we forget to include a header, it might (or might not) already be included indirectly by some other header somewhere down the large impenetrable include tree. Chances are almost 100% that linux/kernel.h or linux/mm.h gets included somewhere, which then in turn includes everything else. Now if this indirect include just happens to be changed eventually, the build may suddenly fail at remote places. Worse, an #ifdef may silently produce different code. Therefore, at each source file, all the includes that are needed should be included directly (but not more). This is only possible if headers are small, and linux/mm.h and linux/kernel.h are large offenders resisting the cleanup.
Therefore, splitting those is the first step towards leaner header dependencies. This patch set starts with linux/mm.h, and I am already preparing another patch set addressing linux/kernel.h.
Some of these changes were part of a previous, bigger patch set
(https://lore.kernel.org/lkml/[email protected]/)
but this patch set grew so large, it could not be reviewed. This is an attempt to break the patch set into smaller pieces.
---
v1 -> v2: added more explanations to commit messages; renamed several
new headers from page_*.h to folio_*.h as suggested by Matthew Wilcox; rebase on linux-next; fix build failures on architectures um,nios2,hexagon by adding more missing includes
v2 -> v3: rebase on linux-next
v3 -> v4: rebase on linux-next; fix build failure on loongarch64
(reported by kernel test robot); add missing includes to drivers/dma/bcm2835-dma.c and include/scsi/scsicam.h
v4 -> v5: rebase on linux-next; more text in cover letter as suggested
by David Hildenbrand
v5 -> v6: rebase on linux-next d04466706db5...d97496ca23a2
Max Kellermann (15):
drivers: add missing includes on linux/mm.h (and others) include/drm/drm_gem.h: add poll_table_struct forward declaration include/scsi/scsicam.h: forward-declare struct block_device linux/mm.h: move page_kasan_tag() to mm/page_kasan_tag.h linux/mm.h: move section functions to mm/page_section.h linux/mm.h: move page_address() and others to mm/page_address.h linux/mm.h: move folio_size(), ... to mm/folio_size.h linux/mm.h: move folio_next() to mm/folio_next.h linux/mm.h: move devmap-related declarations to mm/devmap_managed.h linux/mm.h: move usage count functions to mm/folio_usage.h linux/mm.h: move page_zone_id() and more to mm/folio_zone.h linux/mm.h: move pfmemalloc-related functions to pfmemalloc.h linux/mm.h: move is_vmalloc_addr() to mm/vmalloc_addr.h linux/mm.h: move high_memory to mm/high_memory.h
include: reduce dependencies on linux/mm.h
MAINTAINERS | 1 + arch/arm/include/asm/memory.h | 4 + arch/arm/include/asm/pgtable.h | 2 + arch/arm/mm/iomap.c | 3 + arch/csky/include/asm/page.h | 1 + arch/hexagon/include/asm/mem-layout.h | 4 + arch/m68k/include/asm/page_mm.h | 1 + arch/m68k/include/asm/pgtable_mm.h | 1 + arch/parisc/include/asm/floppy.h | 1 + arch/powerpc/include/asm/book3s/32/pgtable.h | 4 + arch/powerpc/include/asm/nohash/32/pgtable.h | 1 + arch/powerpc/include/asm/page.h | 1 + arch/x86/include/asm/floppy.h | 1 + arch/x86/include/asm/pgtable_32_areas.h | 4 + drivers/comedi/comedi_buf.c | 1 + .../qat/qat_common/adf_gen4_pm_debugfs.c | 1 + drivers/dma/bcm2835-dma.c | 1 + drivers/dma/dma-axi-dmac.c | 1 + drivers/dma/sh/rcar-dmac.c | 1 + drivers/firmware/qcom/qcom_scm-legacy.c | 1 + drivers/firmware/qcom/qcom_scm-smc.c | 1 + drivers/firmware/raspberrypi.c | 1 + drivers/iio/buffer/industrialio-buffer-dma.c | 1 + drivers/iommu/iommufd/ioas.c | 2 + drivers/iommu/iommufd/selftest.c | 1 + drivers/media/platform/mediatek/vpu/mtk_vpu.c | 1 + drivers/media/platform/ti/omap/omap_voutlib.c | 1 + drivers/misc/bcm-vk/bcm_vk_dev.c | 1 + drivers/misc/fastrpc.c | 1 + drivers/misc/genwqe/card_dev.c | 1 + drivers/misc/uacce/uacce.c | 1 + drivers/mtd/nand/onenand/onenand_samsung.c | 1 + drivers/mtd/spi-nor/core.h | 2 + drivers/pci/p2pdma.c | 1 + drivers/pci/pci.c | 1 + drivers/remoteproc/mtk_scp.c | 1 + drivers/remoteproc/remoteproc_core.c | 1 + drivers/soc/qcom/rmtfs_mem.c | 1 + drivers/spi/spi-aspeed-smc.c | 1 + drivers/spi/spi-bcm2835.c | 2 + drivers/spi/spi-intel.c | 1 + drivers/virtio/virtio_ring.c | 1 + include/drm/drm_file.h | 1 + include/linux/bio.h | 2 + include/linux/bpfptr.h | 1 - include/linux/dma-mapping.h | 1 + include/linux/highmem-internal.h | 2 + include/linux/highmem.h | 4 +- include/linux/huge_mm.h | 2 + include/linux/iommu.h | 1 + include/linux/mm.h | 598 +----------------- include/linux/mm/devmap_managed.h | 32 + include/linux/mm/folio_next.h | 27 + include/linux/mm/folio_size.h | 150 +++++ include/linux/mm/folio_usage.h | 182 ++++++ include/linux/mm/folio_zone.h | 56 ++ include/linux/mm/high_memory.h | 7 + include/linux/mm/page_address.h | 71 +++ include/linux/mm/page_kasan_tag.h | 66 ++ include/linux/mm/page_section.h | 23 + include/linux/mm/pfmemalloc.h | 52 ++ include/linux/mm/vmalloc_addr.h | 33 + include/linux/net.h | 2 +- include/linux/nvme-keyring.h | 2 + include/linux/oom.h | 2 +- include/linux/page-flags.h | 3 + include/linux/pagemap.h | 2 +- include/linux/scatterlist.h | 8 +- include/linux/skbuff.h | 4 + include/linux/vmstat.h | 2 + include/scsi/scsicam.h | 5 + kernel/dma/ops_helpers.c | 1 + kernel/dma/remap.c | 1 + kernel/rcu/rcutorture.c | 1 + lib/scatterlist.c | 1 + mm/dmapool.c | 1 + 76 files changed, 811 insertions(+), 595 deletions(-) create mode 100644 include/linux/mm/devmap_managed.h create mode 100644 include/linux/mm/folio_next.h create mode 100644 include/linux/mm/folio_size.h create mode 100644 include/linux/mm/folio_usage.h create mode 100644 include/linux/mm/folio_zone.h create mode 100644 include/linux/mm/high_memory.h create mode 100644 include/linux/mm/page_address.h create mode 100644 include/linux/mm/page_kasan_tag.h create mode 100644 include/linux/mm/page_section.h create mode 100644 include/linux/mm/pfmemalloc.h create mode 100644 include/linux/mm/vmalloc_addr.h
Signature · 1 line
2.39.2
PATCH v6 1/15 drivers: add missing includes on linux/mm.h (and others)
After developing the other patches in this series, I had lots of build failures because "#include <linux/mm.h>" was missing. This patch fixes those build failures by adding the missing "#include" lines. To allow bisects, it is ordered before the others.
--- arch/arm/mm/iomap.c | 3 +++ drivers/comedi/comedi_buf.c | 1 + drivers/crypto/intel/qat/qat_common/adf_gen4_pm_debugfs.c | 1 + drivers/dma/bcm2835-dma.c | 1 + drivers/dma/dma-axi-dmac.c | 1 + drivers/dma/sh/rcar-dmac.c | 1 + drivers/firmware/qcom/qcom_scm-legacy.c | 1 + drivers/firmware/qcom/qcom_scm-smc.c | 1 + drivers/firmware/raspberrypi.c | 1 + drivers/iio/buffer/industrialio-buffer-dma.c | 1 + drivers/iommu/iommufd/ioas.c | 2 ++ drivers/iommu/iommufd/selftest.c | 1 + drivers/media/platform/mediatek/vpu/mtk_vpu.c | 1 + drivers/media/platform/ti/omap/omap_voutlib.c | 1 + drivers/misc/bcm-vk/bcm_vk_dev.c | 1 + drivers/misc/fastrpc.c | 1 + drivers/misc/genwqe/card_dev.c | 1 + drivers/misc/uacce/uacce.c | 1 + drivers/mtd/spi-nor/core.h | 2 ++ drivers/pci/p2pdma.c | 1 + drivers/pci/pci.c | 1 + drivers/remoteproc/mtk_scp.c | 1 + drivers/remoteproc/remoteproc_core.c | 1 + drivers/soc/qcom/rmtfs_mem.c | 1 + drivers/spi/spi-aspeed-smc.c | 1 + drivers/spi/spi-bcm2835.c | 2 ++ drivers/spi/spi-intel.c | 1 + drivers/virtio/virtio_ring.c | 1 + include/linux/huge_mm.h | 2 ++ include/linux/iommu.h | 1 + include/linux/nvme-keyring.h | 2 ++ include/linux/page-flags.h | 3 +++ include/linux/scatterlist.h | 6 ++++++ include/linux/vmstat.h | 1 + include/scsi/scsicam.h | 3 +++ kernel/dma/ops_helpers.c | 1 + kernel/dma/remap.c | 1 + kernel/rcu/rcutorture.c | 1 + mm/dmapool.c | 1 + 39 files changed, 55 insertions(+)
arch/arm/mm/iomap.c +3 -0
@@ -29,6 +29,9 @@ EXPORT_SYMBOL(ioport_unmap);#endif #ifdef CONFIG_PCI + +#include <asm/pgtable.h> // for VMALLOC_* +unsigned long pcibios_min_io =0x1000 ;EXPORT_SYMBOL (pcibios_min_io);
drivers/comedi/comedi_buf.c +1 -0
@@ -10,6 +10,7 @@#include <linux/vmalloc.h> #include <linux/slab.h> #include <linux/comedi/comedidev.h> +#include <asm/pgtable.h> // for PAGE_KERNEL* #include "comedi_internal.h" #ifdef PAGE_KERNEL_NOCACHE
drivers/crypto/intel/qat/qat_common/adf_gen4_pm_debugfs.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0-only /* Copyright(c) 2023 Intel Corporation */ #include <linux/dma-mapping.h> +#include <linux/fs.h> // for simple_read_from_buffer() #include <linux/kernel.h> #include <linux/string_helpers.h> #include <linux/stringify.h>
drivers/dma/bcm2835-dma.c +1 -0
@@ -31,6 +31,7 @@#include <linux/spinlock.h> #include <linux/of.h> #include <linux/of_dma.h> +#include <asm/pgtable.h> // for ZERO_PAGE() #include "virt-dma.h"
drivers/dma/dma-axi-dmac.c +1 -0
@@ -15,6 +15,7 @@#include <linux/interrupt.h> #include <linux/io.h> #include <linux/kernel.h> +#include <linux/mm.h> // for PAGE_ALIGN() #include <linux/module.h> #include <linux/of.h> #include <linux/of_dma.h>
drivers/dma/sh/rcar-dmac.c +1 -0
@@ -12,6 +12,7 @@#include <linux/dmaengine.h> #include <linux/interrupt.h> #include <linux/list.h> +#include <linux/mm.h> // for PAGE_ALIGN() #include <linux/module.h> #include <linux/mutex.h> #include <linux/of.h>
drivers/firmware/qcom/qcom_scm-legacy.c +1 -0
@@ -5,6 +5,7 @@#include <linux/slab.h> #include <linux/io.h> +#include <linux/mm.h> // for PAGE_ALIGN() #include <linux/module.h> #include <linux/mutex.h> #include <linux/errno.h>
drivers/firmware/qcom/qcom_scm-smc.c +1 -0
@@ -5,6 +5,7 @@#include <linux/io.h> #include <linux/errno.h> #include <linux/delay.h> +#include <linux/mm.h> // for PAGE_ALIGN() #include <linux/mutex.h> #include <linux/slab.h> #include <linux/types.h>
drivers/firmware/raspberrypi.c +1 -0
@@ -10,6 +10,7 @@#include <linux/kref.h> #include <linux/mailbox_client.h> #include <linux/mailbox_controller.h> +#include <linux/mm.h> // for PAGE_ALIGN() #include <linux/module.h> #include <linux/of.h> #include <linux/of_platform.h>
drivers/iio/buffer/industrialio-buffer-dma.c +1 -0
@@ -6,6 +6,7 @@#include <linux/slab.h> #include <linux/kernel.h> +#include <linux/mm.h> // for PAGE_ALIGN() #include <linux/module.h> #include <linux/device.h> #include <linux/workqueue.h>
drivers/iommu/iommufd/ioas.c +2 -0
@@ -5,6 +5,8 @@#include <linux/interval_tree.h> #include <linux/iommufd.h> #include <linux/iommu.h> +#include <linux/capability.h> +#include <linux/slab.h> #include <uapi/linux/iommufd.h> #include "io_pagetable.h"
drivers/iommu/iommufd/selftest.c +1 -0
@@ -5,6 +5,7 @@*/ #include <linux/slab.h> #include <linux/iommu.h> +#include <linux/mm.h> // for GUP_PIN_COUNTING_BIAS #include <linux/xarray.h> #include <linux/file.h> #include <linux/anon_inodes.h>
drivers/media/platform/mediatek/vpu/mtk_vpu.c +1 -0
@@ -8,6 +8,7 @@#include <linux/firmware.h> #include <linux/interrupt.h> #include <linux/iommu.h> +#include <linux/mm.h> // for totalram_pages() #include <linux/module.h> #include <linux/of.h> #include <linux/of_platform.h>
drivers/media/platform/ti/omap/omap_voutlib.c +1 -0
@@ -18,6 +18,7 @@* */ +#include <linux/mm.h> // for PAGE_ALIGN() #include <linux/module.h> #include <linux/errno.h> #include <linux/kernel.h>
drivers/misc/bcm-vk/bcm_vk_dev.c +1 -0
@@ -11,6 +11,7 @@#include <linux/interrupt.h> #include <linux/panic_notifier.h> #include <linux/kref.h> +#include <linux/mm.h> // for io_remap_pfn_range() #include <linux/module.h> #include <linux/mutex.h> #include <linux/pci.h>
drivers/misc/fastrpc.c +1 -0
@@ -10,6 +10,7 @@#include <linux/idr.h> #include <linux/list.h> #include <linux/miscdevice.h> +#include <linux/mm.h> // for find_vma() #include <linux/module.h> #include <linux/of_address.h> #include <linux/of.h>
drivers/misc/genwqe/card_dev.c +1 -0
@@ -17,6 +17,7 @@#include <linux/kernel.h> #include <linux/types.h> +#include <linux/mm.h> // for struct vm_operations_struct #include <linux/module.h> #include <linux/pci.h> #include <linux/string.h>
drivers/misc/uacce/uacce.c +1 -0
@@ -2,6 +2,7 @@#include <linux/compat.h> #include <linux/dma-mapping.h> #include <linux/iommu.h> +#include <linux/mm.h> // for struct vm_operations_struct #include <linux/module.h> #include <linux/poll.h> #include <linux/slab.h>
drivers/mtd/spi-nor/core.h +2 -0
@@ -9,6 +9,8 @@#include "sfdp.h" +#include <linux/sizes.h> // for SZ_* +#define SPI_NOR_MAX_ID_LEN 6/* * 256 bytes is a sane default for most older flashes. Newer flashes will
drivers/pci/p2pdma.c +1 -0
@@ -16,6 +16,7 @@#include <linux/slab.h> #include <linux/genalloc.h> #include <linux/memremap.h> +#include <linux/mm.h> // for VM_MAYSHARE #include <linux/percpu-refcount.h> #include <linux/random.h> #include <linux/seq_buf.h>
drivers/pci/pci.c +1 -0
@@ -25,6 +25,7 @@#include <linux/logic_pio.h> #include <linux/pm_wakeup.h> #include <linux/device.h> +#include <linux/pgtable.h> // for pgprot_device() #include <linux/pm_runtime.h> #include <linux/pci_hotplug.h> #include <linux/vmalloc.h>
drivers/remoteproc/mtk_scp.c +1 -0
@@ -16,6 +16,7 @@#include <linux/remoteproc.h> #include <linux/remoteproc/mtk_scp.h> #include <linux/rpmsg/mtk_rpmsg.h> +#include <linux/slab.h> #include "mtk_common.h" #include "remoteproc_internal.h"
drivers/remoteproc/remoteproc_core.c +1 -0
@@ -18,6 +18,7 @@#include <linux/delay.h> #include <linux/kernel.h> +#include <linux/mm.h> // for PAGE_ALIGN() #include <linux/module.h> #include <linux/device.h> #include <linux/panic_notifier.h>
drivers/soc/qcom/rmtfs_mem.c +1 -0
@@ -6,6 +6,7 @@#include <linux/kernel.h> #include <linux/cdev.h> #include <linux/err.h> +#include <linux/mm.h> // for remap_pfn_range() #include <linux/module.h> #include <linux/platform_device.h> #include <linux/of.h>
drivers/spi/spi-aspeed-smc.c +1 -0
@@ -11,6 +11,7 @@#include <linux/of.h> #include <linux/of_platform.h> #include <linux/platform_device.h> +#include <linux/sizes.h> // for SZ_* #include <linux/spi/spi.h> #include <linux/spi/spi-mem.h>
drivers/spi/spi-bcm2835.c +2 -0
@@ -33,6 +33,8 @@#include <linux/slab.h> #include <linux/spi/spi.h> +#include <asm/pgtable.h> // for ZERO_PAGE() +/* SPI register offsets */ #define BCM2835_SPI_CS 0x00#define BCM2835_SPI_FIFO 0x04
drivers/spi/spi-intel.c +1 -0
@@ -8,6 +8,7 @@#include <linux/iopoll.h> #include <linux/module.h> +#include <linux/sizes.h> // for SZ_* #include <linux/mtd/partitions.h> #include <linux/mtd/spi-nor.h>
drivers/virtio/virtio_ring.c +1 -0
@@ -12,6 +12,7 @@#include <linux/hrtimer.h> #include <linux/dma-mapping.h> #include <linux/kmsan.h> +#include <linux/mm.h> // for PAGE_ALIGN() #include <linux/spinlock.h> #include <xen/xen.h>
include/linux/huge_mm.h +2 -0
@@ -7,6 +7,8 @@#include <linux/fs.h> /* only for vma_is_dax() */ +#include <asm/page.h> // for pmd_t +vm_fault_t do_huge_pmd_anonymous_page (struct vm_fault *vmf); int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm, pmd_t *dst_pmd, pmd_t *src_pmd, unsigned long addr,
include/linux/iommu.h +1 -0
@@ -14,6 +14,7 @@#include <linux/err.h> #include <linux/of.h> #include <linux/iova_bitmap.h> +#include <linux/uaccess.h> // for copy_struct_from_user() #define IOMMU_READ (1 << 0)#define IOMMU_WRITE (1 << 1)
include/linux/nvme-keyring.h +2 -0
@@ -6,6 +6,8 @@#ifndef _NVME_KEYRING_H#define _NVME_KEYRING_H +#include <linux/key.h> +#if IS_ENABLED (CONFIG_NVME_KEYRING ) key_serial_t nvme_tls_psk_default(struct key *keyring,
include/linux/page-flags.h +3 -0
@@ -12,6 +12,9 @@#ifndef __GENERATING_BOUNDS_H#include <linux/mm_types.h> #include <generated/bounds.h> +#ifdef CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP +#include <linux/jump_label.h> // for DECLARE_STATIC_KEY_FALSE +#endif #endif /* !__GENERATING_BOUNDS_H */ /*
include/linux/scatterlist.h +6 -0
@@ -8,6 +8,12 @@#include <linux/mm.h> #include <asm/io.h> +#ifdef CONFIG_UML +#include <asm/pgtable.h> // for virt_to_page(), page_to_phys() +#else +#include <asm/page.h> // for virt_to_page(), page_to_phys() +#endif +struct scatterlist {unsigned long page_link;unsigned int offset;
include/linux/vmstat.h +1 -0
@@ -4,6 +4,7 @@#include <linux/types.h> #include <linux/percpu.h> +#include <linux/mm.h> // for folio_zone(), folio_nr_pages() #include <linux/mmzone.h> #include <linux/vm_event_item.h> #include <linux/atomic.h>
include/scsi/scsicam.h +3 -0
@@ -13,6 +13,9 @@#ifndef SCSICAM_H #define SCSICAM_H + +#include <linux/types.h> // for sector_t +int scsicam_bios_param (struct block_device *bdev,sector_t capacity,int *ip);bool scsi_partsize (struct block_device *bdev,sector_t capacity,int geom[3 ]);unsigned char *scsi_bios_ptable (struct block_device *bdev);
kernel/dma/ops_helpers.c +1 -0
@@ -4,6 +4,7 @@* the allocated memory contains normal pages in the direct kernel mapping. */ #include <linux/dma-map-ops.h> +#include <linux/mm.h> // for PAGE_ALIGN() static struct page *dma_common_vaddr_to_page (void *cpu_addr) {
kernel/dma/remap.c +1 -0
@@ -3,6 +3,7 @@* Copyright (c) 2014 The Linux Foundation */ #include <linux/dma-map-ops.h> +#include <linux/mm.h> // for vmap(), PAGE_ALIGN() #include <linux/slab.h> #include <linux/vmalloc.h>
kernel/rcu/rcutorture.c +1 -0
@@ -47,6 +47,7 @@#include <linux/oom.h> #include <linux/tick.h> #include <linux/rcupdate_trace.h> +#include <linux/mm.h> // for mem_dump_obj() #include <linux/nmi.h> #include "rcu.h"
mm/dmapool.c +1 -0
@@ -25,6 +25,7 @@#include <linux/kernel.h> #include <linux/list.h> #include <linux/export.h> +#include <linux/mm.h> // for want_init_on_alloc() #include <linux/mutex.h> #include <linux/poison.h> #include <linux/sched.h>
Signature · 1 line
2.39.2
PATCH v6 2/15 include/drm/drm_gem.h: add poll_table_struct forward declaration
In reply to Max KellermannAfter eliminating includes of linux/mm.h, the following build failure occurred:
./include/drm/drm_file.h:443:45: warning: ‘struct poll_table_struct’ declared inside parameter list will not be visible outside of this definition or declaration
443 | __poll_t drm_poll(struct file *filp, struct poll_table_struct *wait);
| ^~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/imagination/pvr_gem.h:12,
from drivers/gpu/drm/imagination/pvr_fw.h:9:
./include/drm/drm_gem.h:447:27: error: initialization of ‘__poll_t (*)(struct file *, struct poll_table_struct *)’ {aka ‘unsigned int (*)(struct file *, struct poll_table_struct *)’} from incompatible pointer type ‘__poll_t (*)(struct file *, struct poll_table_struct *)’ {aka ‘unsigned int (*)(struct file *, struct poll_table_struct *)’} [-Werror=incompatible-pointer-types]
447 | .poll = drm_poll,\
| ^~~~~~~~
The compiler is confused, and that can be fixed easily by forward-declaring the struct expicitly.
--- include/drm/drm_file.h | 1 + 1 file changed, 1 insertion(+)
include/drm/drm_file.h +1 -0
@@ -44,6 +44,7 @@ struct drm_device;struct drm_printer ;struct device ;struct file ; +struct poll_table_struct ;/* * FIXME: Not sure we want to have drm_minor here in the end, but to avoid
Signature · 1 line
2.39.2
PATCH v6 3/15 include/scsi/scsicam.h: forward-declare struct block_device
In reply to Max KellermannAfter eliminating includes of linux/mm.h, the following build failure occurred:
In file included from drivers/scsi/fdomain.c:87:
./include/scsi/scsicam.h:16:31: error: 'struct block_device' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
16 | int scsicam_bios_param(struct block_device *bdev, sector_t capacity, int *ip);
| ^~~~~~~~~~~~
./include/scsi/scsicam.h:17:27: error: 'struct block_device' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
17 | bool scsi_partsize(struct block_device *bdev, sector_t capacity, int geom[3]);
| ^~~~~~~~~~~~
./include/scsi/scsicam.h:18:40: error: 'struct block_device' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
18 | unsigned char *scsi_bios_ptable(struct block_device *bdev);
| ^~~~~~~~~~~~
drivers/scsi/fdomain.c: In function 'fdomain_biosparam':
drivers/scsi/fdomain.c:475:45: error: passing argument 1 of 'scsi_bios_ptable' from incompatible pointer type [-Werror=incompatible-pointer-types]
475 | unsigned char *p = scsi_bios_ptable(bdev);
| ^~~~
| |
| struct block_device *
./include/scsi/scsicam.h:18:54: note: expected 'struct block_device *' but argument is of type 'struct block_device *'
18 | unsigned char *scsi_bios_ptable(struct block_device *bdev);
| ~~~~~~~~~~~~~~~~~~~~~^~~~--- include/scsi/scsicam.h | 2 ++ 1 file changed, 2 insertions(+)
include/scsi/scsicam.h +2 -0
@@ -16,6 +16,8 @@#include <linux/types.h> // for sector_t +struct block_device ; +int scsicam_bios_param (struct block_device *bdev,sector_t capacity,int *ip);bool scsi_partsize (struct block_device *bdev,sector_t capacity,int geom[3 ]);unsigned char *scsi_bios_ptable (struct block_device *bdev);
Signature · 1 line
2.39.2
PATCH v6 4/15 linux/mm.h: move page_kasan_tag() to mm/page_kasan_tag.h
In reply to Max KellermannPrepare to reduce dependencies on linux/mm.h.
page_kasan_tag() is used by the page_to_virt() macro in ARM64 (but asm/memory.h does not include linux/mm.h). Thus, in order to be able to use anything that calls page_to_virt(), linux/mm.h needs to be included.
This would prevent us from moving page_address() to a separate header, because it calls lowmem_page_address() which in turn calls page_to_virt(). To prepare for this move, we move page_kasan_tag() out of linux/mm.h into a separate lean header.
A side effect of this patch is that the <linux/kasan.h> include line is moved inside the "#ifdef CONFIG_KASAN..." block, i.e. it is not included at all if KASAN is disabled.
--- MAINTAINERS | 1 + include/linux/mm.h | 56 +------------------------- include/linux/mm/page_kasan_tag.h | 66 +++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 55 deletions(-) create mode 100644 include/linux/mm/page_kasan_tag.h
MAINTAINERS +1 -0
@@ -14475,6 +14475,7 @@ F: include/linux/mempolicy.h F: include/linux/mempool.h F: include/linux/memremap.h F: include/linux/mm.h +F: include/linux/mm/*.h F: include/linux/mm_*.h F: include/linux/mmzone.h F: include/linux/mmu_notifier.h
include/linux/mm.h +1 -55
74 lines not on this page · raw message
include/linux/mm/page_kasan_tag.h new file +66 -0
66 lines not on this page · raw message
Signature · 1 line
2.39.2
PATCH v6 5/15 linux/mm.h: move section functions to mm/page_section.h
In reply to Max KellermannPrepare to reduce dependencies on linux/mm.h.
page_to_section() is used by __page_to_pfn() (but asm-generic/memory_model.h does not include linux/mm.h). Thus, in order to be able to use anything that calls page_to_pfn(), linux/mm.h needs to be included.
This would prevent us from moving page_address() to a separate header, because it calls lowmem_page_address() which in turn calls page_to_virt() and then page_to_pfn(). To prepare for this move, we move page_to_section() out of linux/mm.h into a separate lean header.
--- include/linux/mm.h | 18 +----------------- include/linux/mm/page_section.h | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 include/linux/mm/page_section.h
include/linux/mm.h +1 -17
@@ -3,6 +3,7 @@#define _LINUX_MM_H#include <linux/mm/page_kasan_tag.h> +#include <linux/mm/page_section.h> #include <linux/errno.h> #include <linux/mmdebug.h> #include <linux/gfp.h>
@@ -1631,10 +1632,6 @@ static inline bool is_nommu_shared_mapping(vm_flags_t flags) }#endif -#if defined(CONFIG_SPARSEMEM ) && !defined(CONFIG_SPARSEMEM_VMEMMAP ) -#define SECTION_IN_PAGE_FLAGS -#endif -/* * The identification function is mainly used by the buddy allocator for * determining if two pages could be buddies. We are not really identifying
@@ -1832,19 +1829,6 @@ static inline pg_data_t *folio_pgdat(const struct folio *folio)return page_pgdat (&folio->page); } -#ifdef SECTION_IN_PAGE_FLAGS -static inline void set_page_section (struct page *page,unsigned long section) -{ - page->flags &= ~(SECTIONS_MASK <<SECTIONS_PGSHIFT ); - page->flags |= (section &SECTIONS_MASK ) <<SECTIONS_PGSHIFT ; -} - -static inline unsigned long page_to_section (const struct page *page) -{ -return (page->flags >>SECTIONS_PGSHIFT ) &SECTIONS_MASK ; -} -#endif -/** * folio_pfn - Return the Page Frame Number of a folio. * @folio: The folio.
include/linux/mm/page_section.h new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_MM_PAGE_SECTION_H +#define _LINUX_MM_PAGE_SECTION_H + +#include <linux/mm_types.h> // for struct page +#include <linux/mmzone.h> // for SECTIONS_* + +#if defined(CONFIG_SPARSEMEM ) && !defined(CONFIG_SPARSEMEM_VMEMMAP ) +#define SECTION_IN_PAGE_FLAGS + +static inline void set_page_section (struct page *page,unsigned long section) +{ + page->flags &= ~(SECTIONS_MASK <<SECTIONS_PGSHIFT ); + page->flags |= (section &SECTIONS_MASK ) <<SECTIONS_PGSHIFT ; +} + +static inline unsigned long page_to_section (const struct page *page) +{ +return (page->flags >>SECTIONS_PGSHIFT ) &SECTIONS_MASK ; +} +#endif + +#endif /* _LINUX_MM_PAGE_SECTION_H */
Signature · 1 line
2.39.2
PATCH v6 6/15 linux/mm.h: move page_address() and others to mm/page_address.h
In reply to Max KellermannPrepare to reduce dependencies on linux/mm.h.
page_address() is used by the following popular headers:
- linux/bio.h
- linux/bvec.h
- linux/highmem.h
- linux/scatterlist.h
- linux/skbuff.h
Moving it to a separate lean header will allow us to avoid the dependency on linux/mm.h.
--- include/linux/mm.h | 56 +------------------------- include/linux/mm/page_address.h | 71 +++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 55 deletions(-) create mode 100644 include/linux/mm/page_address.h
include/linux/mm.h +1 -55
@@ -2,7 +2,7 @@#ifndef _LINUX_MM_H#define _LINUX_MM_H -#include <linux/mm/page_kasan_tag.h> +#include <linux/mm/page_address.h> #include <linux/mm/page_section.h> #include <linux/errno.h> #include <linux/mmdebug.h>
@@ -105,10 +105,6 @@ extern int mmap_rnd_compat_bits __read_mostly;#define __pa_symbol (x) __pa(RELOC_HIDE((unsigned long)(x), 0))#endif -#ifndef page_to_virt -#define page_to_virt (x) __va(PFN_PHYS(page_to_pfn(x))) -#endif -#ifndef lm_alias#define lm_alias (x) __va(__pa_symbol(x))#endif
@@ -212,14 +208,6 @@ int overcommit_kbytes_handler(struct ctl_table *, int, void *, size_t *,int overcommit_policy_handler (struct ctl_table *,int ,void *,size_t *,loff_t *); -#if defined(CONFIG_SPARSEMEM ) && !defined(CONFIG_SPARSEMEM_VMEMMAP ) -#define nth_page (page,n) pfn_to_page(page_to_pfn((page)) + (n)) -#define folio_page_idx (folio, p) (page_to_pfn(p) - folio_pfn(folio)) -#else -#define nth_page (page,n) ((page) + (n)) -#define folio_page_idx (folio, p) ((p) - &(folio)->page) -#endif -/* to align the pointer to the (next) page boundary */ #define PAGE_ALIGN (addr) ALIGN(addr, PAGE_SIZE)
@@ -2174,44 +2162,6 @@ static inline int arch_make_folio_accessible(struct folio *folio)*/ #include <linux/vmstat.h> -#if defined(CONFIG_HIGHMEM ) && !defined(WANT_PAGE_VIRTUAL ) -#define HASHED_PAGE_VIRTUAL -#endif - -#if defined(WANT_PAGE_VIRTUAL ) -static inline void *page_address (const struct page *page) -{ -return page->virtual; -} -static inline void set_page_address (struct page *page,void *address) -{ - page->virtual = address; -} -#define page_address_init () do { } while(0) -#endif - -#if defined(HASHED_PAGE_VIRTUAL ) -void *page_address (const struct page *page); -void set_page_address (struct page *page,void *virtual); -void page_address_init (void ); -#endif - -static __always_inline void *lowmem_page_address(const struct page *page) -{ -return page_to_virt (page); -} - -#if !defined(HASHED_PAGE_VIRTUAL ) && !defined(WANT_PAGE_VIRTUAL ) -#define page_address (page) lowmem_page_address(page) -#define set_page_address (page, address) do { } while(0) -#define page_address_init () do { } while(0) -#endif - -static inline void *folio_address (const struct folio *folio) -{ -return page_address (&folio->page); -} -/* * Return true only if the page has been allocated with * ALLOC_NO_WATERMARKS and the low watermark was not
@@ -2261,10 +2211,6 @@ static inline void clear_page_pfmemalloc(struct page *page)*/ extern void pagefault_out_of_memory (void ); -#define offset_in_page (p) ((unsigned long)(p) & ~PAGE_MASK) -#define offset_in_thp (page, p) ((unsigned long)(p) & (thp_size(page) - 1)) -#define offset_in_folio (folio, p) ((unsigned long)(p) & (folio_size(folio) - 1)) -/* * Parameter block passed down to zap_pte_range in exceptional cases. */
include/linux/mm/page_address.h new file +71 -0
71 lines not on this page · raw message
Signature · 1 line
2.39.2
PATCH v6 7/15 linux/mm.h: move folio_size(), ... to mm/folio_size.h
In reply to Max KellermannPrepare to reduce dependencies on linux/mm.h.
folio_size()/page_size() are used by the following popular headers:
- linux/highmem.h
- linux/iov_iter.h
- linux/pagemap.h
Moving them to a separate lean header will allow us to avoid the dependency on linux/mm.h. Additionally, it allows us to move folio_next() to a separate header, because it needs folio_nr_pages() which is also moved to folio_size.h.
--- include/linux/mm.h | 140 +------------------------------ include/linux/mm/folio_size.h | 150 ++++++++++++++++++++++++++++++++++ 2 files changed, 151 insertions(+), 139 deletions(-) create mode 100644 include/linux/mm/folio_size.h
include/linux/mm.h +1 -139
@@ -2,6 +2,7 @@#ifndef _LINUX_MM_H#define _LINUX_MM_H +#include <linux/mm/folio_size.h> #include <linux/mm/page_address.h> #include <linux/mm/page_section.h> #include <linux/errno.h>
@@ -1069,38 +1070,6 @@ int vma_is_stack_for_current(struct vm_area_struct *vma);struct mmu_gather ;struct inode ; -/* -* compound_order() can be called without holding a reference, which means -* that niceties like page_folio() don't work. These callers should be -* prepared to handle wild return values. For example, PG_head may be -* set before the order is initialised, or this may be a tail page. -* See compaction.c for some good examples. -*/ -static inline unsigned int compound_order (struct page *page) -{ -struct folio *folio = (struct folio *)page; - -if (!test_bit (PG_head, &folio->flags)) -return 0 ; -return folio->_flags_1 &0xff ; -} - -/** -* folio_order - The allocation order of a folio. -* @folio: The folio. -* -* A folio is composed of 2^order pages. See get_order() for the definition -* of order. -* -* Return: The order of the folio. -*/ -static inline unsigned int folio_order (struct folio *folio) -{ -if (!folio_test_large (folio)) -return 0 ; -return folio->_flags_1 &0xff ; -} -#include <linux/huge_mm.h> /*
@@ -1303,39 +1272,6 @@ void folio_copy(struct folio *dst, struct folio *src);unsigned long nr_free_buffer_pages (void ); -/* Returns the number of bytes in this potentially compound page. */ -static inline unsigned long page_size (struct page *page) -{ -return PAGE_SIZE <<compound_order (page); -} - -/* Returns the number of bits needed for the number of bytes in a page */ -static inline unsigned int page_shift (struct page *page) -{ -return PAGE_SHIFT +compound_order (page); -} - -/** -* thp_order - Order of a transparent huge page. -* @page: Head page of a transparent huge page. -*/ -static inline unsigned int thp_order (struct page *page) -{ -VM_BUG_ON_PGFLAGS (PageTail (page), page); -return compound_order (page); -} - -/** -* thp_size - Size of a transparent huge page. -* @page: Head page of a transparent huge page. -* -* Return: Number of bytes in this page. -*/ -static inline unsigned long thp_size (struct page *page) -{ -return PAGE_SIZE <<thp_order (page); -} -#ifdef CONFIG_MMU /* * Do pte_mkwrite, but only if the vma says VM_WRITE. We do this when
@@ -1973,23 +1909,6 @@ static inline void set_page_links(struct page *page, enum zone_type zone,#endif } -/** -* folio_nr_pages - The number of pages in the folio. -* @folio: The folio. -* -* Return: A positive power of two. -*/ -static inline long folio_nr_pages (const struct folio *folio) -{ -if (!folio_test_large (folio)) -return 1 ; -#ifdef CONFIG_64BIT -return folio->_folio_nr_pages; -#else -return 1L << (folio->_flags_1 &0xff ); -#endif -} -/* Only hugetlbfs can allocate folios larger than MAX_ORDER */ #ifdef CONFIG_ARCH_HAS_GIGANTIC_PAGE #define MAX_FOLIO_NR_PAGES (1UL << PUD_ORDER)
@@ -1997,33 +1916,6 @@ static inline long folio_nr_pages(const struct folio *folio)#define MAX_FOLIO_NR_PAGES MAX_ORDER_NR_PAGES#endif -/* -* compound_nr() returns the number of pages in this potentially compound -* page. compound_nr() can be called on a tail page, and is defined to -* return 1 in that case. -*/ -static inline unsigned long compound_nr (struct page *page) -{ -struct folio *folio = (struct folio *)page; - -if (!test_bit (PG_head, &folio->flags)) -return 1 ; -#ifdef CONFIG_64BIT -return folio->_folio_nr_pages; -#else -return 1L << (folio->_flags_1 &0xff ); -#endif -} - -/** -* thp_nr_pages - The number of regular pages in this huge page. -* @page: The head page of a huge page. -*/ -static inline int thp_nr_pages (struct page *page) -{ -return folio_nr_pages ((struct folio *)page); -} -/** * folio_next - Move to the next physical folio. * @folio: The folio we're currently operating on.
@@ -2043,36 +1935,6 @@ static inline struct folio *folio_next(struct folio *folio)return (struct folio *)folio_page (folio,folio_nr_pages (folio)); } -/** -* folio_shift - The size of the memory described by this folio. -* @folio: The folio. -* -* A folio represents a number of bytes which is a power-of-two in size. -* This function tells you which power-of-two the folio is. See also -* folio_size() and folio_order(). -* -* Context: The caller should have a reference on the folio to prevent -* it from being split. It is not necessary for the folio to be locked. -* Return: The base-2 logarithm of the size of this folio. -*/ -static inline unsigned int folio_shift (struct folio *folio) -{ -return PAGE_SHIFT +folio_order (folio); -} - -/** -* folio_size - The number of bytes in a folio. -* @folio: The folio. -* -* Context: The caller should have a reference on the folio to prevent -* it from being split. It is not necessary for the folio to be locked. -* Return: The number of bytes in this folio. -*/ -static inline size_t folio_size (struct folio *folio) -{ -return PAGE_SIZE <<folio_order (folio); -} -/** * folio_likely_mapped_shared - Estimate if the folio is mapped into the page * tables of more than one MM
include/linux/mm/folio_size.h new file +150 -0
150 lines not on this page · raw message
Signature · 1 line
2.39.2
PATCH v6 8/15 linux/mm.h: move folio_next() to mm/folio_next.h
In reply to Max KellermannPrepare to reduce dependencies on linux/mm.h.
folio_next() is used by linux/bio.h. Moving it to a separate lean header will allow us to avoid the dependency on linux/mm.h.
Having a one-function header may seem excessive, but there is hardly another way if we want to distangle linux/mm.h from linux/bio.h. If one day, say, folio_prev() gets added, we can still rename the header to something like folio_iterator.h, but until that happens, this folio_next.h header seems like the best trade-off to reduce dependencies.
--- include/linux/mm.h | 20 +------------------- include/linux/mm/folio_next.h | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 include/linux/mm/folio_next.h
include/linux/mm.h +1 -19
@@ -2,6 +2,7 @@#ifndef _LINUX_MM_H#define _LINUX_MM_H +#include <linux/mm/folio_next.h> #include <linux/mm/folio_size.h> #include <linux/mm/page_address.h> #include <linux/mm/page_section.h>
@@ -1916,25 +1917,6 @@ static inline void set_page_links(struct page *page, enum zone_type zone,#define MAX_FOLIO_NR_PAGES MAX_ORDER_NR_PAGES#endif -/** -* folio_next - Move to the next physical folio. -* @folio: The folio we're currently operating on. -* -* If you have physically contiguous memory which may span more than -* one folio (eg a &struct bio_vec), use this function to move from one -* folio to the next. Do not use it if the memory is only virtually -* contiguous as the folios are almost certainly not adjacent to each -* other. This is the folio equivalent to writing ``page++``. -* -* Context: We assume that the folios are refcounted and/or locked at a -* higher level and do not adjust the reference counts. -* Return: The next struct folio. -*/ -static inline struct folio *folio_next (struct folio *folio) -{ -return (struct folio *)folio_page (folio,folio_nr_pages (folio)); -} -/** * folio_likely_mapped_shared - Estimate if the folio is mapped into the page * tables of more than one MM
include/linux/mm/folio_next.h new file +27 -0
@@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_MM_FOLIO_NEXT_H +#define _LINUX_MM_FOLIO_NEXT_H + +#include <linux/mm/folio_size.h> // for folio_nr_pages() +#include <linux/mm/page_address.h> // for nth_page(), needed by folio_page() + +/** +* folio_next - Move to the next physical folio. +* @folio: The folio we're currently operating on. +* +* If you have physically contiguous memory which may span more than +* one folio (eg a &struct bio_vec), use this function to move from one +* folio to the next. Do not use it if the memory is only virtually +* contiguous as the folios are almost certainly not adjacent to each +* other. This is the folio equivalent to writing ``page++``. +* +* Context: We assume that the folios are refcounted and/or locked at a +* higher level and do not adjust the reference counts. +* Return: The next struct folio. +*/ +static inline struct folio *folio_next (struct folio *folio) +{ +return (struct folio *)folio_page (folio,folio_nr_pages (folio)); +} + +#endif /* _LINUX_MM_FOLIO_NEXT_H */
Signature · 1 line
2.39.2
PATCH v6 9/15 linux/mm.h: move devmap-related declarations to mm/devmap_managed.h
In reply to Max KellermannPrepare to reduce dependencies on linux/mm.h.
put_devmap_managed_page() is called by put_page(). Moving it to a separate header allows us to move put_page() to a separate lean header as well.
--- include/linux/mm.h | 20 +------------------ include/linux/mm/devmap_managed.h | 32 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 include/linux/mm/devmap_managed.h
include/linux/mm.h +1 -19
@@ -2,6 +2,7 @@#ifndef _LINUX_MM_H#define _LINUX_MM_H +#include <linux/mm/devmap_managed.h> #include <linux/mm/folio_next.h> #include <linux/mm/folio_size.h> #include <linux/mm/page_address.h>
@@ -1354,25 +1355,6 @@ vm_fault_t finish_fault(struct vm_fault *vmf);* back into memory. */ -#if defined(CONFIG_ZONE_DEVICE ) && defined(CONFIG_FS_DAX ) -DECLARE_STATIC_KEY_FALSE (devmap_managed_key); - -bool __put_devmap_managed_folio_refs (struct folio *folio,int refs); -static inline bool put_devmap_managed_folio_refs (struct folio *folio,int refs) -{ -if (!static_branch_unlikely (&devmap_managed_key)) -return false; -if (!folio_is_zone_device (folio)) -return false; -return __put_devmap_managed_folio_refs (folio, refs); -} -#else /* CONFIG_ZONE_DEVICE && CONFIG_FS_DAX */ -static inline bool put_devmap_managed_folio_refs (struct folio *folio,int refs) -{ -return false; -} -#endif /* CONFIG_ZONE_DEVICE && CONFIG_FS_DAX */ -/* 127: arbitrary random number, small enough to assemble well */ #define folio_ref_zero_or_close_to_overflow (folio) \ ((unsigned int) folio_ref_count(folio) + 127u <= 127u)
include/linux/mm/devmap_managed.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_MM_DEVMAP_MANAGED_H +#define _LINUX_MM_DEVMAP_MANAGED_H + +#include <linux/types.h> // for bool + +struct page ; + +#if defined(CONFIG_ZONE_DEVICE ) && defined(CONFIG_FS_DAX ) + +#include <linux/jump_label.h> // for DECLARE_STATIC_KEY_FALSE(), static_branch_unlikely() +#include <linux/mmzone.h> // folio_is_zone_device() + +DECLARE_STATIC_KEY_FALSE (devmap_managed_key); + +bool __put_devmap_managed_folio_refs (struct folio *folio,int refs); +static inline bool put_devmap_managed_folio_refs (struct folio *folio,int refs) +{ +if (!static_branch_unlikely (&devmap_managed_key)) +return false; +if (!folio_is_zone_device (folio)) +return false; +return __put_devmap_managed_folio_refs (folio, refs); +} +#else /* CONFIG_ZONE_DEVICE && CONFIG_FS_DAX */ +static inline bool put_devmap_managed_folio_refs (struct folio *folio,int refs) +{ +return false; +} +#endif /* CONFIG_ZONE_DEVICE && CONFIG_FS_DAX */ + +#endif /* _LINUX_MM_DEVMAP_MANAGED_H */
Signature · 1 line
2.39.2
PATCH v6 10/15 linux/mm.h: move usage count functions to mm/folio_usage.h
In reply to Max KellermannPrepare to reduce dependencies on linux/mm.h.
This new header contains wrappers for the low-level functions from page_ref.h. By having those higher-level functions in a separate header, we can avoid their additional dependencies in the page_ref.h.
Having these in a separate header will allow eliminating the dependency on linux/mm.h from these headers:
- linux/skbuff.h
- linux/swap.h
--- include/linux/mm.h | 172 +------------------------------ include/linux/mm/folio_usage.h | 182 +++++++++++++++++++++++++++++++++ 2 files changed, 183 insertions(+), 171 deletions(-) create mode 100644 include/linux/mm/folio_usage.h
include/linux/mm.h +1 -171
@@ -2,9 +2,9 @@#ifndef _LINUX_MM_H#define _LINUX_MM_H -#include <linux/mm/devmap_managed.h> #include <linux/mm/folio_next.h> #include <linux/mm/folio_size.h> +#include <linux/mm/folio_usage.h> #include <linux/mm/page_address.h> #include <linux/mm/page_section.h> #include <linux/errno.h>
@@ -1074,51 +1074,6 @@ struct inode;#include <linux/huge_mm.h> -/* -* Methods to modify the page usage count. -* -* What counts for a page usage: -* - cache mapping (page->mapping) -* - private data (page->private) -* - page mapped in a task's page tables, each mapping -* is counted separately -* -* Also, many kernel routines increase the page count before a critical -* routine so they can be sure the page doesn't go away from under them. -*/ - -/* -* Drop a ref, return true if the refcount fell to zero (the page has no users) -*/ -static inline int put_page_testzero (struct page *page) -{ -VM_BUG_ON_PAGE (page_ref_count (page) ==0 , page); -return page_ref_dec_and_test (page); -} - -static inline int folio_put_testzero (struct folio *folio) -{ -return put_page_testzero (&folio->page); -} - -/* -* Try to grab a ref unless the page has a refcount of zero, return false if -* that is the case. -* This can be called when MMU is off so it must not access -* any of the virtual mappings. -*/ -static inline bool get_page_unless_zero (struct page *page) -{ -return page_ref_add_unless (page,1 ,0 ); -} - -static inline struct folio *folio_get_nontail_page (struct page *page) -{ -if (unlikely (!get_page_unless_zero (page))) -return NULL ; -return (struct folio *)page; -} -extern int page_is_ram (unsigned long pfn);enum {
@@ -1265,8 +1220,6 @@ static inline struct folio *virt_to_folio(const void *x)return page_folio (page); } -void __folio_put (struct folio *folio); -void put_pages_list (struct list_head *pages);void split_page (struct page *page,unsigned int order);
@@ -1355,129 +1308,6 @@ vm_fault_t finish_fault(struct vm_fault *vmf);* back into memory. */ -/* 127: arbitrary random number, small enough to assemble well */ -#define folio_ref_zero_or_close_to_overflow (folio) \ - ((unsigned int) folio_ref_count(folio) + 127u <= 127u) - -/** -* folio_get - Increment the reference count on a folio. -* @folio: The folio. -* -* Context: May be called in any context, as long as you know that -* you have a refcount on the folio. If you do not already have one, -* folio_try_get() may be the right interface for you to use. -*/ -static inline void folio_get (struct folio *folio) -{ -VM_BUG_ON_FOLIO (folio_ref_zero_or_close_to_overflow (folio), folio); -folio_ref_inc (folio); -} - -static inline void get_page (struct page *page) -{ -folio_get (page_folio (page)); -} - -static inline __must_check bool try_get_page (struct page *page) -{ - page =compound_head (page); -if (WARN_ON_ONCE (page_ref_count (page) <=0 )) -return false; -page_ref_inc (page); -return true; -} - -/** -* folio_put - Decrement the reference count on a folio. -* @folio: The folio. -* -* If the folio's reference count reaches zero, the memory will be -* released back to the page allocator and may be used by another -* allocation immediately. Do not access the memory or the struct folio -* after calling folio_put() unless you can be sure that it wasn't the -* last reference. -* -* Context: May be called in process or interrupt context, but not in NMI -* context. May be called while holding a spinlock. -*/ -static inline void folio_put (struct folio *folio) -{ -if (folio_put_testzero (folio)) -__folio_put (folio); -} - -/** -* folio_put_refs - Reduce the reference count on a folio. -* @folio: The folio. -* @refs: The amount to subtract from the folio's reference count. -* -* If the folio's reference count reaches zero, the memory will be -* released back to the page allocator and may be used by another -* allocation immediately. Do not access the memory or the struct folio -* after calling folio_put_refs() unless you can be sure that these weren't -* the last references. -* -* Context: May be called in process or interrupt context, but not in NMI -* context. May be called while holding a spinlock. -*/ -static inline void folio_put_refs (struct folio *folio,int refs) -{ -if (folio_ref_sub_and_test (folio, refs)) -__folio_put (folio); -} - -void folios_put_refs (struct folio_batch *folios,unsigned int *refs); - -/* -* union release_pages_arg - an array of pages or folios -* -* release_pages() releases a simple array of multiple pages, and -* accepts various different forms of said page array: either -* a regular old boring array of pages, an array of folios, or -* an array of encoded page pointers. -* -* The transparent union syntax for this kind of "any of these -* argument types" is all kinds of ugly, so look away. -*/ -typedef union { -struct page **pages; -struct folio **folios; -struct encoded_page **encoded_pages; -}release_pages_arg __attribute__ ((__transparent_union__)); - -void release_pages (release_pages_arg ,int nr); - -/** -* folios_put - Decrement the reference count on an array of folios. -* @folios: The folios. -* -* Like folio_put(), but for a batch of folios. This is more efficient -* than writing the loop yourself as it will optimise the locks which need -* to be taken if the folios are freed. The folios batch is returned -* empty and ready to be reused for another batch; there is no need to -* reinitialise it. -* -* Context: May be called in process or interrupt context, but not in NMI -* context. May be called while holding a spinlock. -*/ -static inline void folios_put (struct folio_batch *folios) -{ -folios_put_refs (folios,NULL ); -} - -static inline void put_page (struct page *page) -{ -struct folio *folio =page_folio (page); - -/* -* For some devmap managed pages we need to catch refcount transition -* from 2 to 1: -*/ -if (put_devmap_managed_folio_refs (folio,1 )) -return ; -folio_put (folio); -} -/* * GUP_PIN_COUNTING_BIAS, and the associated functions that use it, overload * the page's refcount so that two separate items are tracked: the original page
include/linux/mm/folio_usage.h new file +182 -0
182 lines not on this page · raw message
Signature · 1 line
2.39.2
PATCH v6 11/15 linux/mm.h: move page_zone_id() and more to mm/folio_zone.h
In reply to Max KellermannThis is needed to eliminate linux/skbuff.h's dependency on linux/mm.h.
--- include/linux/mm.h | 48 +----------------------------- include/linux/mm/folio_zone.h | 56 +++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 47 deletions(-) create mode 100644 include/linux/mm/folio_zone.h
include/linux/mm.h +1 -47
@@ -5,6 +5,7 @@#include <linux/mm/folio_next.h> #include <linux/mm/folio_size.h> #include <linux/mm/folio_usage.h> +#include <linux/mm/folio_zone.h> #include <linux/mm/page_address.h> #include <linux/mm/page_section.h> #include <linux/errno.h>
@@ -1369,33 +1370,6 @@ static inline bool is_nommu_shared_mapping(vm_flags_t flags) }#endif -/* -* The identification function is mainly used by the buddy allocator for -* determining if two pages could be buddies. We are not really identifying -* the zone since we could be using the section number id if we do not have -* node id available in page flags. -* We only guarantee that it will return the same value for two combinable -* pages in a zone. -*/ -static inline int page_zone_id (struct page *page) -{ -return (page->flags >>ZONEID_PGSHIFT ) &ZONEID_MASK ; -} - -#ifdef NODE_NOT_IN_PAGE_FLAGS -int page_to_nid (const struct page *page); -#else -static inline int page_to_nid (const struct page *page) -{ -return (PF_POISONED_CHECK (page)->flags >>NODES_PGSHIFT ) &NODES_MASK ; -} -#endif - -static inline int folio_nid (const struct folio *folio) -{ -return page_to_nid (&folio->page); -} -#ifdef CONFIG_NUMA_BALANCING /* page access time bits needs to hold at least 4 seconds */ #define PAGE_ACCESS_TIME_MIN_BITS 12
@@ -1546,26 +1520,6 @@ static inline void vma_set_access_pid_bit(struct vm_area_struct *vma) }#endif /* CONFIG_NUMA_BALANCING */ -static inline struct zone *page_zone (const struct page *page) -{ -return &NODE_DATA (page_to_nid (page))->node_zones[page_zonenum (page)]; -} - -static inline pg_data_t *page_pgdat (const struct page *page) -{ -return NODE_DATA (page_to_nid (page)); -} - -static inline struct zone *folio_zone (const struct folio *folio) -{ -return page_zone (&folio->page); -} - -static inline pg_data_t *folio_pgdat (const struct folio *folio) -{ -return page_pgdat (&folio->page); -} -/** * folio_pfn - Return the Page Frame Number of a folio. * @folio: The folio.
include/linux/mm/folio_zone.h new file +56 -0
56 lines not on this page · raw message
Signature · 1 line
2.39.2
PATCH v6 12/15 linux/mm.h: move pfmemalloc-related functions to pfmemalloc.h
In reply to Max KellermannThis is needed to eliminate linux/skbuff.h's dependency on linux/mm.h.
--- include/linux/mm.h | 45 +----------------------------- include/linux/mm/pfmemalloc.h | 52 +++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 44 deletions(-) create mode 100644 include/linux/mm/pfmemalloc.h
include/linux/mm.h +1 -44
@@ -8,6 +8,7 @@#include <linux/mm/folio_zone.h> #include <linux/mm/page_address.h> #include <linux/mm/page_section.h> +#include <linux/mm/pfmemalloc.h> #include <linux/errno.h> #include <linux/mmdebug.h> #include <linux/gfp.h>
@@ -1772,50 +1773,6 @@ static inline int arch_make_folio_accessible(struct folio *folio)*/ #include <linux/vmstat.h> -/* -* Return true only if the page has been allocated with -* ALLOC_NO_WATERMARKS and the low watermark was not -* met implying that the system is under some pressure. -*/ -static inline bool page_is_pfmemalloc (const struct page *page) -{ -/* -* lru.next has bit 1 set if the page is allocated from the -* pfmemalloc reserves. Callers may simply overwrite it if -* they do not need to preserve that information. -*/ -return (uintptr_t )page->lru.next &BIT (1 ); -} - -/* -* Return true only if the folio has been allocated with -* ALLOC_NO_WATERMARKS and the low watermark was not -* met implying that the system is under some pressure. -*/ -static inline bool folio_is_pfmemalloc (const struct folio *folio) -{ -/* -* lru.next has bit 1 set if the page is allocated from the -* pfmemalloc reserves. Callers may simply overwrite it if -* they do not need to preserve that information. -*/ -return (uintptr_t )folio->lru.next &BIT (1 ); -} - -/* -* Only to be called by the page allocator on a freshly allocated -* page. -*/ -static inline void set_page_pfmemalloc (struct page *page) -{ - page->lru.next = (void *)BIT (1 ); -} - -static inline void clear_page_pfmemalloc (struct page *page) -{ - page->lru.next =NULL ; -} -/* * Can be called by the pagefault handler when it gets a VM_FAULT_OOM. */
include/linux/mm/pfmemalloc.h new file +52 -0
52 lines not on this page · raw message
Signature · 1 line
2.39.2
PATCH v6 13/15 linux/mm.h: move is_vmalloc_addr() to mm/vmalloc_addr.h
In reply to Max KellermannThis is needed to eliminate linux/dma-mapping.h's dependency on linux/mm.h.
--- include/linux/mm.h | 25 +------------------------ include/linux/mm/vmalloc_addr.h | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 24 deletions(-) create mode 100644 include/linux/mm/vmalloc_addr.h
include/linux/mm.h +1 -24
@@ -9,6 +9,7 @@#include <linux/mm/page_address.h> #include <linux/mm/page_section.h> #include <linux/mm/pfmemalloc.h> +#include <linux/mm/vmalloc_addr.h> #include <linux/errno.h> #include <linux/mmdebug.h> #include <linux/gfp.h>
@@ -1087,30 +1088,6 @@ enum {int region_intersects (resource_size_t offset,size_t size,unsigned long flags,unsigned long desc); -/* Support for virtually mapped pages */ -struct page *vmalloc_to_page (const void *addr); -unsigned long vmalloc_to_pfn (const void *addr); - -/* -* Determine if an address is within the vmalloc range -* -* On nommu, vmalloc/vfree wrap through kmalloc/kfree directly, so there -* is no special casing required. -*/ -#ifdef CONFIG_MMU -extern bool is_vmalloc_addr (const void *x); -extern int is_vmalloc_or_module_addr (const void *x); -#else -static inline bool is_vmalloc_addr (const void *x) -{ -return false; -} -static inline int is_vmalloc_or_module_addr (const void *x) -{ -return 0 ; -} -#endif -/* * How many times the entire folio is mapped as a single unit (eg by a * PMD or PUD entry). This is probably not what you want, except for
include/linux/mm/vmalloc_addr.h new file +33 -0
@@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_MM_VMALLOC_ADDR_H +#define _LINUX_MM_VMALLOC_ADDR_H + +#include <linux/types.h> // for bool + +struct page ; + +/* Support for virtually mapped pages */ +struct page *vmalloc_to_page (const void *addr); +unsigned long vmalloc_to_pfn (const void *addr); + +/* +* Determine if an address is within the vmalloc range +* +* On nommu, vmalloc/vfree wrap through kmalloc/kfree directly, so there +* is no special casing required. +*/ +#ifdef CONFIG_MMU +extern bool is_vmalloc_addr (const void *x); +extern int is_vmalloc_or_module_addr (const void *x); +#else +static inline bool is_vmalloc_addr (const void *x) +{ +return false; +} +static inline int is_vmalloc_or_module_addr (const void *x) +{ +return 0 ; +} +#endif + +#endif /* _LINUX_MM_VMALLOC_ADDR_H */
Signature · 1 line
2.39.2
PATCH v6 14/15 linux/mm.h: move high_memory to mm/high_memory.h
In reply to Max KellermannThis variable is used by lots of arch/*/include/asm/ headers, but these do not (and should not) include the huge linux/mm.h header. Let's move this "extern" variable to a separate header and include this one in arch/.
--- arch/arm/include/asm/memory.h | 4 ++++ arch/arm/include/asm/pgtable.h | 2 ++ arch/csky/include/asm/page.h | 1 + arch/hexagon/include/asm/mem-layout.h | 4 ++++ arch/m68k/include/asm/page_mm.h | 1 + arch/m68k/include/asm/pgtable_mm.h | 1 + arch/parisc/include/asm/floppy.h | 1 + arch/powerpc/include/asm/book3s/32/pgtable.h | 4 ++++ arch/powerpc/include/asm/nohash/32/pgtable.h | 1 + arch/powerpc/include/asm/page.h | 1 + arch/x86/include/asm/floppy.h | 1 + arch/x86/include/asm/pgtable_32_areas.h | 4 ++++ drivers/mtd/nand/onenand/onenand_samsung.c | 1 + include/linux/mm.h | 2 +- include/linux/mm/high_memory.h | 7 +++++++ 15 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 include/linux/mm/high_memory.h
arch/arm/include/asm/memory.h +4 -0
@@ -387,6 +387,10 @@ static inline unsigned long __virt_to_idmap(unsigned long x)*/ #define ARCH_PFN_OFFSET PHYS_PFN_OFFSET +#ifndef __ASSEMBLY__ +#include <linux/mm/high_memory.h> +#endif +#define virt_to_page (kaddr) pfn_to_page(virt_to_pfn(kaddr))#define virt_addr_valid (kaddr) (((unsigned long)(kaddr) >= PAGE_OFFSET && (unsigned long)(kaddr) < (unsigned long)high_memory) \ && pfn_valid(virt_to_pfn(kaddr)))
arch/arm/include/asm/pgtable.h +2 -0
@@ -11,6 +11,8 @@#include <asm/proc-fns.h> #ifndef __ASSEMBLY__ +#include <linux/mm/high_memory.h> +/* * ZERO_PAGE is a global shared page that is always zero: used * for zero-mapped memory areas etc..
arch/csky/include/asm/page.h +1 -0
@@ -32,6 +32,7 @@#ifndef __ASSEMBLY__ +#include <linux/mm/high_memory.h> #include <linux/pfn.h> #define virt_addr_valid (kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && \
arch/hexagon/include/asm/mem-layout.h +4 -0
@@ -10,6 +10,10 @@#include <linux/const.h> +#ifndef __ASSEMBLY__ +#include <linux/mm/high_memory.h> +#endif +/* * Have to do this for ginormous numbers, else they get printed as * negative numbers, which the linker no likey when you try to
arch/m68k/include/asm/page_mm.h +1 -0
@@ -5,6 +5,7 @@#ifndef __ASSEMBLY__#include <linux/compiler.h> +#include <linux/mm/high_memory.h> #include <asm/module.h> /*
arch/m68k/include/asm/pgtable_mm.h +1 -0
@@ -13,6 +13,7 @@#ifndef __ASSEMBLY__#include <asm/processor.h> +#include <linux/mm/high_memory.h> #include <linux/sched.h> #include <linux/threads.h>
arch/parisc/include/asm/floppy.h +1 -0
@@ -8,6 +8,7 @@#ifndef __ASM_PARISC_FLOPPY_H#define __ASM_PARISC_FLOPPY_H +#include <linux/mm/high_memory.h> #include <linux/vmalloc.h>
arch/powerpc/include/asm/book3s/32/pgtable.h +4 -0
@@ -4,6 +4,10 @@#include <asm-generic/pgtable-nopmd.h> +#ifndef __ASSEMBLY__ +#include <linux/mm/high_memory.h> +#endif +/* * The "classic" 32-bit implementation of the PowerPC MMU uses a hash * table containing PTEs, together with a set of 16 segment registers,
arch/powerpc/include/asm/nohash/32/pgtable.h +1 -0
@@ -5,6 +5,7 @@#include <asm-generic/pgtable-nopmd.h> #ifndef __ASSEMBLY__ +#include <linux/mm/high_memory.h> #include <linux/sched.h> #include <linux/threads.h> #include <asm/mmu.h> /* For sub-arch specific PPC_PIN_SIZE */
arch/powerpc/include/asm/page.h +1 -0
@@ -7,6 +7,7 @@*/ #ifndef __ASSEMBLY__ +#include <linux/mm/high_memory.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/bug.h>
arch/x86/include/asm/floppy.h +1 -0
@@ -10,6 +10,7 @@#ifndef _ASM_X86_FLOPPY_H#define _ASM_X86_FLOPPY_H +#include <linux/mm/high_memory.h> #include <linux/vmalloc.h> /*
arch/x86/include/asm/pgtable_32_areas.h +4 -0
@@ -3,6 +3,10 @@#include <asm/cpu_entry_area.h> +#ifndef __ASSEMBLY__ +#include <linux/mm/high_memory.h> +#endif +/* * Just any arbitrary offset to the start of the vmalloc VM area: the * current 8MB value just means that there will be a 8MB "hole" after the
drivers/mtd/nand/onenand/onenand_samsung.c +1 -0
@@ -15,6 +15,7 @@#include <linux/platform_device.h> #include <linux/sched.h> #include <linux/slab.h> +#include <linux/mm/high_memory.h> #include <linux/mtd/mtd.h> #include <linux/mtd/onenand.h> #include <linux/mtd/partitions.h>
include/linux/mm.h +1 -1
@@ -6,6 +6,7 @@#include <linux/mm/folio_size.h> #include <linux/mm/folio_usage.h> #include <linux/mm/folio_zone.h> +#include <linux/mm/high_memory.h> #include <linux/mm/page_address.h> #include <linux/mm/page_section.h> #include <linux/mm/pfmemalloc.h>
@@ -83,7 +84,6 @@ static inline void totalram_pages_add(long count)atomic_long_add (count, &_totalram_pages); } -extern void * high_memory;extern int page_cluster;extern const int page_cluster_max;
include/linux/mm/high_memory.h new file +7 -0
@@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_MM_HIGH_MEMORY_H +#define _LINUX_MM_HIGH_MEMORY_H + +extern void * high_memory; + +#endif /* _LINUX_MM_HIGH_MEMORY_H */
Signature · 1 line
2.39.2
PATCH v6 15/15 include: reduce dependencies on linux/mm.h
In reply to Max KellermannReplace <linux/mm.h> with the smaller pieces that were just splitted out. This affects a few headers that are included by many, e.g. bio.h and highmem.h, which now no longer depend on the fat <linux/mm.h> header.
For this, several missing includes need to be added because they are no longer indirectly included, e.g. <linux/fs.h>.
--- include/linux/bio.h | 2 ++ include/linux/bpfptr.h | 1 - include/linux/dma-mapping.h | 1 + include/linux/highmem-internal.h | 2 ++ include/linux/highmem.h | 4 +++- include/linux/net.h | 2 +- include/linux/oom.h | 2 +- include/linux/pagemap.h | 2 +- include/linux/scatterlist.h | 2 +- include/linux/skbuff.h | 4 ++++ include/linux/vmstat.h | 3 ++- lib/scatterlist.c | 1 + 12 files changed, 19 insertions(+), 7 deletions(-)
include/linux/bio.h +2 -0
@@ -5,7 +5,9 @@#ifndef __LINUX_BIO_H#define __LINUX_BIO_H +#include <linux/fs.h> // for struct kiocb, IOCB_NOWAIT #include <linux/mempool.h> +#include <linux/mm/folio_next.h> /* struct bio, bio_vec and BIO_* flags are defined in blk_types.h */ #include <linux/blk_types.h> #include <linux/uio.h>
include/linux/bpfptr.h +0 -1
@@ -3,7 +3,6 @@#ifndef _LINUX_BPFPTR_H#define _LINUX_BPFPTR_H -#include <linux/mm.h> #include <linux/sockptr.h> typedef sockptr_t bpfptr_t ;
include/linux/dma-mapping.h +1 -0
@@ -11,6 +11,7 @@#include <linux/scatterlist.h> #include <linux/bug.h> #include <linux/mem_encrypt.h> +#include <linux/mm/vmalloc_addr.h> /** * List of possible attributes associated with a DMA mapping. The semantics
include/linux/highmem-internal.h +2 -0
@@ -2,6 +2,8 @@#ifndef _LINUX_HIGHMEM_INTERNAL_H#define _LINUX_HIGHMEM_INTERNAL_H +#include <linux/mm/page_address.h> +/* * Outside of CONFIG_HIGHMEM to support X86 32bit iomap_atomic() cruft. */
include/linux/highmem.h +3 -1
@@ -7,7 +7,9 @@#include <linux/bug.h> #include <linux/cacheflush.h> #include <linux/kmsan.h> -#include <linux/mm.h> +#include <linux/mm/folio_size.h> // for page_size() +#include <linux/mm/folio_usage.h> // for folio_put() +#include <linux/mm/page_address.h> #include <linux/uaccess.h> #include <linux/hardirq.h>
include/linux/net.h +1 -1
@@ -21,7 +21,7 @@#include <linux/rcupdate.h> #include <linux/once.h> #include <linux/fs.h> -#include <linux/mm.h> +#include <linux/page_ref.h> // for page_count() #include <linux/sockptr.h> #include <uapi/linux/net.h>
include/linux/oom.h +1 -1
@@ -8,7 +8,7 @@#include <linux/nodemask.h> #include <uapi/linux/oom.h> #include <linux/sched/coredump.h> /* MMF_* */ -#include <linux/mm.h> /* VM_FAULT* */ +#include <linux/mm_types.h> /* VM_FAULT* */ struct zonelist ;struct notifier_block ;
include/linux/pagemap.h +1 -1
@@ -5,7 +5,7 @@/* * Copyright 1995 Linus Torvalds */ -#include <linux/mm.h> +#include <linux/mm_types.h> #include <linux/fs.h> #include <linux/list.h> #include <linux/highmem.h>
include/linux/scatterlist.h +1 -1
@@ -5,7 +5,7 @@#include <linux/string.h> #include <linux/types.h> #include <linux/bug.h> -#include <linux/mm.h> +#include <linux/mm/page_address.h> #include <asm/io.h> #ifdef CONFIG_UML
include/linux/skbuff.h +4 -0
@@ -16,6 +16,10 @@#include <linux/bug.h> #include <linux/bvec.h> #include <linux/cache.h> +#include <linux/gfp.h> // for alloc_pages_node() +#include <linux/mm/folio_usage.h> // for get_page(), put_page() +#include <linux/mm/folio_zone.h> // for page_to_nid() +#include <linux/mm/pfmemalloc.h> // for page_is_pfmemalloc() #include <linux/rbtree.h> #include <linux/socket.h> #include <linux/refcount.h>
include/linux/vmstat.h +2 -1
@@ -4,7 +4,8 @@#include <linux/types.h> #include <linux/percpu.h> -#include <linux/mm.h> // for folio_zone(), folio_nr_pages() +#include <linux/mm/folio_size.h> // for folio_nr_pages() +#include <linux/mm/folio_zone.h> // for folio_zone() #include <linux/mmzone.h> #include <linux/vm_event_item.h> #include <linux/atomic.h>
lib/scatterlist.c +1 -0
@@ -9,6 +9,7 @@#include <linux/scatterlist.h> #include <linux/highmem.h> #include <linux/kmemleak.h> +#include <linux/mm.h> #include <linux/bvec.h> #include <linux/uio.h>
Signature · 1 line
2.39.2
Matthew Wilcox
maintainerQuoted 2 lines · Max Kellermann
This patch set aims to clean up the
linux/mm.hheader and reduce dependencies on it by moving parts out.
I am not a fan of these patches. They will make it harder to work on the MM system. We briefly discussed them at LSFMM and nobody was in favour of them. I'm afraid you're shouting into the wind.
Quoted 3 lines · Matthew Wilcox
I am not a fan of these patches. They will make it harder to work on the MM system. We briefly discussed them at LSFMM and nobody was in favour of them. I'm afraid you're shouting into the wind.
Thanks for letting me know, but I'm confused because similar patches have been merged pretty often.
For a very weird example, look at commit adeb04362d74 ("kernel.h: Move upper_*_bits() and lower_*_bits() to wordpart.h") which was submitted on Feb 14th; and then look at
https://lore.kernel.org/lkml/[email protected]/
- it's exactly the same patch, but I submitted it 5 days earlier, yet the other one was merged.
Other recent examples (though without offending earlier patches from me):
- d186eb1ee885 ("cpumask: split out include/linux/cpumask_types.h")
- f7515d9fe8fc4 ("objtool: Add objtool_types.h")
- cb5a065b4ea9 ("headers/deps: mm: Split <linux/gfp_types.h> out of <linux/gfp.h>")
- 50d91c765825 ("hrtimers: Split out hrtimer_types.h")
- 9983deb26d90 ("Split out irqflags_types.h")
- 6d5e9d636830 ("pid: Split out pid_types.h")
.... and so on ...
If there is a general agreement that nobody is in favor of these patches, why are they merged when other people submit them?
Max