Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E11DC10F03 for ; Tue, 23 Apr 2019 16:24:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF7FF208E4 for ; Tue, 23 Apr 2019 16:24:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="WvNEFRMQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728430AbfDWQYu (ORCPT ); Tue, 23 Apr 2019 12:24:50 -0400 Received: from mail-pf1-f202.google.com ([209.85.210.202]:51633 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726655AbfDWQYu (ORCPT ); Tue, 23 Apr 2019 12:24:50 -0400 Received: by mail-pf1-f202.google.com with SMTP id s26so9968068pfm.18 for ; Tue, 23 Apr 2019 09:24:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=tKAf2ZJ3VXT+oVnajJ0aNF2pDLZJjMaHEi9RthgmJco=; b=WvNEFRMQ8HVfqPEIgNTxzNRqFUMTqCRdYRB5xfdUdwZTlqbytle6u7qep5BhEYC3mf /HI/r/Cn5Al3YKjH+IgBqg6zJWFFRkJ2UKY4kwXHn0/04Xj5vA/MIdctUDsjbcCCTPph oZBysVEmzArf+3To1DFgoCJh8z640vVHy3NkxbT01Xio3m7oFvm8m2RTIvFCzLv4qiU5 O/6GjhyJvMixXW6z0t/P/jfNMzVMZDxahw4ERO680NNDGiQipkAf0oREyGSz5ijYiUg2 GrIBGsj4yuWNruYmMaAIz/zCOtdw8WBX7rjZenF3lNQuyTJtgcfG5csZcARgcqRZQYKp XPHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=tKAf2ZJ3VXT+oVnajJ0aNF2pDLZJjMaHEi9RthgmJco=; b=lVQQCT6/215+mpnmUrNRccIl5OkKxhJ9mqUlZnJM/YnvEstzuXGP7jc43Mib83SXzV 3H6EPtOUIAELXf9JD0+e5bxOCiJnsCM3+TJY4JkFezvLtD86Z3MsAzxG7Wais7g8F6/X 0Y4oX2hM0KjZ5DQYYXECCcc79upAGDHs/+5VEdmcBm5fH2ICoLRLXBCgq5u+G2NFXEmU DFKA/zlF8xivcmHL2RfmAcNPSUzPKu33oK0ymHZOq87mcKhvd4em1JbjdK0jmwyT68mM +31yEMRERCtpYyAtgln1F5r8UtFByHUDw72QkzLrOfJyIMhGSZ7fiznf5TyymJ6CYDKN 7a8w== X-Gm-Message-State: APjAAAW6mmdhfVRxzlaQb7i9ek+vgAAkyI39tQF9CCfmy8jCIbzckRnb S+0l8HA3gUbkydS/d+uENeoXDS5do9Pw3g== X-Google-Smtp-Source: APXvYqyivdzrAOSGLsTX6j8tvsdxMZlfDzODTIoBNQJbdy+SNeXcQkPpwWQytC6v5Bt/2BLifjsod+OlCRBLMw== X-Received: by 2002:a63:7444:: with SMTP id e4mr25886773pgn.261.1556036689560; Tue, 23 Apr 2019 09:24:49 -0700 (PDT) Date: Tue, 23 Apr 2019 09:24:46 -0700 Message-Id: <20190423162446.6738-1-edumazet@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog Subject: [PATCH net-next] tipc: tipc_udp_recv() cleanup vs rcu verbs From: Eric Dumazet To: "David S . Miller" Cc: netdev , Eric Dumazet , Eric Dumazet , Jon Maloy , Ying Xue Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org First thing tipc_udp_recv() does is to use rcu_dereference_sk_user_data(), and this is really hinting we already own rcu_read_lock() from the caller (UDP stack). No need to add another rcu_read_lock()/rcu_read_unlock() pair. Also use rcu_dereference() instead of rcu_dereference_rtnl() in the data path. Signed-off-by: Eric Dumazet Cc: Jon Maloy Cc: Ying Xue --- net/tipc/udp_media.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c index 6f166fbbfff148b7d3774ece0d68203d9925b3da..7413cbc9b638af492d6a592df957a3229fa6a3fa 100644 --- a/net/tipc/udp_media.c +++ b/net/tipc/udp_media.c @@ -354,10 +354,9 @@ static int tipc_udp_recv(struct sock *sk, struct sk_buff *skb) skb_pull(skb, sizeof(struct udphdr)); hdr = buf_msg(skb); - rcu_read_lock(); - b = rcu_dereference_rtnl(ub->bearer); + b = rcu_dereference(ub->bearer); if (!b) - goto rcu_out; + goto out; if (b && test_bit(0, &b->up)) { tipc_rcv(sock_net(sk), skb, b); @@ -368,11 +367,9 @@ static int tipc_udp_recv(struct sock *sk, struct sk_buff *skb) if (unlikely(msg_user(hdr) == LINK_CONFIG)) { err = tipc_udp_rcast_disc(b, skb); if (err) - goto rcu_out; + goto out; } -rcu_out: - rcu_read_unlock(); out: kfree_skb(skb); return 0; -- 2.21.0.593.g511ec345e18-goog