selftests/net: optmem_max became per netns
/proc/sys/net/core/optmem_max is now per netns, change two tests that were saving/changing/restoring its value on the parent netns. Signed-off-by: Eric Dumazet <edumazet@google.com> Reviewed-by: Willem de Bruijn <willemb@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
f5769faeec
commit
18872ba8cd
@ -76,23 +76,22 @@ case "${TXMODE}" in
|
||||
esac
|
||||
|
||||
# Start of state changes: install cleanup handler
|
||||
save_sysctl_mem="$(sysctl -n ${path_sysctl_mem})"
|
||||
|
||||
cleanup() {
|
||||
ip netns del "${NS2}"
|
||||
ip netns del "${NS1}"
|
||||
sysctl -w -q "${path_sysctl_mem}=${save_sysctl_mem}"
|
||||
}
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
# Configure system settings
|
||||
sysctl -w -q "${path_sysctl_mem}=1000000"
|
||||
|
||||
# Create virtual ethernet pair between network namespaces
|
||||
ip netns add "${NS1}"
|
||||
ip netns add "${NS2}"
|
||||
|
||||
# Configure system settings
|
||||
ip netns exec "${NS1}" sysctl -w -q "${path_sysctl_mem}=1000000"
|
||||
ip netns exec "${NS2}" sysctl -w -q "${path_sysctl_mem}=1000000"
|
||||
|
||||
ip link add "${DEV}" mtu "${DEV_MTU}" netns "${NS1}" type veth \
|
||||
peer name "${DEV}" mtu "${DEV_MTU}" netns "${NS2}"
|
||||
|
||||
|
@ -70,23 +70,22 @@ case "${TXMODE}" in
|
||||
esac
|
||||
|
||||
# Start of state changes: install cleanup handler
|
||||
save_sysctl_mem="$(sysctl -n ${path_sysctl_mem})"
|
||||
|
||||
cleanup() {
|
||||
ip netns del "${NS2}"
|
||||
ip netns del "${NS1}"
|
||||
sysctl -w -q "${path_sysctl_mem}=${save_sysctl_mem}"
|
||||
}
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
# Configure system settings
|
||||
sysctl -w -q "${path_sysctl_mem}=1000000"
|
||||
|
||||
# Create virtual ethernet pair between network namespaces
|
||||
ip netns add "${NS1}"
|
||||
ip netns add "${NS2}"
|
||||
|
||||
# Configure system settings
|
||||
ip netns exec "${NS1}" sysctl -w -q "${path_sysctl_mem}=1000000"
|
||||
ip netns exec "${NS2}" sysctl -w -q "${path_sysctl_mem}=1000000"
|
||||
|
||||
ip link add "${DEV}" mtu "${DEV_MTU}" netns "${NS1}" type veth \
|
||||
peer name "${DEV}" mtu "${DEV_MTU}" netns "${NS2}"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user