diff options
Diffstat (limited to 'features/rt/mm-workingset-replace-IRQ-off-check-with-a-lockdep-a.patch')
| -rw-r--r-- | features/rt/mm-workingset-replace-IRQ-off-check-with-a-lockdep-a.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/features/rt/mm-workingset-replace-IRQ-off-check-with-a-lockdep-a.patch b/features/rt/mm-workingset-replace-IRQ-off-check-with-a-lockdep-a.patch new file mode 100644 index 00000000..d2cd6abd --- /dev/null +++ b/features/rt/mm-workingset-replace-IRQ-off-check-with-a-lockdep-a.patch @@ -0,0 +1,48 @@ +From f8847b3d3ebc1ea59be319e5833c585bacd2d5f2 Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +Date: Mon, 11 Feb 2019 10:40:46 +0100 +Subject: [PATCH 036/191] mm: workingset: replace IRQ-off check with a lockdep + assert. + +Commit + + 68d48e6a2df57 ("mm: workingset: add vmstat counter for shadow nodes") + +introduced an IRQ-off check to ensure that a lock is held which also +disabled interrupts. This does not work the same way on -RT because none +of the locks, that are held, disable interrupts. +Replace this check with a lockdep assert which ensures that the lock is +held. + +Cc: Peter Zijlstra <peterz@infradead.org> +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +--- + mm/workingset.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/mm/workingset.c b/mm/workingset.c +index cd39902c1062..3d34c1309f54 100644 +--- a/mm/workingset.c ++++ b/mm/workingset.c +@@ -430,6 +430,8 @@ static struct list_lru shadow_nodes; + + void workingset_update_node(struct xa_node *node) + { ++ struct address_space *mapping; ++ + /* + * Track non-empty nodes that contain only shadow entries; + * unlink those that contain pages or are being freed. +@@ -438,7 +440,8 @@ void workingset_update_node(struct xa_node *node) + * already where they should be. The list_empty() test is safe + * as node->private_list is protected by the i_pages lock. + */ +- VM_WARN_ON_ONCE(!irqs_disabled()); /* For __inc_lruvec_page_state */ ++ mapping = container_of(node->array, struct address_space, i_pages); ++ lockdep_assert_held(&mapping->i_pages.xa_lock); + + if (node->count && node->count == node->nr_values) { + if (list_empty(&node->private_list)) { +-- +2.19.1 + |