From patchwork Sat Feb 4 23:24:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 724166 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vG8wv33Dkz9s1y for ; Sun, 5 Feb 2017 10:25:35 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="PhWBw1vt"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751812AbdBDXZ3 (ORCPT ); Sat, 4 Feb 2017 18:25:29 -0500 Received: from mail-pf0-f182.google.com ([209.85.192.182]:33312 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751785AbdBDXZX (ORCPT ); Sat, 4 Feb 2017 18:25:23 -0500 Received: by mail-pf0-f182.google.com with SMTP id y143so14439984pfb.0 for ; Sat, 04 Feb 2017 15:25:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=l68yNlxGGSROm6pJQBZS1KiBf+dK4WzveDRULfA9vu0=; b=PhWBw1vtoKtAYFpdRvkmrGvwwQ42AikzaxFilX0n33Itr2k0g4G+TsOu4/1iLPwYzz xu5HJs6DwXMGnelg2c+kJ9sM9Xiv6Ipj3NKPKk6NA3K4GrUUO61ILe8S2FcmVaVU8Xh9 TiJI3Pbk+JSRkYvq0/BWCRvki/uKuw4hXNoyuTAkkNt4dDSEdLYI2VqTils699RsdFcM 6StYAWaeLSgpdyLhtsKnHe7GCLLbtbZ9Xq9ZBd+ZjIceKPNgU3fLgl/W04WNbNLB4jww GrHMJ462V52gaf24F3DDg8dtUyy78H/+kntUm9R7+z8ZW5v8Ef4L0HD4FGo+LXcFwY0Z wzQQ== 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=l68yNlxGGSROm6pJQBZS1KiBf+dK4WzveDRULfA9vu0=; b=qPqQ8V3jkiWa9SjnlyKc3C4mk5nMtmNCrhLPtQb15Q0yHxgrXt78BSJoNhH/ULSbwI dJF35P+tpdHEK5T+kNUVTUiinmLKs58j/TM0Y2sxUh2BMOw282ymq9fvXuUaPnaOdFZU kWD+GUMDJvED4WlfTv6B8ocQi9u2MaANaBg9Wbp26rPe1IizIMJ/HBpBH106tkHWQsGt TP7FtmGW4CGVnm0xIPdsbyBq9Rv84fxT4gB2gmqRRqothcv4FZ8hSaYLg9WBgfToFHS+ xTBm33s/35R4rxEuZPUDMmjd+53OqP3UqA9s5r7riGsut9aDLqZI+oqRi5SEFIx8RE5X mO9g== X-Gm-Message-State: AIkVDXKB9ED/jnLe8+8NgPN1UjrNa+Xp5h9LeFkjqgn1MZn4u3nov99dbHrjmHYbBzEsbEQ5 X-Received: by 10.98.252.203 with SMTP id e194mr5088707pfh.8.1486250722469; Sat, 04 Feb 2017 15:25:22 -0800 (PST) Received: from localhost ([2620:0:1000:3012:d537:7fd4:76bd:9074]) by smtp.gmail.com with ESMTPSA id s8sm77597553pfj.30.2017.02.04.15.25.21 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Sat, 04 Feb 2017 15:25:21 -0800 (PST) From: Eric Dumazet To: "David S . Miller" Cc: netdev , Eric Dumazet , Eric Dumazet Subject: [PATCH v2 net-next 07/12] skge: use napi_complete_done() Date: Sat, 4 Feb 2017 15:24:57 -0800 Message-Id: <20170204232502.22361-8-edumazet@google.com> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog In-Reply-To: <20170204232502.22361-1-edumazet@google.com> References: <20170204232502.22361-1-edumazet@google.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use napi_complete_done() instead of __napi_complete() to : 1) Get support of gro_flush_timeout if opt-in 2) Not rearm interrupts for busy-polling users. 3) use standard NAPI API and get rid of napi_gro_flush() Signed-off-by: Eric Dumazet --- drivers/net/ethernet/marvell/skge.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c index 81106b73e468b3d542fbbef94503278103c7..edb95271a4f2f784d740b3201364a5e45de1 100644 --- a/drivers/net/ethernet/marvell/skge.c +++ b/drivers/net/ethernet/marvell/skge.c @@ -3201,7 +3201,7 @@ static void skge_tx_done(struct net_device *dev) } } -static int skge_poll(struct napi_struct *napi, int to_do) +static int skge_poll(struct napi_struct *napi, int budget) { struct skge_port *skge = container_of(napi, struct skge_port, napi); struct net_device *dev = skge->netdev; @@ -3214,7 +3214,7 @@ static int skge_poll(struct napi_struct *napi, int to_do) skge_write8(hw, Q_ADDR(rxqaddr[skge->port], Q_CSR), CSR_IRQ_CL_F); - for (e = ring->to_clean; prefetch(e->next), work_done < to_do; e = e->next) { + for (e = ring->to_clean; prefetch(e->next), work_done < budget; e = e->next) { struct skge_rx_desc *rd = e->desc; struct sk_buff *skb; u32 control; @@ -3236,12 +3236,10 @@ static int skge_poll(struct napi_struct *napi, int to_do) wmb(); skge_write8(hw, Q_ADDR(rxqaddr[skge->port], Q_CSR), CSR_START); - if (work_done < to_do) { + if (work_done < budget && napi_complete_done(napi, work_done)) { unsigned long flags; - napi_gro_flush(napi, false); spin_lock_irqsave(&hw->hw_lock, flags); - __napi_complete(napi); hw->intr_mask |= napimask[skge->port]; skge_write32(hw, B0_IMSK, hw->intr_mask); skge_read32(hw, B0_IMSK);