possible em regression (was Re: svn commit: r294958 - in stable/10: share/man/man4 sys/dev/e1000 sys/dev/ixgb sys/dev/netmap)

[Mike Tancsa]

On 1/30/2016 12:26 PM, Marius Strobl wrote:
> 
> Ah, okay, that at least makes sense. Can you please verify that with
> the attached patch applied, you have a setup that works out of the
> box?
> 
Hi,
The patch does not apply cleanly


# patch < em_tso_gig_only_10.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: sys/dev/e1000/if_em.c
|===================================================================
|--- sys/dev/e1000/if_em.c      (revision 294962)
|+++ sys/dev/e1000/if_em.c      (working copy)
--------------------------
Patching file sys/dev/e1000/if_em.c using Plan A...
Hunk #1 failed at 1377.
1 out of 1 hunks failed--saving rejects to sys/dev/e1000/if_em.c.rej
done

# cat sys/dev/e1000/if_em.c.rej
@@ -1377,8 +1377,15 @@
        ifp->if_hwassist = 0;
        if (ifp->if_capenable & IFCAP_TXCSUM)
                ifp->if_hwassist |= (CSUM_TCP | CSUM_UDP);
-       if (ifp->if_capenable & IFCAP_TSO4)
-               ifp->if_hwassist |= CSUM_TSO;
+       /*
+       ** There have proven to be problems with TSO when not
+       ** at full gigabit speed, so disable the assist automatically
+       ** when at lower speeds.  -jfv
+       */
+       if (ifp->if_capenable & IFCAP_TSO4) {
+               if (adapter->link_speed == SPEED_1000)
+                       ifp->if_hwassist |= CSUM_TSO;
+       }

        /* Configure for OS presence */
        em_init_manageability(adapter);


-- 
-------------------
Mike Tancsa, tel +1 519 651 3400
Sentex Communications, mike at sentex.net
Providing Internet services since 1994 www.sentex.net
Cambridge, Ontario Canada   http://www.tancsa.com/