netdev - Re: [PATCH net-next 5/5] net: sh

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1339480115.22704.20.camel@edumazet-glaptop>
Date:	Tue, 12 Jun 2012 07:48:35 +0200
From:	Eric Dumazet <eric.dumazet@...il.com>
To:	"Shimoda, Yoshihiro" <yoshihiro.shimoda.uh@...esas.com>
Cc:	netdev <netdev@...r.kernel.org>,
	SH-Linux <linux-sh@...r.kernel.org>
Subject: Re: [PATCH net-next 5/5] net: sh_eth: use NAPI

On Tue, 2012-06-12 at 14:19 +0900, Shimoda, Yoshihiro wrote:
> This patch modifies the driver to use NAPI.
> 

...

> +static int sh_eth_poll(struct napi_struct *napi, int budget)
> +{
> +	struct sh_eth_private *mdp = container_of(napi, struct sh_eth_private,
> +						  napi);
> +	struct net_device *ndev = mdp->ndev;
> +	struct sh_eth_cpu_data *cd = mdp->cd;
> +	int work_done = 0, txfree_num;
> +	u32 intr_status = sh_eth_read(ndev, EESR);
> +
> +	/* Clear interrupt flags */
> +	sh_eth_write(ndev, intr_status, EESR);
> +
> +	/* check txdesc */
> +	txfree_num = sh_eth_txfree(ndev);
> +	if (txfree_num) {
> +		netif_tx_lock(ndev);
> +		if (netif_queue_stopped(ndev))
> +			netif_wake_queue(ndev);
> +		netif_tx_unlock(ndev);
>  	}

...

> @@ -1678,19 +1707,6 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
>  	struct sh_eth_private *mdp = netdev_priv(ndev);
>  	struct sh_eth_txdesc *txdesc;
>  	u32 entry;
> -	unsigned long flags;
> -
> -	spin_lock_irqsave(&mdp->lock, flags);
> -	if ((mdp->cur_tx - mdp->dirty_tx) >= (mdp->num_tx_ring - 4)) {
> -		if (!sh_eth_txfree(ndev)) {
> -			if (netif_msg_tx_queued(mdp))
> -				dev_warn(&ndev->dev, "TxFD exhausted.\n");
> -			netif_stop_queue(ndev);
> -			spin_unlock_irqrestore(&mdp->lock, flags);
> -			return NETDEV_TX_BUSY;
> -		}
> -	}
> -	spin_unlock_irqrestore(&mdp->lock, flags);
> 
>  	entry = mdp->cur_tx % mdp->num_tx_ring;
>  	mdp->tx_skbuff[entry] = skb;
> @@ -1716,6 +1732,13 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
>  	if (!(sh_eth_read(ndev, EDTRR) & sh_eth_get_edtrr_trns(mdp)))
>  		sh_eth_write(ndev, sh_eth_get_edtrr_trns(mdp), EDTRR);
> 
> +	if ((mdp->cur_tx - mdp->dirty_tx) >= (mdp->num_tx_ring - 4)) {
> +		if (netif_msg_tx_queued(mdp)) {
> +			dev_warn(&ndev->dev, "TxFD exhausted.\n");
> +			netif_stop_queue(ndev);
> +		}
> +	}
> +
>  	return NETDEV_TX_OK;
>  }


I have no idea why you call netif_stop_queue() only if
netif_msg_tx_queued(mdp)

You should test your driver under heavy TX load.



--
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