Skip to content

Commit

Permalink
Turn on scatter-gather and checksum offload
Browse files Browse the repository at this point in the history
Checksum offload was turned off in QubesOS/qubes-issues#700 due to a bug
that is unlikely to still be relevant.  Scatter-gather was turned off
for unclear reasons that are also unlikely to be relevant nowadays.
This should significantly improve networking performance.

Fixes QubesOS/qubes-issues#3510.
  • Loading branch information
DemiMarie committed Mar 18, 2022
1 parent 32c81ec commit 045e85e
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 10 deletions.
5 changes: 2 additions & 3 deletions archlinux/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ build() {
done

# Fix for network tools paths
sed 's:/sbin/ethtool:ethtool:g' -i network/*
sed 's:/sbin/ip:ip:g' -i network/*
sed 's:/bin/grep:grep:g' -i network/*

Expand All @@ -61,7 +60,7 @@ package_qubes-vm-core() {
release=${BASH_REMATCH[1]}.${BASH_REMATCH[2]}
# temporarily pretend it is still R4.1, until repository for R4.2 is created
release=4.1
depends=(qubes-vm-utils python python-xdg ethtool ntp iproute2
depends=(qubes-vm-utils python python-xdg ntp iproute2
gnome-packagekit imagemagick fakeroot notification-daemon dconf
zenity qubes-libvchan qubes-db-vm haveged python-gobject
python-dbus xdg-utils notification-daemon gawk sed procps-ng librsvg
Expand Down Expand Up @@ -119,7 +118,7 @@ EOF
#
package_qubes-vm-networking() {
pkgdesc="Qubes OS tools allowing to use a Qubes VM as a NetVM/ProxyVM"
depends=(qubes-vm-core qubes-vm-utils python ethtool iproute2
depends=(qubes-vm-core qubes-vm-utils python iproute2
qubes-db-vm networkmanager iptables tinyproxy nftables
conntrack-tools
)
Expand Down
1 change: 0 additions & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ Depends:
qubes-core-agent (= ${binary:Version}),
tinyproxy,
iptables,
ethtool,
conntrack,
socat,
tinyproxy,
Expand Down
3 changes: 0 additions & 3 deletions network/setup-ip
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,6 @@ if [ "$ACTION" == "add" ]; then
secondary_dns=$(/usr/bin/qubesdb-read /qubes-secondary-dns 2>/dev/null) || secondary_dns=

if [ -n "$ip" ]; then
/sbin/ethtool -K "$INTERFACE" sg off
/sbin/ethtool -K "$INTERFACE" tx off

# If NetworkManager is enabled, let it configure the network
if qsvc network-manager && [ -e /usr/bin/nmcli ]; then
configure_network_nm "$MAC" "$INTERFACE" "$ip" "$ip6" "$netmask" "$netmask6" "$gateway" "$gateway6" "$primary_dns" "$secondary_dns"
Expand Down
1 change: 0 additions & 1 deletion rpm_spec/core-agent.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ Scripts required to handle dom0 updates.

%package networking
Summary: Networking support for Qubes VM
Requires: ethtool
Requires: iptables
Requires: conntrack-tools
Requires: iproute
Expand Down
1 change: 0 additions & 1 deletion vm-init.d/qubes-firewall
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ start()

if qsvc qubes-firewall ; then
echo -n $"Starting Qubes Firewall monitor:"
/sbin/ethtool -K "$(get_qubes_managed_iface)" sg off
/usr/bin/qubes-firewall &
success
echo ""
Expand Down
1 change: 0 additions & 1 deletion vm-systemd/network-proxy-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,4 @@ if [ "x$network" != "x" ]; then
if [ -n "$gateway6" ]; then
echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
fi
/sbin/ethtool -K "$(get_qubes_managed_iface)" sg off || true
fi

0 comments on commit 045e85e

Please sign in to comment.