From 8711eb611333319713527233bf8af99e43b99c3d Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 21 Dec 2009 11:08:06 -0800 Subject: Move no copy break modprobe file to handle Debian Lintian warning Future versions of modutils ignore files not named .conf, and latest Debian tools warn about that. Fix it before the bug happens. --- Makefile.am | 2 +- etc/modprobe.d/no-copybreak.conf | 63 +++++++++++++++++++++++++++++++++++++++ etc/modprobe.d/vyatta_nocopybreak | 63 --------------------------------------- 3 files changed, 64 insertions(+), 64 deletions(-) create mode 100644 etc/modprobe.d/no-copybreak.conf delete mode 100644 etc/modprobe.d/vyatta_nocopybreak diff --git a/Makefile.am b/Makefile.am index e9a580f..6de91c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ AM_LFLAGS = --prefix=yy_`basename $* .l`_ -olex.yy.c completion_SCRIPTS = etc/bash_completion.d/20vyatta-cfg initd_SCRIPTS = etc/init.d/vyatta-ofr dhcphook_SCRIPTS = scripts/vyatta-dhclient-hook -modprobe_SCRIPTS = etc/modprobe.d/vyatta_nocopybreak +modprobe_SCRIPTS = etc/modprobe.d/no-copybreak.conf lib_LTLIBRARIES = src/libvyatta-cfg.la src_libvyatta_cfg_la_LIBADD = /usr/lib/libglib-2.0.la diff --git a/etc/modprobe.d/no-copybreak.conf b/etc/modprobe.d/no-copybreak.conf new file mode 100644 index 0000000..967be53 --- /dev/null +++ b/etc/modprobe.d/no-copybreak.conf @@ -0,0 +1,63 @@ +# +# **** License **** +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# This code was originally developed by Vyatta, Inc. +# Portions created by Vyatta are Copyright (C) 2009 Vyatta, Inc. +# All Rights Reserved. +# **** End License **** +# +# Author: Bob Gilligan +# +# Some network interface drivers employ a scheme known as "copybreak" +# in which they make a copy of a received skb if the size of the +# buffer is below a particular threshold, then return the original +# receive skb back to the pool. Since these drivers initially +# allocate a buffer size that is larger than the largest possible +# packet, this scheme returns that large buffer to the pool quickly, +# and uses a smaller one. +# +# The primary benefit of copybreak is better memory utilization. On +# systems where the data is ultimately going to be copied out to user +# space, the copybreak scheme is "low cost" because it has the side +# benefit of priming the cache for that later copy. But on a router +# that only touches the header fields of a received packet, the cost +# can be relatively higher. And on modern systems the memory savings +# is rarely an important consideration. +# +# Some of the drivers that employ copybreak make the feature +# configurable via a module parameter. This file disables copybreak +# in some of those drivers. Generally this results in an improvement +# in forwarding performance for traffic using these drivers. +# + +options 3c515 rx_copybreak=0 +options 3c59x rx_copybreak=0 +options cxgb copybreak=0 +options e1000 copybreak=0 +options e1000e copybreak=0 +options epic100 rx_copybreak=0 +options fealnx rx_copybreak=0 +options hamachi rx_copybreak=0 +options ixgb copybreak=0 +options natsemi rx_copybreak=0 +options pcnet32 rx_copybreak=0 +options r8169 rx_copybreak=0 +options sis190 rx_copybreak=0 +options sky2 copybreak=0 +options starfire rx_copybreak=0 +options sundance rx_copybreak=0 +options typhoon rx_copybreak=0 +options via-rhine rx_copybreak=0 +options via-velocity rx_copybreak=0 +options yellowfin rx_copybreak=0 + + + diff --git a/etc/modprobe.d/vyatta_nocopybreak b/etc/modprobe.d/vyatta_nocopybreak deleted file mode 100644 index 967be53..0000000 --- a/etc/modprobe.d/vyatta_nocopybreak +++ /dev/null @@ -1,63 +0,0 @@ -# -# **** License **** -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# This code was originally developed by Vyatta, Inc. -# Portions created by Vyatta are Copyright (C) 2009 Vyatta, Inc. -# All Rights Reserved. -# **** End License **** -# -# Author: Bob Gilligan -# -# Some network interface drivers employ a scheme known as "copybreak" -# in which they make a copy of a received skb if the size of the -# buffer is below a particular threshold, then return the original -# receive skb back to the pool. Since these drivers initially -# allocate a buffer size that is larger than the largest possible -# packet, this scheme returns that large buffer to the pool quickly, -# and uses a smaller one. -# -# The primary benefit of copybreak is better memory utilization. On -# systems where the data is ultimately going to be copied out to user -# space, the copybreak scheme is "low cost" because it has the side -# benefit of priming the cache for that later copy. But on a router -# that only touches the header fields of a received packet, the cost -# can be relatively higher. And on modern systems the memory savings -# is rarely an important consideration. -# -# Some of the drivers that employ copybreak make the feature -# configurable via a module parameter. This file disables copybreak -# in some of those drivers. Generally this results in an improvement -# in forwarding performance for traffic using these drivers. -# - -options 3c515 rx_copybreak=0 -options 3c59x rx_copybreak=0 -options cxgb copybreak=0 -options e1000 copybreak=0 -options e1000e copybreak=0 -options epic100 rx_copybreak=0 -options fealnx rx_copybreak=0 -options hamachi rx_copybreak=0 -options ixgb copybreak=0 -options natsemi rx_copybreak=0 -options pcnet32 rx_copybreak=0 -options r8169 rx_copybreak=0 -options sis190 rx_copybreak=0 -options sky2 copybreak=0 -options starfire rx_copybreak=0 -options sundance rx_copybreak=0 -options typhoon rx_copybreak=0 -options via-rhine rx_copybreak=0 -options via-velocity rx_copybreak=0 -options yellowfin rx_copybreak=0 - - - -- cgit v1.2.3