Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp577237img; Fri, 22 Mar 2019 04:24:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqyv+3ct4ERSLZy5R6a6c58JPA3/nsfmZ7Oe+5adjaAzrCiyCOy7g9KWWDly9bmbbK6SnsU+ X-Received: by 2002:a17:902:9a09:: with SMTP id v9mr8794943plp.225.1553253860715; Fri, 22 Mar 2019 04:24:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553253860; cv=none; d=google.com; s=arc-20160816; b=pbTuc1CLghJ+mLs9/Igav+b1QIgOPbVv02fEmqRGKxdeg/21X/aBLpMUS7gj+WFS5s PGPOjRV9Ps6dyDwcrBq5BZ6upVYTACdhVV965F+ojgk3zJgr0ZQ0hghtIYj2gr0CU0FZ jMPxvwxKKTNSohGtWq+2kT78cSeolEj/0stDAxgjjGYeF4UjbXwTimFoFOiuwl1kwTaq GiN99xpWbN/PkqdsCLNUd0IEemznV1lxhW1MuT5ciA8jp7wYqFH/ND36rjNIuyS+dKwO CFDHRS7mrq1s3HF2bxEacwn29kQrhE1y+GZjOmxGIkUv9Q1YL3fSOrkdaLyzRpP7eMXE wjWQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FQFMRskNNET8qYksZ2S9Encucm9C7Y2voaiX64FdP7s=; b=Su6Axt7tqSetHKETbBhabEisgkEfna1JxDcvpIXQA3LfIJUf9c/fP04tq8FMxEpylD HjDLiIYCgktLD9tUlFZDRzyvCVGs9s+6urnRKAJA2B+0dmkXMhxZYp9ROkL28BF/lz9f ljixRddpB/JJcV727MM299hqy2dJY84pQ/6rYvajNTph7Wa6eS5JCe05a8iZ+b21pMzY uGSeoIT52zyvxklnMUMDJj/O0qLggj1ZpO4+N7GKLx/onciDCun4bOnEvjqry7qxmB6j 1w76/15Zmu9Mgrh5GKdVqCigosO4njl/W7QpdPdaUA1UNAhprrRWJgp97F9r3SodC1qV bFtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=W3SavU9J; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l4si5977770pgp.169.2019.03.22.04.24.01; Fri, 22 Mar 2019 04:24:20 -0700 (PDT) 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=W3SavU9J; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728561AbfCVLVR (ORCPT + 99 others); Fri, 22 Mar 2019 07:21:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:47730 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728126AbfCVLVP (ORCPT ); Fri, 22 Mar 2019 07:21:15 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 96C5C21917; Fri, 22 Mar 2019 11:21:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253675; bh=ULgt3+rjF2V4nYsdgFns8N/iZA+0Tif+SxWkczdh5XM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W3SavU9J8XNdEQUz8AFkmjl4vfB3KtWToNP23qpWhGTYKM5GBQcaJavUyS8P/WHQV gfa4xsavdDT8HfiaAmJ+5bD10a8e2s2xuFEmiQ7z+PoDm/kWhuQQUildHM8n0x5wSr ERx8ld9Y2E7F+N3l5dRm47vQMyYLMRvyp8PhqtbI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Falcon , "David S. Miller" , Sasha Levin Subject: [PATCH 3.18 037/134] ibmveth: Do not process frames after calling napi_reschedule Date: Fri, 22 Mar 2019 12:14:10 +0100 Message-Id: <20190322111212.432914255@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111210.465931067@linuxfoundation.org> References: <20190322111210.465931067@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ 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 427a6674d237b..f0301b1ff56cb 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