On Tue, Sep 03, 2024 at 12:09:58PM +0200, Matthieu Baerts (NGI0) wrote:
> 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@xxxxxxxxxxxxxxx
> Reviewed-by: Geliang Tang <geliang@xxxxxxxxxx>
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
> Link: https://patch.msgid.link/20240826-net-mptcp-close-extra-sf-fin-v1-4-905199fe1172@xxxxxxxxxx
> Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
> [ As mentioned above, conflicts were expected, and resolved by using the
> 'sed' command which is visible above. ]
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
> ---
> net/mptcp/fastopen.c | 4 ++--
> net/mptcp/options.c | 50 ++++++++++++++++++++--------------------
> net/mptcp/pm.c | 28 +++++++++++------------
> net/mptcp/pm_netlink.c | 20 ++++++++--------
> net/mptcp/protocol.c | 52 +++++++++++++++++++++---------------------
> net/mptcp/protocol.h | 4 ++--
> net/mptcp/sched.c | 4 ++--
> net/mptcp/sockopt.c | 4 ++--
> net/mptcp/subflow.c | 48 +++++++++++++++++++-------------------
> 9 files changed, 107 insertions(+), 107 deletions(-)
>
> diff --git a/net/mptcp/fastopen.c b/net/mptcp/fastopen.c
> index ad28da655f8b..a29ff901df75 100644
> --- a/net/mptcp/fastopen.c
> +++ b/net/mptcp/fastopen.c
> @@ -68,12 +68,12 @@ void __mptcp_fastopen_gen_msk_ackseq(struct mptcp_sock *msk, struct mptcp_subflo
> skb = skb_peek_tail(&sk->sk_receive_queue);
> if (skb) {
> WARN_ON_ONCE(MPTCP_SKB_CB(skb)->end_seq);
> - pr_debug("msk %p moving seq %llx -> %llx end_seq %llx -> %llx", sk,
> + pr_debug("msk %p moving seq %llx -> %llx end_seq %llx -> %llx\n", sk,
> MPTCP_SKB_CB(skb)->map_seq, MPTCP_SKB_CB(skb)->map_seq + msk->ack_seq,
> MPTCP_SKB_CB(skb)->end_seq, MPTCP_SKB_CB(skb)->end_seq + msk->ack_seq);
> MPTCP_SKB_CB(skb)->map_seq += msk->ack_seq;
> MPTCP_SKB_CB(skb)->end_seq += msk->ack_seq;
> }
>
> - pr_debug("msk=%p ack_seq=%llx", msk, msk->ack_seq);
> + pr_debug("msk=%p ack_seq=%llx\n", msk, msk->ack_seq);
> }
> diff --git a/net/mptcp/options.c b/net/mptcp/options.c
> index 604724cca887..2ad9006a157a 100644
> --- a/net/mptcp/options.c
> +++ b/net/mptcp/options.c
> @@ -117,7 +117,7 @@ static void mptcp_parse_option(const struct sk_buff *skb,
> mp_opt->suboptions |= OPTION_MPTCP_CSUMREQD;
> ptr += 2;
> }
> - pr_debug("MP_CAPABLE version=%x, flags=%x, optlen=%d sndr=%llu, rcvr=%llu len=%d csum=%u",
> + pr_debug("MP_CAPABLE version=%x, flags=%x, optlen=%d sndr=%llu, rcvr=%llu len=%d csum=%u\n",
> version, flags, opsize, mp_opt->sndr_key,
> mp_opt->rcvr_key, mp_opt->data_len, mp_opt->csum);
> break;
> @@ -131,7 +131,7 @@ static void mptcp_parse_option(const struct sk_buff *skb,
> ptr += 4;
> mp_opt->nonce = get_unaligned_be32(ptr);
> ptr += 4;
> - pr_debug("MP_JOIN bkup=%u, id=%u, token=%u, nonce=%u",
> + pr_debug("MP_JOIN bkup=%u, id=%u, token=%u, nonce=%u\n",
> mp_opt->backup, mp_opt->join_id,
> mp_opt->token, mp_opt->nonce);
> } else if (opsize == TCPOLEN_MPTCP_MPJ_SYNACK) {
> @@ -142,19 +142,19 @@ static void mptcp_parse_option(const struct sk_buff *skb,
> ptr += 8;
> mp_opt->nonce = get_unaligned_be32(ptr);
> ptr += 4;
> - pr_debug("MP_JOIN bkup=%u, id=%u, thmac=%llu, nonce=%u",
> + pr_debug("MP_JOIN bkup=%u, id=%u, thmac=%llu, nonce=%u\n",
> mp_opt->backup, mp_opt->join_id,
> mp_opt->thmac, mp_opt->nonce);
> } else if (opsize == TCPOLEN_MPTCP_MPJ_ACK) {
> mp_opt->suboptions |= OPTION_MPTCP_MPJ_ACK;
> ptr += 2;
> memcpy(mp_opt->hmac, ptr, MPTCPOPT_HMAC_LEN);
> - pr_debug("MP_JOIN hmac");
> + pr_debug("MP_JOIN hmac\n");
> }
> break;
>
> case MPTCPOPT_DSS:
> - pr_debug("DSS");
> + pr_debug("DSS\n");
> ptr++;
>
> /* we must clear 'mpc_map' be able to detect MP_CAPABLE
> @@ -169,7 +169,7 @@ static void mptcp_parse_option(const struct sk_buff *skb,
> mp_opt->ack64 = (flags & MPTCP_DSS_ACK64) != 0;
> mp_opt->use_ack = (flags & MPTCP_DSS_HAS_ACK);
>
> - pr_debug("data_fin=%d dsn64=%d use_map=%d ack64=%d use_ack=%d",
> + pr_debug("data_fin=%d dsn64=%d use_map=%d ack64=%d use_ack=%d\n",
> mp_opt->data_fin, mp_opt->dsn64,
> mp_opt->use_map, mp_opt->ack64,
> mp_opt->use_ack);
> @@ -207,7 +207,7 @@ static void mptcp_parse_option(const struct sk_buff *skb,
> ptr += 4;
> }
>
> - pr_debug("data_ack=%llu", mp_opt->data_ack);
> + pr_debug("data_ack=%llu\n", mp_opt->data_ack);
> }
>
> if (mp_opt->use_map) {
> @@ -231,7 +231,7 @@ static void mptcp_parse_option(const struct sk_buff *skb,
> ptr += 2;
> }
>
> - pr_debug("data_seq=%llu subflow_seq=%u data_len=%u csum=%d:%u",
> + pr_debug("data_seq=%llu subflow_seq=%u data_len=%u csum=%d:%u\n",
> mp_opt->data_seq, mp_opt->subflow_seq,
> mp_opt->data_len, !!(mp_opt->suboptions & OPTION_MPTCP_CSUMREQD),
> mp_opt->csum);
> @@ -293,7 +293,7 @@ static void mptcp_parse_option(const struct sk_buff *skb,
> mp_opt->ahmac = get_unaligned_be64(ptr);
> ptr += 8;
> }
> - pr_debug("ADD_ADDR%s: id=%d, ahmac=%llu, echo=%d, port=%d",
> + pr_debug("ADD_ADDR%s: id=%d, ahmac=%llu, echo=%d, port=%d\n",
> (mp_opt->addr.family == AF_INET6) ? "6" : "",
> mp_opt->addr.id, mp_opt->ahmac, mp_opt->echo, ntohs(mp_opt->addr.port));
> break;
> @@ -309,7 +309,7 @@ static void mptcp_parse_option(const struct sk_buff *skb,
> mp_opt->rm_list.nr = opsize - TCPOLEN_MPTCP_RM_ADDR_BASE;
> for (i = 0; i < mp_opt->rm_list.nr; i++)
> mp_opt->rm_list.ids[i] = *ptr++;
> - pr_debug("RM_ADDR: rm_list_nr=%d", mp_opt->rm_list.nr);
> + pr_debug("RM_ADDR: rm_list_nr=%d\n", mp_opt->rm_list.nr);
> break;
>
> case MPTCPOPT_MP_PRIO:
> @@ -318,7 +318,7 @@ static void mptcp_parse_option(const struct sk_buff *skb,
>
> mp_opt->suboptions |= OPTION_MPTCP_PRIO;
> mp_opt->backup = *ptr++ & MPTCP_PRIO_BKUP;
> - pr_debug("MP_PRIO: prio=%d", mp_opt->backup);
> + pr_debug("MP_PRIO: prio=%d\n", mp_opt->backup);
> break;
>
> case MPTCPOPT_MP_FASTCLOSE:
> @@ -329,7 +329,7 @@ static void mptcp_parse_option(const struct sk_buff *skb,
> mp_opt->rcvr_key = get_unaligned_be64(ptr);
> ptr += 8;
> mp_opt->suboptions |= OPTION_MPTCP_FASTCLOSE;
> - pr_debug("MP_FASTCLOSE: recv_key=%llu", mp_opt->rcvr_key);
> + pr_debug("MP_FASTCLOSE: recv_key=%llu\n", mp_opt->rcvr_key);
> break;
>
> case MPTCPOPT_RST:
> @@ -343,7 +343,7 @@ static void mptcp_parse_option(const struct sk_buff *skb,
> flags = *ptr++;
> mp_opt->reset_transient = flags & MPTCP_RST_TRANSIENT;
> mp_opt->reset_reason = *ptr;
> - pr_debug("MP_RST: transient=%u reason=%u",
> + pr_debug("MP_RST: transient=%u reason=%u\n",
> mp_opt->reset_transient, mp_opt->reset_reason);
> break;
>
> @@ -354,7 +354,7 @@ static void mptcp_parse_option(const struct sk_buff *skb,
> ptr += 2;
> mp_opt->suboptions |= OPTION_MPTCP_FAIL;
> mp_opt->fail_seq = get_unaligned_be64(ptr);
> - pr_debug("MP_FAIL: data_seq=%llu", mp_opt->fail_seq);
> + pr_debug("MP_FAIL: data_seq=%llu\n", mp_opt->fail_seq);
> break;
>
> default:
> @@ -417,7 +417,7 @@ bool mptcp_syn_options(struct sock *sk, const struct sk_buff *skb,
> *size = TCPOLEN_MPTCP_MPC_SYN;
> return true;
> } else if (subflow->request_join) {
> - pr_debug("remote_token=%u, nonce=%u", subflow->remote_token,
> + pr_debug("remote_token=%u, nonce=%u\n", subflow->remote_token,
> subflow->local_nonce);
> opts->suboptions = OPTION_MPTCP_MPJ_SYN;
> opts->join_id = subflow->local_id;
> @@ -500,7 +500,7 @@ static bool mptcp_established_options_mp(struct sock *sk, struct sk_buff *skb,
> *size = TCPOLEN_MPTCP_MPC_ACK;
> }
>
> - pr_debug("subflow=%p, local_key=%llu, remote_key=%llu map_len=%d",
> + pr_debug("subflow=%p, local_key=%llu, remote_key=%llu map_len=%d\n",
> subflow, subflow->local_key, subflow->remote_key,
> data_len);
>
> @@ -509,7 +509,7 @@ static bool mptcp_established_options_mp(struct sock *sk, struct sk_buff *skb,
> opts->suboptions = OPTION_MPTCP_MPJ_ACK;
> memcpy(opts->hmac, subflow->hmac, MPTCPOPT_HMAC_LEN);
> *size = TCPOLEN_MPTCP_MPJ_ACK;
> - pr_debug("subflow=%p", subflow);
> + pr_debug("subflow=%p\n", subflow);
>
> /* we can use the full delegate action helper only from BH context
> * If we are in process context - sk is flushing the backlog at
> @@ -675,7 +675,7 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff *
>
> *size = len;
> if (drop_other_suboptions) {
> - pr_debug("drop other suboptions");
> + pr_debug("drop other suboptions\n");
> opts->suboptions = 0;
>
> /* note that e.g. DSS could have written into the memory
> @@ -695,7 +695,7 @@ static bool mptcp_established_options_add_addr(struct sock *sk, struct sk_buff *
> } else {
> MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_ECHOADDTX);
> }
> - pr_debug("addr_id=%d, ahmac=%llu, echo=%d, port=%d",
> + pr_debug("addr_id=%d, ahmac=%llu, echo=%d, port=%d\n",
> opts->addr.id, opts->ahmac, echo, ntohs(opts->addr.port));
>
> return true;
> @@ -726,7 +726,7 @@ static bool mptcp_established_options_rm_addr(struct sock *sk,
> opts->rm_list = rm_list;
>
> for (i = 0; i < opts->rm_list.nr; i++)
> - pr_debug("rm_list_ids[%d]=%d", i, opts->rm_list.ids[i]);
> + pr_debug("rm_list_ids[%d]=%d\n", i, opts->rm_list.ids[i]);
> MPTCP_ADD_STATS(sock_net(sk), MPTCP_MIB_RMADDRTX, opts->rm_list.nr);
> return true;
> }
> @@ -752,7 +752,7 @@ static bool mptcp_established_options_mp_prio(struct sock *sk,
> opts->suboptions |= OPTION_MPTCP_PRIO;
> opts->backup = subflow->request_bkup;
>
> - pr_debug("prio=%d", opts->backup);
> + pr_debug("prio=%d\n", opts->backup);
>
> return true;
> }
> @@ -794,7 +794,7 @@ static bool mptcp_established_options_fastclose(struct sock *sk,
> opts->suboptions |= OPTION_MPTCP_FASTCLOSE;
> opts->rcvr_key = msk->remote_key;
>
> - pr_debug("FASTCLOSE key=%llu", opts->rcvr_key);
> + pr_debug("FASTCLOSE key=%llu\n", opts->rcvr_key);
> MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFASTCLOSETX);
> return true;
> }
> @@ -816,7 +816,7 @@ static bool mptcp_established_options_mp_fail(struct sock *sk,
> opts->suboptions |= OPTION_MPTCP_FAIL;
> opts->fail_seq = subflow->map_seq;
>
> - pr_debug("MP_FAIL fail_seq=%llu", opts->fail_seq);
> + pr_debug("MP_FAIL fail_seq=%llu\n", opts->fail_seq);
> MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFAILTX);
>
> return true;
> @@ -904,7 +904,7 @@ bool mptcp_synack_options(const struct request_sock *req, unsigned int *size,
> opts->csum_reqd = subflow_req->csum_reqd;
> opts->allow_join_id0 = subflow_req->allow_join_id0;
> *size = TCPOLEN_MPTCP_MPC_SYNACK;
> - pr_debug("subflow_req=%p, local_key=%llu",
> + pr_debug("subflow_req=%p, local_key=%llu\n",
> subflow_req, subflow_req->local_key);
> return true;
> } else if (subflow_req->mp_join) {
> @@ -913,7 +913,7 @@ bool mptcp_synack_options(const struct request_sock *req, unsigned int *size,
> opts->join_id = subflow_req->local_id;
> opts->thmac = subflow_req->thmac;
> opts->nonce = subflow_req->local_nonce;
> - pr_debug("req=%p, bkup=%u, id=%u, thmac=%llu, nonce=%u",
> + pr_debug("req=%p, bkup=%u, id=%u, thmac=%llu, nonce=%u\n",
> subflow_req, opts->backup, opts->join_id,
> opts->thmac, opts->nonce);
> *size = TCPOLEN_MPTCP_MPJ_SYNACK;
> diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
> index c42496bcb5e0..157a574fab0c 100644
> --- a/net/mptcp/pm.c
> +++ b/net/mptcp/pm.c
> @@ -20,7 +20,7 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk,
> {
> u8 add_addr = READ_ONCE(msk->pm.addr_signal);
>
> - pr_debug("msk=%p, local_id=%d, echo=%d", msk, addr->id, echo);
> + pr_debug("msk=%p, local_id=%d, echo=%d\n", msk, addr->id, echo);
>
> lockdep_assert_held(&msk->pm.lock);
>
> @@ -46,7 +46,7 @@ int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_
> {
> u8 rm_addr = READ_ONCE(msk->pm.addr_signal);
>
> - pr_debug("msk=%p, rm_list_nr=%d", msk, rm_list->nr);
> + pr_debug("msk=%p, rm_list_nr=%d\n", msk, rm_list->nr);
>
> if (rm_addr) {
> MPTCP_ADD_STATS(sock_net((struct sock *)msk),
> @@ -67,7 +67,7 @@ void mptcp_pm_new_connection(struct mptcp_sock *msk, const struct sock *ssk, int
> {
> struct mptcp_pm_data *pm = &msk->pm;
>
> - pr_debug("msk=%p, token=%u side=%d", msk, msk->token, server_side);
> + pr_debug("msk=%p, token=%u side=%d\n", msk, msk->token, server_side);
>
> WRITE_ONCE(pm->server_side, server_side);
> mptcp_event(MPTCP_EVENT_CREATED, msk, ssk, GFP_ATOMIC);
> @@ -91,7 +91,7 @@ bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk)
>
> subflows_max = mptcp_pm_get_subflows_max(msk);
>
> - pr_debug("msk=%p subflows=%d max=%d allow=%d", msk, pm->subflows,
> + pr_debug("msk=%p subflows=%d max=%d allow=%d\n", msk, pm->subflows,
> subflows_max, READ_ONCE(pm->accept_subflow));
>
> /* try to avoid acquiring the lock below */
> @@ -115,7 +115,7 @@ bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk)
> static bool mptcp_pm_schedule_work(struct mptcp_sock *msk,
> enum mptcp_pm_status new_status)
> {
> - pr_debug("msk=%p status=%x new=%lx", msk, msk->pm.status,
> + pr_debug("msk=%p status=%x new=%lx\n", msk, msk->pm.status,
> BIT(new_status));
> if (msk->pm.status & BIT(new_status))
> return false;
> @@ -130,7 +130,7 @@ void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk)
> struct mptcp_pm_data *pm = &msk->pm;
> bool announce = false;
>
> - pr_debug("msk=%p", msk);
> + pr_debug("msk=%p\n", msk);
>
> spin_lock_bh(&pm->lock);
>
> @@ -154,14 +154,14 @@ void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk)
>
> void mptcp_pm_connection_closed(struct mptcp_sock *msk)
> {
> - pr_debug("msk=%p", msk);
> + pr_debug("msk=%p\n", msk);
> }
>
> void mptcp_pm_subflow_established(struct mptcp_sock *msk)
> {
> struct mptcp_pm_data *pm = &msk->pm;
>
> - pr_debug("msk=%p", msk);
> + pr_debug("msk=%p\n", msk);
>
> if (!READ_ONCE(pm->work_pending))
> return;
> @@ -213,7 +213,7 @@ void mptcp_pm_add_addr_received(const struct sock *ssk,
> struct mptcp_sock *msk = mptcp_sk(subflow->conn);
> struct mptcp_pm_data *pm = &msk->pm;
>
> - pr_debug("msk=%p remote_id=%d accept=%d", msk, addr->id,
> + pr_debug("msk=%p remote_id=%d accept=%d\n", msk, addr->id,
> READ_ONCE(pm->accept_addr));
>
> mptcp_event_addr_announced(ssk, addr);
> @@ -246,7 +246,7 @@ void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk,
> {
> struct mptcp_pm_data *pm = &msk->pm;
>
> - pr_debug("msk=%p", msk);
> + pr_debug("msk=%p\n", msk);
>
> spin_lock_bh(&pm->lock);
>
> @@ -270,7 +270,7 @@ void mptcp_pm_rm_addr_received(struct mptcp_sock *msk,
> struct mptcp_pm_data *pm = &msk->pm;
> u8 i;
>
> - pr_debug("msk=%p remote_ids_nr=%d", msk, rm_list->nr);
> + pr_debug("msk=%p remote_ids_nr=%d\n", msk, rm_list->nr);
>
> for (i = 0; i < rm_list->nr; i++)
> mptcp_event_addr_removed(msk, rm_list->ids[i]);
> @@ -302,19 +302,19 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq)
> struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
> struct mptcp_sock *msk = mptcp_sk(subflow->conn);
>
> - pr_debug("fail_seq=%llu", fail_seq);
> + pr_debug("fail_seq=%llu\n", fail_seq);
>
> if (!READ_ONCE(msk->allow_infinite_fallback))
> return;
>
> if (!subflow->fail_tout) {
> - pr_debug("send MP_FAIL response and infinite map");
> + pr_debug("send MP_FAIL response and infinite map\n");
>
> subflow->send_mp_fail = 1;
> subflow->send_infinite_map = 1;
> tcp_send_ack(sk);
> } else {
> - pr_debug("MP_FAIL response received");
> + pr_debug("MP_FAIL response received\n");
> WRITE_ONCE(subflow->fail_tout, 0);
> }
> }
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index 7dd10bacc8d2..aff41beb4dab 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -295,7 +295,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer)
> struct mptcp_sock *msk = entry->sock;
> struct sock *sk = (struct sock *)msk;
>
> - pr_debug("msk=%p", msk);
> + pr_debug("msk=%p\n", msk);
>
> if (!msk)
> return;
> @@ -314,7 +314,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer)
> spin_lock_bh(&msk->pm.lock);
>
> if (!mptcp_pm_should_add_signal_addr(msk)) {
> - pr_debug("retransmit ADD_ADDR id=%d", entry->addr.id);
> + pr_debug("retransmit ADD_ADDR id=%d\n", entry->addr.id);
> mptcp_pm_announce_addr(msk, &entry->addr, false);
> mptcp_pm_add_addr_send_ack(msk);
> entry->retrans_times++;
> @@ -395,7 +395,7 @@ void mptcp_pm_free_anno_list(struct mptcp_sock *msk)
> struct sock *sk = (struct sock *)msk;
> LIST_HEAD(free_list);
>
> - pr_debug("msk=%p", msk);
> + pr_debug("msk=%p\n", msk);
>
> spin_lock_bh(&msk->pm.lock);
> list_splice_init(&msk->pm.anno_list, &free_list);
> @@ -481,7 +481,7 @@ static void __mptcp_pm_send_ack(struct mptcp_sock *msk, struct mptcp_subflow_con
> struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
> bool slow;
>
> - pr_debug("send ack for %s",
> + pr_debug("send ack for %s\n",
> prio ? "mp_prio" : (mptcp_pm_should_add_signal(msk) ? "add_addr" : "rm_addr"));
>
> slow = lock_sock_fast(ssk);
> @@ -730,7 +730,7 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk)
> add_addr_accept_max = mptcp_pm_get_add_addr_accept_max(msk);
> subflows_max = mptcp_pm_get_subflows_max(msk);
>
> - pr_debug("accepted %d:%d remote family %d",
> + pr_debug("accepted %d:%d remote family %d\n",
> msk->pm.add_addr_accepted, add_addr_accept_max,
> msk->pm.remote.family);
>
> @@ -803,7 +803,7 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk,
> {
> struct mptcp_subflow_context *subflow;
>
> - pr_debug("bkup=%d", bkup);
> + pr_debug("bkup=%d\n", bkup);
>
> mptcp_for_each_subflow(msk, subflow) {
> struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
> @@ -839,7 +839,7 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk,
> struct sock *sk = (struct sock *)msk;
> u8 i;
>
> - pr_debug("%s rm_list_nr %d",
> + pr_debug("%s rm_list_nr %d\n",
> rm_type == MPTCP_MIB_RMADDR ? "address" : "subflow", rm_list->nr);
>
> msk_owned_by_me(msk);
> @@ -870,7 +870,7 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk,
> if (rm_type == MPTCP_MIB_RMSUBFLOW && !mptcp_local_id_match(msk, id, rm_id))
> continue;
>
> - pr_debug(" -> %s rm_list_ids[%d]=%u local_id=%u remote_id=%u mpc_id=%u",
> + pr_debug(" -> %s rm_list_ids[%d]=%u local_id=%u remote_id=%u mpc_id=%u\n",
> rm_type == MPTCP_MIB_RMADDR ? "address" : "subflow",
> i, rm_id, id, remote_id, msk->mpc_endpoint_id);
> spin_unlock_bh(&msk->pm.lock);
> @@ -927,7 +927,7 @@ void mptcp_pm_nl_work(struct mptcp_sock *msk)
>
> spin_lock_bh(&msk->pm.lock);
>
> - pr_debug("msk=%p status=%x", msk, pm->status);
> + pr_debug("msk=%p status=%x\n", msk, pm->status);
> if (pm->status & BIT(MPTCP_PM_ADD_ADDR_RECEIVED)) {
> pm->status &= ~BIT(MPTCP_PM_ADD_ADDR_RECEIVED);
> mptcp_pm_nl_add_addr_received(msk);
> @@ -1544,7 +1544,7 @@ static int mptcp_nl_remove_subflow_and_signal_addr(struct net *net,
> long s_slot = 0, s_num = 0;
> struct mptcp_sock *msk;
>
> - pr_debug("remove_id=%d", addr->id);
> + pr_debug("remove_id=%d\n", addr->id);
>
> list.ids[list.nr++] = addr->id;
>
> diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
> index 0ae684624c82..e4d446f32761 100644
> --- a/net/mptcp/protocol.c
> +++ b/net/mptcp/protocol.c
> @@ -141,7 +141,7 @@ static bool mptcp_try_coalesce(struct sock *sk, struct sk_buff *to,
> !skb_try_coalesce(to, from, &fragstolen, &delta))
> return false;
>
> - pr_debug("colesced seq %llx into %llx new len %d new end seq %llx",
> + pr_debug("colesced seq %llx into %llx new len %d new end seq %llx\n",
> MPTCP_SKB_CB(from)->map_seq, MPTCP_SKB_CB(to)->map_seq,
> to->len, MPTCP_SKB_CB(from)->end_seq);
> MPTCP_SKB_CB(to)->end_seq = MPTCP_SKB_CB(from)->end_seq;
> @@ -219,7 +219,7 @@ static void mptcp_data_queue_ofo(struct mptcp_sock *msk, struct sk_buff *skb)
> end_seq = MPTCP_SKB_CB(skb)->end_seq;
> max_seq = atomic64_read(&msk->rcv_wnd_sent);
>
> - pr_debug("msk=%p seq=%llx limit=%llx empty=%d", msk, seq, max_seq,
> + pr_debug("msk=%p seq=%llx limit=%llx empty=%d\n", msk, seq, max_seq,
> RB_EMPTY_ROOT(&msk->out_of_order_queue));
> if (after64(end_seq, max_seq)) {
> /* out of window */
> @@ -643,7 +643,7 @@ static bool __mptcp_move_skbs_from_subflow(struct mptcp_sock *msk,
> }
> }
>
> - pr_debug("msk=%p ssk=%p", msk, ssk);
> + pr_debug("msk=%p ssk=%p\n", msk, ssk);
> tp = tcp_sk(ssk);
> do {
> u32 map_remaining, offset;
> @@ -722,7 +722,7 @@ static bool __mptcp_ofo_queue(struct mptcp_sock *msk)
> u64 end_seq;
>
> p = rb_first(&msk->out_of_order_queue);
> - pr_debug("msk=%p empty=%d", msk, RB_EMPTY_ROOT(&msk->out_of_order_queue));
> + pr_debug("msk=%p empty=%d\n", msk, RB_EMPTY_ROOT(&msk->out_of_order_queue));
> while (p) {
> skb = rb_to_skb(p);
> if (after64(MPTCP_SKB_CB(skb)->map_seq, msk->ack_seq))
> @@ -744,7 +744,7 @@ static bool __mptcp_ofo_queue(struct mptcp_sock *msk)
> int delta = msk->ack_seq - MPTCP_SKB_CB(skb)->map_seq;
>
> /* skip overlapping data, if any */
> - pr_debug("uncoalesced seq=%llx ack seq=%llx delta=%d",
> + pr_debug("uncoalesced seq=%llx ack seq=%llx delta=%d\n",
> MPTCP_SKB_CB(skb)->map_seq, msk->ack_seq,
> delta);
> MPTCP_SKB_CB(skb)->offset += delta;
> @@ -1235,7 +1235,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk,
> size_t copy;
> int i;
>
> - pr_debug("msk=%p ssk=%p sending dfrag at seq=%llu len=%u already sent=%u",
> + pr_debug("msk=%p ssk=%p sending dfrag at seq=%llu len=%u already sent=%u\n",
> msk, ssk, dfrag->data_seq, dfrag->data_len, info->sent);
>
> if (WARN_ON_ONCE(info->sent > info->limit ||
> @@ -1336,7 +1336,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk,
> mpext->use_map = 1;
> mpext->dsn64 = 1;
>
> - pr_debug("data_seq=%llu subflow_seq=%u data_len=%u dsn64=%d",
> + pr_debug("data_seq=%llu subflow_seq=%u data_len=%u dsn64=%d\n",
> mpext->data_seq, mpext->subflow_seq, mpext->data_len,
> mpext->dsn64);
>
> @@ -1855,7 +1855,7 @@ static int mptcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
> if (!msk->first_pending)
> WRITE_ONCE(msk->first_pending, dfrag);
> }
> - pr_debug("msk=%p dfrag at seq=%llu len=%u sent=%u new=%d", msk,
> + pr_debug("msk=%p dfrag at seq=%llu len=%u sent=%u new=%d\n", msk,
> dfrag->data_seq, dfrag->data_len, dfrag->already_sent,
> !dfrag_collapsed);
>
> @@ -2211,7 +2211,7 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
> }
> }
>
> - pr_debug("block timeout %ld", timeo);
> + pr_debug("block timeout %ld\n", timeo);
> sk_wait_data(sk, &timeo, NULL);
> }
>
> @@ -2227,7 +2227,7 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
> }
> }
>
> - pr_debug("msk=%p rx queue empty=%d:%d copied=%d",
> + pr_debug("msk=%p rx queue empty=%d:%d copied=%d\n",
> msk, skb_queue_empty_lockless(&sk->sk_receive_queue),
> skb_queue_empty(&msk->receive_queue), copied);
> if (!(flags & MSG_PEEK))
> @@ -2680,7 +2680,7 @@ static void mptcp_mp_fail_no_response(struct mptcp_sock *msk)
> if (!ssk)
> return;
>
> - pr_debug("MP_FAIL doesn't respond, reset the subflow");
> + pr_debug("MP_FAIL doesn't respond, reset the subflow\n");
>
> slow = lock_sock_fast(ssk);
> mptcp_subflow_reset(ssk);
> @@ -2850,7 +2850,7 @@ void mptcp_subflow_shutdown(struct sock *sk, struct sock *ssk, int how)
> break;
> default:
> if (__mptcp_check_fallback(mptcp_sk(sk))) {
> - pr_debug("Fallback");
> + pr_debug("Fallback\n");
> ssk->sk_shutdown |= how;
> tcp_shutdown(ssk, how);
>
> @@ -2860,7 +2860,7 @@ void mptcp_subflow_shutdown(struct sock *sk, struct sock *ssk, int how)
> WRITE_ONCE(mptcp_sk(sk)->snd_una, mptcp_sk(sk)->snd_nxt);
> mptcp_schedule_work(sk);
> } else {
> - pr_debug("Sending DATA_FIN on subflow %p", ssk);
> + pr_debug("Sending DATA_FIN on subflow %p\n", ssk);
> tcp_send_ack(ssk);
> if (!mptcp_rtx_timer_pending(sk))
> mptcp_reset_rtx_timer(sk);
> @@ -2926,7 +2926,7 @@ static void mptcp_check_send_data_fin(struct sock *sk)
> struct mptcp_subflow_context *subflow;
> struct mptcp_sock *msk = mptcp_sk(sk);
>
> - pr_debug("msk=%p snd_data_fin_enable=%d pending=%d snd_nxt=%llu write_seq=%llu",
> + pr_debug("msk=%p snd_data_fin_enable=%d pending=%d snd_nxt=%llu write_seq=%llu\n",
> msk, msk->snd_data_fin_enable, !!mptcp_send_head(sk),
> msk->snd_nxt, msk->write_seq);
>
> @@ -2950,7 +2950,7 @@ static void __mptcp_wr_shutdown(struct sock *sk)
> {
> struct mptcp_sock *msk = mptcp_sk(sk);
>
> - pr_debug("msk=%p snd_data_fin_enable=%d shutdown=%x state=%d pending=%d",
> + pr_debug("msk=%p snd_data_fin_enable=%d shutdown=%x state=%d pending=%d\n",
> msk, msk->snd_data_fin_enable, sk->sk_shutdown, sk->sk_state,
> !!mptcp_send_head(sk));
>
> @@ -2965,7 +2965,7 @@ static void __mptcp_destroy_sock(struct sock *sk)
> {
> struct mptcp_sock *msk = mptcp_sk(sk);
>
> - pr_debug("msk=%p", msk);
> + pr_debug("msk=%p\n", msk);
>
> might_sleep();
>
> @@ -3073,7 +3073,7 @@ bool __mptcp_close(struct sock *sk, long timeout)
> mptcp_set_state(sk, TCP_CLOSE);
>
> sock_hold(sk);
> - pr_debug("msk=%p state=%d", sk, sk->sk_state);
> + pr_debug("msk=%p state=%d\n", sk, sk->sk_state);
> if (msk->token)
> mptcp_event(MPTCP_EVENT_CLOSED, msk, NULL, GFP_KERNEL);
>
> @@ -3508,7 +3508,7 @@ static int mptcp_get_port(struct sock *sk, unsigned short snum)
> {
> struct mptcp_sock *msk = mptcp_sk(sk);
>
> - pr_debug("msk=%p, ssk=%p", msk, msk->first);
> + pr_debug("msk=%p, ssk=%p\n", msk, msk->first);
> if (WARN_ON_ONCE(!msk->first))
> return -EINVAL;
>
> @@ -3525,7 +3525,7 @@ void mptcp_finish_connect(struct sock *ssk)
> sk = subflow->conn;
> msk = mptcp_sk(sk);
>
> - pr_debug("msk=%p, token=%u", sk, subflow->token);
> + pr_debug("msk=%p, token=%u\n", sk, subflow->token);
>
> subflow->map_seq = subflow->iasn;
> subflow->map_subflow_seq = 1;
> @@ -3554,7 +3554,7 @@ bool mptcp_finish_join(struct sock *ssk)
> struct sock *parent = (void *)msk;
> bool ret = true;
>
> - pr_debug("msk=%p, subflow=%p", msk, subflow);
> + pr_debug("msk=%p, subflow=%p\n", msk, subflow);
>
> /* mptcp socket already closing? */
> if (!mptcp_is_fully_established(parent)) {
> @@ -3600,7 +3600,7 @@ bool mptcp_finish_join(struct sock *ssk)
>
> static void mptcp_shutdown(struct sock *sk, int how)
> {
> - pr_debug("sk=%p, how=%d", sk, how);
> + pr_debug("sk=%p, how=%d\n", sk, how);
>
> if ((how & SEND_SHUTDOWN) && mptcp_close_state(sk))
> __mptcp_wr_shutdown(sk);
> @@ -3820,7 +3820,7 @@ static int mptcp_listen(struct socket *sock, int backlog)
> struct sock *ssk;
> int err;
>
> - pr_debug("msk=%p", msk);
> + pr_debug("msk=%p\n", msk);
>
> lock_sock(sk);
>
> @@ -3860,7 +3860,7 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock,
> struct sock *ssk, *newsk;
> int err;
>
> - pr_debug("msk=%p", msk);
> + pr_debug("msk=%p\n", msk);
>
> /* Buggy applications can call accept on socket states other then LISTEN
> * but no need to allocate the first subflow just to error out.
> @@ -3869,12 +3869,12 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock,
> if (!ssk)
> return -EINVAL;
>
> - pr_debug("ssk=%p, listener=%p", ssk, mptcp_subflow_ctx(ssk));
> + pr_debug("ssk=%p, listener=%p\n", ssk, mptcp_subflow_ctx(ssk));
> newsk = inet_csk_accept(ssk, flags, &err, kern);
> if (!newsk)
> return err;
>
> - pr_debug("newsk=%p, subflow is mptcp=%d", newsk, sk_is_mptcp(newsk));
> + pr_debug("newsk=%p, subflow is mptcp=%d\n", newsk, sk_is_mptcp(newsk));
> if (sk_is_mptcp(newsk)) {
> struct mptcp_subflow_context *subflow;
> struct sock *new_mptcp_sock;
> @@ -3967,7 +3967,7 @@ static __poll_t mptcp_poll(struct file *file, struct socket *sock,
> sock_poll_wait(file, sock, wait);
>
> state = inet_sk_state_load(sk);
> - pr_debug("msk=%p state=%d flags=%lx", msk, state, msk->flags);
> + pr_debug("msk=%p state=%d flags=%lx\n", msk, state, msk->flags);
> if (state == TCP_LISTEN) {
> struct sock *ssk = READ_ONCE(msk->first);
>
> diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
> index 20736f31dc53..8996cd6b6820 100644
> --- a/net/mptcp/protocol.h
> +++ b/net/mptcp/protocol.h
> @@ -1093,7 +1093,7 @@ static inline bool mptcp_check_fallback(const struct sock *sk)
> static inline void __mptcp_do_fallback(struct mptcp_sock *msk)
> {
> if (test_bit(MPTCP_FALLBACK_DONE, &msk->flags)) {
> - pr_debug("TCP fallback already done (msk=%p)", msk);
> + pr_debug("TCP fallback already done (msk=%p)\n", msk);
> return;
> }
> set_bit(MPTCP_FALLBACK_DONE, &msk->flags);
> @@ -1120,7 +1120,7 @@ static inline void mptcp_do_fallback(struct sock *ssk)
> }
> }
>
> -#define pr_fallback(a) pr_debug("%s:fallback to TCP (msk=%p)", __func__, a)
> +#define pr_fallback(a) pr_debug("%s:fallback to TCP (msk=%p)\n", __func__, a)
>
> static inline bool mptcp_check_infinite_map(struct sk_buff *skb)
> {
> diff --git a/net/mptcp/sched.c b/net/mptcp/sched.c
> index 4ab0693c069c..907986f5f042 100644
> --- a/net/mptcp/sched.c
> +++ b/net/mptcp/sched.c
> @@ -64,7 +64,7 @@ int mptcp_register_scheduler(struct mptcp_sched_ops *sched)
> list_add_tail_rcu(&sched->list, &mptcp_sched_list);
> spin_unlock(&mptcp_sched_list_lock);
>
> - pr_debug("%s registered", sched->name);
> + pr_debug("%s registered\n", sched->name);
> return 0;
> }
>
> @@ -96,7 +96,7 @@ int mptcp_init_sched(struct mptcp_sock *msk,
> if (msk->sched->init)
> msk->sched->init(msk);
>
> - pr_debug("sched=%s", msk->sched->name);
> + pr_debug("sched=%s\n", msk->sched->name);
>
> return 0;
> }
> diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c
> index bdfeecea814f..d0f73b9180c7 100644
> --- a/net/mptcp/sockopt.c
> +++ b/net/mptcp/sockopt.c
> @@ -858,7 +858,7 @@ int mptcp_setsockopt(struct sock *sk, int level, int optname,
> struct mptcp_sock *msk = mptcp_sk(sk);
> struct sock *ssk;
>
> - pr_debug("msk=%p", msk);
> + pr_debug("msk=%p\n", msk);
>
> if (level == SOL_SOCKET)
> return mptcp_setsockopt_sol_socket(msk, optname, optval, optlen);
> @@ -1416,7 +1416,7 @@ int mptcp_getsockopt(struct sock *sk, int level, int optname,
> struct mptcp_sock *msk = mptcp_sk(sk);
> struct sock *ssk;
>
> - pr_debug("msk=%p", msk);
> + pr_debug("msk=%p\n", msk);
>
> /* @@ the meaning of setsockopt() when the socket is connected and
> * there are multiple subflows is not yet defined. It is up to the
> diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
> index 81050aa55f7b..2c779275a031 100644
> --- a/net/mptcp/subflow.c
> +++ b/net/mptcp/subflow.c
> @@ -40,7 +40,7 @@ static void subflow_req_destructor(struct request_sock *req)
> {
> struct mptcp_subflow_request_sock *subflow_req = mptcp_subflow_rsk(req);
>
> - pr_debug("subflow_req=%p", subflow_req);
> + pr_debug("subflow_req=%p\n", subflow_req);
>
> if (subflow_req->msk)
> sock_put((struct sock *)subflow_req->msk);
> @@ -146,7 +146,7 @@ static int subflow_check_req(struct request_sock *req,
> struct mptcp_options_received mp_opt;
> bool opt_mp_capable, opt_mp_join;
>
> - pr_debug("subflow_req=%p, listener=%p", subflow_req, listener);
> + pr_debug("subflow_req=%p, listener=%p\n", subflow_req, listener);
>
> #ifdef CONFIG_TCP_MD5SIG
> /* no MPTCP if MD5SIG is enabled on this socket or we may run out of
> @@ -219,7 +219,7 @@ static int subflow_check_req(struct request_sock *req,
> }
>
> if (subflow_use_different_sport(subflow_req->msk, sk_listener)) {
> - pr_debug("syn inet_sport=%d %d",
> + pr_debug("syn inet_sport=%d %d\n",
> ntohs(inet_sk(sk_listener)->inet_sport),
> ntohs(inet_sk((struct sock *)subflow_req->msk)->inet_sport));
> if (!mptcp_pm_sport_in_anno_list(subflow_req->msk, sk_listener)) {
> @@ -238,7 +238,7 @@ static int subflow_check_req(struct request_sock *req,
> return -EPERM;
> }
>
> - pr_debug("token=%u, remote_nonce=%u msk=%p", subflow_req->token,
> + pr_debug("token=%u, remote_nonce=%u msk=%p\n", subflow_req->token,
> subflow_req->remote_nonce, subflow_req->msk);
> }
>
> @@ -508,7 +508,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)
> subflow->rel_write_seq = 1;
> subflow->conn_finished = 1;
> subflow->ssn_offset = TCP_SKB_CB(skb)->seq;
> - pr_debug("subflow=%p synack seq=%x", subflow, subflow->ssn_offset);
> + pr_debug("subflow=%p synack seq=%x\n", subflow, subflow->ssn_offset);
>
> mptcp_get_options(skb, &mp_opt);
> if (subflow->request_mptcp) {
> @@ -540,7 +540,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)
> subflow->thmac = mp_opt.thmac;
> subflow->remote_nonce = mp_opt.nonce;
> WRITE_ONCE(subflow->remote_id, mp_opt.join_id);
> - pr_debug("subflow=%p, thmac=%llu, remote_nonce=%u backup=%d",
> + pr_debug("subflow=%p, thmac=%llu, remote_nonce=%u backup=%d\n",
> subflow, subflow->thmac, subflow->remote_nonce,
> subflow->backup);
>
> @@ -566,7 +566,7 @@ static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)
> MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_JOINSYNACKBACKUPRX);
>
> if (subflow_use_different_dport(msk, sk)) {
> - pr_debug("synack inet_dport=%d %d",
> + pr_debug("synack inet_dport=%d %d\n",
> ntohs(inet_sk(sk)->inet_dport),
> ntohs(inet_sk(parent)->inet_dport));
> MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_JOINPORTSYNACKRX);
> @@ -636,7 +636,7 @@ static int subflow_v4_conn_request(struct sock *sk, struct sk_buff *skb)
> {
> struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
>
> - pr_debug("subflow=%p", subflow);
> + pr_debug("subflow=%p\n", subflow);
>
> /* Never answer to SYNs sent to broadcast or multicast */
> if (skb_rtable(skb)->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST))
> @@ -667,7 +667,7 @@ static int subflow_v6_conn_request(struct sock *sk, struct sk_buff *skb)
> {
> struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
>
> - pr_debug("subflow=%p", subflow);
> + pr_debug("subflow=%p\n", subflow);
>
> if (skb->protocol == htons(ETH_P_IP))
> return subflow_v4_conn_request(sk, skb);
> @@ -786,7 +786,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,
> struct mptcp_sock *owner;
> struct sock *child;
>
> - pr_debug("listener=%p, req=%p, conn=%p", listener, req, listener->conn);
> + pr_debug("listener=%p, req=%p, conn=%p\n", listener, req, listener->conn);
>
> /* After child creation we must look for MPC even when options
> * are not parsed
> @@ -877,7 +877,7 @@ static struct sock *subflow_syn_recv_sock(const struct sock *sk,
> ctx->conn = (struct sock *)owner;
>
> if (subflow_use_different_sport(owner, sk)) {
> - pr_debug("ack inet_sport=%d %d",
> + pr_debug("ack inet_sport=%d %d\n",
> ntohs(inet_sk(sk)->inet_sport),
> ntohs(inet_sk((struct sock *)owner)->inet_sport));
> if (!mptcp_pm_sport_in_anno_list(owner, sk)) {
> @@ -934,7 +934,7 @@ enum mapping_status {
>
> static void dbg_bad_map(struct mptcp_subflow_context *subflow, u32 ssn)
> {
> - pr_debug("Bad mapping: ssn=%d map_seq=%d map_data_len=%d",
> + pr_debug("Bad mapping: ssn=%d map_seq=%d map_data_len=%d\n",
> ssn, subflow->map_subflow_seq, subflow->map_data_len);
> }
>
> @@ -1094,7 +1094,7 @@ static enum mapping_status get_mapping_status(struct sock *ssk,
>
> data_len = mpext->data_len;
> if (data_len == 0) {
> - pr_debug("infinite mapping received");
> + pr_debug("infinite mapping received\n");
> MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_INFINITEMAPRX);
> subflow->map_data_len = 0;
> return MAPPING_INVALID;
> @@ -1104,7 +1104,7 @@ static enum mapping_status get_mapping_status(struct sock *ssk,
> if (data_len == 1) {
> bool updated = mptcp_update_rcv_data_fin(msk, mpext->data_seq,
> mpext->dsn64);
> - pr_debug("DATA_FIN with no payload seq=%llu", mpext->data_seq);
> + pr_debug("DATA_FIN with no payload seq=%llu\n", mpext->data_seq);
> if (subflow->map_valid) {
> /* A DATA_FIN might arrive in a DSS
> * option before the previous mapping
> @@ -1129,7 +1129,7 @@ static enum mapping_status get_mapping_status(struct sock *ssk,
> data_fin_seq &= GENMASK_ULL(31, 0);
>
> mptcp_update_rcv_data_fin(msk, data_fin_seq, mpext->dsn64);
> - pr_debug("DATA_FIN with mapping seq=%llu dsn64=%d",
> + pr_debug("DATA_FIN with mapping seq=%llu dsn64=%d\n",
> data_fin_seq, mpext->dsn64);
> }
>
> @@ -1176,7 +1176,7 @@ static enum mapping_status get_mapping_status(struct sock *ssk,
> if (unlikely(subflow->map_csum_reqd != csum_reqd))
> return MAPPING_INVALID;
>
> - pr_debug("new map seq=%llu subflow_seq=%u data_len=%u csum=%d:%u",
> + pr_debug("new map seq=%llu subflow_seq=%u data_len=%u csum=%d:%u\n",
> subflow->map_seq, subflow->map_subflow_seq,
> subflow->map_data_len, subflow->map_csum_reqd,
> subflow->map_data_csum);
> @@ -1211,7 +1211,7 @@ static void mptcp_subflow_discard_data(struct sock *ssk, struct sk_buff *skb,
> avail_len = skb->len - offset;
> incr = limit >= avail_len ? avail_len + fin : limit;
>
> - pr_debug("discarding=%d len=%d offset=%d seq=%d", incr, skb->len,
> + pr_debug("discarding=%d len=%d offset=%d seq=%d\n", incr, skb->len,
> offset, subflow->map_subflow_seq);
> MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DUPDATA);
> tcp_sk(ssk)->copied_seq += incr;
> @@ -1312,7 +1312,7 @@ static bool subflow_check_data_avail(struct sock *ssk)
>
> old_ack = READ_ONCE(msk->ack_seq);
> ack_seq = mptcp_subflow_get_mapped_dsn(subflow);
> - pr_debug("msk ack_seq=%llx subflow ack_seq=%llx", old_ack,
> + pr_debug("msk ack_seq=%llx subflow ack_seq=%llx\n", old_ack,
> ack_seq);
> if (unlikely(before64(ack_seq, old_ack))) {
> mptcp_subflow_discard_data(ssk, skb, old_ack - ack_seq);
> @@ -1384,7 +1384,7 @@ bool mptcp_subflow_data_available(struct sock *sk)
> subflow->map_valid = 0;
> WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA);
>
> - pr_debug("Done with mapping: seq=%u data_len=%u",
> + pr_debug("Done with mapping: seq=%u data_len=%u\n",
> subflow->map_subflow_seq,
> subflow->map_data_len);
> }
> @@ -1494,7 +1494,7 @@ void mptcpv6_handle_mapped(struct sock *sk, bool mapped)
>
> target = mapped ? &subflow_v6m_specific : subflow_default_af_ops(sk);
>
> - pr_debug("subflow=%p family=%d ops=%p target=%p mapped=%d",
> + pr_debug("subflow=%p family=%d ops=%p target=%p mapped=%d\n",
> subflow, sk->sk_family, icsk->icsk_af_ops, target, mapped);
>
> if (likely(icsk->icsk_af_ops == target))
> @@ -1589,7 +1589,7 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc,
> goto failed;
>
> mptcp_crypto_key_sha(subflow->remote_key, &remote_token, NULL);
> - pr_debug("msk=%p remote_token=%u local_id=%d remote_id=%d", msk,
> + pr_debug("msk=%p remote_token=%u local_id=%d remote_id=%d\n", msk,
> remote_token, local_id, remote_id);
> subflow->remote_token = remote_token;
> WRITE_ONCE(subflow->remote_id, remote_id);
> @@ -1727,7 +1727,7 @@ int mptcp_subflow_create_socket(struct sock *sk, unsigned short family,
> SOCK_INODE(sf)->i_gid = SOCK_INODE(sk->sk_socket)->i_gid;
>
> subflow = mptcp_subflow_ctx(sf->sk);
> - pr_debug("subflow=%p", subflow);
> + pr_debug("subflow=%p\n", subflow);
>
> *new_sock = sf;
> sock_hold(sk);
> @@ -1751,7 +1751,7 @@ static struct mptcp_subflow_context *subflow_create_ctx(struct sock *sk,
> INIT_LIST_HEAD(&ctx->node);
> INIT_LIST_HEAD(&ctx->delegated_node);
>
> - pr_debug("subflow=%p", ctx);
> + pr_debug("subflow=%p\n", ctx);
>
> ctx->tcp_sock = sk;
> WRITE_ONCE(ctx->local_id, -1);
> @@ -1902,7 +1902,7 @@ static int subflow_ulp_init(struct sock *sk)
> goto out;
> }
>
> - pr_debug("subflow=%p, family=%d", ctx, sk->sk_family);
> + pr_debug("subflow=%p, family=%d\n", ctx, sk->sk_family);
>
> tp->is_mptcp = 1;
> ctx->icsk_af_ops = icsk->icsk_af_ops;
> --
> 2.45.2
>
Now applied.
