From: Stephen Hemminger <shemminger@linux-foundation.org>
To: David Miller <davem@davemloft.net>
Cc: joonwpark81@gmail.com, netdev@vger.kernel.org, jgarzik@pobox.com,
baum@tehutinetworks.net, andy@greyhouse.net
Subject: [RFT] tehuti: napi fix
Date: Wed, 12 Dec 2007 13:58:52 -0800 [thread overview]
Message-ID: <20071212135852.3369c820@freepuppy.rosehill> (raw)
In-Reply-To: <20071212.071832.07747779.davem@davemloft.net>
This should fix the tehuti napi fence post problems by getting
rid of priv->napi_stop, and setting weight to 32 (like other 10G).
Also, used the wierd entry/exit macro's like rest of driver.
--- a/drivers/net/tehuti.c 2007-11-13 22:19:14.000000000 -0800
+++ b/drivers/net/tehuti.c 2007-12-12 13:37:01.000000000 -0800
@@ -295,18 +295,12 @@ static int bdx_poll(struct napi_struct *
ENTER;
bdx_tx_cleanup(priv);
work_done = bdx_rx_receive(priv, &priv->rxd_fifo0, budget);
- if ((work_done < budget) ||
- (priv->napi_stop++ >= 30)) {
+ if (work_done < budget) {
DBG("rx poll is done. backing to isr-driven\n");
-
- /* from time to time we exit to let NAPI layer release
- * device lock and allow waiting tasks (eg rmmod) to advance) */
- priv->napi_stop = 0;
-
netif_rx_complete(dev, napi);
bdx_enable_interrupts(priv);
}
- return work_done;
+ RET(work_done);
}
/* bdx_fw_load - loads firmware to NIC
@@ -2022,7 +2016,7 @@ bdx_probe(struct pci_dev *pdev, const st
priv->nic = nic;
priv->msg_enable = BDX_DEF_MSG_ENABLE;
- netif_napi_add(ndev, &priv->napi, bdx_poll, 64);
+ netif_napi_add(ndev, &priv->napi, bdx_poll, 32);
if ((readl(nic->regs + FPGA_VER) & 0xFFF) == 308) {
DBG("HW statistics not supported\n");
--- a/drivers/net/tehuti.h 2007-10-16 16:48:17.000000000 -0700
+++ b/drivers/net/tehuti.h 2007-12-12 13:25:25.000000000 -0800
@@ -257,7 +257,6 @@ struct bdx_priv {
struct rxd_fifo rxd_fifo0;
struct rxf_fifo rxf_fifo0;
struct rxdb *rxdb; /* rx dbs to store skb pointers */
- int napi_stop;
struct vlan_group *vlgrp;
/* Tx FIFOs: 1 for data desc, 1 for empty (acks) desc */
next prev parent reply other threads:[~2007-12-12 22:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-12 4:01 [PATCH 6/7] : tehuti Fix possible causing oops of net_rx_action Joonwoo Park
2007-12-12 5:39 ` Stephen Hemminger
2007-12-12 5:46 ` [RFC] net: napi fix Stephen Hemminger
2007-12-12 6:05 ` Joonwoo Park
2007-12-12 15:22 ` David Miller
2007-12-12 15:21 ` David Miller
2007-12-12 5:48 ` [PATCH 6/7] : tehuti Fix possible causing oops of net_rx_action Joonwoo Park
2007-12-12 5:53 ` Stephen Hemminger
2007-12-12 15:20 ` [PATCH 6/7] [NETDEV]: " David Miller
2007-12-12 16:36 ` Stephen Hemminger
2007-12-12 15:18 ` [PATCH 6/7] : " David Miller
2007-12-12 21:58 ` Stephen Hemminger [this message]
2007-12-16 21:38 ` [RFT] tehuti: napi fix David Miller
2007-12-17 20:18 ` Stephen Hemminger
2007-12-13 7:07 ` [PATCH 6/7] : tehuti Fix possible causing oops of net_rx_action Joonwoo Park
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=20071212135852.3369c820@freepuppy.rosehill \
--to=shemminger@linux-foundation.org \
--cc=andy@greyhouse.net \
--cc=baum@tehutinetworks.net \
--cc=davem@davemloft.net \
--cc=jgarzik@pobox.com \
--cc=joonwpark81@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