Unverified Commit 7b149db6 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12772 MPTCP Upstream part 16 

Merge Pull Request from: @geliangtang 
 
Put three independent patches into this set.

Patch 1, update Geliang's email address
Patch 2, add NET debug config
Patch 3, avoid extra waiting in mptcp diag selftest 
 
Link:https://gitee.com/openeuler/kernel/pulls/12772

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents cdd09604 251bf608

.mailmap

+5 −4
Original line number Diff line number Diff line
@@ -188,10 +188,11 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com> 
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>

Geliang Tang <geliang.tang@linux.dev> <geliang.tang@suse.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@xiaomi.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@gmail.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@163.com>

Geliang Tang <geliang@kernel.org> <geliang.tang@linux.dev>

Geliang Tang <geliang@kernel.org> <geliang.tang@suse.com>

Geliang Tang <geliang@kernel.org> <geliangtang@xiaomi.com>

Geliang Tang <geliang@kernel.org> <geliangtang@gmail.com>

Geliang Tang <geliang@kernel.org> <geliangtang@163.com>

Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -15017,7 +15017,7 @@ K: \bmdo_ 
NETWORKING [MPTCP]

M:	Matthieu Baerts <matttbe@kernel.org>

M:	Mat Martineau <martineau@kernel.org>

R:	Geliang Tang <geliang.tang@linux.dev>

R:	Geliang Tang <geliang@kernel.org>

L:	netdev@vger.kernel.org

L:	mptcp@lists.linux.dev

S:	Maintained

kernel/configs/debug.config

+6 −0
Original line number Diff line number Diff line
@@ -40,6 +40,12 @@ CONFIG_UBSAN_ENUM=y 
CONFIG_UBSAN_SHIFT=y

CONFIG_UBSAN_UNREACHABLE=y

#

# Networking Debugging

#

CONFIG_NET_DEV_REFCNT_TRACKER=y

CONFIG_NET_NS_REFCNT_TRACKER=y

CONFIG_DEBUG_NET=y

#

# Memory Debugging

#

# CONFIG_DEBUG_PAGEALLOC is not set

tools/testing/selftests/net/mptcp/diag.sh

+3 −6
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ chk_listener_nr() 
	local expected=$1

	local msg="$2"



	__chk_nr "ss -inmlHMON $ns | wc -l" "$expected" "$msg - mptcp" 0

	__chk_nr "ss -inmlHtON $ns | wc -l" "$expected" "$msg - subflows"

	__chk_nr "ss -nlHMON $ns | wc -l" "$expected" "$msg - mptcp" 0

	__chk_nr "ss -nlHtON $ns | wc -l" "$expected" "$msg - subflows"

}



wait_msk_nr()
@@ -304,10 +304,7 @@ for I in $(seq 1 $NR_SERVERS); do 
	ip netns exec $ns ./mptcp_connect -p $((I + 20001)) \

		-t ${timeout_poll} -l 0.0.0.0 >/dev/null 2>&1 &

done



for I in $(seq 1 $NR_SERVERS); do

	mptcp_lib_wait_local_port_listen $ns $((I + 20001))

done

mptcp_lib_wait_local_port_listen $ns $((NR_SERVERS + 20001))



chk_listener_nr $NR_SERVERS "many listener sockets"