0015-fscache-initialize-cookie-hash-table-raw-spinlocks.patch 2.27 KB
Newer Older
1
From 8cf7a5b4f03a2829c823971a12c1a206bcba069d Mon Sep 17 00:00:00 2001
2 3
From: Clark Williams <williams@redhat.com>
Date: Tue, 3 Jul 2018 13:34:30 -0500
4 5
Subject: [PATCH 015/269] fscache: initialize cookie hash table raw spinlocks
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.37-rt20.tar.xz
6 7 8 9 10 11 12 13 14 15 16

The fscache cookie mechanism uses a hash table of hlist_bl_head structures. The
PREEMPT_RT patcheset adds a raw spinlock to this structure and so on PREEMPT_RT
the structures get used uninitialized, causing warnings about bad magic numbers
when spinlock debugging is turned on.

Use the init function for fscache cookies.

Signed-off-by: Clark Williams <williams@redhat.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
17 18 19
 fs/fscache/cookie.c     | 8 ++++++++
 fs/fscache/main.c       | 1 +
 include/linux/fscache.h | 1 +
20 21
 3 files changed, 10 insertions(+)

22 23
diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
index c550512ce335..d5d57da32ffa 100644
24 25
--- a/fs/fscache/cookie.c
+++ b/fs/fscache/cookie.c
26
@@ -962,3 +962,11 @@ int __fscache_check_consistency(struct fscache_cookie *cookie,
27 28 29 30 31 32 33 34 35 36 37
 	return -ESTALE;
 }
 EXPORT_SYMBOL(__fscache_check_consistency);
+
+void __init fscache_cookie_init(void)
+{
+	int i;
+
+	for (i = 0; i < (1 << fscache_cookie_hash_shift) - 1; i++)
+		INIT_HLIST_BL_HEAD(&fscache_cookie_hash[i]);
+}
38 39
diff --git a/fs/fscache/main.c b/fs/fscache/main.c
index 30ad89db1efc..1d5f1d679ffa 100644
40 41
--- a/fs/fscache/main.c
+++ b/fs/fscache/main.c
Romain Perier's avatar
Romain Perier committed
42
@@ -149,6 +149,7 @@ static int __init fscache_init(void)
43 44 45 46 47 48 49
 		ret = -ENOMEM;
 		goto error_cookie_jar;
 	}
+	fscache_cookie_init();
 
 	fscache_root = kobject_create_and_add("fscache", kernel_kobj);
 	if (!fscache_root)
50 51
diff --git a/include/linux/fscache.h b/include/linux/fscache.h
index 84b90a79d75a..87a9330eafa2 100644
52 53
--- a/include/linux/fscache.h
+++ b/include/linux/fscache.h
54
@@ -230,6 +230,7 @@ extern void __fscache_readpages_cancel(struct fscache_cookie *cookie,
55 56 57 58 59 60 61
 extern void __fscache_disable_cookie(struct fscache_cookie *, const void *, bool);
 extern void __fscache_enable_cookie(struct fscache_cookie *, const void *, loff_t,
 				    bool (*)(void *), void *);
+extern void fscache_cookie_init(void);
 
 /**
  * fscache_register_netfs - Register a filesystem as desiring caching services
62 63 64
-- 
2.20.1