Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp206451imj; Thu, 14 Feb 2019 18:41:01 -0800 (PST) X-Google-Smtp-Source: AHgI3IaWy6sOKNz3dsV9Ovuk8bmuPgmycOaTaqHS0Rza3SxneIJx/NnGk5sZEypjMBT/syXH4AKC X-Received: by 2002:a62:1049:: with SMTP id y70mr7435023pfi.220.1550198461424; Thu, 14 Feb 2019 18:41:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550198461; cv=none; d=google.com; s=arc-20160816; b=vA9eV30OSuG9btmRJP1mi5x1ho+RYFijCR6H3ZrEbgvMSxA6sO2IkI9jZb4FfD7IXz eCSLYh6eSXjciL8WgQa+YNoF68yWkwqbLZg/w5Jnnc836in9ppyZBYX29wNQFIxnX2N2 GXIvmrAKODRIhTmg7MrH2tdZQ2UzLJ+x477Y0XCbWnFaGKaAIjL1nGFzJlpOupWt7IrP 4dULg4SyFzugMdzh/9UiVB66DVAGAgz0/Y3xsOBpKqOfO1TjXIejSs/qjTNKaDsyejHo MRnwpGCb20/6PNtHkXVznXLfbaaNHyJJFzRpWlyFby9yOdCPk0o8M/eLQM1rXCQ8g+Up jyLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BH9LCvK2xms2PAIyfJoea+EcD7TeRBhZgvVARvSdOZw=; b=I1DO+gNjVHR0ZoDb8Bw1HGY1smzPqCsyv8KSyZgoz8hVK1WGUORp9H8bdOemO1/osS HMPV6WUgG/9G9WtFAk3JD6Jy7GvL7+qylGyNxjte/ygQHaINXk2wBUS9aIrsi1IKCIqg /R7wnogaCG2I6CiyX0xIIRzwGb0FNCQbDSv9baOPbtoB+ElB/QE1Ayp/HxDLEz7ZqNtk DTGJClj2DaCdLAXcrGDaVRuWKPyKgs47snr6XNYIfq3Qx7IIrLH1C6WagFworX/iT/PG +uZpk0+56HiFQqmYeFbY7CbOO5eBOLjaosLKjSwcCseC8qbojQHl8sMfV0ft7UNcMoUz ONkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xG4a97t+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o186si4131385pfb.66.2019.02.14.18.40.45; Thu, 14 Feb 2019 18:41:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xG4a97t+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388899AbfBOCgJ (ORCPT + 99 others); Thu, 14 Feb 2019 21:36:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:51088 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732025AbfBOCLA (ORCPT ); Thu, 14 Feb 2019 21:11:00 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C2FA2222C9; Fri, 15 Feb 2019 02:10:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550196659; bh=cZRdN/ElhOl0M7rved4UQFSybSToDCkYh2xwqG9NltI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xG4a97t+7l1gq4cCMNaQy5e5WHiFTELi4DFihmnVg86cY0+G99OeO55JppcqDMiUn 9uBI6OLu5NlAgbgSavGf/P+WsiTfTqY+mYcNWlpkVGF5sVZy83FVHab+BEPcFbZtlI geiEkaDXO90YTw2CgNdrKid5CCXRuqGfVFYTxAFM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thomas Falcon , "David S . Miller" , Sasha Levin , linuxppc-dev@lists.ozlabs.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.20 69/77] ibmveth: Do not process frames after calling napi_reschedule Date: Thu, 14 Feb 2019 21:08:47 -0500 Message-Id: <20190215020855.176727-69-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190215020855.176727-1-sashal@kernel.org> References: <20190215020855.176727-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Falcon [ Upstream commit e95d22c69b2c130ccce257b84daf283fd82d611e ] The IBM virtual ethernet driver's polling function continues to process frames after rescheduling NAPI, resulting in a warning if it exhausted its budget. Do not restart polling after calling napi_reschedule. Instead let frames be processed in the following instance. Signed-off-by: Thomas Falcon Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/ibm/ibmveth.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c index 098d8764c0ea..dd71d5db7274 100644 --- a/drivers/net/ethernet/ibm/ibmveth.c +++ b/drivers/net/ethernet/ibm/ibmveth.c @@ -1313,7 +1313,6 @@ static int ibmveth_poll(struct napi_struct *napi, int budget) unsigned long lpar_rc; u16 mss = 0; -restart_poll: while (frames_processed < budget) { if (!ibmveth_rxq_pending_buffer(adapter)) break; @@ -1401,7 +1400,6 @@ static int ibmveth_poll(struct napi_struct *napi, int budget) napi_reschedule(napi)) { lpar_rc = h_vio_signal(adapter->vdev->unit_address, VIO_IRQ_DISABLE); - goto restart_poll; } } -- 2.19.1