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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 AD1C2C43381 for ; Fri, 15 Feb 2019 02:36:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7DFDB21927 for ; Fri, 15 Feb 2019 02:36:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550198173; bh=cZRdN/ElhOl0M7rved4UQFSybSToDCkYh2xwqG9NltI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jxlf0SDGWLtv9jzA49RqpambI/Nl4Azt0p80+efxVYLguPZdiJPkhw0moE/gyCNlY bLIvlvvq9O/CP5hhW6FMkPxzKZBP4Dzi+u7fNZ2m23LMM4dSvFQQakHFNfgWaKbxG3 Dqkhg2CbB69lb1B9sPOBDtHUn3HFr0iOe8/Tl2Ew= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388066AbfBOCgI (ORCPT ); Thu, 14 Feb 2019 21:36:08 -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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@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