Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2117 from Rmys/master

Browse Source 
kernel-6.6.87
This commit is contained in:
Rmys
2025-04-18 19:24:40 +03:00
committed by GitHub
parent 5fefa0ea92 6f268ad08f
commit b7e4462a79
10 changed files with 38897 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/tools/cpupowertools/files/patches/aufs6/aufs6-base.patch
+12 -12
View File
@@ -1,8 +1,8 @@
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs6.6.63 base patch aufs6.6.84 base patch
diff --git a/MAINTAINERS b/MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS
index ae4c0cec5073..2b5edd2836a7 100644 index ae4c0cec50736..2b5edd2836a7d 100644
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -3334,6 +3334,19 @@ F: include/uapi/linux/audit.h @@ -3334,6 +3334,19 @@ F: include/uapi/linux/audit.h
@@ -26,7 +26,7 @@ index ae4c0cec5073..2b5edd2836a7 100644
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
R: Dave Ertman <david.m.ertman@intel.com> R: Dave Ertman <david.m.ertman@intel.com>
diff --git a/drivers/block/loop.c b/drivers/block/loop.c diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 886c63599037..73dae3b1bd4e 100644 index 886c635990377..73dae3b1bd4e5 100644
--- a/drivers/block/loop.c --- a/drivers/block/loop.c
+++ b/drivers/block/loop.c +++ b/drivers/block/loop.c
@@ -640,6 +640,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, @@ -640,6 +640,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@@ -55,7 +55,7 @@ index 886c63599037..73dae3b1bd4e 100644
static ssize_t loop_attr_show(struct device *dev, char *page, static ssize_t loop_attr_show(struct device *dev, char *page,
diff --git a/fs/dcache.c b/fs/dcache.c diff --git a/fs/dcache.c b/fs/dcache.c
index 4030c010a768..e2877ac9a1e6 100644 index 4030c010a7682..e2877ac9a1e6c 100644
--- a/fs/dcache.c --- a/fs/dcache.c
+++ b/fs/dcache.c +++ b/fs/dcache.c
@@ -1350,7 +1350,7 @@ enum d_walk_ret { @@ -1350,7 +1350,7 @@ enum d_walk_ret {
@@ -68,7 +68,7 @@ index 4030c010a768..e2877ac9a1e6 100644
{ {
struct dentry *this_parent; struct dentry *this_parent;
diff --git a/fs/fcntl.c b/fs/fcntl.c diff --git a/fs/fcntl.c b/fs/fcntl.c
index 1484f062ee65..1e44fc9b0f70 100644 index 1484f062ee65e..1e44fc9b0f704 100644
--- a/fs/fcntl.c --- a/fs/fcntl.c
+++ b/fs/fcntl.c +++ b/fs/fcntl.c
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
@@ -90,7 +90,7 @@ index 1484f062ee65..1e44fc9b0f70 100644
return error; return error;
diff --git a/fs/namespace.c b/fs/namespace.c diff --git a/fs/namespace.c b/fs/namespace.c
index b4385e2413d5..c9347fc5e14a 100644 index b4385e2413d59..c9347fc5e14a0 100644
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -872,6 +872,12 @@ static inline int check_mnt(struct mount *mnt) @@ -872,6 +872,12 @@ static inline int check_mnt(struct mount *mnt)
@@ -107,7 +107,7 @@ index b4385e2413d5..c9347fc5e14a 100644
* vfsmount lock must be held for write * vfsmount lock must be held for write
*/ */
diff --git a/fs/splice.c b/fs/splice.c diff --git a/fs/splice.c b/fs/splice.c
index d983d375ff11..7216ef993b5f 100644 index d983d375ff113..7216ef993b5f9 100644
--- a/fs/splice.c --- a/fs/splice.c
+++ b/fs/splice.c +++ b/fs/splice.c
@@ -925,8 +925,8 @@ static int warn_unsupported(struct file *file, const char *op) @@ -925,8 +925,8 @@ static int warn_unsupported(struct file *file, const char *op)
@@ -122,7 +122,7 @@ index d983d375ff11..7216ef993b5f 100644
if (unlikely(!out->f_op->splice_write)) if (unlikely(!out->f_op->splice_write))
return warn_unsupported(out, "write"); return warn_unsupported(out, "write");
diff --git a/include/linux/fs.h b/include/linux/fs.h diff --git a/include/linux/fs.h b/include/linux/fs.h
index 6c3d86532e3f..c572420129a5 100644 index 81edfa1e66b60..534be34edab64 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -1101,6 +1101,7 @@ extern void fasync_free(struct fasync_struct *); @@ -1101,6 +1101,7 @@ extern void fasync_free(struct fasync_struct *);
@@ -142,7 +142,7 @@ index 6c3d86532e3f..c572420129a5 100644
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int); ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index dc2844b071c2..069ffb776c2c 100644 index 919a5cb6368d1..e4be17a2efdb9 100644
--- a/include/linux/lockdep.h --- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h +++ b/include/linux/lockdep.h
@@ -249,6 +249,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock, @@ -249,6 +249,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
@@ -155,7 +155,7 @@ index dc2844b071c2..069ffb776c2c 100644
* Acquire a lock. * Acquire a lock.
* *
diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h
index 8f882f5881e8..6b9808f09843 100644 index 8f882f5881e87..6b9808f098435 100644
--- a/include/linux/mnt_namespace.h --- a/include/linux/mnt_namespace.h
+++ b/include/linux/mnt_namespace.h +++ b/include/linux/mnt_namespace.h
@@ -7,12 +7,15 @@ struct mnt_namespace; @@ -7,12 +7,15 @@ struct mnt_namespace;
@@ -175,7 +175,7 @@ index 8f882f5881e8..6b9808f09843 100644
extern const struct file_operations proc_mountinfo_operations; extern const struct file_operations proc_mountinfo_operations;
extern const struct file_operations proc_mountstats_operations; extern const struct file_operations proc_mountstats_operations;
diff --git a/include/linux/splice.h b/include/linux/splice.h diff --git a/include/linux/splice.h b/include/linux/splice.h
index 6c461573434d..f08de3775987 100644 index 6c461573434dd..f08de37759877 100644
--- a/include/linux/splice.h --- a/include/linux/splice.h
+++ b/include/linux/splice.h +++ b/include/linux/splice.h
@@ -99,4 +99,7 @@ extern void splice_shrink_spd(struct splice_pipe_desc *); @@ -99,4 +99,7 @@ extern void splice_shrink_spd(struct splice_pipe_desc *);
@@ -187,7 +187,7 @@ index 6c461573434d..f08de3775987 100644
+ loff_t *ppos, size_t len, unsigned int flags); + loff_t *ppos, size_t len, unsigned int flags);
#endif #endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 3468d8230e5f..64b9aedbe941 100644 index 3468d8230e5f7..64b9aedbe941d 100644
--- a/kernel/locking/lockdep.c --- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c
@@ -218,7 +218,7 @@ unsigned long max_lock_class_idx; @@ -218,7 +218,7 @@ unsigned long max_lock_class_idx;
kernel/tools/cpupowertools/files/patches/aufs6/aufs6-kbuild.patch
+4 -4
View File
@@ -1,11 +1,11 @@
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs6.6.63 kbuild patch aufs6.6.84 kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig diff --git a/fs/Kconfig b/fs/Kconfig
index aa7e03cc1941..bf780967b6c4 100644 index 02a9237807a77..bb3f7ec67b867 100644
--- a/fs/Kconfig --- a/fs/Kconfig
+++ b/fs/Kconfig +++ b/fs/Kconfig
@@ -331,6 +331,7 @@ source "fs/sysv/Kconfig" @@ -337,6 +337,7 @@ source "fs/sysv/Kconfig"
source "fs/ufs/Kconfig" source "fs/ufs/Kconfig"
source "fs/erofs/Kconfig" source "fs/erofs/Kconfig"
source "fs/vboxsf/Kconfig" source "fs/vboxsf/Kconfig"
@@ -14,7 +14,7 @@ index aa7e03cc1941..bf780967b6c4 100644
endif # MISC_FILESYSTEMS endif # MISC_FILESYSTEMS
diff --git a/fs/Makefile b/fs/Makefile diff --git a/fs/Makefile b/fs/Makefile
index f9541f40be4e..3a0e13ee39e7 100644 index f9541f40be4e0..3a0e13ee39e7f 100644
--- a/fs/Makefile --- a/fs/Makefile
+++ b/fs/Makefile +++ b/fs/Makefile
@@ -129,3 +129,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/ @@ -129,3 +129,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/
kernel/tools/cpupowertools/files/patches/aufs6/aufs6-loopback.patch
+7 -7
View File
@@ -1,8 +1,8 @@
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs6.6.63 loopback patch aufs6.6.84 loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 73dae3b1bd4e..ae84fb81acbf 100644 index 73dae3b1bd4e5..ae84fb81acbf9 100644
--- a/drivers/block/loop.c --- a/drivers/block/loop.c
+++ b/drivers/block/loop.c +++ b/drivers/block/loop.c
@@ -54,7 +54,7 @@ struct loop_device { @@ -54,7 +54,7 @@ struct loop_device {
@@ -149,7 +149,7 @@ index 73dae3b1bd4e..ae84fb81acbf 100644
static int loop_clr_fd(struct loop_device *lo) static int loop_clr_fd(struct loop_device *lo)
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
index d109c1392d60..dfe82d9c6292 100644 index db7e9fcf1056a..6d202136d29af 100644
--- a/fs/aufs/f_op.c --- a/fs/aufs/f_op.c
+++ b/fs/aufs/f_op.c +++ b/fs/aufs/f_op.c
@@ -317,7 +317,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter) @@ -317,7 +317,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
@@ -162,7 +162,7 @@ index d109c1392d60..dfe82d9c6292 100644
if (file->f_mapping != h_file->f_mapping) { if (file->f_mapping != h_file->f_mapping) {
file->f_mapping = h_file->f_mapping; file->f_mapping = h_file->f_mapping;
diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c
index 58043e31e5f3..e2bfae6f9d59 100644 index 69dea4cda00c0..92a74affb2208 100644
--- a/fs/aufs/loop.c --- a/fs/aufs/loop.c
+++ b/fs/aufs/loop.c +++ b/fs/aufs/loop.c
@@ -133,3 +133,19 @@ void au_loopback_fin(void) @@ -133,3 +133,19 @@ void au_loopback_fin(void)
@@ -186,7 +186,7 @@ index 58043e31e5f3..e2bfae6f9d59 100644
+ return f; + return f;
+} +}
diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
index 03d4908a6c03..34d356e181d5 100644 index 519efba31c700..ac701381da792 100644
--- a/fs/aufs/loop.h --- a/fs/aufs/loop.h
+++ b/fs/aufs/loop.h +++ b/fs/aufs/loop.h
@@ -26,6 +26,8 @@ void au_warn_loopback(struct super_block *h_sb); @@ -26,6 +26,8 @@ void au_warn_loopback(struct super_block *h_sb);
@@ -208,7 +208,7 @@ index 03d4908a6c03..34d356e181d5 100644
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
diff --git a/fs/aufs/super.c b/fs/aufs/super.c diff --git a/fs/aufs/super.c b/fs/aufs/super.c
index 6da6270e98ca..5f9bbcd90851 100644 index 9c30cba527421..8161108d0f6d5 100644
--- a/fs/aufs/super.c --- a/fs/aufs/super.c
+++ b/fs/aufs/super.c +++ b/fs/aufs/super.c
@@ -758,7 +758,10 @@ const struct super_operations aufs_sop = { @@ -758,7 +758,10 @@ const struct super_operations aufs_sop = {
@@ -224,7 +224,7 @@ index 6da6270e98ca..5f9bbcd90851 100644
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h diff --git a/include/linux/fs.h b/include/linux/fs.h
index c572420129a5..5b434c0e85ab 100644 index 534be34edab64..b7c27b0486b7d 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -2089,6 +2089,11 @@ struct super_operations { @@ -2089,6 +2089,11 @@ struct super_operations {
kernel/tools/cpupowertools/files/patches/aufs6/aufs6-mmap.patch
+70 -55
View File
@@ -1,8 +1,8 @@
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs6.6.63 mmap patch aufs6.6.84 mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c diff --git a/fs/proc/base.c b/fs/proc/base.c
index 699f085d4de7..8e7cb5a20a30 100644 index 91fe20b7657c0..b8573598ca4e6 100644
--- a/fs/proc/base.c --- a/fs/proc/base.c
+++ b/fs/proc/base.c +++ b/fs/proc/base.c
@@ -2277,7 +2277,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path) @@ -2277,7 +2277,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
@@ -15,7 +15,7 @@ index 699f085d4de7..8e7cb5a20a30 100644
rc = 0; rc = 0;
} }
diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
index 4d3493579458..42edd9a42c78 100644 index 4d3493579458f..42edd9a42c78b 100644
--- a/fs/proc/nommu.c --- a/fs/proc/nommu.c
+++ b/fs/proc/nommu.c +++ b/fs/proc/nommu.c
@@ -39,7 +39,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region) @@ -39,7 +39,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
@@ -31,7 +31,7 @@ index 4d3493579458..42edd9a42c78 100644
ino = inode->i_ino; ino = inode->i_ino;
} }
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 59571737e167..fc9b9f4aa75f 100644 index b8640f36ebf8a..fde14252ce111 100644
--- a/fs/proc/task_mmu.c --- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c
@@ -271,7 +271,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma) @@ -271,7 +271,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
@@ -56,7 +56,7 @@ index 59571737e167..fc9b9f4aa75f 100644
struct mempolicy *pol; struct mempolicy *pol;
char buffer[64]; char buffer[64];
diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
index 7cebd397cc26..81be1641c7fb 100644 index 7cebd397cc26e..81be1641c7fbd 100644
--- a/fs/proc/task_nommu.c --- a/fs/proc/task_nommu.c
+++ b/fs/proc/task_nommu.c +++ b/fs/proc/task_nommu.c
@@ -137,7 +137,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma) @@ -137,7 +137,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
@@ -72,7 +72,7 @@ index 7cebd397cc26..81be1641c7fb 100644
ino = inode->i_ino; ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT; pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
diff --git a/include/linux/mm.h b/include/linux/mm.h diff --git a/include/linux/mm.h b/include/linux/mm.h
index b6a4d6471b4a..00c7e351d2e8 100644 index 209370f644366..5c84e2330fd64 100644
--- a/include/linux/mm.h --- a/include/linux/mm.h
+++ b/include/linux/mm.h +++ b/include/linux/mm.h
@@ -2415,6 +2415,43 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, @@ -2415,6 +2415,43 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
@@ -120,10 +120,10 @@ index b6a4d6471b4a..00c7e351d2e8 100644
void *buf, int len, unsigned int gup_flags); void *buf, int len, unsigned int gup_flags);
extern int access_remote_vm(struct mm_struct *mm, unsigned long addr, extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 43c19d85dfe7..c6bdd132b7ff 100644 index e77d4a5c0bace..5aa50ed123be1 100644
--- a/include/linux/mm_types.h --- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h +++ b/include/linux/mm_types.h
@@ -524,6 +524,9 @@ struct vm_region { @@ -554,6 +554,9 @@ struct vm_region {
unsigned long vm_top; /* region allocated to here */ unsigned long vm_top; /* region allocated to here */
unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */ unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */
struct file *vm_file; /* the backing file or NULL */ struct file *vm_file; /* the backing file or NULL */
@@ -133,7 +133,7 @@ index 43c19d85dfe7..c6bdd132b7ff 100644
int vm_usage; /* region usage count (access under nommu_region_sem) */ int vm_usage; /* region usage count (access under nommu_region_sem) */
bool vm_icache_flushed : 1; /* true if the icache has been flushed for bool vm_icache_flushed : 1; /* true if the icache has been flushed for
@@ -664,6 +667,9 @@ struct vm_area_struct { @@ -697,6 +700,9 @@ struct vm_area_struct {
unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
units */ units */
struct file * vm_file; /* File we map to (can be NULL). */ struct file * vm_file; /* File we map to (can be NULL). */
@@ -144,7 +144,7 @@ index 43c19d85dfe7..c6bdd132b7ff 100644
#ifdef CONFIG_ANON_VMA_NAME #ifdef CONFIG_ANON_VMA_NAME
diff --git a/kernel/fork.c b/kernel/fork.c diff --git a/kernel/fork.c b/kernel/fork.c
index 23efaa2c42e4..50b94374b715 100644 index 23efaa2c42e4f..50b94374b715c 100644
--- a/kernel/fork.c --- a/kernel/fork.c
+++ b/kernel/fork.c +++ b/kernel/fork.c
@@ -732,7 +732,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, @@ -732,7 +732,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
@@ -157,7 +157,7 @@ index 23efaa2c42e4..50b94374b715 100644
if (tmp->vm_flags & VM_SHARED) if (tmp->vm_flags & VM_SHARED)
mapping_allow_writable(mapping); mapping_allow_writable(mapping);
diff --git a/mm/Makefile b/mm/Makefile diff --git a/mm/Makefile b/mm/Makefile
index ec65984e2ade..d59461647ccd 100644 index ec65984e2adee..d59461647ccd9 100644
--- a/mm/Makefile --- a/mm/Makefile
+++ b/mm/Makefile +++ b/mm/Makefile
@@ -138,3 +138,4 @@ obj-$(CONFIG_IO_MAPPING) += io-mapping.o @@ -138,3 +138,4 @@ obj-$(CONFIG_IO_MAPPING) += io-mapping.o
@@ -166,7 +166,7 @@ index ec65984e2ade..d59461647ccd 100644
obj-$(CONFIG_SHRINKER_DEBUG) += shrinker_debug.o obj-$(CONFIG_SHRINKER_DEBUG) += shrinker_debug.o
+obj-y += prfile.o +obj-y += prfile.o
diff --git a/mm/filemap.c b/mm/filemap.c diff --git a/mm/filemap.c b/mm/filemap.c
index 2c308413387f..82051ef9f5dd 100644 index 056422e6a0be8..065b94fe81d90 100644
--- a/mm/filemap.c --- a/mm/filemap.c
+++ b/mm/filemap.c +++ b/mm/filemap.c
@@ -3661,7 +3661,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) @@ -3661,7 +3661,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
@@ -179,7 +179,7 @@ index 2c308413387f..82051ef9f5dd 100644
if (folio->mapping != mapping) { if (folio->mapping != mapping) {
folio_unlock(folio); folio_unlock(folio);
diff --git a/mm/mmap.c b/mm/mmap.c diff --git a/mm/mmap.c b/mm/mmap.c
index e4dfeaef668a..a15b967bb0f8 100644 index 03a24cb3951d4..db6134d0458ec 100644
--- a/mm/mmap.c --- a/mm/mmap.c
+++ b/mm/mmap.c +++ b/mm/mmap.c
@@ -139,7 +139,7 @@ static void remove_vma(struct vm_area_struct *vma, bool unreachable) @@ -139,7 +139,7 @@ static void remove_vma(struct vm_area_struct *vma, bool unreachable)
@@ -227,58 +227,73 @@ index e4dfeaef668a..a15b967bb0f8 100644
vma->vm_file = NULL; vma->vm_file = NULL;
vma_iter_set(&vmi, vma->vm_end); vma_iter_set(&vmi, vma->vm_end);
@@ -2981,6 +2981,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, @@ -2982,6 +2982,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
unsigned long populate = 0;
unsigned long ret = -EINVAL; unsigned long ret = -EINVAL;
struct file *file; struct file *file;
+#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */ vm_flags_t vm_flags;
+ struct file *prfile; + struct file *prfile = NULL; /* aufs */
+#endif
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/mm/remap_file_pages.rst.\n", pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/mm/remap_file_pages.rst.\n",
current->comm, current->pid); current->comm, current->pid);
@@ -3039,6 +3042,32 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, @@ -3024,14 +3025,18 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
if (vma->vm_flags & VM_LOCKED)
flags |= MAP_LOCKED;
+#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */ /* Save vm_flags used to calculate prot and flags, and recheck later. */
vm_flags = vma->vm_flags;
- file = get_file(vma->vm_file);
+ vma_get_file(vma); + vma_get_file(vma);
+ file = vma->vm_file; + file = vma->vm_file;
+#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */
+ prfile = vma->vm_prfile; + prfile = vma->vm_prfile;
+ ret = security_mmap_file(vma->vm_file, prot, flags); +#endif
+ if (!ret) {
+ ret = do_mmap(vma->vm_file, start, size, mmap_read_unlock(mm);
+ prot, flags, /*vm_flags*/0, pgoff, &populate, NULL);
+ if (!IS_ERR_VALUE(ret) && file && prfile) { /* Call outside mmap_lock to be consistent with other callers. */
+ struct vm_area_struct *new_vma; ret = security_mmap_file(file, prot, flags);
if (ret) {
- fput(file);
+ vma_fput(vma);
return ret;
}
@@ -3039,7 +3044,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
/* OK security check passed, take write lock + let it rip. */
if (mmap_write_lock_killable(mm)) {
- fput(file);
+ vma_fput(vma);
return -EINTR;
}
@@ -3081,9 +3086,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
ret = do_mmap(vma->vm_file, start, size,
prot, flags, 0, pgoff, &populate, NULL);
+#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */
+ if (!IS_ERR_VALUE(ret) && file && prfile) {
+ struct vm_area_struct *new_vma;
+ +
+ new_vma = find_vma(mm, ret); + new_vma = find_vma(mm, ret);
+ if (!new_vma->vm_prfile) + if (!new_vma->vm_prfile)
+ new_vma->vm_prfile = prfile; + new_vma->vm_prfile = prfile;
+ if (prfile) + if (prfile)
+ get_file(prfile); + get_file(prfile);
+ }
+ } + }
+#endif
+
out:
mmap_write_unlock(mm);
+ /* + /*
+ * two fput()s instead of vma_fput(vma), + * two fput()s instead of vma_fput(vma),
+ * coz vma may not be available anymore. + * coz vma may not be available anymore.
+ */ + */
+ fput(file); fput(file);
+ if (prfile) + if (prfile)
+ fput(prfile); + fput(prfile);
+#else
file = get_file(vma->vm_file);
ret = security_mmap_file(vma->vm_file, prot, flags);
if (ret)
@@ -3047,6 +3076,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
prot, flags, 0, pgoff, &populate, NULL);
out_fput:
fput(file);
+#endif /* CONFIG_AUFS_FS */
out:
mmap_write_unlock(mm);
if (populate) if (populate)
@@ -3397,7 +3427,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, mm_populate(ret, populate);
if (!IS_ERR_VALUE(ret))
@@ -3432,7 +3455,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
if (anon_vma_clone(new_vma, vma)) if (anon_vma_clone(new_vma, vma))
goto out_free_mempol; goto out_free_mempol;
if (new_vma->vm_file) if (new_vma->vm_file)
@@ -287,7 +302,7 @@ index e4dfeaef668a..a15b967bb0f8 100644
if (new_vma->vm_ops && new_vma->vm_ops->open) if (new_vma->vm_ops && new_vma->vm_ops->open)
new_vma->vm_ops->open(new_vma); new_vma->vm_ops->open(new_vma);
if (vma_link(mm, new_vma)) if (vma_link(mm, new_vma))
@@ -3410,7 +3440,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, @@ -3445,7 +3468,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
vma_close(new_vma); vma_close(new_vma);
if (new_vma->vm_file) if (new_vma->vm_file)
@@ -297,10 +312,10 @@ index e4dfeaef668a..a15b967bb0f8 100644
unlink_anon_vmas(new_vma); unlink_anon_vmas(new_vma);
out_free_mempol: out_free_mempol:
diff --git a/mm/nommu.c b/mm/nommu.c diff --git a/mm/nommu.c b/mm/nommu.c
index f848d98e8997..a6f5ef257fd4 100644 index 3228b2d3e4ab6..a1fc80e87fbd5 100644
--- a/mm/nommu.c --- a/mm/nommu.c
+++ b/mm/nommu.c +++ b/mm/nommu.c
@@ -523,7 +523,7 @@ static void __put_nommu_region(struct vm_region *region) @@ -530,7 +530,7 @@ static void __put_nommu_region(struct vm_region *region)
up_write(&nommu_region_sem); up_write(&nommu_region_sem);
if (region->vm_file) if (region->vm_file)
@@ -309,7 +324,7 @@ index f848d98e8997..a6f5ef257fd4 100644
/* IO memory and memory shared directly out of the pagecache /* IO memory and memory shared directly out of the pagecache
* from ramfs/tmpfs mustn't be released here */ * from ramfs/tmpfs mustn't be released here */
@@ -602,7 +602,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma) @@ -609,7 +609,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
{ {
vma_close(vma); vma_close(vma);
if (vma->vm_file) if (vma->vm_file)
@@ -318,7 +333,7 @@ index f848d98e8997..a6f5ef257fd4 100644
put_nommu_region(vma->vm_region); put_nommu_region(vma->vm_region);
vm_area_free(vma); vm_area_free(vma);
} }
@@ -1134,7 +1134,7 @@ unsigned long do_mmap(struct file *file, @@ -1141,7 +1141,7 @@ unsigned long do_mmap(struct file *file,
goto error_just_free; goto error_just_free;
} }
} }
@@ -327,7 +342,7 @@ index f848d98e8997..a6f5ef257fd4 100644
kmem_cache_free(vm_region_jar, region); kmem_cache_free(vm_region_jar, region);
region = pregion; region = pregion;
result = start; result = start;
@@ -1220,10 +1220,10 @@ unsigned long do_mmap(struct file *file, @@ -1227,10 +1227,10 @@ unsigned long do_mmap(struct file *file,
error: error:
vma_iter_free(&vmi); vma_iter_free(&vmi);
if (region->vm_file) if (region->vm_file)
@@ -342,7 +357,7 @@ index f848d98e8997..a6f5ef257fd4 100644
diff --git a/mm/prfile.c b/mm/prfile.c diff --git a/mm/prfile.c b/mm/prfile.c
new file mode 100644 new file mode 100644
index 000000000000..8f820a235364 index 0000000000000..b034d160a18f4
--- /dev/null --- /dev/null
+++ b/mm/prfile.c +++ b/mm/prfile.c
@@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
@@ -354,7 +369,7 @@ index 000000000000..8f820a235364
+ * + *
+ * See Documentation/filesystems/aufs/design/06mmap.txt + * See Documentation/filesystems/aufs/design/06mmap.txt
+ * + *
+ * Copyright (c) 2014-2022 Junjro R. Okajima + * Copyright (c) 2014-2025 Junjro R. Okajima
+ * Copyright (c) 2014 Ian Campbell + * Copyright (c) 2014 Ian Campbell
+ */ + */
+ +
kernel/tools/cpupowertools/files/patches/aufs6/aufs6.6.84-20250414.patch
+38780
View File
File diff suppressed because it is too large Load Diff
kernel/tools/cpupowertools/files/patches/aufs6/lockdep-debug.patch
+2 -2
View File
@@ -1,8 +1,8 @@
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs6.6.63 lockdep patch aufs6.6.84 lockdep patch
diff --git a/include/linux/lockdep_types.h b/include/linux/lockdep_types.h diff --git a/include/linux/lockdep_types.h b/include/linux/lockdep_types.h
index 2ebc323d345a..9d7009190515 100644 index 2ebc323d345ae..9d7009190515d 100644
--- a/include/linux/lockdep_types.h --- a/include/linux/lockdep_types.h
+++ b/include/linux/lockdep_types.h +++ b/include/linux/lockdep_types.h
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
kernel/tools/cpupowertools/files/patches/aufs6/tmpfs-idr.patch
+10 -10
View File
@@ -21,7 +21,7 @@ index 134c686c8676..632d447caf64 100644
umode_t mode; /* Mount mode for root directory */ umode_t mode; /* Mount mode for root directory */
unsigned char huge; /* Whether to try for hugepages */ unsigned char huge; /* Whether to try for hugepages */
diff --git a/mm/shmem.c b/mm/shmem.c diff --git a/mm/shmem.c b/mm/shmem.c
index db7dd45c9181..554f1c80882e 100644 index 283fb62084d4..3ecdfcad9159 100644
--- a/mm/shmem.c --- a/mm/shmem.c
+++ b/mm/shmem.c +++ b/mm/shmem.c
@@ -111,7 +111,7 @@ struct shmem_falloc { @@ -111,7 +111,7 @@ struct shmem_falloc {
@@ -89,7 +89,7 @@ index db7dd45c9181..554f1c80882e 100644
lockdep_annotate_inode_mutex_key(inode); lockdep_annotate_inode_mutex_key(inode);
return inode; return inode;
} }
@@ -3773,8 +3799,7 @@ static struct dentry *shmem_get_parent(struct dentry *child) @@ -3772,8 +3798,7 @@ static struct dentry *shmem_get_parent(struct dentry *child)
static int shmem_match(struct inode *ino, void *vfh) static int shmem_match(struct inode *ino, void *vfh)
{ {
__u32 *fh = vfh; __u32 *fh = vfh;
@@ -99,7 +99,7 @@ index db7dd45c9181..554f1c80882e 100644
return ino->i_ino == inum && fh[0] == ino->i_generation; return ino->i_ino == inum && fh[0] == ino->i_generation;
} }
@@ -3794,14 +3819,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, @@ -3793,14 +3818,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
struct dentry *dentry = NULL; struct dentry *dentry = NULL;
u64 inum; u64 inum;
@@ -117,7 +117,7 @@ index db7dd45c9181..554f1c80882e 100644
if (inode) { if (inode) {
dentry = shmem_find_alias(inode); dentry = shmem_find_alias(inode);
iput(inode); iput(inode);
@@ -3813,30 +3835,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, @@ -3812,30 +3834,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb,
static int shmem_encode_fh(struct inode *inode, __u32 *fh, int *len, static int shmem_encode_fh(struct inode *inode, __u32 *fh, int *len,
struct inode *parent) struct inode *parent)
{ {
@@ -151,7 +151,7 @@ index db7dd45c9181..554f1c80882e 100644
return 1; return 1;
} }
@@ -3935,7 +3942,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param) @@ -3934,7 +3941,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param)
break; break;
case Opt_nr_inodes: case Opt_nr_inodes:
ctx->inodes = memparse(param->string, &rest); ctx->inodes = memparse(param->string, &rest);
@@ -160,7 +160,7 @@ index db7dd45c9181..554f1c80882e 100644
goto bad_value; goto bad_value;
ctx->seen |= SHMEM_SEEN_INODES; ctx->seen |= SHMEM_SEEN_INODES;
break; break;
@@ -4221,7 +4228,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root) @@ -4220,7 +4227,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root)
if (sbinfo->max_blocks != shmem_default_max_blocks()) if (sbinfo->max_blocks != shmem_default_max_blocks())
seq_printf(seq, ",size=%luk", K(sbinfo->max_blocks)); seq_printf(seq, ",size=%luk", K(sbinfo->max_blocks));
if (sbinfo->max_inodes != shmem_default_max_inodes()) if (sbinfo->max_inodes != shmem_default_max_inodes())
@@ -169,7 +169,7 @@ index db7dd45c9181..554f1c80882e 100644
if (sbinfo->mode != (0777 | S_ISVTX)) if (sbinfo->mode != (0777 | S_ISVTX))
seq_printf(seq, ",mode=%03ho", sbinfo->mode); seq_printf(seq, ",mode=%03ho", sbinfo->mode);
if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID)) if (!uid_eq(sbinfo->uid, GLOBAL_ROOT_UID))
@@ -4275,6 +4282,8 @@ static void shmem_put_super(struct super_block *sb) @@ -4274,6 +4281,8 @@ static void shmem_put_super(struct super_block *sb)
#ifdef CONFIG_TMPFS_QUOTA #ifdef CONFIG_TMPFS_QUOTA
shmem_disable_quotas(sb); shmem_disable_quotas(sb);
#endif #endif
@@ -178,7 +178,7 @@ index db7dd45c9181..554f1c80882e 100644
free_percpu(sbinfo->ino_batch); free_percpu(sbinfo->ino_batch);
percpu_counter_destroy(&sbinfo->used_blocks); percpu_counter_destroy(&sbinfo->used_blocks);
mpol_put(sbinfo->mpol); mpol_put(sbinfo->mpol);
@@ -4319,9 +4328,11 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) @@ -4318,9 +4327,11 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc)
#else #else
sb->s_flags |= SB_NOUSER; sb->s_flags |= SB_NOUSER;
#endif #endif
@@ -191,7 +191,7 @@ index db7dd45c9181..554f1c80882e 100644
if (sb->s_flags & SB_KERNMOUNT) { if (sb->s_flags & SB_KERNMOUNT) {
sbinfo->ino_batch = alloc_percpu(ino_t); sbinfo->ino_batch = alloc_percpu(ino_t);
if (!sbinfo->ino_batch) if (!sbinfo->ino_batch)
@@ -4464,6 +4475,15 @@ static int shmem_error_remove_page(struct address_space *mapping, @@ -4463,6 +4474,15 @@ static int shmem_error_remove_page(struct address_space *mapping,
return 0; return 0;
} }
@@ -207,7 +207,7 @@ index db7dd45c9181..554f1c80882e 100644
const struct address_space_operations shmem_aops = { const struct address_space_operations shmem_aops = {
.writepage = shmem_writepage, .writepage = shmem_writepage,
.dirty_folio = noop_dirty_folio, .dirty_folio = noop_dirty_folio,
@@ -4637,6 +4657,7 @@ void __init shmem_init(void) @@ -4636,6 +4656,7 @@ void __init shmem_init(void)
pr_err("Could not kern_mount tmpfs\n"); pr_err("Could not kern_mount tmpfs\n");
goto out1; goto out1;
} }
kernel/tools/cpupowertools/files/patches/aufs6/vfs-ino.patch
+3 -3
View File
@@ -1,10 +1,10 @@
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
diff --git a/fs/inode.c b/fs/inode.c diff --git a/fs/inode.c b/fs/inode.c
index 9cafde77e2b0..318aef01fe9e 100644 index 030e07b169c2..44c331163dd5 100644
--- a/fs/inode.c --- a/fs/inode.c
+++ b/fs/inode.c +++ b/fs/inode.c
@@ -1011,6 +1011,8 @@ unsigned int get_next_ino(void) @@ -1015,6 +1015,8 @@ unsigned int get_next_ino(void)
unsigned int *p = &get_cpu_var(last_ino); unsigned int *p = &get_cpu_var(last_ino);
unsigned int res = *p; unsigned int res = *p;
@@ -13,7 +13,7 @@ index 9cafde77e2b0..318aef01fe9e 100644
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) { if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
static atomic_t shared_last_ino; static atomic_t shared_last_ino;
@@ -1023,7 +1025,7 @@ unsigned int get_next_ino(void) @@ -1027,7 +1029,7 @@ unsigned int get_next_ino(void)
res++; res++;
/* get_next_ino should not provide a 0 inode number */ /* get_next_ino should not provide a 0 inode number */
if (unlikely(!res)) if (unlikely(!res))
kernel/tools/cpupowertools/files/patches/linux/patch-6.6.87.xz
BIN
View File
Binary file not shown.
kernel/tools/cpupowertools/pspec.xml
+9 -2
View File
@@ -18,10 +18,10 @@
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!-- Linux patches --> <!-- Linux patches -->
<Patch level="1" compressionType="xz">patches/linux/patch-6.6.83.xz</Patch> <Patch level="1" compressionType="xz">patches/linux/patch-6.6.87.xz</Patch>
<!-- aufs6 patchec --> <!-- aufs6 patchec -->
<Patch level="1">patches/aufs6/aufs6.6.63-20241202.patch</Patch> <Patch level="1">patches/aufs6/aufs6.6.84-20250414.patch</Patch>
<Patch level="1">patches/aufs6/aufs6-base.patch</Patch> <Patch level="1">patches/aufs6/aufs6-base.patch</Patch>
<Patch level="1">patches/aufs6/aufs6-kbuild.patch</Patch> <Patch level="1">patches/aufs6/aufs6-kbuild.patch</Patch>
<!-- <Patch level="1">patches/aufs6/aufs6-loopback.patch</Patch> --> <!-- <Patch level="1">patches/aufs6/aufs6-loopback.patch</Patch> -->
@@ -77,6 +77,13 @@
</Package> </Package>
<History> <History>
<Update release="99">
<Date>2025-04-17</Date>
<Version>6.6.87</Version>
<Comment>Version bump</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="98"> <Update release="98">
<Date>2025-04-01</Date> <Date>2025-04-01</Date>
<Version>6.6.83</Version> <Version>6.6.83</Version>