-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Peter Jung <[email protected]>
- Loading branch information
Showing
17 changed files
with
418 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 8ee940fba58a3763ebd4f7a28b55c1a19ae86f23 Mon Sep 17 00:00:00 2001 | ||
From 8e0e835743e08241b643a5c3228e3fdd0200db59 Mon Sep 17 00:00:00 2001 | ||
From: Peter Jung <[email protected]> | ||
Date: Fri, 19 Aug 2022 16:56:10 +0200 | ||
Subject: [PATCH 01/16] bbr2 | ||
|
@@ -3658,5 +3658,5 @@ index 50bba370486e..e873a768f9e8 100644 | |
event = icsk->icsk_pending; | ||
|
||
-- | ||
2.37.3 | ||
2.38.0.rc1.8.g2a7d63a245 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
From 79309f2b0f0b0ad220d7a14c776289d71481b63c Mon Sep 17 00:00:00 2001 | ||
From 641bb7b41cfa5f6a0e81bb621f79fd9f8f27eb08 Mon Sep 17 00:00:00 2001 | ||
From: Peter Jung <[email protected]> | ||
Date: Tue, 20 Sep 2022 14:26:07 +0200 | ||
Date: Wed, 28 Sep 2022 14:47:56 +0200 | ||
Subject: [PATCH 02/16] cachy | ||
|
||
Signed-off-by: Peter Jung <[email protected]> | ||
|
@@ -208,12 +208,17 @@ Signed-off-by: Peter Jung <[email protected]> | |
kernel/sysctl.c | 22 + | ||
kernel/user_namespace.c | 7 + | ||
kernel/watchdog.c | 2 +- | ||
lib/Kconfig | 8 +- | ||
lib/Kconfig.debug | 4 +- | ||
lib/bitmap.c | 9 +- | ||
lib/cpumask.c | 97 +- | ||
lib/find_bit.c | 155 ++- | ||
lib/raid6/algos.c | 4 +- | ||
lib/string.c | 62 +- | ||
lib/test_bitmap.c | 68 ++ | ||
lib/zstd/Makefile | 16 +- | ||
lib/zstd/common/entropy_common.c | 4 +- | ||
lib/zstd/common/zstd_common.c | 7 + | ||
lib/zstd/compress/zstd_compress.c | 2 +- | ||
lib/zstd/compress/zstd_double_fast.c | 61 +- | ||
lib/zstd/compress/zstd_fast.c | 69 +- | ||
|
@@ -253,7 +258,7 @@ Signed-off-by: Peter Jung <[email protected]> | |
tools/testing/selftests/vm/.gitignore | 1 + | ||
tools/testing/selftests/vm/Makefile | 1 + | ||
tools/testing/selftests/vm/test-ksm-auto.c | 273 +++++ | ||
248 files changed, 5545 insertions(+), 3297 deletions(-) | ||
253 files changed, 5570 insertions(+), 3311 deletions(-) | ||
create mode 100644 arch/x86/Makefile.postlink | ||
create mode 100644 include/asm-generic/bitops/generic-non-atomic.h | ||
create mode 100644 include/asm-generic/bitops/non-instrumented-non-atomic.h | ||
|
@@ -2303,7 +2308,7 @@ index 7854685c5f25..ad47a4698b95 100644 | |
|
||
diff --git a/arch/x86/Makefile.postlink b/arch/x86/Makefile.postlink | ||
new file mode 100644 | ||
index 000000000000..4650aaf6d8b3 | ||
index 000000000000..b38ffa4defb3 | ||
--- /dev/null | ||
+++ b/arch/x86/Makefile.postlink | ||
@@ -0,0 +1,41 @@ | ||
|
@@ -2326,7 +2331,7 @@ index 000000000000..4650aaf6d8b3 | |
+ cmd_relocs = $(CMD_RELOCS) $@ > [email protected];$(CMD_RELOCS) --abs-relocs $@ | ||
+ | ||
+quiet_cmd_strip_relocs = RSTRIP $@ | ||
+ cmd_strip_relocs = objcopy --remove-relocations='*' $@ | ||
+ cmd_strip_relocs = $(OBJCOPY) --remove-section='.rel.*' --remove-section='.rel__*' --remove-section='.rela.*' --remove-section='.rela__*' $@ | ||
+ | ||
+# `@true` prevents complaint when there is nothing to be done | ||
+ | ||
|
@@ -3102,10 +3107,10 @@ index 52c94ab5c205..1518e261d882 100644 | |
450 common set_mempolicy_home_node sys_set_mempolicy_home_node | ||
+451 common pmadv_ksm sys_pmadv_ksm | ||
diff --git a/block/blk-core.c b/block/blk-core.c | ||
index cc6fbcb6d252..8ff18274fd18 100644 | ||
index 7743c68177e8..a6021c51a35b 100644 | ||
--- a/block/blk-core.c | ||
+++ b/block/blk-core.c | ||
@@ -795,6 +795,9 @@ void submit_bio_noacct(struct bio *bio) | ||
@@ -752,6 +752,9 @@ void submit_bio_noacct(struct bio *bio) | ||
status = BLK_STS_OK; | ||
goto end_io; | ||
} | ||
|
@@ -5104,7 +5109,7 @@ index 3fc0a89cc785..a7c103f9dfd3 100644 | |
#endif | ||
} | ||
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c | ||
index 861a239d905a..9405769fb17e 100644 | ||
index 3ed15e8ca677..124feeea1c3d 100644 | ||
--- a/drivers/iommu/intel/iommu.c | ||
+++ b/drivers/iommu/intel/iommu.c | ||
@@ -3932,7 +3932,7 @@ static ssize_t domains_used_show(struct device *dev, | ||
|
@@ -5305,7 +5310,7 @@ index bb40889d7c72..7e88882b87d9 100644 | |
ar->fw.mem_blocks, atomic_read(&ar->mem_allocs)); | ||
|
||
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c | ||
index 2f965356f345..9fa65c8ac7ac 100644 | ||
index 6d76fc608b74..0c8a4e334290 100644 | ||
--- a/drivers/nvme/host/core.c | ||
+++ b/drivers/nvme/host/core.c | ||
@@ -48,7 +48,7 @@ static u8 nvme_max_retries = 5; | ||
|
@@ -5627,7 +5632,7 @@ index be383fa46b12..32749fcee090 100644 | |
} | ||
|
||
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c | ||
index 781952c5a5c2..06ab451972a4 100644 | ||
index 20ad619a8a97..1043eb6c7206 100644 | ||
--- a/fs/btrfs/disk-io.c | ||
+++ b/fs/btrfs/disk-io.c | ||
@@ -871,28 +871,28 @@ void btrfs_submit_metadata_bio(struct inode *inode, struct bio *bio, int mirror_ | ||
|
@@ -9010,7 +9015,7 @@ index 262664107b83..a822a83ed52e 100644 | |
void buffer_init(void); | ||
|
||
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h | ||
index 4592d0845941..57c8496d28b2 100644 | ||
index 57aa459c6618..20fe9b1e697b 100644 | ||
--- a/include/linux/cpumask.h | ||
+++ b/include/linux/cpumask.h | ||
@@ -12,6 +12,8 @@ | ||
|
@@ -11215,6 +11220,51 @@ index 8e61f21e7e33..be1439d38f26 100644 | |
static int __read_mostly nmi_watchdog_available; | ||
|
||
struct cpumask watchdog_cpumask __read_mostly; | ||
diff --git a/lib/Kconfig b/lib/Kconfig | ||
index eaaad4d85bf2..762ba5ede212 100644 | ||
--- a/lib/Kconfig | ||
+++ b/lib/Kconfig | ||
@@ -336,12 +336,16 @@ config LZ4HC_COMPRESS | ||
config LZ4_DECOMPRESS | ||
tristate | ||
|
||
-config ZSTD_COMPRESS | ||
+config ZSTD_COMMON | ||
select XXHASH | ||
tristate | ||
|
||
+config ZSTD_COMPRESS | ||
+ select ZSTD_COMMON | ||
+ tristate | ||
+ | ||
config ZSTD_DECOMPRESS | ||
- select XXHASH | ||
+ select ZSTD_COMMON | ||
tristate | ||
|
||
source "lib/xz/Kconfig" | ||
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug | ||
index c399ab486557..fb9f6c3bdacb 100644 | ||
--- a/lib/Kconfig.debug | ||
+++ b/lib/Kconfig.debug | ||
@@ -190,7 +190,7 @@ config DYNAMIC_DEBUG_CORE | ||
|
||
config SYMBOLIC_ERRNAME | ||
bool "Support symbolic error names in printf" | ||
- default y if PRINTK | ||
+ default n | ||
help | ||
If you say Y here, the kernel's printf implementation will | ||
be able to print symbolic error names such as ENOSPC instead | ||
@@ -200,7 +200,7 @@ config SYMBOLIC_ERRNAME | ||
config DEBUG_BUGVERBOSE | ||
bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EXPERT | ||
depends on BUG && (GENERIC_BUG || HAVE_DEBUG_BUGVERBOSE) | ||
- default y | ||
+ default n | ||
help | ||
Say Y here to make BUG() panics output the file name and line number | ||
of the BUG call as well as the EIP and oops trace. This aids | ||
diff --git a/lib/bitmap.c b/lib/bitmap.c | ||
index e903e13c62e1..2b67cd657692 100644 | ||
--- a/lib/bitmap.c | ||
|
@@ -11811,6 +11861,110 @@ index d5923a640457..98754ff9fe68 100644 | |
} | ||
|
||
KSTM_MODULE_LOADERS(test_bitmap); | ||
diff --git a/lib/zstd/Makefile b/lib/zstd/Makefile | ||
index fc45339fc3a3..440bd0007ae2 100644 | ||
--- a/lib/zstd/Makefile | ||
+++ b/lib/zstd/Makefile | ||
@@ -10,14 +10,10 @@ | ||
# ################################################################ | ||
obj-$(CONFIG_ZSTD_COMPRESS) += zstd_compress.o | ||
obj-$(CONFIG_ZSTD_DECOMPRESS) += zstd_decompress.o | ||
+obj-$(CONFIG_ZSTD_COMMON) += zstd_common.o | ||
|
||
zstd_compress-y := \ | ||
zstd_compress_module.o \ | ||
- common/debug.o \ | ||
- common/entropy_common.o \ | ||
- common/error_private.o \ | ||
- common/fse_decompress.o \ | ||
- common/zstd_common.o \ | ||
compress/fse_compress.o \ | ||
compress/hist.o \ | ||
compress/huf_compress.o \ | ||
@@ -33,12 +29,14 @@ zstd_compress-y := \ | ||
|
||
zstd_decompress-y := \ | ||
zstd_decompress_module.o \ | ||
+ decompress/huf_decompress.o \ | ||
+ decompress/zstd_ddict.o \ | ||
+ decompress/zstd_decompress.o \ | ||
+ decompress/zstd_decompress_block.o \ | ||
+ | ||
+zstd_common-y := \ | ||
common/debug.o \ | ||
common/entropy_common.o \ | ||
common/error_private.o \ | ||
common/fse_decompress.o \ | ||
common/zstd_common.o \ | ||
- decompress/huf_decompress.o \ | ||
- decompress/zstd_ddict.o \ | ||
- decompress/zstd_decompress.o \ | ||
- decompress/zstd_decompress_block.o \ | ||
diff --git a/lib/zstd/common/entropy_common.c b/lib/zstd/common/entropy_common.c | ||
index 53b47a2b52ff..f84612627471 100644 | ||
--- a/lib/zstd/common/entropy_common.c | ||
+++ b/lib/zstd/common/entropy_common.c | ||
@@ -15,6 +15,7 @@ | ||
/* ************************************* | ||
* Dependencies | ||
***************************************/ | ||
+#include <linux/module.h> | ||
#include "mem.h" | ||
#include "error_private.h" /* ERR_*, ERROR */ | ||
#define FSE_STATIC_LINKING_ONLY /* FSE_MIN_TABLELOG */ | ||
@@ -239,7 +240,7 @@ size_t FSE_readNCount( | ||
{ | ||
return FSE_readNCount_bmi2(normalizedCounter, maxSVPtr, tableLogPtr, headerBuffer, hbSize, /* bmi2 */ 0); | ||
} | ||
- | ||
+EXPORT_SYMBOL_GPL(FSE_readNCount); | ||
|
||
/*! HUF_readStats() : | ||
Read compact Huffman tree, saved by HUF_writeCTable(). | ||
@@ -255,6 +256,7 @@ size_t HUF_readStats(BYTE* huffWeight, size_t hwSize, U32* rankStats, | ||
U32 wksp[HUF_READ_STATS_WORKSPACE_SIZE_U32]; | ||
return HUF_readStats_wksp(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, wksp, sizeof(wksp), /* bmi2 */ 0); | ||
} | ||
+EXPORT_SYMBOL_GPL(HUF_readStats); | ||
|
||
FORCE_INLINE_TEMPLATE size_t | ||
HUF_readStats_body(BYTE* huffWeight, size_t hwSize, U32* rankStats, | ||
diff --git a/lib/zstd/common/zstd_common.c b/lib/zstd/common/zstd_common.c | ||
index 3d7e35b309b5..06f62b2026d5 100644 | ||
--- a/lib/zstd/common/zstd_common.c | ||
+++ b/lib/zstd/common/zstd_common.c | ||
@@ -13,6 +13,7 @@ | ||
/*-************************************* | ||
* Dependencies | ||
***************************************/ | ||
+#include <linux/module.h> | ||
#define ZSTD_DEPS_NEED_MALLOC | ||
#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */ | ||
#include "error_private.h" | ||
@@ -59,6 +60,7 @@ void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem) | ||
return customMem.customAlloc(customMem.opaque, size); | ||
return ZSTD_malloc(size); | ||
} | ||
+EXPORT_SYMBOL_GPL(ZSTD_customMalloc); | ||
|
||
void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) | ||
{ | ||
@@ -71,6 +73,7 @@ void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem) | ||
} | ||
return ZSTD_calloc(1, size); | ||
} | ||
+EXPORT_SYMBOL_GPL(ZSTD_customCalloc); | ||
|
||
void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) | ||
{ | ||
@@ -81,3 +84,7 @@ void ZSTD_customFree(void* ptr, ZSTD_customMem customMem) | ||
ZSTD_free(ptr); | ||
} | ||
} | ||
+EXPORT_SYMBOL_GPL(ZSTD_customFree); | ||
+ | ||
+MODULE_LICENSE("Dual BSD/GPL"); | ||
+MODULE_DESCRIPTION("Zstd Common"); | ||
diff --git a/lib/zstd/compress/zstd_compress.c b/lib/zstd/compress/zstd_compress.c | ||
index a4e916008b3a..73fff4c60149 100644 | ||
--- a/lib/zstd/compress/zstd_compress.c | ||
|
@@ -16086,5 +16240,5 @@ index 000000000000..0d71593e008e | |
+ return 0; | ||
+} | ||
-- | ||
2.37.3 | ||
2.38.0.rc1.8.g2a7d63a245 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 654e5a98ed327a800aebd56f31f1acba369609ed Mon Sep 17 00:00:00 2001 | ||
From 6aa565c96524eae9abe6935a13410257f87b12cf Mon Sep 17 00:00:00 2001 | ||
From: Peter Jung <[email protected]> | ||
Date: Thu, 8 Sep 2022 15:37:12 +0200 | ||
Subject: [PATCH 03/16] sched | ||
|
@@ -2981,5 +2981,5 @@ index 986b9458efb2..4177f9507bbe 100644 | |
rseq_offset = *libc_rseq_offset_p; | ||
rseq_size = *libc_rseq_size_p; | ||
-- | ||
2.37.3 | ||
2.38.0.rc1.8.g2a7d63a245 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From b7f8de74e541033ef77dda75931eb5697ce764b8 Mon Sep 17 00:00:00 2001 | ||
From dd78a584d297e193cbbc651b5641114e95ad657b Mon Sep 17 00:00:00 2001 | ||
From: Peter Jung <[email protected]> | ||
Date: Tue, 20 Sep 2022 14:35:57 +0200 | ||
Subject: [PATCH 04/16] Extend-DAMOS-for-Proactive-LRU-lists-Sorting. | ||
|
@@ -1391,5 +1391,5 @@ index 3c7b9d6dca95..cc04d467ba23 100644 | |
goto regular_page; | ||
} | ||
-- | ||
2.37.3 | ||
2.38.0.rc1.8.g2a7d63a245 | ||
|
Oops, something went wrong.