Message ID | 20180514223223.25433-15-sthemmin@microsoft.com |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=networkplumber.org 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="UJwcQIZh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40lFpy5nWYz9s0q for <patchwork-incoming-netdev@ozlabs.org>; Tue, 15 May 2018 08:33:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752449AbeENWdo (ORCPT <rfc822;patchwork-incoming-netdev@ozlabs.org>); Mon, 14 May 2018 18:33:44 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33692 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752265AbeENWcv (ORCPT <rfc822;netdev@vger.kernel.org>); Mon, 14 May 2018 18:32:51 -0400 Received: by mail-pf0-f196.google.com with SMTP id a20-v6so2742969pfo.0 for <netdev@vger.kernel.org>; Mon, 14 May 2018 15:32:51 -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=1aMIApXyoEouNp4aZAyYPap68IIt6Vir6C7H8fBqZLw=; b=UJwcQIZhpZ0MM0gPfYIxG52ppxNzcmX/EowZAlBa50OuV/6H5zy2OCkOI+sptnmbLO eQMyswK3wdTl/oQDJjuBZJ6eTcOvdlIDhOfX79rmA4D8dUizNfeMmG5QqwCdyloh83aE 5fJP666EfZTFa0xjnWLxFXbvRpSRmrvHwdDOw86Ph2Sp+pyX7ant1jRWPPpWa0FTYfSN QCcbhWueQzUlRDrB4UBiUsfXafIv4poThgFW2WbI70g6Lk1h8WB0wYqmQLOH9utEVLxM ODzuq52s0UUOlFuKm2UmxfZS1l7RM4qhGlWD2sgNKsSkzXY4vgPZSE+YXSBTrY7/uhVJ EqdA== 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=1aMIApXyoEouNp4aZAyYPap68IIt6Vir6C7H8fBqZLw=; b=WDYOI1O05G99RFUoZJxvD57StAr24zSYvEG91CjOD1SJqKrc+lLrH4UDM/i0mMLSJr SEm+SFtudX0b+WuTWkFB5f0uaPZoj2zvBA1RW+NKzHq9AjA6TP/Qo4cghrK86yJ1/U7S gFxSl1fN2RXYSyb8DgYVlEzfDhL5ar0NxVG18KQ6W71LbXSM8F27T6hW6vmGognGVzQS KyXpc3q3EmgC7SPh47DhtXGq7x66s6JAby2rUA66subs3SEYY3Ay0yi6v4v+ElRB3KsQ eSUy3Ebqm/ZNa1uGhiyZSc62Y7BSU6Tv0hEuv3fYGc09Lno1sWGnlTsfHLsENWM4/DEy cIsA== X-Gm-Message-State: ALKqPweuqcw02IaGnkjxoMXb9evc6Oso8QzuyQ3D/iWmCtfrMpQfTe8Z 3T4KSmv6Em6oQ1+LxLw5NFO/lAf5QyY= X-Google-Smtp-Source: AB8JxZozLGDsMG9IiaQKYt2G2baqoviEOOXIQf/ERx4DQezqPOMjbee2dkUFMLMtvQ+TOhKhXh7yEQ== X-Received: by 2002:a65:53ca:: with SMTP id z10-v6mr7765138pgr.413.1526337170560; Mon, 14 May 2018 15:32:50 -0700 (PDT) Received: from xeon-e3.lan (204-195-35-107.wavecable.com. [204.195.35.107]) by smtp.gmail.com with ESMTPSA id y29-v6sm23827830pff.42.2018.05.14.15.32.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 15:32:49 -0700 (PDT) From: Stephen Hemminger <stephen@networkplumber.org> X-Google-Original-From: Stephen Hemminger <sthemmin@microsoft.com> To: davem@davemloft.net Cc: netdev@vger.kernel.org, Stephen Hemminger <stephen@networkplumber.org>, Stephen Hemminger <sthemmin@microsoft.com> Subject: [PATCH net-stable 14/24] hv_netvsc: fix race in napi poll when rescheduling Date: Mon, 14 May 2018 15:32:13 -0700 Message-Id: <20180514223223.25433-15-sthemmin@microsoft.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514223223.25433-1-sthemmin@microsoft.com> References: <20180514223223.25433-1-sthemmin@microsoft.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
hv_netvsc patches for 4.14 stable
|
expand
|
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index b7720b65f5d6..7e0eb99571af 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -1205,9 +1205,10 @@ int netvsc_poll(struct napi_struct *napi, int budget) if (send_recv_completions(ndev, net_device, nvchan) == 0 && work_done < budget && napi_complete_done(napi, work_done) && - hv_end_read(&channel->inbound)) { + hv_end_read(&channel->inbound) && + napi_schedule_prep(napi)) { hv_begin_read(&channel->inbound); - napi_reschedule(napi); + __napi_schedule(napi); } /* Driver may overshoot since multiple packets per descriptor */