diff options
| author | Luca Coelho <luciano.coelho@intel.com> | 2018-02-18 15:24:52 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-02-23 12:33:30 +0100 |
| commit | 3b0d02e17c0c063f3893d7fcb0caa66954a75c8c (patch) | |
| tree | 1fef6f882cbb7f8d908bd0b3b0c15243904c999d /patches | |
| parent | 1c96e546c821aef6e0fb5028d93cc6735a6f3b1c (diff) | |
backport: include lib/bucket_locks.c
The alloc/free_bucket_spinlocks() functions were moved to a new lib
file, namely bucket_locks.c. Add an auto-backport for the
bucket_locks.c file and move the patching of the code that moved from
rhashtable to bucket_locks.c.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/lib-bucket_locks.patch | 29 | ||||
| -rw-r--r-- | patches/lib-rhashtable.patch | 27 |
2 files changed, 29 insertions, 27 deletions
diff --git a/patches/lib-bucket_locks.patch b/patches/lib-bucket_locks.patch new file mode 100644 index 00000000..df7420de --- /dev/null +++ b/patches/lib-bucket_locks.patch @@ -0,0 +1,29 @@ +diff --git a/compat/lib-bucket_locks.c b/compat/lib-bucket_locks.c +index 266a97c5708b..405b52ca5708 100644 +--- a/compat/lib-bucket_locks.c ++++ b/compat/lib-bucket_locks.c +@@ -30,10 +30,24 @@ int alloc_bucket_spinlocks(spinlock_t **locks, unsigned int *locks_mask, + } + + if (sizeof(spinlock_t) != 0) { ++#if LINUX_VERSION_IS_LESS(4,12,0) ++#ifdef CONFIG_NUMA ++ if (size * sizeof(spinlock_t) > PAGE_SIZE && ++ gfp == GFP_KERNEL) ++ tlocks = vmalloc(size * sizeof(spinlock_t)); ++#endif ++ if (gfp != GFP_KERNEL) ++ gfp |= __GFP_NOWARN | __GFP_NORETRY; ++ ++ if (!tlocks) ++ tlocks = kmalloc_array(size, sizeof(spinlock_t), ++ gfp); ++#else + if (gfpflags_allow_blocking(gfp)) + tlocks = kvmalloc(size * sizeof(spinlock_t), gfp); + else + tlocks = kmalloc_array(size, sizeof(spinlock_t), gfp); ++#endif + if (!tlocks) + return -ENOMEM; + for (i = 0; i < size; i++) diff --git a/patches/lib-rhashtable.patch b/patches/lib-rhashtable.patch index 59d870c0..d29169f4 100644 --- a/patches/lib-rhashtable.patch +++ b/patches/lib-rhashtable.patch @@ -1,33 +1,6 @@ --- a/compat/lib-rhashtable.c +++ b/compat/lib-rhashtable.c -@@ -86,11 +86,26 @@ static int alloc_bucket_locks(struct rha - size = min(size, 1U << tbl->nest); - - if (sizeof(spinlock_t) != 0) { -+#if LINUX_VERSION_IS_LESS(4,12,0) -+ tbl->locks = NULL; -+#ifdef CONFIG_NUMA -+ if (size * sizeof(spinlock_t) > PAGE_SIZE && -+ gfp == GFP_KERNEL) -+ tbl->locks = vmalloc(size * sizeof(spinlock_t)); -+#endif -+ if (gfp != GFP_KERNEL) -+ gfp |= __GFP_NOWARN | __GFP_NORETRY; -+ -+ if (!tbl->locks) -+ tbl->locks = kmalloc_array(size, sizeof(spinlock_t), -+ gfp); -+#else - if (gfpflags_allow_blocking(gfp)) - tbl->locks = kvmalloc(size * sizeof(spinlock_t), gfp); - else - tbl->locks = kmalloc_array(size, sizeof(spinlock_t), - gfp); -+#endif - if (!tbl->locks) - return -ENOMEM; - for (i = 0; i < size; i++) @@ -211,10 +226,11 @@ static struct bucket_table *bucket_table int i; |