From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752905AbdJaCa2 (ORCPT ); Mon, 30 Oct 2017 22:30:28 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:64374 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751837AbdJaCa1 (ORCPT ); Mon, 30 Oct 2017 22:30:27 -0400 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v9V2T5rB006527 X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Thomas Gleixner Cc: Peter Zijlstra , Ingo Molnar , "Paul E . McKenney" , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH] genirq: add mutex and rcu locking to irq_desc_tree Date: Tue, 31 Oct 2017 11:28:48 +0900 Message-Id: <1509416928-7450-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a mutex to prevent concurrency on the updater side of the irq_desc radix tree. Add rcu_read_lock/unlock to the reader side so that lifetimes of leaf pointers of the radix tree are correctly managed. Signed-off-by: Masahiro Yamada --- kernel/irq/irqdesc.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index 82afb7e..928c896 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -312,21 +313,32 @@ static void irq_sysfs_add(int irq, struct irq_desc *desc) {} #endif /* CONFIG_SYSFS */ static RADIX_TREE(irq_desc_tree, GFP_KERNEL); +static DEFINE_MUTEX(irq_desc_tree_mutex); static void irq_insert_desc(unsigned int irq, struct irq_desc *desc) { + mutex_lock(&irq_desc_tree_mutex); radix_tree_insert(&irq_desc_tree, irq, desc); + mutex_unlock(&irq_desc_tree_mutex); } struct irq_desc *irq_to_desc(unsigned int irq) { - return radix_tree_lookup(&irq_desc_tree, irq); + struct irq_desc *desc; + + rcu_read_lock(); + desc = radix_tree_lookup(&irq_desc_tree, irq); + rcu_read_unlock(); + + return desc; } EXPORT_SYMBOL(irq_to_desc); static void delete_irq_desc(unsigned int irq) { + mutex_lock(&irq_desc_tree_mutex); radix_tree_delete(&irq_desc_tree, irq); + mutex_unlock(&irq_desc_tree_mutex); } #ifdef CONFIG_SMP -- 2.7.4