fix issue: ADD_ADDR and RM_ADDR use pm.add_signal to mark event, so
in some case pm.add_signal will be flush when ADD_ADDR/RM_ADDR in
process.
fix issue: if ADD_ADDR and ADD_ADDR-echo process at the same time,
only one event can write pm.add_signal. so ADD_ADDR will process
after add_timer timeout or ADD_ADDR-echo will not be process.
Patch 1 fix ADD_ADDR and RM_ADDR maybe clear addr_signal each other.
Patch 2 and 3 deal ADD_ADDR and ADD_ADDR-echo with separately to fix
conflicts in using pm.addr_signal porcess.
Patch 4 MPTCP_ADD_ADDR_IPV6 and MPTCP_ADD_ADDR_PORT is not necessary.
v1->v2:
- remove READ_ONCE under the pm spin lock.
v2->v3:
- Patch 2: mptcp_pm_should_add_addr => mptcp_pm_should_add_signal_addr
- Patch 3: avoid read-modify-write of msk->pm.addr_signal and change
mptcp_pm_add_addr_signal to return void.
v3->v4:
- Patch 1: use ~(BIT(MPTCP_ADD_ADDR_SIGNAL) | BIT(MPTCP_ADD_ADDR_ECHO))
instead of BIT(MPTCP_RM_ADDR_SIGNAL)
- Patch 3: simple the code; init flags; fix wrong goto logic code;
v4->v5:
- Patch 3: simple the code of 'mptcp_established_options_add_addr'
v5->v6:
- Patch2: fix fails of 'mptcp_join.sh -t'. In mptcp_pm_add_addr_send_ack
without MPTCP_ADD_ADDR_SIGNAL check so pure ack can not be sent for
ADD_ADDR. That cause ADD_ADDR can not be sent in time.
- Patch3: refactor some code according Geliang's suggestions.
- Patch4: modify commit comment
v6->v7:
- Patch1: use reverse xmas tree order for variables definition
- Patch3: refactor some code according Geliang's suggestions.
- add a Patch4: remove some double-check
Yonglong Li (5):
mptcp: fix ADD_ADDR and RM_ADDR maybe flush addr_signal each other
mptcp: make MPTCP_ADD_ADDR_SIGNAL and MPTCP_ADD_ADDR_ECHO separate
mptcp: build ADD_ADDR/echo-ADD_ADDR option according pm.add_signal
mptcp: remove some double-check
mptcp: remove MPTCP_ADD_ADDR_IPV6 and MPTCP_ADD_ADDR_PORT
include/net/mptcp.h | 3 ++-
net/mptcp/options.c | 64 ++++++++++++++++++++++-------------------------
net/mptcp/pm.c | 68 +++++++++++++++++++++++++++++++-------------------
net/mptcp/pm_netlink.c | 10 +++-----
net/mptcp/protocol.h | 45 +++++++++++++++++----------------
5 files changed, 103 insertions(+), 87 deletions(-)