BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/237667
Change subject: Don't disable LRO/GRO on jessie LVS hosts ...................................................................... Don't disable LRO/GRO on jessie LVS hosts Best available information from old mailing list posts and commits is that both GRO and LRO should work fine for bnx2x + LVS on modern kernels. Bug: T110530 Change-Id: I01666219ebef43b16668a4e647de7dd626f36cc6 --- M modules/lvs/manifests/interface-tweaks.pp 1 file changed, 14 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/67/237667/1 diff --git a/modules/lvs/manifests/interface-tweaks.pp b/modules/lvs/manifests/interface-tweaks.pp index 09351ff..702199b 100644 --- a/modules/lvs/manifests/interface-tweaks.pp +++ b/modules/lvs/manifests/interface-tweaks.pp @@ -5,13 +5,20 @@ # forcing GRO off... define lvs::interface-tweaks($bnx2x=false, $txqlen=false, $rss_pattern=false) { - # Disable GRO (generically incompatible with LVS due to kernel issues, I believe this - # is now fixed upstream for both ipv4 and ipv6 as of kernel 3.7 or higher, but - # that idea needs testing!) - interface::offload { "${name} gro": interface => $name, setting => 'gro', value => 'off' } - if $name != 'eth0' { - # Make sure GRO is off for the non-primary interfaces... - interface::manual { $name: interface => $name, before => Interface::Offload["${name} gro"] } + if ! os_version('debian >= jessie') { + # Disable GRO (generically incompatible with LVS due to kernel issues, I believe this + # is now fixed upstream for both ipv4 and ipv6 as of kernel 3.7 or higher, but + # that idea needs testing!) + interface::offload { "${name} gro": interface => $name, setting => 'gro', value => 'off' } + if $name != 'eth0' { + # Make sure GRO is off for the non-primary interfaces... + interface::manual { $name: interface => $name, before => Interface::Offload["${name} gro"] } + } + + # bnx2x is buggy with TPA (LRO) + LVS + if $bnx2x { + interface::offload { "${name} lro": interface => $name, setting => 'lro', value => 'off' } + } } # RSS/RPS/XPS-type perf stuff ( https://www.kernel.org/doc/Documentation/networking/scaling.txt ) @@ -22,8 +29,6 @@ # bnx2x-specific stuff if $bnx2x { - # bnx2x is buggy with TPA (LRO) + LVS - interface::offload { "${name} lro": interface => $name, setting => 'lro', value => 'off' } # Max for bnx2x/BCM57800, seems to eliminate the spurious rx drops under heavy traffic interface::ring { "${name} rxring": interface => $name, setting => 'rx', value => 4078 } } -- To view, visit https://gerrit.wikimedia.org/r/237667 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01666219ebef43b16668a4e647de7dd626f36cc6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack <bbl...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits