From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 9A185C433EF for ; Sun, 8 Sep 2019 12:47:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 70385218AC for ; Sun, 8 Sep 2019 12:47:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567946833; bh=ckHC48in04SwhmT6ngLQZCD/vhD2yjIy5nX/6DJRkXQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=R3t404nALY5q5pqI1AH1g1BhtlhOs2rwAcFViGGP4B8T6p0dYMGMjmwJBAAQL/m9D gYnCwChMND55xlE7Lf+5fxxB5jxG2LiyFHbVgPVZzXnEqCu6P6pPM0NLL232YAvbUg iKCWp431rsNkpDkP2KylQHLfBkp5ItKAdN76o8KE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730606AbfIHMrM (ORCPT ); Sun, 8 Sep 2019 08:47:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:35228 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730580AbfIHMrJ (ORCPT ); Sun, 8 Sep 2019 08:47:09 -0400 Received: from localhost (unknown [62.28.240.114]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 72168218AC; Sun, 8 Sep 2019 12:47:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567946828; bh=ckHC48in04SwhmT6ngLQZCD/vhD2yjIy5nX/6DJRkXQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yRroT5hgTeAiCyHn9F/GpZMOjX4MAzV6fDnGjzMJewf5L15PVGRAODVGiMsMl9v2F DywHf3VGot0AdPXGT21XxPoZeovSk1qz3aetp47WnAOcucQJxt1qFhe7kAHFBpIyxa WnGvtY4GWcLwR2io2YslzKsb5ES14LpLThDWtg1E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dexuan Cui , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 16/57] hv_netvsc: Fix a warning of suspicious RCU usage Date: Sun, 8 Sep 2019 13:41:40 +0100 Message-Id: <20190908121132.068481992@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190908121125.608195329@linuxfoundation.org> References: <20190908121125.608195329@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 6d0d779dca73cd5acb649c54f81401f93098b298 ] This fixes a warning of "suspicious rcu_dereference_check() usage" when nload runs. Fixes: 776e726bfb34 ("netvsc: fix RCU warning in get_stats") Signed-off-by: Dexuan Cui Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/hyperv/netvsc_drv.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index cc60ef9634db2..6f6c0dbd91fc8 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -1248,12 +1248,15 @@ static void netvsc_get_stats64(struct net_device *net, struct rtnl_link_stats64 *t) { struct net_device_context *ndev_ctx = netdev_priv(net); - struct netvsc_device *nvdev = rcu_dereference_rtnl(ndev_ctx->nvdev); + struct netvsc_device *nvdev; struct netvsc_vf_pcpu_stats vf_tot; int i; + rcu_read_lock(); + + nvdev = rcu_dereference(ndev_ctx->nvdev); if (!nvdev) - return; + goto out; netdev_stats_to_stats64(t, &net->stats); @@ -1292,6 +1295,8 @@ static void netvsc_get_stats64(struct net_device *net, t->rx_packets += packets; t->multicast += multicast; } +out: + rcu_read_unlock(); } static int netvsc_set_mac_addr(struct net_device *ndev, void *p) -- 2.20.1