| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 19 May 2009 17:40:58 +0530
From: Ajit Khaparde <ajitk@...verengines.com>
To: David Miller <davem@...emloft.net>
Cc: netdev <netdev@...r.kernel.org>
Subject: [net-next-2.6 PATCH][be2net] remove napi in the tx path and do tx
completion processing in interrupt context
Hi,
This patch will remove napi in tx path and do Tx compleiton processing in
interrupt context. This makes Tx completion processing simpler without loss of
performance.
Thanks
Ajit
Signed-off-by: Ajit Khaparde <ajitk@...verengines.com>
---
drivers/net/benet/be.h | 3 +-
drivers/net/benet/be_main.c | 114 ++++++++++++++++++++++---------------------
2 files changed, 60 insertions(+), 57 deletions(-)
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h
index b4bb06f..6d149a4 100644
--- a/drivers/net/benet/be.h
+++ b/drivers/net/benet/be.h
@@ -159,8 +159,6 @@ struct be_eq_obj {
u16 min_eqd; /* in usecs */
u16 max_eqd; /* in usecs */
u16 cur_eqd; /* in usecs */
-
- struct napi_struct napi;
};
struct be_tx_obj {
@@ -179,6 +177,7 @@ struct be_rx_page_info {
};
struct be_rx_obj {
+ struct napi_struct napi;
struct be_queue_info q;
struct be_queue_info cq;
struct be_rx_page_info page_info_tbl[RX_Q_LEN];
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index ae2f6b5..640337c 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -991,7 +991,7 @@ static void be_tx_compl_process(struct be_adapter *adapter, u16 last_index)
atomic_sub(num_wrbs, &txq->used);
- kfree_skb(sent_skb);
+ dev_kfree_skb_any(sent_skb);
}
static void be_rx_q_clean(struct be_adapter *adapter)
@@ -1216,20 +1216,66 @@ static int event_handle(struct be_ctrl_info *ctrl,
/* We can see an interrupt and no event */
be_eq_notify(ctrl, eq_obj->q.id, true, true, num);
- if (num)
- napi_schedule(&eq_obj->napi);
return num;
}
+static int rx_event_handle(struct be_adapter *adapter)
+{
+ int evts;
+
+ evts = event_handle(&adapter->ctrl, &adapter->rx_eq);
+ if (evts)
+ napi_schedule(&adapter->rx_obj.napi);
+
+ return evts;
+}
+
+static int tx_event_handle(struct be_adapter *adapter)
+{
+ struct be_tx_obj *tx_obj = &adapter->tx_obj;
+ struct be_queue_info *tx_cq = &tx_obj->cq;
+ struct be_queue_info *txq = &tx_obj->q;
+ struct be_eth_tx_compl *txcp;
+ u32 num_cmpl = 0;
+ u16 end_idx;
+ int evts;
+
+ evts = event_handle(&adapter->ctrl, &adapter->tx_eq);
+ if (!evts)
+ goto done;
+
+ while ((txcp = be_tx_compl_get(adapter))) {
+ end_idx = AMAP_GET_BITS(struct amap_eth_tx_compl,
+ wrb_index, txcp);
+ be_tx_compl_process(adapter, end_idx);
+ num_cmpl++;
+ }
+
+ /* As Tx wrbs have been freed up, wake up netdev queue if
+ * it was stopped due to lack of tx wrbs.
+ */
+ if (netif_queue_stopped(adapter->netdev) &&
+ atomic_read(&txq->used) < txq->len / 2) {
+ netif_wake_queue(adapter->netdev);
+ }
+
+ be_cq_notify(&adapter->ctrl, tx_cq->id, true, num_cmpl);
+
+ drvr_stats(adapter)->be_tx_events++;
+ drvr_stats(adapter)->be_tx_compl += num_cmpl;
+
+done:
+ return evts;
+}
+
static irqreturn_t be_intx(int irq, void *dev)
{
struct be_adapter *adapter = dev;
- struct be_ctrl_info *ctrl = &adapter->ctrl;
int rx, tx;
- tx = event_handle(ctrl, &adapter->tx_eq);
- rx = event_handle(ctrl, &adapter->rx_eq);
+ rx = rx_event_handle(adapter);
+ tx = tx_event_handle(adapter);
if (rx || tx)
return IRQ_HANDLED;
@@ -1241,7 +1287,7 @@ static irqreturn_t be_msix_rx(int irq, void *dev)
{
struct be_adapter *adapter = dev;
- event_handle(&adapter->ctrl, &adapter->rx_eq);
+ rx_event_handle(adapter);
return IRQ_HANDLED;
}
@@ -1250,7 +1296,7 @@ static irqreturn_t be_msix_tx(int irq, void *dev)
{
struct be_adapter *adapter = dev;
- event_handle(&adapter->ctrl, &adapter->tx_eq);
+ tx_event_handle(adapter);
return IRQ_HANDLED;
}
@@ -1270,9 +1316,9 @@ static inline bool do_lro(struct be_adapter *adapter,
int be_poll_rx(struct napi_struct *napi, int budget)
{
- struct be_eq_obj *rx_eq = container_of(napi, struct be_eq_obj, napi);
+ struct be_rx_obj *rx_obj = container_of(napi, struct be_rx_obj, napi);
struct be_adapter *adapter =
- container_of(rx_eq, struct be_adapter, rx_eq);
+ container_of(rx_obj, struct be_adapter, rx_obj);
struct be_queue_info *rx_cq = &adapter->rx_obj.cq;
struct be_eth_rx_compl *rxcp;
u32 work_done;
@@ -1305,44 +1351,6 @@ int be_poll_rx(struct napi_struct *napi, int budget)
return work_done;
}
-/* For TX we don't honour budget; consume everything */
-int be_poll_tx(struct napi_struct *napi, int budget)
-{
- struct be_eq_obj *tx_eq = container_of(napi, struct be_eq_obj, napi);
- struct be_adapter *adapter =
- container_of(tx_eq, struct be_adapter, tx_eq);
- struct be_tx_obj *tx_obj = &adapter->tx_obj;
- struct be_queue_info *tx_cq = &tx_obj->cq;
- struct be_queue_info *txq = &tx_obj->q;
- struct be_eth_tx_compl *txcp;
- u32 num_cmpl = 0;
- u16 end_idx;
-
- while ((txcp = be_tx_compl_get(adapter))) {
- end_idx = AMAP_GET_BITS(struct amap_eth_tx_compl,
- wrb_index, txcp);
- be_tx_compl_process(adapter, end_idx);
- num_cmpl++;
- }
-
- /* As Tx wrbs have been freed up, wake up netdev queue if
- * it was stopped due to lack of tx wrbs.
- */
- if (netif_queue_stopped(adapter->netdev) &&
- atomic_read(&txq->used) < txq->len / 2) {
- netif_wake_queue(adapter->netdev);
- }
-
- napi_complete(napi);
-
- be_cq_notify(&adapter->ctrl, tx_cq->id, true, num_cmpl);
-
- drvr_stats(adapter)->be_tx_events++;
- drvr_stats(adapter)->be_tx_compl += num_cmpl;
-
- return 1;
-}
-
static void be_worker(struct work_struct *work)
{
struct be_adapter *adapter =
@@ -1505,8 +1513,7 @@ static int be_open(struct net_device *netdev)
/* First time posting */
be_post_rx_frags(adapter);
- napi_enable(&rx_eq->napi);
- napi_enable(&tx_eq->napi);
+ napi_enable(&adapter->rx_obj.napi);
be_irq_register(adapter);
@@ -1559,8 +1566,7 @@ static int be_close(struct net_device *netdev)
}
be_irq_unregister(adapter);
- napi_disable(&rx_eq->napi);
- napi_disable(&tx_eq->napi);
+ napi_disable(&adapter->rx_obj.napi);
be_rx_queues_destroy(adapter);
be_tx_queues_destroy(adapter);
@@ -1652,9 +1658,7 @@ static void be_netdev_init(struct net_device *netdev)
be_lro_init(adapter, netdev);
- netif_napi_add(netdev, &adapter->rx_eq.napi, be_poll_rx,
- BE_NAPI_WEIGHT);
- netif_napi_add(netdev, &adapter->tx_eq.napi, be_poll_tx,
+ netif_napi_add(netdev, &adapter->rx_obj.napi, be_poll_rx,
BE_NAPI_WEIGHT);
netif_carrier_off(netdev);
--
1.5.4.3
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists