From patchwork Wed Mar 25 22:01:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qian Cai X-Patchwork-Id: 1261673 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=lca.pw Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lca.pw header.i=@lca.pw header.a=rsa-sha256 header.s=google header.b=WcbDqTsC; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48nhs70fjlz9sRN for ; Thu, 26 Mar 2020 09:01:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727547AbgCYWBL (ORCPT ); Wed, 25 Mar 2020 18:01:11 -0400 Received: from mail-qv1-f67.google.com ([209.85.219.67]:46439 "EHLO mail-qv1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727351AbgCYWBK (ORCPT ); Wed, 25 Mar 2020 18:01:10 -0400 Received: by mail-qv1-f67.google.com with SMTP id m2so1930020qvu.13 for ; Wed, 25 Mar 2020 15:01:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lca.pw; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2LRvU1MBkUR83Gqvgx7L+Y8Q4FBFbX8N5vp+5n4yg4Q=; b=WcbDqTsCMr/IAwnZN8MoX/dVXK1RBR6E9bZd8ICOvtz6cZoglcAGaTl705g0nhrOp8 tZ6gQDXn0zF05An8BN6HQ6CjAGOnzk2EgErysPwvey8ehfgxQlcD9QVEmume+6aQ38pG wtyN32HhUV015KYPnNVRmQpJH2F6UwG7lP+YQMU/p+GGFshq9FWCXmHF/ZYCrvc+p2+R F7ta4az8XTEskx5SGmes2SL51S2CbFmlT8davsU7lIfct17FUr6Cpc9Q0tITcvlUswez ec2lE1gxRq2JkJ7xaTMy4Ub/tRRlIomDghBjRQWdRmn5hBPYYNFsSmeAKs52N055Ockb HGiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2LRvU1MBkUR83Gqvgx7L+Y8Q4FBFbX8N5vp+5n4yg4Q=; b=Bk2AqYO+DcCo6P8X273JZf0mMcErdMGpYPydRCybwAgqwO0I8q0QJ5vrNbsAyG0V52 KOhSD9nL9CVSPeVgb2TWMC/1FFXQzr2h/6M9yi+bcDnFAyRklbI8hzGv+ac1CPqOjamr 7hofWrCEZv6S0v2VkZ0zCvick0d42yEBFQseiAJanVnXiWp1t1aUDdSic5IjWtcto5wN Up6puyGbFlBnrwCR0j0d4z+1/EK+8xewO/KNlGpqV6aSaWVHxU+REPtGDlfawtMMsgig MRWIgrQ1bB0qiSqRoB8FY7EVZLlKo3F8E4cE1sv17IUWr/BZv6C6OhCaJkiU0i+Y9WQm s+Mw== X-Gm-Message-State: ANhLgQ3aopfsUMHjlMZoIVnLU2BE3Q4bvBJgVXwt6zxsW6ytWfD9Nvos IuS0JxnmDnIR+dmzARD+gx/Tpg== X-Google-Smtp-Source: ADFU+vs7SuVQXXkdNRbBL1RUpn65JVCeZ4bdF/5nuV5w6WTVXfR1bgNyW6rTpZ9NHRfVC6aCgq347g== X-Received: by 2002:a05:6214:11ec:: with SMTP id e12mr5359612qvu.89.1585173669264; Wed, 25 Mar 2020 15:01:09 -0700 (PDT) Received: from ovpn-66-69.rdu2.redhat.com (pool-71-184-117-43.bstnma.fios.verizon.net. [71.184.117.43]) by smtp.gmail.com with ESMTPSA id l42sm205009qtf.51.2020.03.25.15.01.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Mar 2020 15:01:08 -0700 (PDT) From: Qian Cai To: davem@davemloft.net Cc: kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, kuba@kernel.org, eric.dumazet@gmail.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Qian Cai Subject: [PATCH v2] ipv4: fix a RCU-list lock in fib_triestat_seq_show Date: Wed, 25 Mar 2020 18:01:00 -0400 Message-Id: <20200325220100.7863-1-cai@lca.pw> X-Mailer: git-send-email 2.21.0 (Apple Git-122.2) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org fib_triestat_seq_show() calls hlist_for_each_entry_rcu(tb, head, tb_hlist) without rcu_read_lock() will trigger a warning, net/ipv4/fib_trie.c:2579 RCU-list traversed in non-reader section!! other info that might help us debug this: rcu_scheduler_active = 2, debug_locks = 1 1 lock held by proc01/115277: #0: c0000014507acf00 (&p->lock){+.+.}-{3:3}, at: seq_read+0x58/0x670 Call Trace: dump_stack+0xf4/0x164 (unreliable) lockdep_rcu_suspicious+0x140/0x164 fib_triestat_seq_show+0x750/0x880 seq_read+0x1a0/0x670 proc_reg_read+0x10c/0x1b0 __vfs_read+0x3c/0x70 vfs_read+0xac/0x170 ksys_read+0x7c/0x140 system_call+0x5c/0x68 Fix it by adding a pair of rcu_read_lock/unlock() and use cond_resched_rcu() to avoid the situation where walking of a large number of items may prevent scheduling for a long time. Signed-off-by: Qian Cai Reviewed-by: Eric Dumazet --- Use cond_resched_rcu() from Eric. net/ipv4/fib_trie.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index ff0c24371e33..3be0affbabd3 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -2577,6 +2577,7 @@ static int fib_triestat_seq_show(struct seq_file *seq, void *v) " %zd bytes, size of tnode: %zd bytes.\n", LEAF_SIZE, TNODE_SIZE(0)); + rcu_read_lock(); for (h = 0; h < FIB_TABLE_HASHSZ; h++) { struct hlist_head *head = &net->ipv4.fib_table_hash[h]; struct fib_table *tb; @@ -2596,7 +2597,9 @@ static int fib_triestat_seq_show(struct seq_file *seq, void *v) trie_show_usage(seq, t->stats); #endif } + cond_resched_rcu(); } + rcu_read_unlock(); return 0; }