From: Stefan Bader <stefan.bader@canonical•com>
To: Francois Romieu <romieu@fr•zoreil.com>
Cc: netdev@vger•kernel.org,
Realtek linux nic maintainers <nic_swsd@realtek•com>
Subject: Re: rtl8168e-vl dropping tftp ack
Date: Fri, 19 Apr 2013 14:54:42 +0200 [thread overview]
Message-ID: <51713E92.3050803@canonical.com> (raw)
In-Reply-To: <20130418215501.GB8944@electric-eye.fr.zoreil.com>
[-- Attachment #1: Type: text/plain, Size: 3408 bytes --]
On 18.04.2013 23:55, Francois Romieu wrote:
> Stefan Bader <stefan.bader@canonical•com> :
> [...]
>> This was taken with a 3.9-rc7 kernel running on the Xen host, listening on the
>> tftp server. First run is with the kernel driver and the second pass with
>
> Please try the patch below with current kernel and capture traffic on
> both the tftp server and r8169 interfaces.
>
> diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
> index 4ecbe64..c1cd9f6 100644
> --- a/drivers/net/ethernet/realtek/r8169.c
> +++ b/drivers/net/ethernet/realtek/r8169.c
> @@ -5747,7 +5747,7 @@ err_out:
> return -EIO;
> }
>
> -static inline void rtl8169_tso_csum(struct rtl8169_private *tp,
> +static inline bool rtl8169_tso_csum(struct rtl8169_private *tp,
> struct sk_buff *skb, u32 *opts)
> {
> const struct rtl_tx_desc_info *info = tx_desc_info + tp->txd_version;
> @@ -5760,6 +5760,15 @@ static inline void rtl8169_tso_csum(struct rtl8169_private *tp,
> } else if (skb->ip_summed == CHECKSUM_PARTIAL) {
> const struct iphdr *ip = ip_hdr(skb);
>
> + if (unlikely(skb->len < ETH_ZLEN &&
> + (tp->mac_version == RTL_GIGA_MAC_VER_34))) {
> + if (skb_padto(skb, ETH_ZLEN))
> + return false;
> + skb_checksum_help(skb);
> + skb_put(skb, ETH_ZLEN - skb->len);
> + return true;
> + }
> +
> if (ip->protocol == IPPROTO_TCP)
> opts[offset] |= info->checksum.tcp;
> else if (ip->protocol == IPPROTO_UDP)
> @@ -5767,6 +5776,7 @@ static inline void rtl8169_tso_csum(struct rtl8169_private *tp,
> else
> WARN_ON_ONCE(1);
> }
> + return true;
> }
>
> static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
> @@ -5790,25 +5800,26 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
> if (unlikely(le32_to_cpu(txd->opts1) & DescOwn))
> goto err_stop_0;
>
> + opts[1] = cpu_to_le32(rtl8169_tx_vlan_tag(skb));
> + opts[0] = DescOwn;
> +
> + if (!rtl8169_tso_csum(tp, skb, opts))
> + goto err_update_stats_0;
> +
> len = skb_headlen(skb);
> mapping = dma_map_single(d, skb->data, len, DMA_TO_DEVICE);
> if (unlikely(dma_mapping_error(d, mapping))) {
> if (net_ratelimit())
> netif_err(tp, drv, dev, "Failed to map TX DMA!\n");
> - goto err_dma_0;
> + goto err_free_skb_1;
> }
>
> tp->tx_skb[entry].len = len;
> txd->addr = cpu_to_le64(mapping);
>
> - opts[1] = cpu_to_le32(rtl8169_tx_vlan_tag(skb));
> - opts[0] = DescOwn;
> -
> - rtl8169_tso_csum(tp, skb, opts);
> -
> frags = rtl8169_xmit_frags(tp, skb, opts);
> if (frags < 0)
> - goto err_dma_1;
> + goto err_unmap_2;
> else if (frags)
> opts[0] |= FirstFrag;
> else {
> @@ -5854,10 +5865,11 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
>
> return NETDEV_TX_OK;
>
> -err_dma_1:
> +err_unmap_2:
> rtl8169_unmap_tx_skb(d, tp->tx_skb + entry, txd);
> -err_dma_0:
> +err_free_skb_1:
> dev_kfree_skb(skb);
> +err_update_stats_0:
> dev->stats.tx_dropped++;
> return NETDEV_TX_OK;
>
>
Might be a while till I will be able to run any tests since msi was so generous
to provide an uefi bios that can brick itself from their efi shell. *sigh*
I had tried the combination of your change and Hayes' but that would cause
panics in skb_checksum_help (not sure which of the two) on boot.
-Stefan
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 899 bytes --]
prev parent reply other threads:[~2013-04-19 12:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-17 14:31 rtl8168e-vl dropping tftp ack Stefan Bader
2013-04-17 21:32 ` Francois Romieu
2013-04-18 9:51 ` Stefan Bader
2013-04-18 21:55 ` Francois Romieu
2013-04-19 3:27 ` hayeswang
2013-04-19 6:14 ` Francois Romieu
2013-04-19 7:49 ` hayeswang
2013-04-25 10:56 ` Stefan Bader
2013-04-25 23:03 ` Francois Romieu
2013-04-19 12:54 ` Stefan Bader [this message]
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=51713E92.3050803@canonical.com \
--to=stefan.bader@canonical$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nic_swsd@realtek$(echo .)com \
--cc=romieu@fr$(echo .)zoreil.com \
/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