From: Eric Dumazet <dada1@cosmosbay•com>
To: joakim.tjernlund@transmode•se
Cc: Netdev <netdev@vger•kernel.org>,
leoli@freescale•com,
'linuxppc-dev Development' <linuxppc-dev@ozlabs•org>
Subject: Re: [PATCH] ucc_geth: Move freeing of TX packets to NAPI context.
Date: Wed, 25 Mar 2009 15:04:26 +0100 [thread overview]
Message-ID: <49CA39EA.6020208@cosmosbay.com> (raw)
In-Reply-To: <1237987849.2194.9.camel@gentoo-jocke.transmode.se>
Joakim Tjernlund a =E9crit :
>>From 1c2f23b1f37f4818c0fd0217b93eb38ab6564840 Mon Sep 17 00:00:00 2001
> From: Joakim Tjernlund <Joakim.Tjernlund@transmode•se>
> Date: Tue, 24 Mar 2009 10:19:27 +0100
> Subject: [PATCH] ucc_geth: Move freeing of TX packets to NAPI context.
> Also increase NAPI weight somewhat.
> This will make the system alot more responsive while
> ping flooding the ucc_geth ethernet interaface.
>=20
>=20
> Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode•se>
> ---
> drivers/net/ucc_geth.c | 30 +++++++++++-------------------
> drivers/net/ucc_geth.h | 2 +-
> 2 files changed, 12 insertions(+), 20 deletions(-)
>=20
> diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
> index 097aed8..7d5d110 100644
> --- a/drivers/net/ucc_geth.c
> +++ b/drivers/net/ucc_geth.c
> @@ -3214,7 +3214,7 @@ static int ucc_geth_tx(struct net_device *dev, u8=
txQ)
> dev->stats.tx_packets++;
> =20
> /* Free the sk buffer associated with this TxBD */
> - dev_kfree_skb_irq(ugeth->
> + dev_kfree_skb(ugeth->
> tx_skbuff[txQ][ugeth->skb_dirtytx[txQ]]);
> ugeth->tx_skbuff[txQ][ugeth->skb_dirtytx[txQ]] =3D NULL;
> ugeth->skb_dirtytx[txQ] =3D
> @@ -3248,9 +3248,16 @@ static int ucc_geth_poll(struct napi_struct *nap=
i, int budget)
> for (i =3D 0; i < ug_info->numQueuesRx; i++)
> howmany +=3D ucc_geth_rx(ugeth, i, budget - howmany);
> =20
Cant you test (ucce & UCCE_TX_EVENTS) or something here to avoid
taking lock and checking queues if not necessary ?
> + /* Tx event processing */
> + spin_lock(&ugeth->lock);
> + for (i =3D 0; i < ug_info->numQueuesTx; i++) {
> + ucc_geth_tx(ugeth->dev, i);
> + }
> + spin_unlock(&ugeth->lock);
> +
Why tx completions dont change "howmany" ?
It seems strange you changed UCC_GETH_DEV_WEIGHT if not taking into accou=
nt tx event above...
> if (howmany < budget) {
> netif_rx_complete(napi);
> - setbits32(ugeth->uccf->p_uccm, UCCE_RX_EVENTS);
> + setbits32(ugeth->uccf->p_uccm, UCCE_RX_EVENTS | UCCE_TX_EVENTS);
> }
> =20
> return howmany;
> @@ -3264,8 +3271,6 @@ static irqreturn_t ucc_geth_irq_handler(int irq, =
void *info)
> struct ucc_geth_info *ug_info;
> register u32 ucce;
> register u32 uccm;
> - register u32 tx_mask;
> - u8 i;
> =20
> ugeth_vdbg("%s: IN", __func__);
> =20
> @@ -3279,27 +3284,14 @@ static irqreturn_t ucc_geth_irq_handler(int irq=
, void *info)
> out_be32(uccf->p_ucce, ucce);
> =20
> /* check for receive events that require processing */
> - if (ucce & UCCE_RX_EVENTS) {
> + if (ucce & (UCCE_RX_EVENTS | UCCE_TX_EVENTS)) {
> if (netif_rx_schedule_prep(&ugeth->napi)) {
> - uccm &=3D ~UCCE_RX_EVENTS;
> + uccm &=3D ~(UCCE_RX_EVENTS | UCCE_TX_EVENTS);
> out_be32(uccf->p_uccm, uccm);
> __netif_rx_schedule(&ugeth->napi);
> }
> }
> =20
> - /* Tx event processing */
> - if (ucce & UCCE_TX_EVENTS) {
> - spin_lock(&ugeth->lock);
> - tx_mask =3D UCC_GETH_UCCE_TXB0;
> - for (i =3D 0; i < ug_info->numQueuesTx; i++) {
> - if (ucce & tx_mask)
> - ucc_geth_tx(dev, i);
> - ucce &=3D ~tx_mask;
> - tx_mask <<=3D 1;
> - }
> - spin_unlock(&ugeth->lock);
> - }
> -
> /* Errors and other events */
> if (ucce & UCCE_OTHER) {
> if (ucce & UCC_GETH_UCCE_BSY)
> diff --git a/drivers/net/ucc_geth.h b/drivers/net/ucc_geth.h
> index 44218b8..ea30aa7 100644
> --- a/drivers/net/ucc_geth.h
> +++ b/drivers/net/ucc_geth.h
> @@ -843,7 +843,7 @@ struct ucc_geth_hardware_statistics {
> /* Driver definitions */
> #define TX_BD_RING_LEN 0x10
> #define RX_BD_RING_LEN 0x10
> -#define UCC_GETH_DEV_WEIGHT TX_BD_RING_LEN
> +#define UCC_GETH_DEV_WEIGHT (RX_BD_RING_LEN+TX_BD_=
RING_LEN/2)
> =20
> #define TX_RING_MOD_MASK(size) (size-1)
> #define RX_RING_MOD_MASK(size) (size-1)
next prev parent reply other threads:[~2009-03-25 14:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-25 13:30 [PATCH] ucc_geth: Move freeing of TX packets to NAPI context Joakim Tjernlund
2009-03-25 14:04 ` Eric Dumazet [this message]
2009-03-25 15:16 ` Joakim Tjernlund
2009-03-25 21:42 ` David Miller
2009-03-25 21:40 ` David Miller
2009-03-25 21:55 ` Joakim Tjernlund
2009-03-25 14:25 ` Anton Vorontsov
2009-03-25 15:21 ` Joakim Tjernlund
2009-03-25 17:51 ` Joakim Tjernlund
2009-03-30 8:34 ` Li Yang
2009-03-30 9:21 ` Joakim Tjernlund
2009-03-30 9:36 ` Li Yang
2009-03-30 10:01 ` Joakim Tjernlund
2009-03-30 10:24 ` Li Yang
2009-03-30 20:36 ` David Miller
2009-03-25 21:39 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2009-04-17 22:03 Anton Vorontsov
2009-04-21 9:07 ` David Miller
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=49CA39EA.6020208@cosmosbay.com \
--to=dada1@cosmosbay$(echo .)com \
--cc=joakim.tjernlund@transmode$(echo .)se \
--cc=leoli@freescale$(echo .)com \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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