Skip to content

Commit 8e1704b

Browse files
committed
Merge branches 'doc.2023.01.05a', 'fixes.2023.01.23a', 'kvfree.2023.01.03a', 'srcu.2023.01.03a', 'srcu-always.2023.02.02a', 'tasks.2023.01.03a', 'torture.2023.01.05a' and 'torturescript.2023.01.03a' into HEAD
doc.2023.01.05a: Documentation update. fixes.2023.01.23a: Miscellaneous fixes. kvfree.2023.01.03a: kvfree_rcu() updates. srcu.2023.01.03a: SRCU updates. srcu-always.2023.02.02a: Finish making SRCU be unconditionally available. tasks.2023.01.03a: Tasks-RCU updates. torture.2023.01.05a: Torture-test updates. torturescript.2023.01.03a: Torture-test scripting updates.
8 parents 5e013dc + cf7066b + 608723c + dafc4d1 + 5634469 + a4fcfbe + d52d3a2 + 5a6cd56 commit 8e1704b

39 files changed

+1010
-506
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5113,6 +5113,11 @@
51135113
rcupdate.rcu_cpu_stall_timeout to be used (after
51145114
conversion from seconds to milliseconds).
51155115

5116+
rcupdate.rcu_exp_stall_task_details= [KNL]
5117+
Print stack dumps of any tasks blocking the
5118+
current expedited RCU grace period during an
5119+
expedited RCU CPU stall warning.
5120+
51165121
rcupdate.rcu_expedited= [KNL]
51175122
Use expedited grace-period primitives, for
51185123
example, synchronize_rcu_expedited() instead

drivers/base/core.c

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ void fw_devlink_purge_absent_suppliers(struct fwnode_handle *fwnode)
181181
}
182182
EXPORT_SYMBOL_GPL(fw_devlink_purge_absent_suppliers);
183183

184-
#ifdef CONFIG_SRCU
185184
static DEFINE_MUTEX(device_links_lock);
186185
DEFINE_STATIC_SRCU(device_links_srcu);
187186

@@ -220,47 +219,6 @@ static void device_link_remove_from_lists(struct device_link *link)
220219
list_del_rcu(&link->s_node);
221220
list_del_rcu(&link->c_node);
222221
}
223-
#else /* !CONFIG_SRCU */
224-
static DECLARE_RWSEM(device_links_lock);
225-
226-
static inline void device_links_write_lock(void)
227-
{
228-
down_write(&device_links_lock);
229-
}
230-
231-
static inline void device_links_write_unlock(void)
232-
{
233-
up_write(&device_links_lock);
234-
}
235-
236-
int device_links_read_lock(void)
237-
{
238-
down_read(&device_links_lock);
239-
return 0;
240-
}
241-
242-
void device_links_read_unlock(int not_used)
243-
{
244-
up_read(&device_links_lock);
245-
}
246-
247-
#ifdef CONFIG_DEBUG_LOCK_ALLOC
248-
int device_links_read_lock_held(void)
249-
{
250-
return lockdep_is_held(&device_links_lock);
251-
}
252-
#endif
253-
254-
static inline void device_link_synchronize_removal(void)
255-
{
256-
}
257-
258-
static void device_link_remove_from_lists(struct device_link *link)
259-
{
260-
list_del(&link->s_node);
261-
list_del(&link->c_node);
262-
}
263-
#endif /* !CONFIG_SRCU */
264222

265223
static bool device_is_ancestor(struct device *dev, struct device *target)
266224
{

drivers/dax/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
menuconfig DAX
33
tristate "DAX: direct access to differentiated memory"
4-
select SRCU
54
default m if NVDIMM_DAX
65

76
if DAX

drivers/hwtracing/stm/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
config STM
33
tristate "System Trace Module devices"
44
select CONFIGFS_FS
5-
select SRCU
65
help
76
A System Trace Module (STM) is a device exporting data in System
87
Trace Protocol (STP) format as defined by MIPI STP standards.

drivers/md/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
menuconfig MD
77
bool "Multiple devices driver support (RAID and LVM)"
88
depends on BLOCK
9-
select SRCU
109
help
1110
Support multiple physical spindles through a single logical device.
1211
Required for RAID and logical volume management.

drivers/net/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@ config NETCONSOLE_DYNAMIC
334334

335335
config NETPOLL
336336
def_bool NETCONSOLE
337-
select SRCU
338337

339338
config NET_POLL_CONTROLLER
340339
def_bool NETPOLL

drivers/pci/controller/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ config PCIE_MEDIATEK_GEN3
258258
MediaTek SoCs.
259259

260260
config VMD
261-
depends on PCI_MSI && X86_64 && SRCU && !UML
261+
depends on PCI_MSI && X86_64 && !UML
262262
tristate "Intel Volume Management Device Driver"
263263
help
264264
Adds support for the Intel Volume Management Device (VMD). VMD is a

fs/btrfs/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ config BTRFS_FS
1717
select FS_IOMAP
1818
select RAID6_PQ
1919
select XOR_BLOCKS
20-
select SRCU
2120
depends on PAGE_SIZE_LESS_THAN_256KB
2221

2322
help

fs/locks.c

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1889,7 +1889,6 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp,
18891889
}
18901890
EXPORT_SYMBOL(generic_setlease);
18911891

1892-
#if IS_ENABLED(CONFIG_SRCU)
18931892
/*
18941893
* Kernel subsystems can register to be notified on any attempt to set
18951894
* a new lease with the lease_notifier_chain. This is used by (e.g.) nfsd
@@ -1923,30 +1922,6 @@ void lease_unregister_notifier(struct notifier_block *nb)
19231922
}
19241923
EXPORT_SYMBOL_GPL(lease_unregister_notifier);
19251924

1926-
#else /* !IS_ENABLED(CONFIG_SRCU) */
1927-
static inline void
1928-
lease_notifier_chain_init(void)
1929-
{
1930-
}
1931-
1932-
static inline void
1933-
setlease_notifier(long arg, struct file_lock *lease)
1934-
{
1935-
}
1936-
1937-
int lease_register_notifier(struct notifier_block *nb)
1938-
{
1939-
return 0;
1940-
}
1941-
EXPORT_SYMBOL_GPL(lease_register_notifier);
1942-
1943-
void lease_unregister_notifier(struct notifier_block *nb)
1944-
{
1945-
}
1946-
EXPORT_SYMBOL_GPL(lease_unregister_notifier);
1947-
1948-
#endif /* IS_ENABLED(CONFIG_SRCU) */
1949-
19501925
/**
19511926
* vfs_setlease - sets a lease on an open file
19521927
* @filp: file pointer

fs/notify/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
config FSNOTIFY
33
def_bool n
4-
select SRCU
54

65
source "fs/notify/dnotify/Kconfig"
76
source "fs/notify/inotify/Kconfig"

0 commit comments

Comments
 (0)