From patchwork Wed Jul 19 18:53:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 791205 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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; dkim=pass (2048-bit key; unprotected) header.d=networkplumber-org.20150623.gappssmtp.com header.i=@networkplumber-org.20150623.gappssmtp.com header.b="lfHeFKg9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xCR5745Dyz9t16 for ; Thu, 20 Jul 2017 04:53:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933669AbdGSSxp (ORCPT ); Wed, 19 Jul 2017 14:53:45 -0400 Received: from mail-pg0-f49.google.com ([74.125.83.49]:37263 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754888AbdGSSxa (ORCPT ); Wed, 19 Jul 2017 14:53:30 -0400 Received: by mail-pg0-f49.google.com with SMTP id y129so3889119pgy.4 for ; Wed, 19 Jul 2017 11:53:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xjNgR3Z5dWhQYfbQqgAi5zk+XeG86igVs1gqNxfAWYk=; b=lfHeFKg9LQGqHXNO74ue8S19NbxU9GJnxdemOEtpoTIJP2urvBaGmSnhJFddPX3Gox YlbO1fFD5qBcPLDF55EeMjuauyBOurr6NcOIlt/hjKzZNJXU+ZhvYEFUOp2FrMbJ/sqP lt3zubwUCT3U3VNoe513mOdFxrWbL9XbXGoqjqEVpW8uEjocBFHkFJKoI32axVTcDqSj phGDBX2RWcTqnibylQPUonDfNwcpcj/mauZ41ZrJRvYAAs2VBw/quOqffNVFkAGJTdy+ 0j5Ior6ECoErDQrctkvHuW74kz6K6AZBN66lPOkPj5xO/76BhZWe/OH/Ntev5rVLVnF5 ecNg== 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:in-reply-to :references; bh=xjNgR3Z5dWhQYfbQqgAi5zk+XeG86igVs1gqNxfAWYk=; b=TPRbNjOnu3HBYAPuwsyOhMWmbbcdlK4Bjz99f4egi0zJNJtQC6TvqNIiRK8UShZMrI ibBQskRW3xt4DCV2JUJ31wIxeQugt9PwRjUxD67YLaTcFkZGI8hzzdWgGBeV/SMLelTH NNHYADtwhMpd36IGgI+346ZWEKW+LIwVssLYS+ispCE9+/Qzaa6NxmBrwHXzLf520cwq DfRhHJWItD3o9gqZDTMVzesoYcvBJNaQBJjGiSLfm8h3FVjpDlb+Y/MBZ6d+kchOUxRw d6geSIhkNS+LZ+PGzA0X2BgOZ2bLrP00L67EkNSNKoOh1RYbbcZJ388eQ9T/sRm7QkEJ 07JQ== X-Gm-Message-State: AIVw112sy2+jYvzzhKDk+SzTfFtvDENXeAwGL8z8+SJuK1GQhEvom8Je oW9y8GZynh8ui4g+ X-Received: by 10.99.16.65 with SMTP id 1mr1108898pgq.208.1500490410417; Wed, 19 Jul 2017 11:53:30 -0700 (PDT) Received: from xeon-e3.wavecable.com (76-14-207-240.or.wavecable.com. [76.14.207.240]) by smtp.gmail.com with ESMTPSA id v86sm13822pfa.6.2017.07.19.11.53.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jul 2017 11:53:29 -0700 (PDT) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: kys@microsoft.com, haiyangz@microsoft.com, sthemmin@microsoft.com Cc: devel@linuxdriverproject.org, netdev@vger.kernel.org Subject: [PATCH net-next 7/8] netvsc: save pointer to parent netvsc_device in channel table Date: Wed, 19 Jul 2017 11:53:18 -0700 Message-Id: <20170719185319.25871-8-sthemmin@microsoft.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170719185319.25871-1-sthemmin@microsoft.com> References: <20170719185319.25871-1-sthemmin@microsoft.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Keep back pointer in the per-channel data structure to avoid any possible RCU related issues when napi poll is called but netvsc_device is in RCU limbo. Signed-off-by: Stephen Hemminger --- drivers/net/hyperv/hyperv_net.h | 1 + drivers/net/hyperv/netvsc.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h index 0054b6929f6e..d13572879e7e 100644 --- a/drivers/net/hyperv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h @@ -727,6 +727,7 @@ struct net_device_context { /* Per channel data */ struct netvsc_channel { struct vmbus_channel *channel; + struct netvsc_device *net_device; const struct vmpacket_descriptor *desc; struct napi_struct napi; struct multi_send_data msd; diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 3c6f3ae520d9..c15640c6fd83 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -1224,11 +1224,11 @@ int netvsc_poll(struct napi_struct *napi, int budget) { struct netvsc_channel *nvchan = container_of(napi, struct netvsc_channel, napi); + struct netvsc_device *net_device = nvchan->net_device; struct vmbus_channel *channel = nvchan->channel; struct hv_device *device = netvsc_channel_to_device(channel); u16 q_idx = channel->offermsg.offer.sub_channel_index; struct net_device *ndev = hv_get_drvdata(device); - struct netvsc_device *net_device = net_device_to_netvsc_device(ndev); int work_done = 0; /* If starting a new interval */ @@ -1307,6 +1307,7 @@ struct netvsc_device *netvsc_device_add(struct hv_device *device, struct netvsc_channel *nvchan = &net_device->chan_table[i]; nvchan->channel = device->channel; + nvchan->net_device = net_device; } /* Enable NAPI handler before init callbacks */