netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Dumazet <edumazet@google.com>
To: "David S . Miller" <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>,
	Eric Dumazet <edumazet@google.com>,
	Eric Dumazet <eric.dumazet@gmail.com>
Subject: [PATCH net-next 1/9] 8139too: use napi_complete_done()
Date: Sat,  4 Feb 2017 10:20:30 -0800	[thread overview]
Message-ID: <20170204182038.3752-2-edumazet@google.com> (raw)
In-Reply-To: <20170204182038.3752-1-edumazet@google.com>

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.

Signed-off-by: Eric Dumazet <edumazet@google.com>
---
 drivers/net/ethernet/realtek/8139too.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
index 5ad59c6d29a46a036a6b1d70e77ae288d9fe..60e8e86d5f1317029c372b137bf96f6680b3 100644
--- a/drivers/net/ethernet/realtek/8139too.c
+++ b/drivers/net/ethernet/realtek/8139too.c
@@ -2136,15 +2136,13 @@ static int rtl8139_poll(struct napi_struct *napi, int budget)
 		work_done += rtl8139_rx(dev, tp, budget);
 
 	if (work_done < budget) {
-		unsigned long flags;
-		/*
-		 * Order is important since data can get interrupted
-		 * again when we think we are done.
-		 */
-		spin_lock_irqsave(&tp->lock, flags);
-		__napi_complete(napi);
-		RTL_W16_F(IntrMask, rtl8139_intr_mask);
-		spin_unlock_irqrestore(&tp->lock, flags);
+		if (napi_complete_done(napi, work_done)) {
+			unsigned long flags;
+
+			spin_lock_irqsave(&tp->lock, flags);
+			RTL_W16_F(IntrMask, rtl8139_intr_mask);
+			spin_unlock_irqrestore(&tp->lock, flags);
+		}
 	}
 	spin_unlock(&tp->rx_lock);
 
-- 
2.11.0.483.g087da7b7c-goog

  reply	other threads:[~2017-02-04 18:20 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-04 18:20 [PATCH net-next 0/9] net: get rid of most __napi_complete() usages Eric Dumazet
2017-02-04 18:20 ` Eric Dumazet [this message]
2017-02-04 18:20 ` [PATCH net-next 2/9] 8139cp: use napi_complete_done() Eric Dumazet
2017-02-04 18:20 ` [PATCH net-next 3/9] epic100: " Eric Dumazet
2017-02-04 18:20 ` [PATCH net-next 4/9] amd8111e: add GRO support Eric Dumazet
2017-02-04 18:20 ` [PATCH net-next 5/9] pcnet32: use napi_complete_done() Eric Dumazet
2017-02-04 18:20 ` [PATCH net-next 6/9] ep93xx_eth: add GRO support Eric Dumazet
2017-02-04 20:47   ` kbuild test robot
2017-02-04 18:20 ` [PATCH net-next 7/9] skge: use napi_complete_done() Eric Dumazet
2017-02-04 21:44   ` Stephen Hemminger
2017-02-04 22:16     ` Eric Dumazet
2017-02-04 18:20 ` [PATCH net-next 8/9] ks8695net: add GRO support Eric Dumazet
2017-02-04 18:20 ` [PATCH net-next 9/9] qla3xxx: " Eric Dumazet
2017-02-04 22:17 ` [PATCH net-next 0/9] net: get rid of most __napi_complete() usages Eric Dumazet

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170204182038.3752-2-edumazet@google.com \
    --to=edumazet@google.com \
    --cc=davem@davemloft.net \
    --cc=eric.dumazet@gmail.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).