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

Merge pull request #1984 from Rmys/master

Browse Source 
kernel-6.6.56
This commit is contained in:
Rmys
2024-10-14 11:01:29 +03:00
committed by GitHub
parent b2c249edc4 be334ca64f
commit 39d7bfc0e8
12 changed files with 303 additions and 284 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.4 base patch aufs6.6.54 base patch
diff --git a/MAINTAINERS b/MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS
index dd5de540ec0b..1b495555a80c 100644 index ae4c0cec5073..2b5edd2836a7 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,10 +26,10 @@ index dd5de540ec0b..1b495555a80c 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 9f2d412fc560..1fefc6a8d049 100644 index 552f56a84a7e..ad953bc6d08a 100644
--- a/drivers/block/loop.c --- a/drivers/block/loop.c
+++ b/drivers/block/loop.c +++ b/drivers/block/loop.c
@@ -645,6 +645,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, @@ -643,6 +643,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
goto done; goto done;
} }
@@ -55,10 +55,10 @@ index 9f2d412fc560..1fefc6a8d049 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 25ac74d30bff..6c930ceed526 100644 index 4030c010a768..e2877ac9a1e6 100644
--- a/fs/dcache.c --- a/fs/dcache.c
+++ b/fs/dcache.c +++ b/fs/dcache.c
@@ -1345,7 +1345,7 @@ enum d_walk_ret { @@ -1350,7 +1350,7 @@ enum d_walk_ret {
* *
* The @enter() callbacks are called with d_lock held. * The @enter() callbacks are called with d_lock held.
*/ */
@@ -68,7 +68,7 @@ index 25ac74d30bff..6c930ceed526 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 e871009f6c88..d62e114c1b1a 100644 index 1484f062ee65..1e44fc9b0f70 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 e871009f6c88..d62e114c1b1a 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 e157efc54023..6c57487f126b 100644 index b4385e2413d5..c9347fc5e14a 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)
@@ -122,10 +122,10 @@ 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 4a40823c3c67..a46e516bfc32 100644 index 6c3d86532e3f..c572420129a5 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -1099,6 +1099,7 @@ extern void fasync_free(struct fasync_struct *); @@ -1101,6 +1101,7 @@ extern void fasync_free(struct fasync_struct *);
/* can be called from interrupts */ /* can be called from interrupts */
extern void kill_fasync(struct fasync_struct **, int, int); extern void kill_fasync(struct fasync_struct **, int, int);
@@ -133,7 +133,7 @@ index 4a40823c3c67..a46e516bfc32 100644
extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force); extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
extern int f_setown(struct file *filp, int who, int force); extern int f_setown(struct file *filp, int who, int force);
extern void f_delown(struct file *filp); extern void f_delown(struct file *filp);
@@ -1872,6 +1873,7 @@ struct file_operations { @@ -1934,6 +1935,7 @@ struct file_operations {
int (*lock) (struct file *, int, struct file_lock *); int (*lock) (struct file *, int, struct file_lock *);
unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
int (*check_flags)(int); int (*check_flags)(int);
@@ -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 151bd3de5936..2223ee909c10 100644 index 3468d8230e5f..64b9aedbe941 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
+1 -1
View File
@@ -1,5 +1,5 @@
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs6.6.4 kbuild patch aufs6.6.54 kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig diff --git a/fs/Kconfig b/fs/Kconfig
index aa7e03cc1941..bf780967b6c4 100644 index aa7e03cc1941..bf780967b6c4 100644
kernel/tools/cpupowertools/files/patches/aufs6/aufs6-loopback.patch
+17 -17
View File
@@ -1,8 +1,8 @@
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs6.6.4 loopback patch aufs6.6.54 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 1fefc6a8d049..86f1f66305d2 100644 index ad953bc6d08a..799119d6b95a 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 {
@@ -14,7 +14,7 @@ index 1fefc6a8d049..86f1f66305d2 100644
struct block_device *lo_device; struct block_device *lo_device;
gfp_t old_gfp_mask; gfp_t old_gfp_mask;
@@ -510,6 +510,15 @@ static inline void loop_update_dio(struct loop_device *lo) @@ -508,6 +508,15 @@ static inline void loop_update_dio(struct loop_device *lo)
lo->use_dio); lo->use_dio);
} }
@@ -30,7 +30,7 @@ index 1fefc6a8d049..86f1f66305d2 100644
static void loop_reread_partitions(struct loop_device *lo) static void loop_reread_partitions(struct loop_device *lo)
{ {
int rc; int rc;
@@ -567,6 +576,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, @@ -565,6 +574,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
{ {
struct file *file = fget(arg); struct file *file = fget(arg);
struct file *old_file; struct file *old_file;
@@ -38,7 +38,7 @@ index 1fefc6a8d049..86f1f66305d2 100644
int error; int error;
bool partscan; bool partscan;
bool is_loop; bool is_loop;
@@ -590,11 +600,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, @@ -588,11 +598,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
if (!(lo->lo_flags & LO_FLAGS_READ_ONLY)) if (!(lo->lo_flags & LO_FLAGS_READ_ONLY))
goto out_err; goto out_err;
@@ -58,7 +58,7 @@ index 1fefc6a8d049..86f1f66305d2 100644
error = -EINVAL; error = -EINVAL;
@@ -607,6 +625,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, @@ -605,6 +623,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
blk_mq_freeze_queue(lo->lo_queue); blk_mq_freeze_queue(lo->lo_queue);
mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask); mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
lo->lo_backing_file = file; lo->lo_backing_file = file;
@@ -66,7 +66,7 @@ index 1fefc6a8d049..86f1f66305d2 100644
lo->old_gfp_mask = mapping_gfp_mask(file->f_mapping); lo->old_gfp_mask = mapping_gfp_mask(file->f_mapping);
mapping_set_gfp_mask(file->f_mapping, mapping_set_gfp_mask(file->f_mapping,
lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS)); lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
@@ -629,6 +648,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, @@ -627,6 +646,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
* dependency. * dependency.
*/ */
fput(old_file); fput(old_file);
@@ -75,7 +75,7 @@ index 1fefc6a8d049..86f1f66305d2 100644
if (partscan) if (partscan)
loop_reread_partitions(lo); loop_reread_partitions(lo);
@@ -642,6 +663,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, @@ -640,6 +661,8 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
loop_global_unlock(lo, is_loop); loop_global_unlock(lo, is_loop);
out_putf: out_putf:
fput(file); fput(file);
@@ -84,7 +84,7 @@ index 1fefc6a8d049..86f1f66305d2 100644
goto done; goto done;
} }
@@ -1013,6 +1036,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode, @@ -1011,6 +1034,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
const struct loop_config *config) const struct loop_config *config)
{ {
struct file *file = fget(config->fd); struct file *file = fget(config->fd);
@@ -92,7 +92,7 @@ index 1fefc6a8d049..86f1f66305d2 100644
struct inode *inode; struct inode *inode;
struct address_space *mapping; struct address_space *mapping;
int error; int error;
@@ -1028,6 +1052,13 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode, @@ -1026,6 +1050,13 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
/* This is safe, since we have a reference from open(). */ /* This is safe, since we have a reference from open(). */
__module_get(THIS_MODULE); __module_get(THIS_MODULE);
@@ -106,7 +106,7 @@ index 1fefc6a8d049..86f1f66305d2 100644
/* /*
* If we don't hold exclusive handle for the device, upgrade to it * If we don't hold exclusive handle for the device, upgrade to it
* here to avoid changing device under exclusive owner. * here to avoid changing device under exclusive owner.
@@ -1091,6 +1122,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode, @@ -1089,6 +1120,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
lo->use_dio = lo->lo_flags & LO_FLAGS_DIRECT_IO; lo->use_dio = lo->lo_flags & LO_FLAGS_DIRECT_IO;
lo->lo_device = bdev; lo->lo_device = bdev;
lo->lo_backing_file = file; lo->lo_backing_file = file;
@@ -114,7 +114,7 @@ index 1fefc6a8d049..86f1f66305d2 100644
lo->old_gfp_mask = mapping_gfp_mask(mapping); lo->old_gfp_mask = mapping_gfp_mask(mapping);
mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS)); mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
@@ -1146,6 +1178,8 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode, @@ -1144,6 +1176,8 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
bd_abort_claiming(bdev, loop_configure); bd_abort_claiming(bdev, loop_configure);
out_putf: out_putf:
fput(file); fput(file);
@@ -123,7 +123,7 @@ index 1fefc6a8d049..86f1f66305d2 100644
/* This is safe: open() is still holding a reference. */ /* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE); module_put(THIS_MODULE);
return error; return error;
@@ -1154,6 +1188,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode, @@ -1152,6 +1186,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
static void __loop_clr_fd(struct loop_device *lo, bool release) static void __loop_clr_fd(struct loop_device *lo, bool release)
{ {
struct file *filp; struct file *filp;
@@ -131,7 +131,7 @@ index 1fefc6a8d049..86f1f66305d2 100644
gfp_t gfp = lo->old_gfp_mask; gfp_t gfp = lo->old_gfp_mask;
if (test_bit(QUEUE_FLAG_WC, &lo->lo_queue->queue_flags)) if (test_bit(QUEUE_FLAG_WC, &lo->lo_queue->queue_flags))
@@ -1170,6 +1205,7 @@ static void __loop_clr_fd(struct loop_device *lo, bool release) @@ -1168,6 +1203,7 @@ static void __loop_clr_fd(struct loop_device *lo, bool release)
spin_lock_irq(&lo->lo_lock); spin_lock_irq(&lo->lo_lock);
filp = lo->lo_backing_file; filp = lo->lo_backing_file;
lo->lo_backing_file = NULL; lo->lo_backing_file = NULL;
@@ -139,7 +139,7 @@ index 1fefc6a8d049..86f1f66305d2 100644
spin_unlock_irq(&lo->lo_lock); spin_unlock_irq(&lo->lo_lock);
lo->lo_device = NULL; lo->lo_device = NULL;
@@ -1232,6 +1268,8 @@ static void __loop_clr_fd(struct loop_device *lo, bool release) @@ -1230,6 +1266,8 @@ static void __loop_clr_fd(struct loop_device *lo, bool release)
* fput can take open_mutex which is usually taken before lo_mutex. * fput can take open_mutex which is usually taken before lo_mutex.
*/ */
fput(filp); fput(filp);
@@ -224,10 +224,10 @@ index 07d3412e950f..c4a00f620e57 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 a46e516bfc32..a0d040eef83d 100644 index c572420129a5..5b434c0e85ab 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -2027,6 +2027,11 @@ struct super_operations { @@ -2089,6 +2089,11 @@ struct super_operations {
long (*free_cached_objects)(struct super_block *, long (*free_cached_objects)(struct super_block *,
struct shrink_control *); struct shrink_control *);
void (*shutdown)(struct super_block *sb); void (*shutdown)(struct super_block *sb);
kernel/tools/cpupowertools/files/patches/aufs6/aufs6-mmap.patch
+34 -28
View File
@@ -1,8 +1,8 @@
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs6.6.4 mmap patch aufs6.6.54 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 ffd54617c354..29ec720c8038 100644 index 6e61d93ffa55..cf8cc0f18b36 100644
--- a/fs/proc/base.c --- a/fs/proc/base.c
+++ b/fs/proc/base.c +++ b/fs/proc/base.c
@@ -2218,7 +2218,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path) @@ -2218,7 +2218,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
@@ -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 3dd5be96691b..40d9d970b308 100644 index 59571737e167..fc9b9f4aa75f 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)
@@ -46,7 +46,7 @@ index 3dd5be96691b..40d9d970b308 100644
dev = inode->i_sb->s_dev; dev = inode->i_sb->s_dev;
ino = inode->i_ino; ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
@@ -1943,7 +1946,7 @@ static int show_numa_map(struct seq_file *m, void *v) @@ -1947,7 +1950,7 @@ static int show_numa_map(struct seq_file *m, void *v)
struct proc_maps_private *proc_priv = &numa_priv->proc_maps; struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
struct vm_area_struct *vma = v; struct vm_area_struct *vma = v;
struct numa_maps *md = &numa_priv->md; struct numa_maps *md = &numa_priv->md;
@@ -72,10 +72,10 @@ 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 bf5d0b1b16f4..94b956eff452 100644 index b6a4d6471b4a..00c7e351d2e8 100644
--- a/include/linux/mm.h --- a/include/linux/mm.h
+++ b/include/linux/mm.h +++ b/include/linux/mm.h
@@ -2409,6 +2409,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,
static inline struct vm_area_struct *vma_lookup(struct mm_struct *mm, static inline struct vm_area_struct *vma_lookup(struct mm_struct *mm,
unsigned long addr); unsigned long addr);
@@ -120,7 +120,7 @@ index bf5d0b1b16f4..94b956eff452 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 36c5b43999e6..ce93e97f76a6 100644 index 43c19d85dfe7..c6bdd132b7ff 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 { @@ -524,6 +524,9 @@ struct vm_region {
@@ -133,7 +133,7 @@ index 36c5b43999e6..ce93e97f76a6 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
@@ -637,6 +640,9 @@ struct vm_area_struct { @@ -664,6 +667,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). */
@@ -166,10 +166,10 @@ 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 f0a15ce1bd1b..a5eba9bbe416 100644 index e6c112f3a211..4d794ca8b6d2 100644
--- a/mm/filemap.c --- a/mm/filemap.c
+++ b/mm/filemap.c +++ b/mm/filemap.c
@@ -3626,7 +3626,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) @@ -3663,7 +3663,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
vm_fault_t ret = VM_FAULT_LOCKED; vm_fault_t ret = VM_FAULT_LOCKED;
sb_start_pagefault(mapping->host->i_sb); sb_start_pagefault(mapping->host->i_sb);
@@ -179,7 +179,7 @@ index f0a15ce1bd1b..a5eba9bbe416 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 9e018d8dd7d6..047bd4a0ced8 100644 index 6530e9cac458..3a696f12c0f6 100644
--- a/mm/mmap.c --- a/mm/mmap.c
+++ b/mm/mmap.c +++ b/mm/mmap.c
@@ -140,7 +140,7 @@ static void remove_vma(struct vm_area_struct *vma, bool unreachable) @@ -140,7 +140,7 @@ static void remove_vma(struct vm_area_struct *vma, bool unreachable)
@@ -200,7 +200,7 @@ index 9e018d8dd7d6..047bd4a0ced8 100644
} }
if (vp->remove->anon_vma) if (vp->remove->anon_vma)
anon_vma_merge(vp->vma, vp->remove); anon_vma_merge(vp->vma, vp->remove);
@@ -2384,7 +2384,7 @@ int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma, @@ -2392,7 +2392,7 @@ int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
goto out_free_mpol; goto out_free_mpol;
if (new->vm_file) if (new->vm_file)
@@ -209,7 +209,7 @@ index 9e018d8dd7d6..047bd4a0ced8 100644
if (new->vm_ops && new->vm_ops->open) if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new); new->vm_ops->open(new);
@@ -2801,7 +2801,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, @@ -2809,7 +2809,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
* and cause general protection fault * and cause general protection fault
* ultimately. * ultimately.
*/ */
@@ -218,7 +218,7 @@ index 9e018d8dd7d6..047bd4a0ced8 100644
vm_area_free(vma); vm_area_free(vma);
vma = merge; vma = merge;
/* Update vm_flags to pick up the change. */ /* Update vm_flags to pick up the change. */
@@ -2896,7 +2896,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, @@ -2904,7 +2904,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
if (file || vma->vm_file) { if (file || vma->vm_file) {
unmap_and_free_vma: unmap_and_free_vma:
@@ -227,7 +227,7 @@ index 9e018d8dd7d6..047bd4a0ced8 100644
vma->vm_file = NULL; vma->vm_file = NULL;
vma_iter_set(&vmi, vma->vm_end); vma_iter_set(&vmi, vma->vm_end);
@@ -2958,6 +2958,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, @@ -2966,6 +2966,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
unsigned long populate = 0; unsigned long populate = 0;
unsigned long ret = -EINVAL; unsigned long ret = -EINVAL;
struct file *file; struct file *file;
@@ -237,7 +237,7 @@ index 9e018d8dd7d6..047bd4a0ced8 100644
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);
@@ -3016,10 +3019,34 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, @@ -3024,6 +3027,32 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
if (vma->vm_flags & VM_LOCKED) if (vma->vm_flags & VM_LOCKED)
flags |= MAP_LOCKED; flags |= MAP_LOCKED;
@@ -245,16 +245,19 @@ index 9e018d8dd7d6..047bd4a0ced8 100644
+ vma_get_file(vma); + vma_get_file(vma);
+ file = vma->vm_file; + file = vma->vm_file;
+ prfile = vma->vm_prfile; + prfile = vma->vm_prfile;
+ ret = do_mmap(vma->vm_file, start, size, + ret = security_mmap_file(vma->vm_file, prot, flags);
+ prot, flags, /*vm_flags*/0, pgoff, &populate, NULL); + if (!ret) {
+ if (!IS_ERR_VALUE(ret) && file && prfile) { + ret = do_mmap(vma->vm_file, start, size,
+ struct vm_area_struct *new_vma; + prot, flags, /*vm_flags*/0, pgoff, &populate, NULL);
+ 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);
+ }
+ } + }
+ /* + /*
+ * two fput()s instead of vma_fput(vma), + * two fput()s instead of vma_fput(vma),
@@ -265,14 +268,17 @@ index 9e018d8dd7d6..047bd4a0ced8 100644
+ fput(prfile); + fput(prfile);
+#else +#else
file = get_file(vma->vm_file); file = get_file(vma->vm_file);
ret = do_mmap(vma->vm_file, start, size, ret = security_mmap_file(vma->vm_file, prot, flags);
if (ret)
@@ -3032,6 +3061,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
prot, flags, 0, pgoff, &populate, NULL); prot, flags, 0, pgoff, &populate, NULL);
out_fput:
fput(file); fput(file);
+#endif /* CONFIG_AUFS_FS */ +#endif /* CONFIG_AUFS_FS */
out: out:
mmap_write_unlock(mm); mmap_write_unlock(mm);
if (populate) if (populate)
@@ -3370,7 +3397,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, @@ -3382,7 +3412,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)
@@ -281,7 +287,7 @@ index 9e018d8dd7d6..047bd4a0ced8 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))
@@ -3384,7 +3411,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, @@ -3396,7 +3426,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
new_vma->vm_ops->close(new_vma); new_vma->vm_ops->close(new_vma);
if (new_vma->vm_file) if (new_vma->vm_file)
kernel/tools/cpupowertools/files/patches/aufs6/aufs6-standalone.patch
+16 -16
View File
@@ -1,11 +1,11 @@
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs6.6.4 standalone patch aufs6.6.54 standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c diff --git a/fs/dcache.c b/fs/dcache.c
index 6c930ceed526..576ad162cdec 100644 index e2877ac9a1e6..f20b4ac29a1d 100644
--- a/fs/dcache.c --- a/fs/dcache.c
+++ b/fs/dcache.c +++ b/fs/dcache.c
@@ -1450,6 +1450,7 @@ void d_walk(struct dentry *parent, void *data, @@ -1455,6 +1455,7 @@ void d_walk(struct dentry *parent, void *data,
seq = 1; seq = 1;
goto again; goto again;
} }
@@ -13,7 +13,7 @@ index 6c930ceed526..576ad162cdec 100644
struct check_mount { struct check_mount {
struct vfsmount *mnt; struct vfsmount *mnt;
@@ -3051,6 +3052,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2) @@ -3058,6 +3059,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
write_sequnlock(&rename_lock); write_sequnlock(&rename_lock);
} }
@@ -22,7 +22,7 @@ index 6c930ceed526..576ad162cdec 100644
/** /**
* d_ancestor - search for an ancestor * d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c diff --git a/fs/exec.c b/fs/exec.c
index 6518e33ea813..b67efac6a1ad 100644 index 1cbbef281f8c..d4f50eb57e67 100644
--- a/fs/exec.c --- a/fs/exec.c
+++ b/fs/exec.c +++ b/fs/exec.c
@@ -112,6 +112,7 @@ bool path_noexec(const struct path *path) @@ -112,6 +112,7 @@ bool path_noexec(const struct path *path)
@@ -34,7 +34,7 @@ index 6518e33ea813..b67efac6a1ad 100644
#ifdef CONFIG_USELIB #ifdef CONFIG_USELIB
/* /*
diff --git a/fs/fcntl.c b/fs/fcntl.c diff --git a/fs/fcntl.c b/fs/fcntl.c
index d62e114c1b1a..ceef001775bd 100644 index 1e44fc9b0f70..f5dd3c8b414e 100644
--- a/fs/fcntl.c --- a/fs/fcntl.c
+++ b/fs/fcntl.c +++ b/fs/fcntl.c
@@ -87,6 +87,7 @@ int setfl(int fd, struct file * filp, unsigned int arg) @@ -87,6 +87,7 @@ int setfl(int fd, struct file * filp, unsigned int arg)
@@ -43,8 +43,8 @@ index d62e114c1b1a..ceef001775bd 100644
} }
+EXPORT_SYMBOL_GPL(setfl); +EXPORT_SYMBOL_GPL(setfl);
static void f_modown(struct file *filp, struct pid *pid, enum pid_type type, void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
int force) int force)
diff --git a/fs/file_table.c b/fs/file_table.c diff --git a/fs/file_table.c b/fs/file_table.c
index ee21b3da9d08..c45ac36795dd 100644 index ee21b3da9d08..c45ac36795dd 100644
--- a/fs/file_table.c --- a/fs/file_table.c
@@ -58,7 +58,7 @@ index ee21b3da9d08..c45ac36795dd 100644
/* /*
* Variant of alloc_empty_file() that doesn't check and modify nr_files. * Variant of alloc_empty_file() that doesn't check and modify nr_files.
diff --git a/fs/namespace.c b/fs/namespace.c diff --git a/fs/namespace.c b/fs/namespace.c
index 6c57487f126b..16be9ac1c734 100644 index c9347fc5e14a..d47e357d65de 100644
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -466,6 +466,7 @@ void __mnt_drop_write(struct vfsmount *mnt) @@ -466,6 +466,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
@@ -98,7 +98,7 @@ index 1de6631a3925..3008eb37a18d 100644
/* /*
* Drop a reference to a group. Free it if it's through. * Drop a reference to a group. Free it if it's through.
diff --git a/fs/open.c b/fs/open.c diff --git a/fs/open.c b/fs/open.c
index 98f6601fbac6..8624e4ffa15b 100644 index 59db720693f9..523a714839aa 100644
--- a/fs/open.c --- a/fs/open.c
+++ b/fs/open.c +++ b/fs/open.c
@@ -67,6 +67,7 @@ int do_truncate(struct mnt_idmap *idmap, struct dentry *dentry, @@ -67,6 +67,7 @@ int do_truncate(struct mnt_idmap *idmap, struct dentry *dentry,
@@ -142,7 +142,7 @@ index 7216ef993b5f..7ce1f1bc4268 100644
/* /*
* Indicate to the caller that there was a premature EOF when reading from the * Indicate to the caller that there was a premature EOF when reading from the
diff --git a/fs/xattr.c b/fs/xattr.c diff --git a/fs/xattr.c b/fs/xattr.c
index efd4736bc94b..ce1a2c39ab23 100644 index c20046548f21..1d66796705fb 100644
--- a/fs/xattr.c --- a/fs/xattr.c
+++ b/fs/xattr.c +++ b/fs/xattr.c
@@ -406,6 +406,7 @@ vfs_getxattr_alloc(struct mnt_idmap *idmap, struct dentry *dentry, @@ -406,6 +406,7 @@ vfs_getxattr_alloc(struct mnt_idmap *idmap, struct dentry *dentry,
@@ -154,7 +154,7 @@ index efd4736bc94b..ce1a2c39ab23 100644
ssize_t ssize_t
__vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name, __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
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 2223ee909c10..d0ac4fc69a31 100644 index 64b9aedbe941..903a23230775 100644
--- a/kernel/locking/lockdep.c --- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c
@@ -239,6 +239,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock) @@ -239,6 +239,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
@@ -166,16 +166,16 @@ index 2223ee909c10..d0ac4fc69a31 100644
#ifdef CONFIG_LOCK_STAT #ifdef CONFIG_LOCK_STAT
diff --git a/kernel/task_work.c b/kernel/task_work.c diff --git a/kernel/task_work.c b/kernel/task_work.c
index 95a7e1b7f1da..5053670775d3 100644 index 2134ac8057a9..71150628e6b8 100644
--- a/kernel/task_work.c --- a/kernel/task_work.c
+++ b/kernel/task_work.c +++ b/kernel/task_work.c
@@ -183,3 +183,4 @@ void task_work_run(void) @@ -207,3 +207,4 @@ void task_work_run(void)
} while (work); } while (work);
} }
} }
+EXPORT_SYMBOL_GPL(task_work_run); +EXPORT_SYMBOL_GPL(task_work_run);
diff --git a/security/security.c b/security/security.c diff --git a/security/security.c b/security/security.c
index 23b129d482a7..fca4c5707a1c 100644 index b6144833c7a8..3b15e084ecc3 100644
--- a/security/security.c --- a/security/security.c
+++ b/security/security.c +++ b/security/security.c
@@ -1750,6 +1750,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry) @@ -1750,6 +1750,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
@@ -234,7 +234,7 @@ index 23b129d482a7..fca4c5707a1c 100644
/** /**
* security_file_alloc() - Allocate and init a file's LSM blob * security_file_alloc() - Allocate and init a file's LSM blob
@@ -2854,6 +2861,7 @@ int security_file_truncate(struct file *file) @@ -2872,6 +2879,7 @@ int security_file_truncate(struct file *file)
{ {
return call_int_hook(file_truncate, 0, file); return call_int_hook(file_truncate, 0, file);
} }
kernel/tools/cpupowertools/files/patches/aufs6/aufs6.6.4-20240624.patch → kernel/tools/cpupowertools/files/patches/aufs6/aufs6.6.54-20241014.patch
+191 -189
View File
File diff suppressed because it is too large Load Diff
kernel/tools/cpupowertools/files/patches/aufs6/lockdep-debug.patch
+1 -1
View File
@@ -1,5 +1,5 @@
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
aufs6.6.4 lockdep patch aufs6.6.54 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 2ebc323d345a..9d7009190515 100644
kernel/tools/cpupowertools/files/patches/aufs6/tmpfs-idr.patch
+19 -15
View File
@@ -1,7 +1,7 @@
SPDX-License-Identifier: GPL-2.0 SPDX-License-Identifier: GPL-2.0
diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index 6b0c626620f5..fc6fa00a3016 100644 index 134c686c8676..632d447caf64 100644
--- a/include/linux/shmem_fs.h --- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h
@@ -51,10 +51,13 @@ struct shmem_quota_limits { @@ -51,10 +51,13 @@ struct shmem_quota_limits {
@@ -16,12 +16,12 @@ index 6b0c626620f5..fc6fa00a3016 100644
- unsigned long max_inodes; /* How many inodes are allowed */ - unsigned long max_inodes; /* How many inodes are allowed */
- unsigned long free_ispace; /* How much ispace left for allocation */ - unsigned long free_ispace; /* How much ispace left for allocation */
+ int max_inodes; /* How many inodes are allowed */ + int max_inodes; /* How many inodes are allowed */
+ int free_ispace; /* How many are left for allocation */ + unsigned long free_ispace; /* How many are left for allocation */
raw_spinlock_t stat_lock; /* Serialize shmem_sb_info changes */ raw_spinlock_t stat_lock; /* Serialize shmem_sb_info changes */
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 69595d341882..34cdf49cf1d4 100644 index 3d721d5591dd..b6065f7cb931 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 {
@@ -51,7 +51,7 @@ index 69595d341882..34cdf49cf1d4 100644
} }
#endif #endif
@@ -1262,6 +1264,11 @@ static void shmem_evict_inode(struct inode *inode) @@ -1284,6 +1286,11 @@ static void shmem_evict_inode(struct inode *inode)
} }
simple_xattrs_free(&info->xattrs, sbinfo->max_inodes ? &freed : NULL); simple_xattrs_free(&info->xattrs, sbinfo->max_inodes ? &freed : NULL);
@@ -63,7 +63,7 @@ index 69595d341882..34cdf49cf1d4 100644
shmem_free_inode(inode->i_sb, freed); shmem_free_inode(inode->i_sb, freed);
WARN_ON(inode->i_blocks); WARN_ON(inode->i_blocks);
clear_inode(inode); clear_inode(inode);
@@ -2506,6 +2513,25 @@ static struct inode *__shmem_get_inode(struct mnt_idmap *idmap, @@ -2528,6 +2535,25 @@ static struct inode *__shmem_get_inode(struct mnt_idmap *idmap,
break; break;
} }
@@ -89,7 +89,7 @@ index 69595d341882..34cdf49cf1d4 100644
lockdep_annotate_inode_mutex_key(inode); lockdep_annotate_inode_mutex_key(inode);
return inode; return inode;
} }
@@ -3754,8 +3780,7 @@ static struct dentry *shmem_get_parent(struct dentry *child) @@ -3776,8 +3802,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 69595d341882..34cdf49cf1d4 100644
return ino->i_ino == inum && fh[0] == ino->i_generation; return ino->i_ino == inum && fh[0] == ino->i_generation;
} }
@@ -3775,14 +3800,11 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, @@ -3797,14 +3822,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 69595d341882..34cdf49cf1d4 100644
if (inode) { if (inode) {
dentry = shmem_find_alias(inode); dentry = shmem_find_alias(inode);
iput(inode); iput(inode);
@@ -3794,30 +3816,15 @@ static struct dentry *shmem_fh_to_dentry(struct super_block *sb, @@ -3816,30 +3838,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 69595d341882..34cdf49cf1d4 100644
return 1; return 1;
} }
@@ -3916,7 +3923,7 @@ static int shmem_parse_one(struct fs_context *fc, struct fs_parameter *param) @@ -3938,7 +3945,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 69595d341882..34cdf49cf1d4 100644
goto bad_value; goto bad_value;
ctx->seen |= SHMEM_SEEN_INODES; ctx->seen |= SHMEM_SEEN_INODES;
break; break;
@@ -4202,7 +4209,7 @@ static int shmem_show_options(struct seq_file *seq, struct dentry *root) @@ -4224,7 +4231,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 69595d341882..34cdf49cf1d4 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))
@@ -4256,6 +4263,8 @@ static void shmem_put_super(struct super_block *sb) @@ -4278,6 +4285,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 69595d341882..34cdf49cf1d4 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);
@@ -4300,6 +4309,8 @@ static int shmem_fill_super(struct super_block *sb, struct fs_context *fc) @@ -4322,9 +4331,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
@@ -186,8 +186,12 @@ index 69595d341882..34cdf49cf1d4 100644
+ idr_init(&sbinfo->idr); + idr_init(&sbinfo->idr);
sbinfo->max_blocks = ctx->blocks; sbinfo->max_blocks = ctx->blocks;
sbinfo->max_inodes = ctx->inodes; sbinfo->max_inodes = ctx->inodes;
sbinfo->free_ispace = sbinfo->max_inodes * BOGO_INODE_SIZE; - sbinfo->free_ispace = sbinfo->max_inodes * BOGO_INODE_SIZE;
@@ -4445,6 +4456,15 @@ static int shmem_error_remove_page(struct address_space *mapping, + sbinfo->free_ispace = (unsigned long)sbinfo->max_inodes * BOGO_INODE_SIZE;
if (sb->s_flags & SB_KERNMOUNT) {
sbinfo->ino_batch = alloc_percpu(ino_t);
if (!sbinfo->ino_batch)
@@ -4467,6 +4478,15 @@ static int shmem_error_remove_page(struct address_space *mapping,
return 0; return 0;
} }
@@ -203,7 +207,7 @@ index 69595d341882..34cdf49cf1d4 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,
@@ -4618,6 +4638,7 @@ void __init shmem_init(void) @@ -4640,6 +4660,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 ae1a6410b53d..bf99aa98223c 100644 index 9cafde77e2b0..318aef01fe9e 100644
--- a/fs/inode.c --- a/fs/inode.c
+++ b/fs/inode.c +++ b/fs/inode.c
@@ -972,6 +972,8 @@ unsigned int get_next_ino(void) @@ -1011,6 +1011,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 ae1a6410b53d..bf99aa98223c 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;
@@ -984,7 +986,7 @@ unsigned int get_next_ino(void) @@ -1023,7 +1025,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.45.xz
BIN
View File
Binary file not shown.
kernel/tools/cpupowertools/files/patches/linux/patch-6.6.56.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.50.xz</Patch> <Patch level="1" compressionType="xz">patches/linux/patch-6.6.56.xz</Patch>
<!-- aufs6 patchec --> <!-- aufs6 patchec -->
<Patch level="1">patches/aufs6/aufs6.6.4-20240624.patch</Patch> <Patch level="1">patches/aufs6/aufs6.6.54-20241014.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="94">
<Date>2024-10-14</Date>
<Version>6.6.56</Version>
<Comment>Version bump</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="93"> <Update release="93">
<Date>2024-09-08</Date> <Date>2024-09-08</Date>
<Version>6.6.50</Version> <Version>6.6.50</Version>