2024-06-15 21:02:09 +02:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
/* Multipath TCP
|
|
|
|
*
|
|
|
|
* Copyright (c) 2020, Red Hat, Inc.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define pr_fmt(fmt) "MPTCP: " fmt
|
|
|
|
|
|
|
|
#include <linux/inet.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <net/tcp.h>
|
|
|
|
#include <net/netns/generic.h>
|
|
|
|
#include <net/mptcp.h>
|
|
|
|
#include <net/genetlink.h>
|
|
|
|
#include <uapi/linux/mptcp.h>
|
|
|
|
|
|
|
|
#include "protocol.h"
|
|
|
|
#include "mib.h"
|
|
|
|
|
|
|
|
/* forward declaration */
|
|
|
|
static struct genl_family mptcp_genl_family;
|
|
|
|
|
|
|
|
static int pm_nl_pernet_id;
|
|
|
|
|
|
|
|
struct mptcp_pm_addr_entry {
|
|
|
|
struct list_head list;
|
|
|
|
struct mptcp_addr_info addr;
|
|
|
|
struct rcu_head rcu;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct mptcp_pm_add_entry {
|
|
|
|
struct list_head list;
|
|
|
|
struct mptcp_addr_info addr;
|
|
|
|
struct timer_list add_timer;
|
|
|
|
struct mptcp_sock *sock;
|
|
|
|
u8 retrans_times;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct pm_nl_pernet {
|
|
|
|
/* protects pernet updates */
|
|
|
|
spinlock_t lock;
|
|
|
|
struct list_head local_addr_list;
|
|
|
|
unsigned int addrs;
|
|
|
|
unsigned int add_addr_signal_max;
|
|
|
|
unsigned int add_addr_accept_max;
|
|
|
|
unsigned int local_addr_max;
|
|
|
|
unsigned int subflows_max;
|
|
|
|
unsigned int next_id;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define MPTCP_PM_ADDR_MAX 8
|
|
|
|
#define ADD_ADDR_RETRANS_MAX 3
|
|
|
|
|
|
|
|
static bool addresses_equal(const struct mptcp_addr_info *a,
|
|
|
|
struct mptcp_addr_info *b, bool use_port)
|
|
|
|
{
|
|
|
|
bool addr_equals = false;
|
|
|
|
|
|
|
|
if (a->family != b->family)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (a->family == AF_INET)
|
|
|
|
addr_equals = a->addr.s_addr == b->addr.s_addr;
|
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
else
|
|
|
|
addr_equals = !ipv6_addr_cmp(&a->addr6, &b->addr6);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (!addr_equals)
|
|
|
|
return false;
|
|
|
|
if (!use_port)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return a->port == b->port;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool address_zero(const struct mptcp_addr_info *addr)
|
|
|
|
{
|
|
|
|
struct mptcp_addr_info zero;
|
|
|
|
|
|
|
|
memset(&zero, 0, sizeof(zero));
|
|
|
|
zero.family = addr->family;
|
|
|
|
|
|
|
|
return addresses_equal(addr, &zero, false);
|
|
|
|
}
|
|
|
|
|
2024-08-09 12:55:39 +02:00
|
|
|
void mptcp_local_address(const struct sock_common *skc, struct mptcp_addr_info *addr)
|
2024-06-15 21:02:09 +02:00
|
|
|
{
|
|
|
|
addr->port = 0;
|
|
|
|
addr->family = skc->skc_family;
|
|
|
|
if (addr->family == AF_INET)
|
|
|
|
addr->addr.s_addr = skc->skc_rcv_saddr;
|
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
else if (addr->family == AF_INET6)
|
|
|
|
addr->addr6 = skc->skc_v6_rcv_saddr;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
static void remote_address(const struct sock_common *skc,
|
|
|
|
struct mptcp_addr_info *addr)
|
|
|
|
{
|
|
|
|
addr->family = skc->skc_family;
|
|
|
|
addr->port = skc->skc_dport;
|
|
|
|
if (addr->family == AF_INET)
|
|
|
|
addr->addr.s_addr = skc->skc_daddr;
|
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
else if (addr->family == AF_INET6)
|
|
|
|
addr->addr6 = skc->skc_v6_daddr;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool lookup_subflow_by_saddr(const struct list_head *list,
|
|
|
|
struct mptcp_addr_info *saddr)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
struct mptcp_addr_info cur;
|
|
|
|
struct sock_common *skc;
|
|
|
|
|
|
|
|
list_for_each_entry(subflow, list, node) {
|
|
|
|
skc = (struct sock_common *)mptcp_subflow_tcp_sock(subflow);
|
|
|
|
|
2024-08-09 12:55:39 +02:00
|
|
|
mptcp_local_address(skc, &cur);
|
2024-06-15 21:02:09 +02:00
|
|
|
if (addresses_equal(&cur, saddr, false))
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2024-09-06 11:22:23 +02:00
|
|
|
static bool
|
2024-06-15 21:02:09 +02:00
|
|
|
select_local_address(const struct pm_nl_pernet *pernet,
|
2024-09-06 11:22:23 +02:00
|
|
|
struct mptcp_sock *msk,
|
|
|
|
struct mptcp_pm_addr_entry *new_entry)
|
2024-06-15 21:02:09 +02:00
|
|
|
{
|
2024-09-06 11:22:23 +02:00
|
|
|
struct mptcp_pm_addr_entry *entry;
|
|
|
|
bool found = false;
|
2024-06-15 21:02:09 +02:00
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
spin_lock_bh(&msk->join_list_lock);
|
|
|
|
list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) {
|
|
|
|
if (!(entry->addr.flags & MPTCP_PM_ADDR_FLAG_SUBFLOW))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* avoid any address already in use by subflows and
|
|
|
|
* pending join
|
|
|
|
*/
|
|
|
|
if (entry->addr.family == ((struct sock *)msk)->sk_family &&
|
|
|
|
!lookup_subflow_by_saddr(&msk->conn_list, &entry->addr) &&
|
|
|
|
!lookup_subflow_by_saddr(&msk->join_list, &entry->addr)) {
|
2024-09-06 11:22:23 +02:00
|
|
|
*new_entry = *entry;
|
|
|
|
found = true;
|
2024-06-15 21:02:09 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
spin_unlock_bh(&msk->join_list_lock);
|
|
|
|
rcu_read_unlock();
|
2024-09-06 11:22:23 +02:00
|
|
|
|
|
|
|
return found;
|
2024-06-15 21:02:09 +02:00
|
|
|
}
|
|
|
|
|
2024-09-06 11:22:23 +02:00
|
|
|
static bool
|
|
|
|
select_signal_address(struct pm_nl_pernet *pernet, unsigned int pos,
|
|
|
|
struct mptcp_pm_addr_entry *new_entry)
|
2024-06-15 21:02:09 +02:00
|
|
|
{
|
2024-09-06 11:22:23 +02:00
|
|
|
struct mptcp_pm_addr_entry *entry;
|
|
|
|
bool found = false;
|
2024-06-15 21:02:09 +02:00
|
|
|
int i = 0;
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
/* do not keep any additional per socket state, just signal
|
|
|
|
* the address list in order.
|
|
|
|
* Note: removal from the local address list during the msk life-cycle
|
|
|
|
* can lead to additional addresses not being announced.
|
|
|
|
*/
|
|
|
|
list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) {
|
|
|
|
if (!(entry->addr.flags & MPTCP_PM_ADDR_FLAG_SIGNAL))
|
|
|
|
continue;
|
|
|
|
if (i++ == pos) {
|
2024-09-06 11:22:23 +02:00
|
|
|
*new_entry = *entry;
|
|
|
|
found = true;
|
2024-06-15 21:02:09 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
2024-09-06 11:22:23 +02:00
|
|
|
|
|
|
|
return found;
|
2024-06-15 21:02:09 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void check_work_pending(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
if (msk->pm.add_addr_signaled == msk->pm.add_addr_signal_max &&
|
|
|
|
(msk->pm.local_addr_used == msk->pm.local_addr_max ||
|
|
|
|
msk->pm.subflows == msk->pm.subflows_max))
|
|
|
|
WRITE_ONCE(msk->pm.work_pending, false);
|
|
|
|
}
|
|
|
|
|
2024-09-17 09:26:09 +02:00
|
|
|
struct mptcp_pm_add_entry *
|
|
|
|
mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk,
|
|
|
|
struct mptcp_addr_info *addr)
|
2024-06-15 21:02:09 +02:00
|
|
|
{
|
|
|
|
struct mptcp_pm_add_entry *entry;
|
|
|
|
|
|
|
|
list_for_each_entry(entry, &msk->pm.anno_list, list) {
|
|
|
|
if (addresses_equal(&entry->addr, addr, false))
|
|
|
|
return entry;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mptcp_pm_add_timer(struct timer_list *timer)
|
|
|
|
{
|
|
|
|
struct mptcp_pm_add_entry *entry = from_timer(entry, timer, add_timer);
|
|
|
|
struct mptcp_sock *msk = entry->sock;
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
|
mptcp: pr_debug: add missing \n at the end
commit cb41b195e634d3f1ecfcd845314e64fd4bb3c7aa upstream.
pr_debug() have been added in various places in MPTCP code to help
developers to debug some situations. With the dynamic debug feature, it
is easy to enable all or some of them, and asks users to reproduce
issues with extra debug.
Many of these pr_debug() don't end with a new line, while no 'pr_cont()'
are used in MPTCP code. So the goal was not to display multiple debug
messages on one line: they were then not missing the '\n' on purpose.
Not having the new line at the end causes these messages to be printed
with a delay, when something else needs to be printed. This issue is not
visible when many messages need to be printed, but it is annoying and
confusing when only specific messages are expected, e.g.
# echo "func mptcp_pm_add_addr_echoed +fmp" \
> /sys/kernel/debug/dynamic_debug/control
# ./mptcp_join.sh "signal address"; \
echo "$(awk '{print $1}' /proc/uptime) - end"; \
sleep 5s; \
echo "$(awk '{print $1}' /proc/uptime) - restart"; \
./mptcp_join.sh "signal address"
013 signal address
(...)
10.75 - end
15.76 - restart
013 signal address
[ 10.367935] mptcp:mptcp_pm_add_addr_echoed: MPTCP: msk=(...)
(...)
=> a delay of 5 seconds: printed with a 10.36 ts, but after 'restart'
which was printed at the 15.76 ts.
The 'Fixes' tag here below points to the first pr_debug() used without
'\n' in net/mptcp. This patch could be split in many small ones, with
different Fixes tag, but it doesn't seem worth it, because it is easy to
re-generate this patch with this simple 'sed' command:
git grep -l pr_debug -- net/mptcp |
xargs sed -i "s/\(pr_debug(\".*[^n]\)\(\"[,)]\)/\1\\\n\2/g"
So in case of conflicts, simply drop the modifications, and launch this
command.
Fixes: f870fa0b5768 ("mptcp: Add MPTCP socket stubs")
Cc: stable@vger.kernel.org
Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20240826-net-mptcp-close-extra-sf-fin-v1-4-905199fe1172@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
[ As mentioned above, conflicts were expected, and resolved by using the
'sed' command which is visible above. ]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-09-06 11:22:56 +02:00
|
|
|
pr_debug("msk=%p\n", msk);
|
2024-06-15 21:02:09 +02:00
|
|
|
|
|
|
|
if (!msk)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (inet_sk_state_load(sk) == TCP_CLOSE)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!entry->addr.id)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (mptcp_pm_should_add_signal(msk)) {
|
|
|
|
sk_reset_timer(sk, timer, jiffies + TCP_RTO_MAX / 8);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_lock_bh(&msk->pm.lock);
|
|
|
|
|
|
|
|
if (!mptcp_pm_should_add_signal(msk)) {
|
mptcp: pr_debug: add missing \n at the end
commit cb41b195e634d3f1ecfcd845314e64fd4bb3c7aa upstream.
pr_debug() have been added in various places in MPTCP code to help
developers to debug some situations. With the dynamic debug feature, it
is easy to enable all or some of them, and asks users to reproduce
issues with extra debug.
Many of these pr_debug() don't end with a new line, while no 'pr_cont()'
are used in MPTCP code. So the goal was not to display multiple debug
messages on one line: they were then not missing the '\n' on purpose.
Not having the new line at the end causes these messages to be printed
with a delay, when something else needs to be printed. This issue is not
visible when many messages need to be printed, but it is annoying and
confusing when only specific messages are expected, e.g.
# echo "func mptcp_pm_add_addr_echoed +fmp" \
> /sys/kernel/debug/dynamic_debug/control
# ./mptcp_join.sh "signal address"; \
echo "$(awk '{print $1}' /proc/uptime) - end"; \
sleep 5s; \
echo "$(awk '{print $1}' /proc/uptime) - restart"; \
./mptcp_join.sh "signal address"
013 signal address
(...)
10.75 - end
15.76 - restart
013 signal address
[ 10.367935] mptcp:mptcp_pm_add_addr_echoed: MPTCP: msk=(...)
(...)
=> a delay of 5 seconds: printed with a 10.36 ts, but after 'restart'
which was printed at the 15.76 ts.
The 'Fixes' tag here below points to the first pr_debug() used without
'\n' in net/mptcp. This patch could be split in many small ones, with
different Fixes tag, but it doesn't seem worth it, because it is easy to
re-generate this patch with this simple 'sed' command:
git grep -l pr_debug -- net/mptcp |
xargs sed -i "s/\(pr_debug(\".*[^n]\)\(\"[,)]\)/\1\\\n\2/g"
So in case of conflicts, simply drop the modifications, and launch this
command.
Fixes: f870fa0b5768 ("mptcp: Add MPTCP socket stubs")
Cc: stable@vger.kernel.org
Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20240826-net-mptcp-close-extra-sf-fin-v1-4-905199fe1172@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
[ As mentioned above, conflicts were expected, and resolved by using the
'sed' command which is visible above. ]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-09-06 11:22:56 +02:00
|
|
|
pr_debug("retransmit ADD_ADDR id=%d\n", entry->addr.id);
|
2024-06-15 21:02:09 +02:00
|
|
|
mptcp_pm_announce_addr(msk, &entry->addr, false);
|
|
|
|
entry->retrans_times++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (entry->retrans_times < ADD_ADDR_RETRANS_MAX)
|
|
|
|
sk_reset_timer(sk, timer, jiffies + TCP_RTO_MAX);
|
|
|
|
|
|
|
|
spin_unlock_bh(&msk->pm.lock);
|
|
|
|
|
|
|
|
out:
|
|
|
|
__sock_put(sk);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct mptcp_pm_add_entry *
|
|
|
|
mptcp_pm_del_add_timer(struct mptcp_sock *msk,
|
mptcp: validate 'id' when stopping the ADD_ADDR retransmit timer
commit d58300c3185b78ab910092488126b97f0abe3ae2 upstream.
when Linux receives an echo-ed ADD_ADDR, it checks the IP address against
the list of "announced" addresses. In case of a positive match, the timer
that handles retransmissions is stopped regardless of the 'Address Id' in
the received packet: this behaviour does not comply with RFC8684 3.4.1.
Fix it by validating the 'Address Id' in received echo-ed ADD_ADDRs.
Tested using packetdrill, with the following captured output:
unpatched kernel:
Out <...> Flags [.], ack 1, win 256, options [mptcp add-addr v1 id 1 198.51.100.2 hmac 0xfd2e62517888fe29,mptcp dss ack 3007449509], length 0
In <...> Flags [.], ack 1, win 257, options [mptcp add-addr v1-echo id 1 1.2.3.4,mptcp dss ack 3013740213], length 0
Out <...> Flags [.], ack 1, win 256, options [mptcp add-addr v1 id 1 198.51.100.2 hmac 0xfd2e62517888fe29,mptcp dss ack 3007449509], length 0
In <...> Flags [.], ack 1, win 257, options [mptcp add-addr v1-echo id 90 198.51.100.2,mptcp dss ack 3013740213], length 0
^^^ retransmission is stopped here, but 'Address Id' is 90
patched kernel:
Out <...> Flags [.], ack 1, win 256, options [mptcp add-addr v1 id 1 198.51.100.2 hmac 0x1cf372d59e05f4b8,mptcp dss ack 3007449509], length 0
In <...> Flags [.], ack 1, win 257, options [mptcp add-addr v1-echo id 1 1.2.3.4,mptcp dss ack 1672384568], length 0
Out <...> Flags [.], ack 1, win 256, options [mptcp add-addr v1 id 1 198.51.100.2 hmac 0x1cf372d59e05f4b8,mptcp dss ack 3007449509], length 0
In <...> Flags [.], ack 1, win 257, options [mptcp add-addr v1-echo id 90 198.51.100.2,mptcp dss ack 1672384568], length 0
Out <...> Flags [.], ack 1, win 256, options [mptcp add-addr v1 id 1 198.51.100.2 hmac 0x1cf372d59e05f4b8,mptcp dss ack 3007449509], length 0
In <...> Flags [.], ack 1, win 257, options [mptcp add-addr v1-echo id 1 198.51.100.2,mptcp dss ack 1672384568], length 0
^^^ retransmission is stopped here, only when both 'Address Id' and 'IP Address' match
Fixes: 00cfd77b9063 ("mptcp: retransmit ADD_ADDR when timeout")
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: b4cd80b03389 ("mptcp: pm: Fix uaf in __timer_delete_sync")
[ Conflicts in options.c, because some features are missing in this
version, e.g. commit 557963c383e8 ("mptcp: move to next addr when
subflow creation fail") and commit f7dafee18538 ("mptcp: use
mptcp_addr_info in mptcp_options_received"). ]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-09-17 09:26:10 +02:00
|
|
|
struct mptcp_addr_info *addr, bool check_id)
|
2024-06-15 21:02:09 +02:00
|
|
|
{
|
|
|
|
struct mptcp_pm_add_entry *entry;
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
2024-09-17 09:26:11 +02:00
|
|
|
struct timer_list *add_timer = NULL;
|
2024-06-15 21:02:09 +02:00
|
|
|
|
|
|
|
spin_lock_bh(&msk->pm.lock);
|
2024-09-17 09:26:09 +02:00
|
|
|
entry = mptcp_lookup_anno_list_by_saddr(msk, addr);
|
2024-09-17 09:26:11 +02:00
|
|
|
if (entry && (!check_id || entry->addr.id == addr->id)) {
|
2024-06-15 21:02:09 +02:00
|
|
|
entry->retrans_times = ADD_ADDR_RETRANS_MAX;
|
2024-09-17 09:26:11 +02:00
|
|
|
add_timer = &entry->add_timer;
|
|
|
|
}
|
|
|
|
if (!check_id && entry)
|
|
|
|
list_del(&entry->list);
|
2024-06-15 21:02:09 +02:00
|
|
|
spin_unlock_bh(&msk->pm.lock);
|
|
|
|
|
2024-09-17 09:26:11 +02:00
|
|
|
/* no lock, because sk_stop_timer_sync() is calling del_timer_sync() */
|
|
|
|
if (add_timer)
|
|
|
|
sk_stop_timer_sync(sk, add_timer);
|
2024-06-15 21:02:09 +02:00
|
|
|
|
|
|
|
return entry;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk,
|
|
|
|
struct mptcp_pm_addr_entry *entry)
|
|
|
|
{
|
|
|
|
struct mptcp_pm_add_entry *add_entry = NULL;
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
|
2024-09-17 09:26:09 +02:00
|
|
|
if (mptcp_lookup_anno_list_by_saddr(msk, &entry->addr))
|
2024-06-15 21:02:09 +02:00
|
|
|
return false;
|
|
|
|
|
|
|
|
add_entry = kmalloc(sizeof(*add_entry), GFP_ATOMIC);
|
|
|
|
if (!add_entry)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
list_add(&add_entry->list, &msk->pm.anno_list);
|
|
|
|
|
|
|
|
add_entry->addr = entry->addr;
|
|
|
|
add_entry->sock = msk;
|
|
|
|
add_entry->retrans_times = 0;
|
|
|
|
|
|
|
|
timer_setup(&add_entry->add_timer, mptcp_pm_add_timer, 0);
|
|
|
|
sk_reset_timer(sk, &add_entry->add_timer, jiffies + TCP_RTO_MAX);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void mptcp_pm_free_anno_list(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
struct mptcp_pm_add_entry *entry, *tmp;
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
LIST_HEAD(free_list);
|
|
|
|
|
mptcp: pr_debug: add missing \n at the end
commit cb41b195e634d3f1ecfcd845314e64fd4bb3c7aa upstream.
pr_debug() have been added in various places in MPTCP code to help
developers to debug some situations. With the dynamic debug feature, it
is easy to enable all or some of them, and asks users to reproduce
issues with extra debug.
Many of these pr_debug() don't end with a new line, while no 'pr_cont()'
are used in MPTCP code. So the goal was not to display multiple debug
messages on one line: they were then not missing the '\n' on purpose.
Not having the new line at the end causes these messages to be printed
with a delay, when something else needs to be printed. This issue is not
visible when many messages need to be printed, but it is annoying and
confusing when only specific messages are expected, e.g.
# echo "func mptcp_pm_add_addr_echoed +fmp" \
> /sys/kernel/debug/dynamic_debug/control
# ./mptcp_join.sh "signal address"; \
echo "$(awk '{print $1}' /proc/uptime) - end"; \
sleep 5s; \
echo "$(awk '{print $1}' /proc/uptime) - restart"; \
./mptcp_join.sh "signal address"
013 signal address
(...)
10.75 - end
15.76 - restart
013 signal address
[ 10.367935] mptcp:mptcp_pm_add_addr_echoed: MPTCP: msk=(...)
(...)
=> a delay of 5 seconds: printed with a 10.36 ts, but after 'restart'
which was printed at the 15.76 ts.
The 'Fixes' tag here below points to the first pr_debug() used without
'\n' in net/mptcp. This patch could be split in many small ones, with
different Fixes tag, but it doesn't seem worth it, because it is easy to
re-generate this patch with this simple 'sed' command:
git grep -l pr_debug -- net/mptcp |
xargs sed -i "s/\(pr_debug(\".*[^n]\)\(\"[,)]\)/\1\\\n\2/g"
So in case of conflicts, simply drop the modifications, and launch this
command.
Fixes: f870fa0b5768 ("mptcp: Add MPTCP socket stubs")
Cc: stable@vger.kernel.org
Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20240826-net-mptcp-close-extra-sf-fin-v1-4-905199fe1172@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
[ As mentioned above, conflicts were expected, and resolved by using the
'sed' command which is visible above. ]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-09-06 11:22:56 +02:00
|
|
|
pr_debug("msk=%p\n", msk);
|
2024-06-15 21:02:09 +02:00
|
|
|
|
|
|
|
spin_lock_bh(&msk->pm.lock);
|
|
|
|
list_splice_init(&msk->pm.anno_list, &free_list);
|
|
|
|
spin_unlock_bh(&msk->pm.lock);
|
|
|
|
|
|
|
|
list_for_each_entry_safe(entry, tmp, &free_list, list) {
|
|
|
|
sk_stop_timer_sync(sk, &entry->add_timer);
|
|
|
|
kfree(entry);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
struct mptcp_addr_info remote = { 0 };
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
2024-09-06 11:22:23 +02:00
|
|
|
struct mptcp_pm_addr_entry local;
|
2024-06-15 21:02:09 +02:00
|
|
|
struct pm_nl_pernet *pernet;
|
|
|
|
|
|
|
|
pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id);
|
|
|
|
|
|
|
|
pr_debug("local %d:%d signal %d:%d subflows %d:%d\n",
|
|
|
|
msk->pm.local_addr_used, msk->pm.local_addr_max,
|
|
|
|
msk->pm.add_addr_signaled, msk->pm.add_addr_signal_max,
|
|
|
|
msk->pm.subflows, msk->pm.subflows_max);
|
|
|
|
|
|
|
|
/* check first for announce */
|
|
|
|
if (msk->pm.add_addr_signaled < msk->pm.add_addr_signal_max) {
|
2024-09-06 11:22:23 +02:00
|
|
|
if (select_signal_address(pernet, msk->pm.add_addr_signaled,
|
|
|
|
&local)) {
|
|
|
|
if (mptcp_pm_alloc_anno_list(msk, &local)) {
|
2024-06-15 21:02:09 +02:00
|
|
|
msk->pm.add_addr_signaled++;
|
2024-09-06 11:22:23 +02:00
|
|
|
mptcp_pm_announce_addr(msk, &local.addr, false);
|
2024-06-15 21:02:09 +02:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* pick failed, avoid fourther attempts later */
|
|
|
|
msk->pm.local_addr_used = msk->pm.add_addr_signal_max;
|
|
|
|
}
|
|
|
|
|
|
|
|
check_work_pending(msk);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* check if should create a new subflow */
|
|
|
|
if (msk->pm.local_addr_used < msk->pm.local_addr_max &&
|
|
|
|
msk->pm.subflows < msk->pm.subflows_max) {
|
|
|
|
remote_address((struct sock_common *)sk, &remote);
|
|
|
|
|
2024-09-06 11:22:23 +02:00
|
|
|
if (select_local_address(pernet, msk, &local)) {
|
2024-06-15 21:02:09 +02:00
|
|
|
msk->pm.local_addr_used++;
|
|
|
|
msk->pm.subflows++;
|
|
|
|
check_work_pending(msk);
|
|
|
|
spin_unlock_bh(&msk->pm.lock);
|
2024-09-06 11:22:23 +02:00
|
|
|
__mptcp_subflow_connect(sk, &local.addr, &remote);
|
2024-06-15 21:02:09 +02:00
|
|
|
spin_lock_bh(&msk->pm.lock);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* lookup failed, avoid fourther attempts later */
|
|
|
|
msk->pm.local_addr_used = msk->pm.local_addr_max;
|
|
|
|
check_work_pending(msk);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void mptcp_pm_nl_fully_established(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
mptcp_pm_create_subflow_or_signal_addr(msk);
|
|
|
|
}
|
|
|
|
|
|
|
|
void mptcp_pm_nl_subflow_established(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
mptcp_pm_create_subflow_or_signal_addr(msk);
|
|
|
|
}
|
|
|
|
|
|
|
|
void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
struct mptcp_addr_info remote;
|
|
|
|
struct mptcp_addr_info local;
|
mptcp: pm: update add_addr counters after connect
commit 40eec1795cc27b076d49236649a29507c7ed8c2d upstream.
The creation of new subflows can fail for different reasons. If no
subflow have been created using the received ADD_ADDR, the related
counters should not be updated, otherwise they will never be decremented
for events related to this ID later on.
For the moment, the number of accepted ADD_ADDR is only decremented upon
the reception of a related RM_ADDR, and only if the remote address ID is
currently being used by at least one subflow. In other words, if no
subflow can be created with the received address, the counter will not
be decremented. In this case, it is then important not to increment
pm.add_addr_accepted counter, and not to modify pm.accept_addr bit.
Note that this patch does not modify the behaviour in case of failures
later on, e.g. if the MP Join is dropped or rejected.
The "remove invalid addresses" MP Join subtest has been modified to
validate this case. The broadcast IP address is added before the "valid"
address that will be used to successfully create a subflow, and the
limit is decreased by one: without this patch, it was not possible to
create the last subflow, because:
- the broadcast address would have been accepted even if it was not
usable: the creation of a subflow to this address results in an error,
- the limit of 2 accepted ADD_ADDR would have then been reached.
Fixes: 01cacb00b35c ("mptcp: add netlink-based PM")
Cc: stable@vger.kernel.org
Co-developed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: YonglongLi <liyonglong@chinatelecom.cn>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240607-upstream-net-20240607-misc-fixes-v1-3-1ab9ddfa3d00@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
[ Conflicts in pm_netlink.c because commit 1a0d6136c5f0 ("mptcp: local
addresses fullmesh") is not present in this version (+ others changing
the context). To resolve the conflicts, the same block is moved later,
and under the condition that the call to __mptcp_subflow_connect()
didn't fail.
The selftest modification has been dropped, because the modified test
is not in this version. That's fine, we can test with selftests from a
newer version. ]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-06-18 14:25:32 +02:00
|
|
|
int err;
|
2024-06-15 21:02:09 +02:00
|
|
|
|
mptcp: pr_debug: add missing \n at the end
commit cb41b195e634d3f1ecfcd845314e64fd4bb3c7aa upstream.
pr_debug() have been added in various places in MPTCP code to help
developers to debug some situations. With the dynamic debug feature, it
is easy to enable all or some of them, and asks users to reproduce
issues with extra debug.
Many of these pr_debug() don't end with a new line, while no 'pr_cont()'
are used in MPTCP code. So the goal was not to display multiple debug
messages on one line: they were then not missing the '\n' on purpose.
Not having the new line at the end causes these messages to be printed
with a delay, when something else needs to be printed. This issue is not
visible when many messages need to be printed, but it is annoying and
confusing when only specific messages are expected, e.g.
# echo "func mptcp_pm_add_addr_echoed +fmp" \
> /sys/kernel/debug/dynamic_debug/control
# ./mptcp_join.sh "signal address"; \
echo "$(awk '{print $1}' /proc/uptime) - end"; \
sleep 5s; \
echo "$(awk '{print $1}' /proc/uptime) - restart"; \
./mptcp_join.sh "signal address"
013 signal address
(...)
10.75 - end
15.76 - restart
013 signal address
[ 10.367935] mptcp:mptcp_pm_add_addr_echoed: MPTCP: msk=(...)
(...)
=> a delay of 5 seconds: printed with a 10.36 ts, but after 'restart'
which was printed at the 15.76 ts.
The 'Fixes' tag here below points to the first pr_debug() used without
'\n' in net/mptcp. This patch could be split in many small ones, with
different Fixes tag, but it doesn't seem worth it, because it is easy to
re-generate this patch with this simple 'sed' command:
git grep -l pr_debug -- net/mptcp |
xargs sed -i "s/\(pr_debug(\".*[^n]\)\(\"[,)]\)/\1\\\n\2/g"
So in case of conflicts, simply drop the modifications, and launch this
command.
Fixes: f870fa0b5768 ("mptcp: Add MPTCP socket stubs")
Cc: stable@vger.kernel.org
Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20240826-net-mptcp-close-extra-sf-fin-v1-4-905199fe1172@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
[ As mentioned above, conflicts were expected, and resolved by using the
'sed' command which is visible above. ]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-09-06 11:22:56 +02:00
|
|
|
pr_debug("accepted %d:%d remote family %d\n",
|
2024-06-15 21:02:09 +02:00
|
|
|
msk->pm.add_addr_accepted, msk->pm.add_addr_accept_max,
|
|
|
|
msk->pm.remote.family);
|
|
|
|
msk->pm.subflows++;
|
|
|
|
|
|
|
|
/* connect to the specified remote address, using whatever
|
|
|
|
* local address the routing configuration will pick.
|
|
|
|
*/
|
|
|
|
remote = msk->pm.remote;
|
|
|
|
if (!remote.port)
|
|
|
|
remote.port = sk->sk_dport;
|
|
|
|
memset(&local, 0, sizeof(local));
|
|
|
|
local.family = remote.family;
|
|
|
|
|
|
|
|
spin_unlock_bh(&msk->pm.lock);
|
mptcp: pm: update add_addr counters after connect
commit 40eec1795cc27b076d49236649a29507c7ed8c2d upstream.
The creation of new subflows can fail for different reasons. If no
subflow have been created using the received ADD_ADDR, the related
counters should not be updated, otherwise they will never be decremented
for events related to this ID later on.
For the moment, the number of accepted ADD_ADDR is only decremented upon
the reception of a related RM_ADDR, and only if the remote address ID is
currently being used by at least one subflow. In other words, if no
subflow can be created with the received address, the counter will not
be decremented. In this case, it is then important not to increment
pm.add_addr_accepted counter, and not to modify pm.accept_addr bit.
Note that this patch does not modify the behaviour in case of failures
later on, e.g. if the MP Join is dropped or rejected.
The "remove invalid addresses" MP Join subtest has been modified to
validate this case. The broadcast IP address is added before the "valid"
address that will be used to successfully create a subflow, and the
limit is decreased by one: without this patch, it was not possible to
create the last subflow, because:
- the broadcast address would have been accepted even if it was not
usable: the creation of a subflow to this address results in an error,
- the limit of 2 accepted ADD_ADDR would have then been reached.
Fixes: 01cacb00b35c ("mptcp: add netlink-based PM")
Cc: stable@vger.kernel.org
Co-developed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: YonglongLi <liyonglong@chinatelecom.cn>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240607-upstream-net-20240607-misc-fixes-v1-3-1ab9ddfa3d00@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
[ Conflicts in pm_netlink.c because commit 1a0d6136c5f0 ("mptcp: local
addresses fullmesh") is not present in this version (+ others changing
the context). To resolve the conflicts, the same block is moved later,
and under the condition that the call to __mptcp_subflow_connect()
didn't fail.
The selftest modification has been dropped, because the modified test
is not in this version. That's fine, we can test with selftests from a
newer version. ]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-06-18 14:25:32 +02:00
|
|
|
err = __mptcp_subflow_connect((struct sock *)msk, &local, &remote);
|
2024-06-15 21:02:09 +02:00
|
|
|
spin_lock_bh(&msk->pm.lock);
|
|
|
|
|
mptcp: pm: update add_addr counters after connect
commit 40eec1795cc27b076d49236649a29507c7ed8c2d upstream.
The creation of new subflows can fail for different reasons. If no
subflow have been created using the received ADD_ADDR, the related
counters should not be updated, otherwise they will never be decremented
for events related to this ID later on.
For the moment, the number of accepted ADD_ADDR is only decremented upon
the reception of a related RM_ADDR, and only if the remote address ID is
currently being used by at least one subflow. In other words, if no
subflow can be created with the received address, the counter will not
be decremented. In this case, it is then important not to increment
pm.add_addr_accepted counter, and not to modify pm.accept_addr bit.
Note that this patch does not modify the behaviour in case of failures
later on, e.g. if the MP Join is dropped or rejected.
The "remove invalid addresses" MP Join subtest has been modified to
validate this case. The broadcast IP address is added before the "valid"
address that will be used to successfully create a subflow, and the
limit is decreased by one: without this patch, it was not possible to
create the last subflow, because:
- the broadcast address would have been accepted even if it was not
usable: the creation of a subflow to this address results in an error,
- the limit of 2 accepted ADD_ADDR would have then been reached.
Fixes: 01cacb00b35c ("mptcp: add netlink-based PM")
Cc: stable@vger.kernel.org
Co-developed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: YonglongLi <liyonglong@chinatelecom.cn>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240607-upstream-net-20240607-misc-fixes-v1-3-1ab9ddfa3d00@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
[ Conflicts in pm_netlink.c because commit 1a0d6136c5f0 ("mptcp: local
addresses fullmesh") is not present in this version (+ others changing
the context). To resolve the conflicts, the same block is moved later,
and under the condition that the call to __mptcp_subflow_connect()
didn't fail.
The selftest modification has been dropped, because the modified test
is not in this version. That's fine, we can test with selftests from a
newer version. ]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-06-18 14:25:32 +02:00
|
|
|
if (!err) {
|
|
|
|
msk->pm.add_addr_accepted++;
|
|
|
|
if (msk->pm.add_addr_accepted >= msk->pm.add_addr_accept_max ||
|
|
|
|
msk->pm.subflows >= msk->pm.subflows_max)
|
|
|
|
WRITE_ONCE(msk->pm.accept_addr, false);
|
|
|
|
}
|
|
|
|
|
2024-06-15 21:02:09 +02:00
|
|
|
mptcp_pm_announce_addr(msk, &remote, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
void mptcp_pm_nl_rm_addr_received(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow, *tmp;
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
|
mptcp: pr_debug: add missing \n at the end
commit cb41b195e634d3f1ecfcd845314e64fd4bb3c7aa upstream.
pr_debug() have been added in various places in MPTCP code to help
developers to debug some situations. With the dynamic debug feature, it
is easy to enable all or some of them, and asks users to reproduce
issues with extra debug.
Many of these pr_debug() don't end with a new line, while no 'pr_cont()'
are used in MPTCP code. So the goal was not to display multiple debug
messages on one line: they were then not missing the '\n' on purpose.
Not having the new line at the end causes these messages to be printed
with a delay, when something else needs to be printed. This issue is not
visible when many messages need to be printed, but it is annoying and
confusing when only specific messages are expected, e.g.
# echo "func mptcp_pm_add_addr_echoed +fmp" \
> /sys/kernel/debug/dynamic_debug/control
# ./mptcp_join.sh "signal address"; \
echo "$(awk '{print $1}' /proc/uptime) - end"; \
sleep 5s; \
echo "$(awk '{print $1}' /proc/uptime) - restart"; \
./mptcp_join.sh "signal address"
013 signal address
(...)
10.75 - end
15.76 - restart
013 signal address
[ 10.367935] mptcp:mptcp_pm_add_addr_echoed: MPTCP: msk=(...)
(...)
=> a delay of 5 seconds: printed with a 10.36 ts, but after 'restart'
which was printed at the 15.76 ts.
The 'Fixes' tag here below points to the first pr_debug() used without
'\n' in net/mptcp. This patch could be split in many small ones, with
different Fixes tag, but it doesn't seem worth it, because it is easy to
re-generate this patch with this simple 'sed' command:
git grep -l pr_debug -- net/mptcp |
xargs sed -i "s/\(pr_debug(\".*[^n]\)\(\"[,)]\)/\1\\\n\2/g"
So in case of conflicts, simply drop the modifications, and launch this
command.
Fixes: f870fa0b5768 ("mptcp: Add MPTCP socket stubs")
Cc: stable@vger.kernel.org
Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20240826-net-mptcp-close-extra-sf-fin-v1-4-905199fe1172@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
[ As mentioned above, conflicts were expected, and resolved by using the
'sed' command which is visible above. ]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-09-06 11:22:56 +02:00
|
|
|
pr_debug("address rm_id %d\n", msk->pm.rm_id);
|
2024-06-15 21:02:09 +02:00
|
|
|
|
|
|
|
if (!msk->pm.rm_id)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (list_empty(&msk->conn_list))
|
|
|
|
return;
|
|
|
|
|
|
|
|
list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) {
|
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
int how = RCV_SHUTDOWN | SEND_SHUTDOWN;
|
|
|
|
long timeout = 0;
|
|
|
|
|
|
|
|
if (msk->pm.rm_id != subflow->remote_id)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
spin_unlock_bh(&msk->pm.lock);
|
|
|
|
mptcp_subflow_shutdown(sk, ssk, how);
|
|
|
|
__mptcp_close_ssk(sk, ssk, subflow, timeout);
|
|
|
|
spin_lock_bh(&msk->pm.lock);
|
|
|
|
|
|
|
|
msk->pm.add_addr_accepted--;
|
|
|
|
msk->pm.subflows--;
|
|
|
|
WRITE_ONCE(msk->pm.accept_addr, true);
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
2024-06-18 14:25:12 +02:00
|
|
|
|
|
|
|
__MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RMADDR);
|
2024-06-15 21:02:09 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, u8 rm_id)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow, *tmp;
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
|
mptcp: pr_debug: add missing \n at the end
commit cb41b195e634d3f1ecfcd845314e64fd4bb3c7aa upstream.
pr_debug() have been added in various places in MPTCP code to help
developers to debug some situations. With the dynamic debug feature, it
is easy to enable all or some of them, and asks users to reproduce
issues with extra debug.
Many of these pr_debug() don't end with a new line, while no 'pr_cont()'
are used in MPTCP code. So the goal was not to display multiple debug
messages on one line: they were then not missing the '\n' on purpose.
Not having the new line at the end causes these messages to be printed
with a delay, when something else needs to be printed. This issue is not
visible when many messages need to be printed, but it is annoying and
confusing when only specific messages are expected, e.g.
# echo "func mptcp_pm_add_addr_echoed +fmp" \
> /sys/kernel/debug/dynamic_debug/control
# ./mptcp_join.sh "signal address"; \
echo "$(awk '{print $1}' /proc/uptime) - end"; \
sleep 5s; \
echo "$(awk '{print $1}' /proc/uptime) - restart"; \
./mptcp_join.sh "signal address"
013 signal address
(...)
10.75 - end
15.76 - restart
013 signal address
[ 10.367935] mptcp:mptcp_pm_add_addr_echoed: MPTCP: msk=(...)
(...)
=> a delay of 5 seconds: printed with a 10.36 ts, but after 'restart'
which was printed at the 15.76 ts.
The 'Fixes' tag here below points to the first pr_debug() used without
'\n' in net/mptcp. This patch could be split in many small ones, with
different Fixes tag, but it doesn't seem worth it, because it is easy to
re-generate this patch with this simple 'sed' command:
git grep -l pr_debug -- net/mptcp |
xargs sed -i "s/\(pr_debug(\".*[^n]\)\(\"[,)]\)/\1\\\n\2/g"
So in case of conflicts, simply drop the modifications, and launch this
command.
Fixes: f870fa0b5768 ("mptcp: Add MPTCP socket stubs")
Cc: stable@vger.kernel.org
Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20240826-net-mptcp-close-extra-sf-fin-v1-4-905199fe1172@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
[ As mentioned above, conflicts were expected, and resolved by using the
'sed' command which is visible above. ]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-09-06 11:22:56 +02:00
|
|
|
pr_debug("subflow rm_id %d\n", rm_id);
|
2024-06-15 21:02:09 +02:00
|
|
|
|
|
|
|
if (!rm_id)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (list_empty(&msk->conn_list))
|
|
|
|
return;
|
|
|
|
|
|
|
|
list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) {
|
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
int how = RCV_SHUTDOWN | SEND_SHUTDOWN;
|
|
|
|
long timeout = 0;
|
|
|
|
|
|
|
|
if (rm_id != subflow->local_id)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
spin_unlock_bh(&msk->pm.lock);
|
|
|
|
mptcp_subflow_shutdown(sk, ssk, how);
|
|
|
|
__mptcp_close_ssk(sk, ssk, subflow, timeout);
|
|
|
|
spin_lock_bh(&msk->pm.lock);
|
|
|
|
|
|
|
|
msk->pm.local_addr_used--;
|
|
|
|
msk->pm.subflows--;
|
|
|
|
|
|
|
|
__MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RMSUBFLOW);
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool address_use_port(struct mptcp_pm_addr_entry *entry)
|
|
|
|
{
|
|
|
|
return (entry->addr.flags &
|
|
|
|
(MPTCP_PM_ADDR_FLAG_SIGNAL | MPTCP_PM_ADDR_FLAG_SUBFLOW)) ==
|
|
|
|
MPTCP_PM_ADDR_FLAG_SIGNAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mptcp_pm_nl_append_new_local_addr(struct pm_nl_pernet *pernet,
|
|
|
|
struct mptcp_pm_addr_entry *entry)
|
|
|
|
{
|
|
|
|
struct mptcp_pm_addr_entry *cur;
|
|
|
|
int ret = -EINVAL;
|
|
|
|
|
|
|
|
spin_lock_bh(&pernet->lock);
|
|
|
|
/* to keep the code simple, don't do IDR-like allocation for address ID,
|
|
|
|
* just bail when we exceed limits
|
|
|
|
*/
|
|
|
|
if (pernet->next_id > 255)
|
|
|
|
goto out;
|
|
|
|
if (pernet->addrs >= MPTCP_PM_ADDR_MAX)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* do not insert duplicate address, differentiate on port only
|
|
|
|
* singled addresses
|
|
|
|
*/
|
|
|
|
list_for_each_entry(cur, &pernet->local_addr_list, list) {
|
|
|
|
if (addresses_equal(&cur->addr, &entry->addr,
|
|
|
|
address_use_port(entry) &&
|
|
|
|
address_use_port(cur)))
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (entry->addr.flags & MPTCP_PM_ADDR_FLAG_SIGNAL)
|
|
|
|
pernet->add_addr_signal_max++;
|
|
|
|
if (entry->addr.flags & MPTCP_PM_ADDR_FLAG_SUBFLOW)
|
|
|
|
pernet->local_addr_max++;
|
|
|
|
|
|
|
|
entry->addr.id = pernet->next_id++;
|
|
|
|
pernet->addrs++;
|
|
|
|
list_add_tail_rcu(&entry->list, &pernet->local_addr_list);
|
|
|
|
ret = entry->addr.id;
|
|
|
|
|
|
|
|
out:
|
|
|
|
spin_unlock_bh(&pernet->lock);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc)
|
|
|
|
{
|
|
|
|
struct mptcp_pm_addr_entry *entry;
|
|
|
|
struct mptcp_addr_info skc_local;
|
|
|
|
struct mptcp_addr_info msk_local;
|
|
|
|
struct pm_nl_pernet *pernet;
|
|
|
|
int ret = -1;
|
|
|
|
|
|
|
|
if (WARN_ON_ONCE(!msk))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* The 0 ID mapping is defined by the first subflow, copied into the msk
|
|
|
|
* addr
|
|
|
|
*/
|
2024-08-09 12:55:39 +02:00
|
|
|
mptcp_local_address((struct sock_common *)msk, &msk_local);
|
|
|
|
mptcp_local_address((struct sock_common *)skc, &skc_local);
|
2024-06-15 21:02:09 +02:00
|
|
|
if (addresses_equal(&msk_local, &skc_local, false))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (address_zero(&skc_local))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id);
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) {
|
|
|
|
if (addresses_equal(&entry->addr, &skc_local, false)) {
|
|
|
|
ret = entry->addr.id;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
if (ret >= 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
/* address not found, add to local list */
|
|
|
|
entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
|
|
|
|
if (!entry)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
entry->addr = skc_local;
|
|
|
|
entry->addr.ifindex = 0;
|
|
|
|
entry->addr.flags = 0;
|
|
|
|
ret = mptcp_pm_nl_append_new_local_addr(pernet, entry);
|
|
|
|
if (ret < 0)
|
|
|
|
kfree(entry);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
mptcp: pm: fix backup support in signal endpoints
commit 6834097fc38c5416701c793da94558cea49c0a1f upstream.
There was a support for signal endpoints, but only when the endpoint's
flag was changed during a connection. If an endpoint with the signal and
backup was already present, the MP_JOIN reply was not containing the
backup flag as expected.
That's confusing to have this inconsistent behaviour. On the other hand,
the infrastructure to set the backup flag in the SYN + ACK + MP_JOIN was
already there, it was just never set before. Now when requesting the
local ID from the path-manager, the backup status is also requested.
Note that when the userspace PM is used, the backup flag can be set if
the local address was already used before with a backup flag, e.g. if
the address was announced with the 'backup' flag, or a subflow was
created with the 'backup' flag.
Fixes: 4596a2c1b7f5 ("mptcp: allow creating non-backup subflows")
Cc: stable@vger.kernel.org
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/507
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
[ Conflicts in pm_userspace.c because the context has changed in commit
1e07938e29c5 ("net: mptcp: rename netlink handlers to
mptcp_pm_nl_<blah>_{doit,dumpit}") which is not in this version. This
commit is unrelated to this modification.
Conflicts in protocol.h because the context has changed in commit
9ae7846c4b6b ("mptcp: dump addrs in userspace pm list") which is not
in this version. This commit is unrelated to this modification.
Conflicts in pm.c because the context has changed in commit
f40be0db0b76 ("mptcp: unify pm get_flags_and_ifindex_by_id") and
commit 71b7dec27f34 ("mptcp: less aggressive retransmission strategy")
which are not in this version. These commits are unrelated to this
modification.
Conflicts in subflow.c, because the commit 4cf86ae84c71 ("mptcp:
strict local address ID selection") is not in this version. It is then
not needed to modify the subflow_chk_local_id() helper, which is not
in this version.
Also, in this version, there is no pm_userspace.c, because this PM has
been added in v5.19, which also causes conflicts in protocol.h, and
pm_netlink.c. Plus the code in pm.c can be simplified, as there is no
userspace PM. And the code in pm_netlink.c needs to use
addresses_equal() instead of mptcp_addresses_equal(), see commit
4638de5aefe5 ("mptcp: handle local addrs announced by userspace PMs").
The code in pm_netlink.c also needs to be adapted because the
pm_nl_get_pernet_from_msk() helper is not in this version, introduced
later in commit c682bf536cf4 ("mptcp: add pm_nl_pernet helpers"), and
also because the 'flags' are in mptcp_addr_info structure, see commit
daa83ab03954 ("mptcp: move flags and ifindex out of
mptcp_addr_info"). ]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-08-09 12:55:40 +02:00
|
|
|
bool mptcp_pm_nl_is_backup(struct mptcp_sock *msk, struct mptcp_addr_info *skc)
|
|
|
|
{
|
|
|
|
struct mptcp_pm_addr_entry *entry;
|
|
|
|
struct pm_nl_pernet *pernet;
|
|
|
|
bool backup = false;
|
|
|
|
|
|
|
|
pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id);
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) {
|
|
|
|
if (addresses_equal(&entry->addr, skc, entry->addr.port)) {
|
|
|
|
backup = !!(entry->addr.flags & MPTCP_PM_ADDR_FLAG_BACKUP);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
return backup;
|
|
|
|
}
|
|
|
|
|
2024-06-15 21:02:09 +02:00
|
|
|
void mptcp_pm_nl_data_init(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
struct mptcp_pm_data *pm = &msk->pm;
|
|
|
|
struct pm_nl_pernet *pernet;
|
|
|
|
bool subflows;
|
|
|
|
|
|
|
|
pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id);
|
|
|
|
|
|
|
|
pm->add_addr_signal_max = READ_ONCE(pernet->add_addr_signal_max);
|
|
|
|
pm->add_addr_accept_max = READ_ONCE(pernet->add_addr_accept_max);
|
|
|
|
pm->local_addr_max = READ_ONCE(pernet->local_addr_max);
|
|
|
|
pm->subflows_max = READ_ONCE(pernet->subflows_max);
|
|
|
|
subflows = !!pm->subflows_max;
|
|
|
|
WRITE_ONCE(pm->work_pending, (!!pm->local_addr_max && subflows) ||
|
|
|
|
!!pm->add_addr_signal_max);
|
|
|
|
WRITE_ONCE(pm->accept_addr, !!pm->add_addr_accept_max && subflows);
|
|
|
|
WRITE_ONCE(pm->accept_subflow, subflows);
|
|
|
|
}
|
|
|
|
|
|
|
|
#define MPTCP_PM_CMD_GRP_OFFSET 0
|
|
|
|
|
|
|
|
static const struct genl_multicast_group mptcp_pm_mcgrps[] = {
|
|
|
|
[MPTCP_PM_CMD_GRP_OFFSET] = { .name = MPTCP_PM_CMD_GRP_NAME, },
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct nla_policy
|
|
|
|
mptcp_pm_addr_policy[MPTCP_PM_ADDR_ATTR_MAX + 1] = {
|
|
|
|
[MPTCP_PM_ADDR_ATTR_FAMILY] = { .type = NLA_U16, },
|
|
|
|
[MPTCP_PM_ADDR_ATTR_ID] = { .type = NLA_U8, },
|
|
|
|
[MPTCP_PM_ADDR_ATTR_ADDR4] = { .type = NLA_U32, },
|
|
|
|
[MPTCP_PM_ADDR_ATTR_ADDR6] =
|
|
|
|
NLA_POLICY_EXACT_LEN(sizeof(struct in6_addr)),
|
|
|
|
[MPTCP_PM_ADDR_ATTR_PORT] = { .type = NLA_U16 },
|
|
|
|
[MPTCP_PM_ADDR_ATTR_FLAGS] = { .type = NLA_U32 },
|
|
|
|
[MPTCP_PM_ADDR_ATTR_IF_IDX] = { .type = NLA_S32 },
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct nla_policy mptcp_pm_policy[MPTCP_PM_ATTR_MAX + 1] = {
|
|
|
|
[MPTCP_PM_ATTR_ADDR] =
|
|
|
|
NLA_POLICY_NESTED(mptcp_pm_addr_policy),
|
|
|
|
[MPTCP_PM_ATTR_RCV_ADD_ADDRS] = { .type = NLA_U32, },
|
|
|
|
[MPTCP_PM_ATTR_SUBFLOWS] = { .type = NLA_U32, },
|
|
|
|
};
|
|
|
|
|
|
|
|
static int mptcp_pm_family_to_addr(int family)
|
|
|
|
{
|
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
if (family == AF_INET6)
|
|
|
|
return MPTCP_PM_ADDR_ATTR_ADDR6;
|
|
|
|
#endif
|
|
|
|
return MPTCP_PM_ADDR_ATTR_ADDR4;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mptcp_pm_parse_addr(struct nlattr *attr, struct genl_info *info,
|
|
|
|
bool require_family,
|
|
|
|
struct mptcp_pm_addr_entry *entry)
|
|
|
|
{
|
|
|
|
struct nlattr *tb[MPTCP_PM_ADDR_ATTR_MAX + 1];
|
|
|
|
int err, addr_addr;
|
|
|
|
|
|
|
|
if (!attr) {
|
|
|
|
GENL_SET_ERR_MSG(info, "missing address info");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* no validation needed - was already done via nested policy */
|
|
|
|
err = nla_parse_nested_deprecated(tb, MPTCP_PM_ADDR_ATTR_MAX, attr,
|
|
|
|
mptcp_pm_addr_policy, info->extack);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
memset(entry, 0, sizeof(*entry));
|
|
|
|
if (!tb[MPTCP_PM_ADDR_ATTR_FAMILY]) {
|
|
|
|
if (!require_family)
|
|
|
|
goto skip_family;
|
|
|
|
|
|
|
|
NL_SET_ERR_MSG_ATTR(info->extack, attr,
|
|
|
|
"missing family");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
entry->addr.family = nla_get_u16(tb[MPTCP_PM_ADDR_ATTR_FAMILY]);
|
|
|
|
if (entry->addr.family != AF_INET
|
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
&& entry->addr.family != AF_INET6
|
|
|
|
#endif
|
|
|
|
) {
|
|
|
|
NL_SET_ERR_MSG_ATTR(info->extack, attr,
|
|
|
|
"unknown address family");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
addr_addr = mptcp_pm_family_to_addr(entry->addr.family);
|
|
|
|
if (!tb[addr_addr]) {
|
|
|
|
NL_SET_ERR_MSG_ATTR(info->extack, attr,
|
|
|
|
"missing address data");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
if (entry->addr.family == AF_INET6)
|
|
|
|
entry->addr.addr6 = nla_get_in6_addr(tb[addr_addr]);
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
entry->addr.addr.s_addr = nla_get_in_addr(tb[addr_addr]);
|
|
|
|
|
|
|
|
skip_family:
|
|
|
|
if (tb[MPTCP_PM_ADDR_ATTR_IF_IDX]) {
|
|
|
|
u32 val = nla_get_s32(tb[MPTCP_PM_ADDR_ATTR_IF_IDX]);
|
|
|
|
|
|
|
|
entry->addr.ifindex = val;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (tb[MPTCP_PM_ADDR_ATTR_ID])
|
|
|
|
entry->addr.id = nla_get_u8(tb[MPTCP_PM_ADDR_ATTR_ID]);
|
|
|
|
|
|
|
|
if (tb[MPTCP_PM_ADDR_ATTR_FLAGS])
|
|
|
|
entry->addr.flags = nla_get_u32(tb[MPTCP_PM_ADDR_ATTR_FLAGS]);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct pm_nl_pernet *genl_info_pm_nl(struct genl_info *info)
|
|
|
|
{
|
|
|
|
return net_generic(genl_info_net(info), pm_nl_pernet_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *info)
|
|
|
|
{
|
|
|
|
struct nlattr *attr = info->attrs[MPTCP_PM_ATTR_ADDR];
|
|
|
|
struct pm_nl_pernet *pernet = genl_info_pm_nl(info);
|
|
|
|
struct mptcp_pm_addr_entry addr, *entry;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = mptcp_pm_parse_addr(attr, info, true, &addr);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
entry = kmalloc(sizeof(*entry), GFP_KERNEL);
|
|
|
|
if (!entry) {
|
|
|
|
GENL_SET_ERR_MSG(info, "can't allocate addr");
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
|
|
|
*entry = addr;
|
|
|
|
ret = mptcp_pm_nl_append_new_local_addr(pernet, entry);
|
|
|
|
if (ret < 0) {
|
|
|
|
GENL_SET_ERR_MSG(info, "too many addresses or duplicate one");
|
|
|
|
kfree(entry);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct mptcp_pm_addr_entry *
|
|
|
|
__lookup_addr_by_id(struct pm_nl_pernet *pernet, unsigned int id)
|
|
|
|
{
|
|
|
|
struct mptcp_pm_addr_entry *entry;
|
|
|
|
|
|
|
|
list_for_each_entry(entry, &pernet->local_addr_list, list) {
|
|
|
|
if (entry->addr.id == id)
|
|
|
|
return entry;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool remove_anno_list_by_saddr(struct mptcp_sock *msk,
|
|
|
|
struct mptcp_addr_info *addr)
|
|
|
|
{
|
|
|
|
struct mptcp_pm_add_entry *entry;
|
|
|
|
|
mptcp: validate 'id' when stopping the ADD_ADDR retransmit timer
commit d58300c3185b78ab910092488126b97f0abe3ae2 upstream.
when Linux receives an echo-ed ADD_ADDR, it checks the IP address against
the list of "announced" addresses. In case of a positive match, the timer
that handles retransmissions is stopped regardless of the 'Address Id' in
the received packet: this behaviour does not comply with RFC8684 3.4.1.
Fix it by validating the 'Address Id' in received echo-ed ADD_ADDRs.
Tested using packetdrill, with the following captured output:
unpatched kernel:
Out <...> Flags [.], ack 1, win 256, options [mptcp add-addr v1 id 1 198.51.100.2 hmac 0xfd2e62517888fe29,mptcp dss ack 3007449509], length 0
In <...> Flags [.], ack 1, win 257, options [mptcp add-addr v1-echo id 1 1.2.3.4,mptcp dss ack 3013740213], length 0
Out <...> Flags [.], ack 1, win 256, options [mptcp add-addr v1 id 1 198.51.100.2 hmac 0xfd2e62517888fe29,mptcp dss ack 3007449509], length 0
In <...> Flags [.], ack 1, win 257, options [mptcp add-addr v1-echo id 90 198.51.100.2,mptcp dss ack 3013740213], length 0
^^^ retransmission is stopped here, but 'Address Id' is 90
patched kernel:
Out <...> Flags [.], ack 1, win 256, options [mptcp add-addr v1 id 1 198.51.100.2 hmac 0x1cf372d59e05f4b8,mptcp dss ack 3007449509], length 0
In <...> Flags [.], ack 1, win 257, options [mptcp add-addr v1-echo id 1 1.2.3.4,mptcp dss ack 1672384568], length 0
Out <...> Flags [.], ack 1, win 256, options [mptcp add-addr v1 id 1 198.51.100.2 hmac 0x1cf372d59e05f4b8,mptcp dss ack 3007449509], length 0
In <...> Flags [.], ack 1, win 257, options [mptcp add-addr v1-echo id 90 198.51.100.2,mptcp dss ack 1672384568], length 0
Out <...> Flags [.], ack 1, win 256, options [mptcp add-addr v1 id 1 198.51.100.2 hmac 0x1cf372d59e05f4b8,mptcp dss ack 3007449509], length 0
In <...> Flags [.], ack 1, win 257, options [mptcp add-addr v1-echo id 1 198.51.100.2,mptcp dss ack 1672384568], length 0
^^^ retransmission is stopped here, only when both 'Address Id' and 'IP Address' match
Fixes: 00cfd77b9063 ("mptcp: retransmit ADD_ADDR when timeout")
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: b4cd80b03389 ("mptcp: pm: Fix uaf in __timer_delete_sync")
[ Conflicts in options.c, because some features are missing in this
version, e.g. commit 557963c383e8 ("mptcp: move to next addr when
subflow creation fail") and commit f7dafee18538 ("mptcp: use
mptcp_addr_info in mptcp_options_received"). ]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-09-17 09:26:10 +02:00
|
|
|
entry = mptcp_pm_del_add_timer(msk, addr, false);
|
2024-06-15 21:02:09 +02:00
|
|
|
if (entry) {
|
|
|
|
kfree(entry);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool mptcp_pm_remove_anno_addr(struct mptcp_sock *msk,
|
|
|
|
struct mptcp_addr_info *addr,
|
|
|
|
bool force)
|
|
|
|
{
|
|
|
|
bool ret;
|
|
|
|
|
|
|
|
ret = remove_anno_list_by_saddr(msk, addr);
|
|
|
|
if (ret || force) {
|
|
|
|
spin_lock_bh(&msk->pm.lock);
|
2024-08-09 12:54:50 +02:00
|
|
|
msk->pm.add_addr_signaled -= ret;
|
2024-06-15 21:02:09 +02:00
|
|
|
mptcp_pm_remove_addr(msk, addr->id);
|
|
|
|
spin_unlock_bh(&msk->pm.lock);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mptcp_nl_remove_subflow_and_signal_addr(struct net *net,
|
|
|
|
struct mptcp_addr_info *addr)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk;
|
|
|
|
long s_slot = 0, s_num = 0;
|
|
|
|
|
mptcp: pr_debug: add missing \n at the end
commit cb41b195e634d3f1ecfcd845314e64fd4bb3c7aa upstream.
pr_debug() have been added in various places in MPTCP code to help
developers to debug some situations. With the dynamic debug feature, it
is easy to enable all or some of them, and asks users to reproduce
issues with extra debug.
Many of these pr_debug() don't end with a new line, while no 'pr_cont()'
are used in MPTCP code. So the goal was not to display multiple debug
messages on one line: they were then not missing the '\n' on purpose.
Not having the new line at the end causes these messages to be printed
with a delay, when something else needs to be printed. This issue is not
visible when many messages need to be printed, but it is annoying and
confusing when only specific messages are expected, e.g.
# echo "func mptcp_pm_add_addr_echoed +fmp" \
> /sys/kernel/debug/dynamic_debug/control
# ./mptcp_join.sh "signal address"; \
echo "$(awk '{print $1}' /proc/uptime) - end"; \
sleep 5s; \
echo "$(awk '{print $1}' /proc/uptime) - restart"; \
./mptcp_join.sh "signal address"
013 signal address
(...)
10.75 - end
15.76 - restart
013 signal address
[ 10.367935] mptcp:mptcp_pm_add_addr_echoed: MPTCP: msk=(...)
(...)
=> a delay of 5 seconds: printed with a 10.36 ts, but after 'restart'
which was printed at the 15.76 ts.
The 'Fixes' tag here below points to the first pr_debug() used without
'\n' in net/mptcp. This patch could be split in many small ones, with
different Fixes tag, but it doesn't seem worth it, because it is easy to
re-generate this patch with this simple 'sed' command:
git grep -l pr_debug -- net/mptcp |
xargs sed -i "s/\(pr_debug(\".*[^n]\)\(\"[,)]\)/\1\\\n\2/g"
So in case of conflicts, simply drop the modifications, and launch this
command.
Fixes: f870fa0b5768 ("mptcp: Add MPTCP socket stubs")
Cc: stable@vger.kernel.org
Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20240826-net-mptcp-close-extra-sf-fin-v1-4-905199fe1172@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
[ As mentioned above, conflicts were expected, and resolved by using the
'sed' command which is visible above. ]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-09-06 11:22:56 +02:00
|
|
|
pr_debug("remove_id=%d\n", addr->id);
|
2024-06-15 21:02:09 +02:00
|
|
|
|
|
|
|
while ((msk = mptcp_token_iter_next(net, &s_slot, &s_num)) != NULL) {
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
bool remove_subflow;
|
|
|
|
|
|
|
|
if (list_empty(&msk->conn_list)) {
|
|
|
|
mptcp_pm_remove_anno_addr(msk, addr, false);
|
|
|
|
goto next;
|
|
|
|
}
|
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
remove_subflow = lookup_subflow_by_saddr(&msk->conn_list, addr);
|
|
|
|
mptcp_pm_remove_anno_addr(msk, addr, remove_subflow);
|
|
|
|
if (remove_subflow)
|
|
|
|
mptcp_pm_remove_subflow(msk, addr->id);
|
|
|
|
release_sock(sk);
|
|
|
|
|
|
|
|
next:
|
|
|
|
sock_put(sk);
|
|
|
|
cond_resched();
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mptcp_nl_cmd_del_addr(struct sk_buff *skb, struct genl_info *info)
|
|
|
|
{
|
|
|
|
struct nlattr *attr = info->attrs[MPTCP_PM_ATTR_ADDR];
|
|
|
|
struct pm_nl_pernet *pernet = genl_info_pm_nl(info);
|
|
|
|
struct mptcp_pm_addr_entry addr, *entry;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = mptcp_pm_parse_addr(attr, info, false, &addr);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
spin_lock_bh(&pernet->lock);
|
|
|
|
entry = __lookup_addr_by_id(pernet, addr.addr.id);
|
|
|
|
if (!entry) {
|
|
|
|
GENL_SET_ERR_MSG(info, "address not found");
|
|
|
|
spin_unlock_bh(&pernet->lock);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
if (entry->addr.flags & MPTCP_PM_ADDR_FLAG_SIGNAL)
|
|
|
|
pernet->add_addr_signal_max--;
|
|
|
|
if (entry->addr.flags & MPTCP_PM_ADDR_FLAG_SUBFLOW)
|
|
|
|
pernet->local_addr_max--;
|
|
|
|
|
|
|
|
pernet->addrs--;
|
|
|
|
list_del_rcu(&entry->list);
|
|
|
|
spin_unlock_bh(&pernet->lock);
|
|
|
|
|
|
|
|
mptcp_nl_remove_subflow_and_signal_addr(sock_net(skb->sk), &entry->addr);
|
|
|
|
kfree_rcu(entry, rcu);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __flush_addrs(struct pm_nl_pernet *pernet)
|
|
|
|
{
|
|
|
|
while (!list_empty(&pernet->local_addr_list)) {
|
|
|
|
struct mptcp_pm_addr_entry *cur;
|
|
|
|
|
|
|
|
cur = list_entry(pernet->local_addr_list.next,
|
|
|
|
struct mptcp_pm_addr_entry, list);
|
|
|
|
list_del_rcu(&cur->list);
|
|
|
|
kfree_rcu(cur, rcu);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __reset_counters(struct pm_nl_pernet *pernet)
|
|
|
|
{
|
|
|
|
pernet->add_addr_signal_max = 0;
|
|
|
|
pernet->add_addr_accept_max = 0;
|
|
|
|
pernet->local_addr_max = 0;
|
|
|
|
pernet->addrs = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mptcp_nl_cmd_flush_addrs(struct sk_buff *skb, struct genl_info *info)
|
|
|
|
{
|
|
|
|
struct pm_nl_pernet *pernet = genl_info_pm_nl(info);
|
|
|
|
|
|
|
|
spin_lock_bh(&pernet->lock);
|
|
|
|
__flush_addrs(pernet);
|
|
|
|
__reset_counters(pernet);
|
|
|
|
spin_unlock_bh(&pernet->lock);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mptcp_nl_fill_addr(struct sk_buff *skb,
|
|
|
|
struct mptcp_pm_addr_entry *entry)
|
|
|
|
{
|
|
|
|
struct mptcp_addr_info *addr = &entry->addr;
|
|
|
|
struct nlattr *attr;
|
|
|
|
|
|
|
|
attr = nla_nest_start(skb, MPTCP_PM_ATTR_ADDR);
|
|
|
|
if (!attr)
|
|
|
|
return -EMSGSIZE;
|
|
|
|
|
|
|
|
if (nla_put_u16(skb, MPTCP_PM_ADDR_ATTR_FAMILY, addr->family))
|
|
|
|
goto nla_put_failure;
|
|
|
|
if (nla_put_u8(skb, MPTCP_PM_ADDR_ATTR_ID, addr->id))
|
|
|
|
goto nla_put_failure;
|
|
|
|
if (nla_put_u32(skb, MPTCP_PM_ADDR_ATTR_FLAGS, entry->addr.flags))
|
|
|
|
goto nla_put_failure;
|
|
|
|
if (entry->addr.ifindex &&
|
|
|
|
nla_put_s32(skb, MPTCP_PM_ADDR_ATTR_IF_IDX, entry->addr.ifindex))
|
|
|
|
goto nla_put_failure;
|
|
|
|
|
|
|
|
if (addr->family == AF_INET &&
|
|
|
|
nla_put_in_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR4,
|
|
|
|
addr->addr.s_addr))
|
|
|
|
goto nla_put_failure;
|
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
else if (addr->family == AF_INET6 &&
|
|
|
|
nla_put_in6_addr(skb, MPTCP_PM_ADDR_ATTR_ADDR6, &addr->addr6))
|
|
|
|
goto nla_put_failure;
|
|
|
|
#endif
|
|
|
|
nla_nest_end(skb, attr);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
nla_put_failure:
|
|
|
|
nla_nest_cancel(skb, attr);
|
|
|
|
return -EMSGSIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mptcp_nl_cmd_get_addr(struct sk_buff *skb, struct genl_info *info)
|
|
|
|
{
|
|
|
|
struct nlattr *attr = info->attrs[MPTCP_PM_ATTR_ADDR];
|
|
|
|
struct pm_nl_pernet *pernet = genl_info_pm_nl(info);
|
|
|
|
struct mptcp_pm_addr_entry addr, *entry;
|
|
|
|
struct sk_buff *msg;
|
|
|
|
void *reply;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = mptcp_pm_parse_addr(attr, info, false, &addr);
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
|
|
|
|
if (!msg)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
reply = genlmsg_put_reply(msg, info, &mptcp_genl_family, 0,
|
|
|
|
info->genlhdr->cmd);
|
|
|
|
if (!reply) {
|
|
|
|
GENL_SET_ERR_MSG(info, "not enough space in Netlink message");
|
|
|
|
ret = -EMSGSIZE;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_lock_bh(&pernet->lock);
|
|
|
|
entry = __lookup_addr_by_id(pernet, addr.addr.id);
|
|
|
|
if (!entry) {
|
|
|
|
GENL_SET_ERR_MSG(info, "address not found");
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto unlock_fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = mptcp_nl_fill_addr(msg, entry);
|
|
|
|
if (ret)
|
|
|
|
goto unlock_fail;
|
|
|
|
|
|
|
|
genlmsg_end(msg, reply);
|
|
|
|
ret = genlmsg_reply(msg, info);
|
|
|
|
spin_unlock_bh(&pernet->lock);
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
unlock_fail:
|
|
|
|
spin_unlock_bh(&pernet->lock);
|
|
|
|
|
|
|
|
fail:
|
|
|
|
nlmsg_free(msg);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mptcp_nl_cmd_dump_addrs(struct sk_buff *msg,
|
|
|
|
struct netlink_callback *cb)
|
|
|
|
{
|
|
|
|
struct net *net = sock_net(msg->sk);
|
|
|
|
struct mptcp_pm_addr_entry *entry;
|
|
|
|
struct pm_nl_pernet *pernet;
|
|
|
|
int id = cb->args[0];
|
|
|
|
void *hdr;
|
|
|
|
|
|
|
|
pernet = net_generic(net, pm_nl_pernet_id);
|
|
|
|
|
|
|
|
spin_lock_bh(&pernet->lock);
|
|
|
|
list_for_each_entry(entry, &pernet->local_addr_list, list) {
|
|
|
|
if (entry->addr.id <= id)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
hdr = genlmsg_put(msg, NETLINK_CB(cb->skb).portid,
|
|
|
|
cb->nlh->nlmsg_seq, &mptcp_genl_family,
|
|
|
|
NLM_F_MULTI, MPTCP_PM_CMD_GET_ADDR);
|
|
|
|
if (!hdr)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (mptcp_nl_fill_addr(msg, entry) < 0) {
|
|
|
|
genlmsg_cancel(msg, hdr);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
id = entry->addr.id;
|
|
|
|
genlmsg_end(msg, hdr);
|
|
|
|
}
|
|
|
|
spin_unlock_bh(&pernet->lock);
|
|
|
|
|
|
|
|
cb->args[0] = id;
|
|
|
|
return msg->len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int parse_limit(struct genl_info *info, int id, unsigned int *limit)
|
|
|
|
{
|
|
|
|
struct nlattr *attr = info->attrs[id];
|
|
|
|
|
|
|
|
if (!attr)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
*limit = nla_get_u32(attr);
|
|
|
|
if (*limit > MPTCP_PM_ADDR_MAX) {
|
|
|
|
GENL_SET_ERR_MSG(info, "limit greater than maximum");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
mptcp_nl_cmd_set_limits(struct sk_buff *skb, struct genl_info *info)
|
|
|
|
{
|
|
|
|
struct pm_nl_pernet *pernet = genl_info_pm_nl(info);
|
|
|
|
unsigned int rcv_addrs, subflows;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
spin_lock_bh(&pernet->lock);
|
|
|
|
rcv_addrs = pernet->add_addr_accept_max;
|
|
|
|
ret = parse_limit(info, MPTCP_PM_ATTR_RCV_ADD_ADDRS, &rcv_addrs);
|
|
|
|
if (ret)
|
|
|
|
goto unlock;
|
|
|
|
|
|
|
|
subflows = pernet->subflows_max;
|
|
|
|
ret = parse_limit(info, MPTCP_PM_ATTR_SUBFLOWS, &subflows);
|
|
|
|
if (ret)
|
|
|
|
goto unlock;
|
|
|
|
|
|
|
|
WRITE_ONCE(pernet->add_addr_accept_max, rcv_addrs);
|
|
|
|
WRITE_ONCE(pernet->subflows_max, subflows);
|
|
|
|
|
|
|
|
unlock:
|
|
|
|
spin_unlock_bh(&pernet->lock);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
mptcp_nl_cmd_get_limits(struct sk_buff *skb, struct genl_info *info)
|
|
|
|
{
|
|
|
|
struct pm_nl_pernet *pernet = genl_info_pm_nl(info);
|
|
|
|
struct sk_buff *msg;
|
|
|
|
void *reply;
|
|
|
|
|
|
|
|
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
|
|
|
|
if (!msg)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
reply = genlmsg_put_reply(msg, info, &mptcp_genl_family, 0,
|
|
|
|
MPTCP_PM_CMD_GET_LIMITS);
|
|
|
|
if (!reply)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
if (nla_put_u32(msg, MPTCP_PM_ATTR_RCV_ADD_ADDRS,
|
|
|
|
READ_ONCE(pernet->add_addr_accept_max)))
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
if (nla_put_u32(msg, MPTCP_PM_ATTR_SUBFLOWS,
|
|
|
|
READ_ONCE(pernet->subflows_max)))
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
genlmsg_end(msg, reply);
|
|
|
|
return genlmsg_reply(msg, info);
|
|
|
|
|
|
|
|
fail:
|
|
|
|
GENL_SET_ERR_MSG(info, "not enough space in Netlink message");
|
|
|
|
nlmsg_free(msg);
|
|
|
|
return -EMSGSIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct genl_small_ops mptcp_pm_ops[] = {
|
|
|
|
{
|
|
|
|
.cmd = MPTCP_PM_CMD_ADD_ADDR,
|
|
|
|
.doit = mptcp_nl_cmd_add_addr,
|
|
|
|
.flags = GENL_ADMIN_PERM,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.cmd = MPTCP_PM_CMD_DEL_ADDR,
|
|
|
|
.doit = mptcp_nl_cmd_del_addr,
|
|
|
|
.flags = GENL_ADMIN_PERM,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.cmd = MPTCP_PM_CMD_FLUSH_ADDRS,
|
|
|
|
.doit = mptcp_nl_cmd_flush_addrs,
|
|
|
|
.flags = GENL_ADMIN_PERM,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.cmd = MPTCP_PM_CMD_GET_ADDR,
|
|
|
|
.doit = mptcp_nl_cmd_get_addr,
|
|
|
|
.dumpit = mptcp_nl_cmd_dump_addrs,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.cmd = MPTCP_PM_CMD_SET_LIMITS,
|
|
|
|
.doit = mptcp_nl_cmd_set_limits,
|
|
|
|
.flags = GENL_ADMIN_PERM,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.cmd = MPTCP_PM_CMD_GET_LIMITS,
|
|
|
|
.doit = mptcp_nl_cmd_get_limits,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct genl_family mptcp_genl_family __ro_after_init = {
|
|
|
|
.name = MPTCP_PM_NAME,
|
|
|
|
.version = MPTCP_PM_VER,
|
|
|
|
.maxattr = MPTCP_PM_ATTR_MAX,
|
|
|
|
.policy = mptcp_pm_policy,
|
|
|
|
.netnsok = true,
|
|
|
|
.module = THIS_MODULE,
|
|
|
|
.small_ops = mptcp_pm_ops,
|
|
|
|
.n_small_ops = ARRAY_SIZE(mptcp_pm_ops),
|
|
|
|
.mcgrps = mptcp_pm_mcgrps,
|
|
|
|
.n_mcgrps = ARRAY_SIZE(mptcp_pm_mcgrps),
|
|
|
|
};
|
|
|
|
|
|
|
|
static int __net_init pm_nl_init_net(struct net *net)
|
|
|
|
{
|
|
|
|
struct pm_nl_pernet *pernet = net_generic(net, pm_nl_pernet_id);
|
|
|
|
|
|
|
|
INIT_LIST_HEAD_RCU(&pernet->local_addr_list);
|
|
|
|
__reset_counters(pernet);
|
|
|
|
pernet->next_id = 1;
|
|
|
|
spin_lock_init(&pernet->lock);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __net_exit pm_nl_exit_net(struct list_head *net_list)
|
|
|
|
{
|
|
|
|
struct net *net;
|
|
|
|
|
|
|
|
list_for_each_entry(net, net_list, exit_list) {
|
|
|
|
/* net is removed from namespace list, can't race with
|
|
|
|
* other modifiers
|
|
|
|
*/
|
|
|
|
__flush_addrs(net_generic(net, pm_nl_pernet_id));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct pernet_operations mptcp_pm_pernet_ops = {
|
|
|
|
.init = pm_nl_init_net,
|
|
|
|
.exit_batch = pm_nl_exit_net,
|
|
|
|
.id = &pm_nl_pernet_id,
|
|
|
|
.size = sizeof(struct pm_nl_pernet),
|
|
|
|
};
|
|
|
|
|
|
|
|
void __init mptcp_pm_nl_init(void)
|
|
|
|
{
|
|
|
|
if (register_pernet_subsys(&mptcp_pm_pernet_ops) < 0)
|
|
|
|
panic("Failed to register MPTCP PM pernet subsystem.\n");
|
|
|
|
|
|
|
|
if (genl_register_family(&mptcp_genl_family))
|
|
|
|
panic("Failed to register MPTCP PM netlink family\n");
|
|
|
|
}
|