Djam/kernel-6.6
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/kernel-6.6.git synced 2025-02-25 20:02:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revisited the patchset for the version 4.9.0

Browse source 
Among other things:
* BFQ was updated to v8r7 for 4.9.0
* AUFS was updated to version 4.9-20161219
* inotify-increase-max-user-watches.patch was dropped: it is better to
  tune such things from user space instead.
This commit is contained in:
Evgenii Shatokhin 2017-01-05 18:45:46 +03:00
parent b32d565192
commit f1688e3205
8 changed files with 3589 additions and 1585 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.8.0.patch → 0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.5.0.patch
View file

@ -1,7 +1,7 @@
From f2ebe596e7d72e96e0fb2be87be90f0b96e6f1b3 Mon Sep 17 00:00:00 2001
From 465ed48c05de63f5bdd34d83915f1b8998a62134 Mon Sep 17 00:00:00 2001
From: Paolo Valente <paolo.valente@unimore.it>
Date: Tue, 7 Apr 2015 13:39:12 +0200
Subject: [PATCH 1/4] block: cgroups, kconfig, build bits for BFQ-v7r11-4.8.0
Subject: [PATCH 1/4] block: cgroups, kconfig, build bits for BFQ-v7r11-4.5.0
Update Kconfig.iosched and do the related Makefile changes to include
kernel configuration options for BFQ. Also increase the number of
@ -74,7 +74,7 @@ index 421bef9..0ee5f0f 100644
endmenu
diff --git a/block/Makefile b/block/Makefile
index 9eda232..4a36683 100644
index 36acdd7..736e91a 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING) += blk-throttle.o
@ -86,7 +86,7 @@ index 9eda232..4a36683 100644
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
obj-$(CONFIG_BLK_CMDLINE_PARSER) += cmdline-parser.o
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index e79055c..931ff1e 100644
index c47c358..1047d99 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -45,7 +45,7 @@ struct pr_ops;
@ -99,5 +99,5 @@ index e79055c..931ff1e 100644
typedef void (rq_end_io_fn)(struct request *, int);
--
2.7.4 (Apple Git-66)
2.10.0

7
0002-block-introduce-the-BFQ-v7r11-I-O-sched-to-be-ported.patch → 0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.5.0.patch
View file

@ -1,8 +1,7 @@
From d9af6fcc4167cbb8433b10bbf3663c8297487f52 Mon Sep 17 00:00:00 2001
From a43c7e21bccd510d72a003e350247b1b4c6b71c3 Mon Sep 17 00:00:00 2001
From: Paolo Valente <paolo.valente@unimore.it>
Date: Thu, 9 May 2013 19:10:02 +0200
Subject: [PATCH 2/4] block: introduce the BFQ-v7r11 I/O sched, to be ported to
4.8.0
Subject: [PATCH 2/4] block: introduce the BFQ-v7r11 I/O sched for 4.5.0
The general structure is borrowed from CFQ, as much of the code for
handling I/O contexts. Over time, several useful features have been
@ -7106,5 +7105,5 @@ index 0000000..2bf54ae
+
+#endif /* _BFQ_H */
--
2.7.4 (Apple Git-66)
2.10.0

8
0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-to-.patch → 0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
View file

@ -1,8 +1,8 @@
From 409e62551360d2802992b0175062237352793a2a Mon Sep 17 00:00:00 2001
From 52135041a6bf118c80a6858f63aff70b325389c4 Mon Sep 17 00:00:00 2001
From: Mauro Andreolini <mauro.andreolini@unimore.it>
Date: Sun, 6 Sep 2015 16:09:05 +0200
Subject: [PATCH 3/4] block, bfq: add Early Queue Merge (EQM) to BFQ-v7r11, to
port to 4.8.0
Subject: [PATCH 3/4] block, bfq: add Early Queue Merge (EQM) to BFQ-v7r11 for
4.5.0
A set of processes may happen to perform interleaved reads, i.e.,requests
whose union would give rise to a sequential read pattern. There are two
@ -1097,5 +1097,5 @@ index 2bf54ae..fcce855 100644
static void bfq_put_queue(struct bfq_queue *bfqq);
static void bfq_dispatch_insert(struct request_queue *q, struct request *rq);
--
2.7.4 (Apple Git-66)
2.10.0

2700
0004-Turn-BFQ-v7r11-into-BFQ-v8r4-for-4.8.0.patch → 0004-Turn-into-BFQ-v8r7-for-4.9.0.patch
View file

File diff suppressed because it is too large Load diff

1297
README.BFQ
View file

File diff suppressed because it is too large Load diff

20
disable-mrproper-prepare-scripts-configs-in-devel-rpms.patch
View file

@ -1,8 +1,8 @@
diff --git a/Makefile b/Makefile
index 5a493e7..2055c07 100644
index b103777..e942e6a 100644
--- a/Makefile
+++ b/Makefile
@@ -540,9 +540,7 @@ ifeq ($(KBUILD_EXTMOD),)
@@ -555,9 +555,7 @@ ifeq ($(KBUILD_EXTMOD),)
# Carefully list dependencies so we do not try to build scripts twice
# in parallel
PHONY += scripts
@ -13,7 +13,7 @@ index 5a493e7..2055c07 100644
# Objects we will link into vmlinux / subdirs we need to visit
init-y := init/
@@ -986,7 +984,7 @@ prepare0: archprepare FORCE
@@ -1033,7 +1031,7 @@ prepare0: archprepare gcc-plugins
$(Q)$(MAKE) $(build)=.
# All the preparing..
@ -22,7 +22,7 @@ index 5a493e7..2055c07 100644
ifdef CONFIG_STACK_VALIDATION
has_libelf := $(call try-run,\
@@ -1171,13 +1169,8 @@ endif # CONFIG_MODULES
@@ -1268,13 +1266,8 @@ endif # CONFIG_MODULES
CLEAN_DIRS += $(MODVERDIR)
# Directories & files removed with 'make mrproper'
@ -38,7 +38,7 @@ index 5a493e7..2055c07 100644
# clean - Delete most, but leave enough to build external modules
#
@@ -1198,7 +1191,7 @@ clean: archclean vmlinuxclean
@@ -1296,7 +1289,7 @@ clean: archclean vmlinuxclean
#
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
@ -48,10 +48,10 @@ index 5a493e7..2055c07 100644
PHONY += $(mrproper-dirs) mrproper archmrproper
$(mrproper-dirs):
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index ebced77..7f51efa 100644
index 90a091b..7f51efa 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -19,23 +19,16 @@ endif
@@ -19,25 +19,16 @@ endif
unexport CONFIG_
xconfig: $(obj)/qconf
@ -71,11 +71,13 @@ index ebced77..7f51efa 100644
silentoldconfig: $(obj)/conf
- $(Q)mkdir -p include/config include/generated
- $(Q)test -e include/generated/autoksyms.h || \
- touch include/generated/autoksyms.h
- $< $(silent) --$@ $(Kconfig)
localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
$(Q)mkdir -p include/config include/generated
@@ -81,7 +74,6 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
@@ -83,7 +74,6 @@ simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
PHONY += $(simple-targets)
$(simple-targets): $(obj)/conf
@ -83,7 +85,7 @@ index ebced77..7f51efa 100644
PHONY += oldnoconfig savedefconfig defconfig
@@ -91,23 +83,10 @@ PHONY += oldnoconfig savedefconfig defconfig
@@ -93,23 +83,10 @@ PHONY += oldnoconfig savedefconfig defconfig
oldnoconfig: olddefconfig
savedefconfig: $(obj)/conf

1112
fs-aufs4.patch
View file

File diff suppressed because it is too large Load diff

20
inotify-increase-max-user-watches.patch
View file

@ -1,20 +0,0 @@
http://bugs.rosalinux.ru/show_bug.cgi?id=4791
It seems, many applications need max_user_watches to be at least 32768.
Let us set the default value of this parameter accordingly.
Signed-off-by: Eugene A. Shatokhin <eugene.shatokhin@rosalab.ru>
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 78a2ca3..ecd1120 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -809,7 +809,7 @@ static int __init inotify_user_setup(void)
inotify_max_queued_events = 16384;
inotify_max_user_instances = 128;
- inotify_max_user_watches = 8192;
+ inotify_max_user_watches = 32768;
return 0;
}