Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp199655imj; Thu, 14 Feb 2019 18:31:53 -0800 (PST) X-Google-Smtp-Source: AHgI3IbhJprCHT46CDH1k2DXYZF8VHDlzLEX35Z5cFa7RDa6MlX6oua2ERzo0wbyy2BnfhiKQFz4 X-Received: by 2002:a17:902:a03:: with SMTP id 3mr7722291plo.112.1550197913796; Thu, 14 Feb 2019 18:31:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550197913; cv=none; d=google.com; s=arc-20160816; b=D0oVvZWdiSZ1hXPkFNE5jIsJgOkCm1xrzBIIqDsbTpn7uLDn63KWtIsmnEh53wvhGr yBqeuxJjSeXBuK0f73BXma6GIRzU2Um8YPvq7S5k8x0WowKYKxD0Oxw9pJIzJKcCX10t gHhlb55YBT+5RcPCJjKyywif/qUl40YhgHikj/FMpVyKoEi3q5E6ognLJjbhrkJvELRw bmGFbbfXPuXCDZ3MQ7TJKE9+F3JqAp8rtWccGAEWE31p9DbHlrlIn/JZqOgYiygAgWM4 CYUMQhQ/dtxDlGZv4NYKp9I+ZqUNCTJtSakuBO02ei1QyC35PTibdj7oy6wzY+3+oeBf 3rag== 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=s/p6TsW4EyXpSoExH0P4MWFzomNg4FDCG/JGGQHNvIg=; b=Bb7lnKnG2W4xOr1lVqfAsbUa7zBzLFN8d2caeWI2scPVXRvSWDyLgBulDGSvfLEm6z t87UNEm5uLWVH+OFLrcx+eQbTE6zKocxCc8v0OZhktTgbOYCuX0Qki87EimPQaUtIW9w DKb+v1hkqXkQSbqyn7aopmEJSOSJQQt6Yu42VeZXl482yXieXzzpRy9Agm8WXRVYzSiD iHLCB86rqujClHyj+WHAZ9by8GTK7iD7TKQA9bsDdEUWI/LExaPWg8RTYJaiSTogWE04 TWWPM4MadeKArtYMJ0hLVqfh7HYiuuUIJx4godwgHPPzvv1mikAvTS96InceV+/mglrf NWPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fEpaLMit; 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 j22si3949183pfi.252.2019.02.14.18.31.37; Thu, 14 Feb 2019 18:31:53 -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=fEpaLMit; 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 S2391743AbfBOCQN (ORCPT + 99 others); Thu, 14 Feb 2019 21:16:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:55600 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392168AbfBOCQH (ORCPT ); Thu, 14 Feb 2019 21:16:07 -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 B57A020643; Fri, 15 Feb 2019 02:16:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550196966; bh=nKYasqKiRsdSyQooPd5Ac+SCy7UedpcIlQ3U9S7npvg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fEpaLMitrhAfft4++h2wurD1jY5a8lcg60pEm+gMBr/X1BdpuR7jvuQkbRGV50bsz CKaaNC71QkFBXPNqR03xUANgmalinzF0sIYY3bxQ2hJA85qEdhtqcFnzgeLuTOI7sV vzvOnOgVKI35bje0SDfMqNcaH0tYsyio4pkA6uFI= 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 3.18 13/16] ibmveth: Do not process frames after calling napi_reschedule Date: Thu, 14 Feb 2019 21:15:43 -0500 Message-Id: <20190215021546.179605-13-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190215021546.179605-1-sashal@kernel.org> References: <20190215021546.179605-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 427a6674d237..f0301b1ff56c 100644 --- a/drivers/net/ethernet/ibm/ibmveth.c +++ b/drivers/net/ethernet/ibm/ibmveth.c @@ -1085,7 +1085,6 @@ static int ibmveth_poll(struct napi_struct *napi, int budget) int frames_processed = 0; unsigned long lpar_rc; -restart_poll: while (frames_processed < budget) { if (!ibmveth_rxq_pending_buffer(adapter)) break; @@ -1154,7 +1153,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