Djam/kernel-5.15
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/kernel-5.15.git synced 2025-02-23 10:32:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update aufs patch, use zstd, enable flow_abi, aufs, binary_extra_modules, clear

Browse source
This commit is contained in:
survolog (Andrey Grigorev) 2022-03-15 17:03:05 +03:00
parent 760c85583c
commit ac08a6c618
4 changed files with 7096 additions and 9517 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15654
0001-Apply-AUFS-5.patch
View file

File diff suppressed because it is too large Load diff

15
0001-Apply-AUFS-5_1.patch Normal file
View file

@ -0,0 +1,15 @@
https://github.com/sfjro/aufs5-linux/commit/a4e1cd668aeb906061bb8cd44554ad3f89759a2d
fs/inode.c only
diff -Naur linux-5.10/fs/inode.c aufs5-linux-aufs5.10/fs/inode.c
--- linux-5.10/fs/inode.c 2020-12-14 01:41:30.000000000 +0300
+++ aufs5-linux-aufs5.10/fs/inode.c 2022-03-07 10:18:47.000000000 +0300
@@ -1770,7 +1770,7 @@
* This does the actual work of updating an inodes time or version. Must have
* had called mnt_want_write() before calling this.
*/
-static int update_time(struct inode *inode, struct timespec64 *time, int flags)
+int update_time(struct inode *inode, struct timespec64 *time, int flags)
{
if (inode->i_op->update_time)
return inode->i_op->update_time(inode, time, flags);

658
aufs-k510.diff
View file

@ -1,658 +0,0 @@
diff --git a/fs/aufs/branch.h b/fs/aufs/branch.h
index 594c8bd674b2..82c24958edd8 100644
--- a/fs/aufs/branch.h
+++ b/fs/aufs/branch.h
@@ -241,10 +241,8 @@ int au_xino_read(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino,
ino_t *ino);
int au_xino_write(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino,
ino_t ino);
-ssize_t xino_fread(vfs_readf_t func, struct file *file, void *buf, size_t size,
- loff_t *pos);
-ssize_t xino_fwrite(vfs_writef_t func, struct file *file, void *buf,
- size_t size, loff_t *pos);
+ssize_t xino_fread(struct file *file, void *buf, size_t size, loff_t *pos);
+ssize_t xino_fwrite(struct file *file, void *buf, size_t size, loff_t *pos);
int au_xib_trunc(struct super_block *sb);
int au_xino_trunc(struct super_block *sb, aufs_bindex_t bindex, int idx_begin);
diff --git a/fs/aufs/cpup.c b/fs/aufs/cpup.c
index 492442339b6c..50141f5a45f9 100644
--- a/fs/aufs/cpup.c
+++ b/fs/aufs/cpup.c
@@ -569,32 +569,19 @@ static int au_do_cpup_regular(struct au_cp_generic *cpg,
static int au_do_cpup_symlink(struct path *h_path, struct dentry *h_src,
struct inode *h_dir)
{
- int err, symlen;
- mm_segment_t old_fs;
- union {
- char *k;
- char __user *u;
- } sym;
+ int err;
+ DEFINE_DELAYED_CALL(done);
+ const char *sym;
- err = -ENOMEM;
- sym.k = (void *)__get_free_page(GFP_NOFS);
- if (unlikely(!sym.k))
+ sym = vfs_get_link(h_src, &done);
+ err = PTR_ERR(sym);
+ if (IS_ERR(sym))
goto out;
- /* unnecessary to support mmap_sem since symlink is not mmap-able */
- old_fs = get_fs();
- set_fs(KERNEL_DS);
- symlen = vfs_readlink(h_src, sym.u, PATH_MAX);
- err = symlen;
- set_fs(old_fs);
-
- if (symlen > 0) {
- sym.k[symlen] = 0;
- err = vfsub_symlink(h_dir, h_path, sym.k);
- }
- free_page((unsigned long)sym.k);
+ err = vfsub_symlink(h_dir, h_path, sym);
out:
+ do_delayed_call(&done);
return err;
}
diff --git a/fs/aufs/dynop.c b/fs/aufs/dynop.c
index 837f94d49f74..4732edb340d7 100644
--- a/fs/aufs/dynop.c
+++ b/fs/aufs/dynop.c
@@ -180,6 +180,7 @@ static void dy_aop(struct au_dykey *key, const void *h_op,
DySetAop(writepages);
DySetAop(set_page_dirty);
DySetAop(readpages);
+ DySetAop(readahead);
DySetAop(write_begin);
DySetAop(write_end);
DySetAop(bmap);
diff --git a/fs/aufs/export.c b/fs/aufs/export.c
index 842df6f05517..f883d2bf5325 100644
--- a/fs/aufs/export.c
+++ b/fs/aufs/export.c
@@ -121,8 +121,7 @@ void au_xigen_inc(struct inode *inode)
pos = inode->i_ino;
pos *= sizeof(igen);
igen = inode->i_generation + 1;
- sz = xino_fwrite(sbinfo->si_xwrite, sbinfo->si_xigen, &igen,
- sizeof(igen), &pos);
+ sz = xino_fwrite(sbinfo->si_xigen, &igen, sizeof(igen), &pos);
if (sz == sizeof(igen))
return; /* success */
@@ -164,10 +163,10 @@ int au_xigen_new(struct inode *inode)
if (vfsub_f_size_read(file)
< pos + sizeof(inode->i_generation)) {
inode->i_generation = atomic_inc_return(&sbinfo->si_xigen_next);
- sz = xino_fwrite(sbinfo->si_xwrite, file, &inode->i_generation,
+ sz = xino_fwrite(file, &inode->i_generation,
sizeof(inode->i_generation), &pos);
} else
- sz = xino_fread(sbinfo->si_xread, file, &inode->i_generation,
+ sz = xino_fread(file, &inode->i_generation,
sizeof(inode->i_generation), &pos);
if (sz == sizeof(inode->i_generation))
goto out; /* success */
diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
index 9894e2124bd5..37eb4f6bcc23 100644
--- a/fs/aufs/f_op.c
+++ b/fs/aufs/f_op.c
@@ -242,34 +242,6 @@ static void au_write_post(struct inode *inode, struct file *h_file,
fput(h_file);
}
-static ssize_t aufs_read(struct file *file, char __user *buf, size_t count,
- loff_t *ppos)
-{
- ssize_t err;
- struct inode *inode;
- struct file *h_file;
- struct super_block *sb;
-
- inode = file_inode(file);
- sb = inode->i_sb;
- si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW);
-
- h_file = au_read_pre(file, /*keep_fi*/0, /*lsc*/0);
- err = PTR_ERR(h_file);
- if (IS_ERR(h_file))
- goto out;
-
- /* filedata may be obsoleted by concurrent copyup, but no problem */
- err = vfsub_read_u(h_file, buf, count, ppos);
- /* todo: necessary? */
- /* file->f_ra = h_file->f_ra; */
- au_read_post(inode, h_file);
-
-out:
- si_read_unlock(sb);
- return err;
-}
-
/*
* todo: very ugly
* it locks both of i_mutex and si_rwsem for read in safe.
@@ -292,33 +264,6 @@ static void au_mtx_and_read_lock(struct inode *inode)
}
}
-static ssize_t aufs_write(struct file *file, const char __user *ubuf,
- size_t count, loff_t *ppos)
-{
- ssize_t err;
- struct au_write_pre wpre;
- struct inode *inode;
- struct file *h_file;
- char __user *buf = (char __user *)ubuf;
-
- inode = file_inode(file);
- au_mtx_and_read_lock(inode);
-
- wpre.lsc = 0;
- h_file = au_write_pre(file, /*do_ready*/1, &wpre);
- err = PTR_ERR(h_file);
- if (IS_ERR(h_file))
- goto out;
-
- err = vfsub_write_u(h_file, buf, count, ppos);
- au_write_post(inode, h_file, &wpre, err);
-
-out:
- si_read_unlock(inode->i_sb);
- inode_unlock(inode);
- return err;
-}
-
static ssize_t au_do_iter(struct file *h_file, int rw, struct kiocb *kio,
struct iov_iter *iov_iter)
{
@@ -788,8 +733,6 @@ const struct file_operations aufs_file_fop = {
.llseek = default_llseek,
- .read = aufs_read,
- .write = aufs_write,
.read_iter = aufs_read_iter,
.write_iter = aufs_write_iter,
diff --git a/fs/aufs/file.c b/fs/aufs/file.c
index b0075b57d8bc..53d0f16c3bab 100644
--- a/fs/aufs/file.c
+++ b/fs/aufs/file.c
@@ -790,6 +790,10 @@ static ssize_t aufs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
/* they will never be called. */
#ifdef CONFIG_AUFS_DEBUG
+/*
+void aufs_readahead(struct readahead_control *)
+{ AuUnsupport(); }
+*/
static int aufs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, unsigned flags,
struct page **pagep, void **fsdata)
diff --git a/fs/aufs/hfsnotify.c b/fs/aufs/hfsnotify.c
index cb4eeb1e6069..d0abe8ac783f 100644
--- a/fs/aufs/hfsnotify.c
+++ b/fs/aufs/hfsnotify.c
@@ -160,8 +160,8 @@ static void au_hfsn_free_group(struct fsnotify_group *group)
}
static int au_hfsn_handle_event(struct fsnotify_group *group,
- struct inode *inode,
u32 mask, const void *data, int data_type,
+ struct inode *dir,
const struct qstr *file_name, u32 cookie,
struct fsnotify_iter_info *iter_info)
{
@@ -178,7 +178,7 @@ static int au_hfsn_handle_event(struct fsnotify_group *group,
if (mask & (FS_IN_IGNORED | FS_UNMOUNT))
goto out;
- h_dir = inode;
+ h_dir = dir;
h_inode = NULL;
#ifdef AuDbgHnotify
au_debug_on();
diff --git a/fs/aufs/super.h b/fs/aufs/super.h
index c0cb0051242c..4638331366b7 100644
--- a/fs/aufs/super.h
+++ b/fs/aufs/super.h
@@ -131,8 +131,6 @@ struct au_sbinfo {
unsigned int si_mntflags;
/* external inode number (bitmap and translation table) */
- vfs_readf_t si_xread;
- vfs_writef_t si_xwrite;
loff_t si_ximaxent; /* max entries in a xino */
struct file *si_xib;
diff --git a/fs/aufs/vfsub.c b/fs/aufs/vfsub.c
index a5e10c5c004f..de875cd4eedc 100644
--- a/fs/aufs/vfsub.c
+++ b/fs/aufs/vfsub.c
@@ -513,22 +513,17 @@ ssize_t vfsub_read_u(struct file *file, char __user *ubuf, size_t count,
return err;
}
-/* todo: kernel_read()? */
ssize_t vfsub_read_k(struct file *file, void *kbuf, size_t count,
loff_t *ppos)
{
ssize_t err;
- mm_segment_t oldfs;
- union {
- void *k;
- char __user *u;
- } buf;
-
- buf.k = kbuf;
- oldfs = get_fs();
- set_fs(KERNEL_DS);
- err = vfsub_read_u(file, buf.u, count, ppos);
- set_fs(oldfs);
+
+ lockdep_off();
+ err = kernel_read(file, kbuf, count, ppos);
+ lockdep_on();
+ AuTraceErr(err);
+ if (err >= 0)
+ vfsub_update_h_iattr(&file->f_path, /*did*/NULL); /*ignore*/
return err;
}
@@ -548,17 +543,12 @@ ssize_t vfsub_write_u(struct file *file, const char __user *ubuf, size_t count,
ssize_t vfsub_write_k(struct file *file, void *kbuf, size_t count, loff_t *ppos)
{
ssize_t err;
- mm_segment_t oldfs;
- union {
- void *k;
- const char __user *u;
- } buf;
-
- buf.k = kbuf;
- oldfs = get_fs();
- set_fs(KERNEL_DS);
- err = vfsub_write_u(file, buf.u, count, ppos);
- set_fs(oldfs);
+
+ lockdep_off();
+ err = kernel_write(file, kbuf, count, ppos);
+ lockdep_on();
+ if (err >= 0)
+ vfsub_update_h_iattr(&file->f_path, /*did*/NULL); /*ignore*/
return err;
}
diff --git a/fs/aufs/xino.c b/fs/aufs/xino.c
index b3152c0ce0b5..ae7bd07b022d 100644
--- a/fs/aufs/xino.c
+++ b/fs/aufs/xino.c
@@ -660,8 +660,8 @@ struct au_xi_writing {
ino_t h_ino, ino;
};
-static int au_xino_do_write(vfs_writef_t write, struct file *file,
- struct au_xi_calc *calc, ino_t ino);
+static int au_xino_do_write(struct file *file, struct au_xi_calc *calc,
+ ino_t ino);
static void au_xino_call_do_new_async(void *args)
{
@@ -690,7 +690,7 @@ static void au_xino_call_do_new_async(void *args)
file = au_xino_file(br->br_xino, a->calc.idx);
AuDebugOn(!file);
- err = au_xino_do_write(sbi->si_xwrite, file, &a->calc, a->ino);
+ err = au_xino_do_write(file, &a->calc, a->ino);
if (unlikely(err)) {
AuIOErr("err %d\n", err);
goto out;
@@ -791,7 +791,7 @@ int au_xino_read(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino,
return 0; /* no xino */
sbinfo = au_sbi(sb);
- sz = xino_fread(sbinfo->si_xread, file, ino, sizeof(*ino), &calc.pos);
+ sz = xino_fread(file, ino, sizeof(*ino), &calc.pos);
if (sz == sizeof(*ino))
return 0; /* success */
@@ -803,12 +803,12 @@ int au_xino_read(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino,
return err;
}
-static int au_xino_do_write(vfs_writef_t write, struct file *file,
- struct au_xi_calc *calc, ino_t ino)
+static int au_xino_do_write(struct file *file, struct au_xi_calc *calc,
+ ino_t ino)
{
ssize_t sz;
- sz = xino_fwrite(write, file, &ino, sizeof(ino), &calc->pos);
+ sz = xino_fwrite(file, &ino, sizeof(ino), &calc->pos);
if (sz == sizeof(ino))
return 0; /* success */
@@ -858,7 +858,7 @@ int au_xino_write(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino,
goto out;
}
- err = au_xino_do_write(au_sbi(sb)->si_xwrite, file, &calc, ino);
+ err = au_xino_do_write(file, &calc, ino);
if (!err) {
br = au_sbr(sb, bindex);
if (au_opt_test(mnt_flags, TRUNC_XINO)
@@ -872,40 +872,27 @@ int au_xino_write(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino,
return -EIO;
}
-static ssize_t xino_fread_wkq(vfs_readf_t func, struct file *file, void *buf,
- size_t size, loff_t *pos);
+static ssize_t xino_fread_wkq(struct file *file, void *buf, size_t size,
+ loff_t *pos);
/* todo: unnecessary to support mmap_sem since kernel-space? */
-ssize_t xino_fread(vfs_readf_t func, struct file *file, void *kbuf, size_t size,
- loff_t *pos)
+ssize_t xino_fread(struct file *file, void *kbuf, size_t size, loff_t *pos)
{
ssize_t err;
- mm_segment_t oldfs;
- union {
- void *k;
- char __user *u;
- } buf;
int i;
const int prevent_endless = 10;
i = 0;
- buf.k = kbuf;
- oldfs = get_fs();
- set_fs(KERNEL_DS);
do {
- err = func(file, buf.u, size, pos);
+ err = vfsub_read_k(file, kbuf, size, pos);
if (err == -EINTR
&& !au_wkq_test()
&& fatal_signal_pending(current)) {
- set_fs(oldfs);
- err = xino_fread_wkq(func, file, kbuf, size, pos);
+ err = xino_fread_wkq(file, kbuf, size, pos);
BUG_ON(err == -EINTR);
- oldfs = get_fs();
- set_fs(KERNEL_DS);
}
} while (i++ < prevent_endless
&& (err == -EAGAIN || err == -EINTR));
- set_fs(oldfs);
#if 0 /* reserved for future use */
if (err > 0)
@@ -917,7 +904,6 @@ ssize_t xino_fread(vfs_readf_t func, struct file *file, void *kbuf, size_t size,
struct xino_fread_args {
ssize_t *errp;
- vfs_readf_t func;
struct file *file;
void *buf;
size_t size;
@@ -927,17 +913,16 @@ struct xino_fread_args {
static void call_xino_fread(void *args)
{
struct xino_fread_args *a = args;
- *a->errp = xino_fread(a->func, a->file, a->buf, a->size, a->pos);
+ *a->errp = xino_fread(a->file, a->buf, a->size, a->pos);
}
-static ssize_t xino_fread_wkq(vfs_readf_t func, struct file *file, void *buf,
- size_t size, loff_t *pos)
+static ssize_t xino_fread_wkq(struct file *file, void *buf, size_t size,
+ loff_t *pos)
{
ssize_t err;
int wkq_err;
struct xino_fread_args args = {
.errp = &err,
- .func = func,
.file = file,
.buf = buf,
.size = size,
@@ -951,39 +936,27 @@ static ssize_t xino_fread_wkq(vfs_readf_t func, struct file *file, void *buf,
return err;
}
-static ssize_t xino_fwrite_wkq(vfs_writef_t func, struct file *file, void *buf,
- size_t size, loff_t *pos);
+static ssize_t xino_fwrite_wkq(struct file *file, void *buf, size_t size,
+ loff_t *pos);
-static ssize_t do_xino_fwrite(vfs_writef_t func, struct file *file, void *kbuf,
- size_t size, loff_t *pos)
+static ssize_t do_xino_fwrite(struct file *file, void *kbuf, size_t size,
+ loff_t *pos)
{
ssize_t err;
- mm_segment_t oldfs;
- union {
- void *k;
- const char __user *u;
- } buf;
int i;
const int prevent_endless = 10;
i = 0;
- buf.k = kbuf;
- oldfs = get_fs();
- set_fs(KERNEL_DS);
do {
- err = func(file, buf.u, size, pos);
+ err = vfsub_write_k(file, kbuf, size, pos);
if (err == -EINTR
&& !au_wkq_test()
&& fatal_signal_pending(current)) {
- set_fs(oldfs);
- err = xino_fwrite_wkq(func, file, kbuf, size, pos);
+ err = xino_fwrite_wkq(file, kbuf, size, pos);
BUG_ON(err == -EINTR);
- oldfs = get_fs();
- set_fs(KERNEL_DS);
}
} while (i++ < prevent_endless
&& (err == -EAGAIN || err == -EINTR));
- set_fs(oldfs);
#if 0 /* reserved for future use */
if (err > 0)
@@ -995,7 +968,6 @@ static ssize_t do_xino_fwrite(vfs_writef_t func, struct file *file, void *kbuf,
struct do_xino_fwrite_args {
ssize_t *errp;
- vfs_writef_t func;
struct file *file;
void *buf;
size_t size;
@@ -1005,17 +977,16 @@ struct do_xino_fwrite_args {
static void call_do_xino_fwrite(void *args)
{
struct do_xino_fwrite_args *a = args;
- *a->errp = do_xino_fwrite(a->func, a->file, a->buf, a->size, a->pos);
+ *a->errp = do_xino_fwrite(a->file, a->buf, a->size, a->pos);
}
-static ssize_t xino_fwrite_wkq(vfs_writef_t func, struct file *file, void *buf,
- size_t size, loff_t *pos)
+static ssize_t xino_fwrite_wkq(struct file *file, void *buf, size_t size,
+ loff_t *pos)
{
ssize_t err;
int wkq_err;
struct do_xino_fwrite_args args = {
.errp = &err,
- .func = func,
.file = file,
.buf = buf,
.size = size,
@@ -1033,18 +1004,17 @@ static ssize_t xino_fwrite_wkq(vfs_writef_t func, struct file *file, void *buf,
return err;
}
-ssize_t xino_fwrite(vfs_writef_t func, struct file *file, void *buf,
- size_t size, loff_t *pos)
+ssize_t xino_fwrite(struct file *file, void *buf, size_t size, loff_t *pos)
{
ssize_t err;
if (rlimit(RLIMIT_FSIZE) == RLIM_INFINITY) {
lockdep_off();
- err = do_xino_fwrite(func, file, buf, size, pos);
+ err = do_xino_fwrite(file, buf, size, pos);
lockdep_on();
} else {
lockdep_off();
- err = xino_fwrite_wkq(func, file, buf, size, pos);
+ err = xino_fwrite_wkq(file, buf, size, pos);
lockdep_on();
}
@@ -1095,17 +1065,17 @@ static int xib_pindex(struct super_block *sb, unsigned long pindex)
p = sbinfo->si_xib_buf;
pos = sbinfo->si_xib_last_pindex;
pos *= PAGE_SIZE;
- sz = xino_fwrite(sbinfo->si_xwrite, xib, p, PAGE_SIZE, &pos);
+ sz = xino_fwrite(xib, p, PAGE_SIZE, &pos);
if (unlikely(sz != PAGE_SIZE))
goto out;
pos = pindex;
pos *= PAGE_SIZE;
if (vfsub_f_size_read(xib) >= pos + PAGE_SIZE)
- sz = xino_fread(sbinfo->si_xread, xib, p, PAGE_SIZE, &pos);
+ sz = xino_fread(xib, p, PAGE_SIZE, &pos);
else {
memset(p, 0, PAGE_SIZE);
- sz = xino_fwrite(sbinfo->si_xwrite, xib, p, PAGE_SIZE, &pos);
+ sz = xino_fwrite(xib, p, PAGE_SIZE, &pos);
}
if (sz == PAGE_SIZE) {
sbinfo->si_xib_last_pindex = pindex;
@@ -1156,7 +1126,6 @@ static int do_xib_restore(struct super_block *sb, struct file *file, void *page)
unsigned long pindex;
loff_t pos, pend;
struct au_sbinfo *sbinfo;
- vfs_readf_t func;
ino_t *ino;
unsigned long *p;
@@ -1164,11 +1133,10 @@ static int do_xib_restore(struct super_block *sb, struct file *file, void *page)
sbinfo = au_sbi(sb);
MtxMustLock(&sbinfo->si_xib_mtx);
p = sbinfo->si_xib_buf;
- func = sbinfo->si_xread;
pend = vfsub_f_size_read(file);
pos = 0;
while (pos < pend) {
- sz = xino_fread(func, file, page, PAGE_SIZE, &pos);
+ sz = xino_fread(file, page, PAGE_SIZE, &pos);
err = sz;
if (unlikely(sz <= 0))
goto out;
@@ -1257,7 +1225,7 @@ int au_xib_trunc(struct super_block *sb)
p = sbinfo->si_xib_buf;
memset(p, 0, PAGE_SIZE);
pos = 0;
- sz = xino_fwrite(sbinfo->si_xwrite, sbinfo->si_xib, p, PAGE_SIZE, &pos);
+ sz = xino_fwrite(sbinfo->si_xib, p, PAGE_SIZE, &pos);
if (unlikely(sz != PAGE_SIZE)) {
err = sz;
AuIOErr("err %d\n", err);
@@ -1396,7 +1364,6 @@ static void xino_clear_xib(struct super_block *sb)
SiMustWriteLock(sb);
sbinfo = au_sbi(sb);
- /* unnecessary to clear sbinfo->si_xread and ->si_xwrite */
if (sbinfo->si_xib)
fput(sbinfo->si_xib);
sbinfo->si_xib = NULL;
@@ -1423,8 +1390,6 @@ static int au_xino_set_xib(struct super_block *sb, struct path *path)
if (sbinfo->si_xib)
fput(sbinfo->si_xib);
sbinfo->si_xib = file;
- sbinfo->si_xread = vfs_readf(file);
- sbinfo->si_xwrite = vfs_writef(file);
xi_sb = file_inode(file)->i_sb;
sbinfo->si_ximaxent = xi_sb->s_maxbytes;
if (unlikely(sbinfo->si_ximaxent < PAGE_SIZE)) {
@@ -1445,8 +1410,7 @@ static int au_xino_set_xib(struct super_block *sb, struct path *path)
sbinfo->si_xib_next_bit = 0;
if (vfsub_f_size_read(file) < PAGE_SIZE) {
pos = 0;
- err = xino_fwrite(sbinfo->si_xwrite, file, sbinfo->si_xib_buf,
- PAGE_SIZE, &pos);
+ err = xino_fwrite(file, sbinfo->si_xib_buf, PAGE_SIZE, &pos);
if (unlikely(err != PAGE_SIZE))
goto out_free;
}
@@ -1497,7 +1461,6 @@ static void au_xino_set_br_shared(struct super_block *sb, struct au_branch *br,
}
struct au_xino_do_set_br {
- vfs_writef_t writef;
struct au_branch *br;
ino_t h_ino;
aufs_bindex_t bshared;
@@ -1539,7 +1502,7 @@ static int au_xino_do_set_br(struct super_block *sb, struct path *path,
goto out;
AuDebugOn(!file);
- err = au_xino_do_write(args->writef, file, &calc, AUFS_ROOT_INO);
+ err = au_xino_do_write(file, &calc, AUFS_ROOT_INO);
if (unlikely(err))
au_xino_put(br);
@@ -1559,7 +1522,6 @@ static int au_xino_set_br(struct super_block *sb, struct path *path)
bbot = au_sbbot(sb);
inode = d_inode(sb->s_root);
- args.writef = au_sbi(sb)->si_xwrite;
for (bindex = 0; bindex <= bbot; bindex++) {
args.h_ino = au_h_iptr(inode, bindex)->i_ino;
args.br = au_sbr(sb, bindex);
@@ -1714,7 +1676,6 @@ int au_xino_init_br(struct super_block *sb, struct au_branch *br, ino_t h_ino,
.br = br
};
- args.writef = au_sbi(sb)->si_xwrite;
args.bshared = sbr_find_shared(sb, /*btop*/0, au_sbbot(sb),
au_br_sb(br));
err = au_xino_do_set_br(sb, base, &args);
@@ -1798,7 +1759,6 @@ void au_xino_delete_inode(struct inode *inode, const int unlinked)
struct au_hinode *hi;
struct inode *h_inode;
struct au_branch *br;
- vfs_writef_t xwrite;
struct au_xi_calc calc;
struct file *file;
@@ -1820,7 +1780,6 @@ void au_xino_delete_inode(struct inode *inode, const int unlinked)
if (bindex < 0)
return;
- xwrite = au_sbi(sb)->si_xwrite;
try_trunc = !!au_opt_test(mnt_flags, TRUNC_XINO);
hi = au_hinode(iinfo, bindex);
bbot = iinfo->ii_bbot;
@@ -1841,7 +1800,7 @@ void au_xino_delete_inode(struct inode *inode, const int unlinked)
if (IS_ERR_OR_NULL(file))
continue;
- err = au_xino_do_write(xwrite, file, &calc, /*ino*/0);
+ err = au_xino_do_write(file, &calc, /*ino*/0);
if (!err && try_trunc
&& au_test_fs_trunc_xino(au_br_sb(br)))
xino_try_trunc(sb, br);

86
kernel.spec
View file

@ -84,7 +84,7 @@
%if %{mdvver} >= 201905
# Build binary out-of-tree kernel modules (experimental)
%bcond_with binary_extra_modules
%bcond_without binary_extra_modules
# Sign kernel modules with GOST key (experimental)
%bcond_without gost_sign
%else
@ -93,9 +93,8 @@
%endif
%bcond_with ccache
%bcond_with flow_abi
# Broken in kernels >= 5.10.84
%bcond_with aufs
%bcond_without flow_abi
%bcond_without aufs
# 1. VirtualBox is for x86_32 and x86_64 only
# 2. I do not know how to solve the problem that userspace part of VirtualBox
@ -108,12 +107,12 @@
%bcond_with binary_shredder
# Compress modules with zstd (zstd is good compression and fast decompression)
#bcond_without compress_modules
%bcond_without compress_modules
# Spend more resources on compression, but make resulting size less;
# decompression speed will not be affected, but more memory will be required
# which should not a problem here (performance penalty from allocating more
# memory should not be big, I think, but I did not benchmark).
#define zstd_cmd zstd -q --format=zstd --ultra -22
%define zstd_cmd zstd -q --format=zstd --ultra -22
# Optionally keep using xz as compressor
#bcond_without modxz
@ -194,7 +193,7 @@ cat %{_builddir}/debugfiles.list >> %{debuginfo_files}
%{?_with_debug: %global build_debug 1}
%{?_with_perf: %global build_perf 1}
%{?_with_cpupower: %global build_cpupower 1}
#{?_with_modxz: %%global build_modxz 1}
%{?_with_modxz: %global build_modxz 0}
# Build defines
%define build_doc 1
@ -205,25 +204,18 @@ cat %{_builddir}/debugfiles.list >> %{debuginfo_files}
%define build_headers 1
# Build perf and cpupower tools
%if %{mdvver} > 201610
%define build_perf 1
%define build_cpupower 1
%else
# This is not the main kernel in rosa2016.1
# This one will be in contrib, not main, in rosa2016.1
%define build_perf 0
%define build_cpupower 0
%endif
#if %%{with compress_modules}
#if %%{with modxz}
%if %{with compress_modules}
%if %{with modxz}
%define kmod_suffix .xz
#else
##define kmod_suffix .zst
#endif
#else
#define kmod_suffix %%{nil}
#endif
%else
%define kmod_suffix .zst
%endif
%else
%define kmod_suffix %{nil}
%endif
%if !%{build_debug}
# Disable debug rpms.
@ -326,9 +318,7 @@ Patch102: 0001-audit-make-it-less-verbose.patch
%if %{with aufs}
# AUFS 5 from http://aufs.sourceforge.net/
Patch109: 0001-Apply-AUFS-5.patch
# Unofficial AUFS for kernel 5.10
# https://sourceforge.net/projects/lxpup/files/Other/huge-kernels/kernel-5.10-aufs-changes/
Patch110: aufs-k510.diff
#Patch110: 0001-Apply-AUFS-5_1.patch
%endif
# For kmod() generator of RPM Provides
@ -372,7 +362,6 @@ Patch0602: 0602-Baikal-M-clock-driver.patch
Patch0603: 0603-efi-rtc-avoid-calling-efi.get_time-on-Baikal-M-board.patch
Patch0604: 0604-efi-arm-runtime-print-EFI-mapping.patch
#Patch0605: 0605-ethernet-stmmac-made-dwmac1000_-DMA-functions-availa.patch
# https://lore.kernel.org/netdev/20220126084456.1122873-1-asheplyakov@basealt.ru/
Patch0606: 0606-stmmac-Baikal-M-dwmac-driver.patch
Patch0607: 0607-Fixed-secondary-CPUs-boot-on-BE-M1000-SoC.patch
Patch0608: 0608-Baikal-M-USB-driver.patch
@ -419,16 +408,16 @@ BuildRequires: ccache
BuildRequires: flex
BuildRequires: gcc
# ./scripts/mkcompile_h
# in net-tools in rosa2016.1, already installed in 2021.1
%if %{mdvver} > 201610
BuildRequires: hostname
%endif
BuildRequires: kmod-compat
BuildRequires: rsync
#if %%{with compress_modules}
%if %{with compress_modules}
%if %{with modxz}
BuildRequires: xz
#BuildRequires: zstd
#endif
%else
BuildRequires: zstd
%endif
%endif
BuildRequires: kmod-devel
%ifarch x86_64 aarch64
BuildRequires: numa-devel
@ -577,8 +566,7 @@ depmod -a %{kver_full}
%files -f %{kernel_files}
%{_bootdir}/System.map-%{kver_full}
%{_bootdir}/symvers-%{kver_full}.xz
#{_bootdir}/symvers-%%{kver_full}.zst
%{_bootdir}/symvers-%{kver_full}.*
%{_bootdir}/config-%{kver_full}
%{_bootdir}/vmlinuz-%{kver_full}
%ghost %{initrd_path}
@ -1515,12 +1503,12 @@ popd
install -d %{temp_boot}
install -m 644 System.map %{temp_boot}/System.map-%{kver_full}
install -m 644 .config %{temp_boot}/config-%{kver_full}
#if %%{with modxz}
%if %{with modxz}
xz -c Module.symvers > %{temp_boot}/symvers-%{kver_full}.xz
#else
#{zstd_cmd} Module.symvers
#install -m 644 Module.symvers.zst %%{temp_boot}/symvers-%%{kver_full}.zst
#endif
%else
%{zstd_cmd} Module.symvers
install -m 644 Module.symvers.zst %{temp_boot}/symvers-%{kver_full}.zst
%endif
%ifarch %{armx}
%make_build ARCH=%{arch_type} V=1 INSTALL_DTBS_PATH=%{temp_boot}/dtb-%{kver_full} dtbs_install
@ -1679,9 +1667,7 @@ mkdir -p "%{certs_dir_rnd}"
touch %{certs_verify_tmp}
_verify_signature(){
if [ -z "$1" ] || [ ! -f "$1" ]; then return; fi
if hexdump -C "$1" | rev | cut -f 2 -d '|' | rev | tr -d '\n' | \
grep -q '~Module signature appended~'
then
if hexdump -C "$1" | rev | cut -f 2 -d '|' | rev | tr -d '\n' | grep -q '~Module signature appended~'; then
if [ -f %{certs_verify_tmp} ]; then
rm -f %{certs_verify_tmp}
fi
@ -1705,7 +1691,7 @@ rm -f %{certs_verify_tmp}
#endif
# Compressing modules
#if %%{with compress_modules}
%if %{with compress_modules}
# Tested on /lib/modules/5.10.34-generic-2rosa2019.1-x86_64, the results are the following:
# * decompressed: 266.3 MiB
# * xz -9 --extreme: 67.8 MiB
@ -1736,16 +1722,16 @@ rm -f %{certs_verify_tmp}
# Let's use zstd for now.
# zstd may also be used to compress linux-firmware to save a lot of space on disk,
# but upstream kernels still cannot decompress it.
#%%{zstd_cmd} -T0 --train $(find . -type f -name '*.ko')
#{zstd_cmd} -T0 --train $(find . -type f -name '*.ko')
#[ -f dictionary ]
# -T1 (one thread) because we run multiple zstd processes by xargs
#if %%{with modxz}
%if %{with modxz}
find %{target_modules} -name "*.ko" | %kxargs xz -6e
#else
#find %%{target_modules} -name "*.ko" | %%kxargs %%{zstd_cmd} --rm -T1 #-D dictionary
#rm -f dictionary
#endif
#endif
%else
find %{target_modules} -name "*.ko" | %kxargs %{zstd_cmd} --rm -T1 #-D dictionary
rm -f dictionary
%endif
%endif
find %{buildroot}%{_modulesdir}/%{kver_full} -type f -name '*.ko%{kmod_suffix}' | sed -e 's,^%{buildroot},,' | sort -u >> %{kernel_files}
find %{buildroot}%{_modulesdir}/%{kver_full} -type d | sed -e 's,^%{buildroot},%dir ,' | sort -u >> %{kernel_files}