netdev - Re: [PATCH next] r8169: add support for Byte Queue Limits

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]

Date:	Mon, 29 Sep 2014 14:05:18 -0700
From:	Tom Herbert <therbert@...gle.com>
To:	Florian Westphal <fw@...len.de>
Cc:	Linux Netdev List <netdev@...r.kernel.org>,
	Francois Romieu <romieu@...zoreil.com>,
	Hayes Wang <hayeswang@...ltek.com>
Subject: Re: [PATCH next] r8169: add support for Byte Queue Limits

Hi Florian,

Thanks for doing this! Can you add a little description in commit log
on test results, something that would indicate accounting is correct.

Thanks,
Tom


On Mon, Sep 29, 2014 at 1:56 PM, Florian Westphal <fw@...len.de> wrote:
> tested on RTL8168d/8111d.
>
> Cc: Francois Romieu <romieu@...zoreil.com>
> Cc: Hayes Wang <hayeswang@...ltek.com>
> Signed-off-by: Florian Westphal <fw@...len.de>
> ---
>  drivers/net/ethernet/realtek/r8169.c | 18 ++++++++++++++----
>  1 file changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
> index 1d81238..73c6ad1 100644
> --- a/drivers/net/ethernet/realtek/r8169.c
> +++ b/drivers/net/ethernet/realtek/r8169.c
> @@ -4712,6 +4712,8 @@ static void rtl_hw_reset(struct rtl8169_private *tp)
>         RTL_W8(ChipCmd, CmdReset);
>
>         rtl_udelay_loop_wait_low(tp, &rtl_chipcmd_cond, 100, 100);
> +
> +       netdev_reset_queue(tp->dev);
>  }
>
>  static void rtl_request_uncached_firmware(struct rtl8169_private *tp)
> @@ -6592,6 +6594,8 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
>
>         txd->opts2 = cpu_to_le32(opts[1]);
>
> +       netdev_sent_queue(dev, skb->len);
> +
>         skb_tx_timestamp(skb);
>
>         wmb();
> @@ -6691,6 +6695,7 @@ static void rtl8169_pcierr_interrupt(struct net_device *dev)
>  static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp)
>  {
>         unsigned int dirty_tx, tx_left;
> +       unsigned bytes_compl = 0, pkts_compl = 0;
>
>         dirty_tx = tp->dirty_tx;
>         smp_rmb();
> @@ -6709,10 +6714,8 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp)
>                 rtl8169_unmap_tx_skb(&tp->pci_dev->dev, tx_skb,
>                                      tp->TxDescArray + entry);
>                 if (status & LastFrag) {
> -                       u64_stats_update_begin(&tp->tx_stats.syncp);
> -                       tp->tx_stats.packets++;
> -                       tp->tx_stats.bytes += tx_skb->skb->len;
> -                       u64_stats_update_end(&tp->tx_stats.syncp);
> +                       pkts_compl++;
> +                       bytes_compl += tx_skb->skb->len;
>                         dev_kfree_skb_any(tx_skb->skb);
>                         tx_skb->skb = NULL;
>                 }
> @@ -6721,6 +6724,13 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp)
>         }
>
>         if (tp->dirty_tx != dirty_tx) {
> +               netdev_completed_queue(tp->dev, pkts_compl, bytes_compl);
> +
> +               u64_stats_update_begin(&tp->tx_stats.syncp);
> +               tp->tx_stats.packets += pkts_compl;
> +               tp->tx_stats.bytes += bytes_compl;
> +               u64_stats_update_end(&tp->tx_stats.syncp);
> +
>                 tp->dirty_tx = dirty_tx;
>                 /* Sync with rtl8169_start_xmit:
>                  * - publish dirty_tx ring index (write barrier)
> --
> 1.8.1.5
>
> --
> 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
--
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