Unverified Commit 431dd11d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13816 [openEuler-24.03-LTS][linux-6.6.y sync] Backport 6.6.49-6.6.50 LTS Conflicts Patches 

Merge Pull Request from: @wenzhiwei11 
 
Merged:
 selftests: mptcp: add mptcp_lib_events helper
Submit after modification：
 selftests: mptcp: join: validate event numbers
 selftests: mptcp: join: check re-re-adding ID 0 signal
 mptcp: avoid duplicated SUB_CLOSED events
 mptcp: pr_debug: add missing \n at the end
 hwmon: (k10temp) Check return value of amd_smn_read() 
 
Link:https://gitee.com/openeuler/kernel/pulls/13816

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents b0092ae9 2e96176d

drivers/hwmon/k10temp.c

+28 −10
Original line number Diff line number Diff line
@@ -159,8 +159,9 @@ static void read_tempreg_nb_f15(struct pci_dev *pdev, u32 *regval) 


static void read_tempreg_nb_zen(struct pci_dev *pdev, u32 *regval)

{

	amd_smn_read(amd_pci_dev_to_node_id(pdev),

		     ZEN_REPORTED_TEMP_CTRL_BASE, regval);

	if (amd_smn_read(amd_pci_dev_to_node_id(pdev),

			 ZEN_REPORTED_TEMP_CTRL_BASE, regval))

		*regval = 0;

}



static long get_raw_temp(struct k10temp_data *data)
@@ -228,6 +229,7 @@ static int k10temp_read_temp(struct device *dev, u32 attr, int channel, 
			     long *val)

{

	struct k10temp_data *data = dev_get_drvdata(dev);

	int ret = -EOPNOTSUPP;

	u32 regval;



	switch (attr) {
@@ -246,14 +248,18 @@ static int k10temp_read_temp(struct device *dev, u32 attr, int channel, 
		case 2 ... 13:		/* Tccd{1-12} */

			if (hygon_f18h_m4h())

				hygon_read_temp(data, channel, &regval);

			else

				amd_smn_read(amd_pci_dev_to_node_id(data->pdev),

			else {

        	                ret = amd_smn_read(amd_pci_dev_to_node_id(data->pdev),

	                                           ZEN_CCD_TEMP(data->ccd_offset, channel - 2),

	                                           &regval);



				if (ret)

					return ret;

			}

			*val = (regval & ZEN_CCD_TEMP_MASK) * 125 - 49000;

			break;

		default:

			return -EOPNOTSUPP;

			return ret;

		}

		break;

	case hwmon_temp_max:
@@ -269,7 +275,7 @@ static int k10temp_read_temp(struct device *dev, u32 attr, int channel, 
			- ((regval >> 24) & 0xf)) * 500 + 52000;

		break;

	default:

		return -EOPNOTSUPP;

		return ret;

	}

	return 0;

}
@@ -407,8 +413,20 @@ static void k10temp_get_ccd_support(struct pci_dev *pdev, 
	int i;



	for (i = 0; i < limit; i++) {

		amd_smn_read(amd_pci_dev_to_node_id(pdev),

			     ZEN_CCD_TEMP(data->ccd_offset, i), &regval);

                /*

                 * Ignore inaccessible CCDs.

                 *

                 * Some systems will return a register value of 0, and the TEMP_VALID

                 * bit check below will naturally fail.

                 *

                 * Other systems will return a PCI_ERROR_RESPONSE (0xFFFFFFFF) for

                 * the register value. And this will incorrectly pass the TEMP_VALID

                 * bit check.

                 */

                if (amd_smn_read(amd_pci_dev_to_node_id(pdev),

                                 ZEN_CCD_TEMP(data->ccd_offset, i), &regval))

                        continue;



		if (regval & ZEN_CCD_TEMP_VALID)

			data->show_temp |= BIT(TCCD_BIT(i));

	}

net/mptcp/fastopen.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}

net/mptcp/options.c

+25 −25
Original line number Diff line number Diff line
@@ -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 = READ_ONCE(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;

net/mptcp/pm.c

+14 −14
Original line number Diff line number Diff line
@@ -19,7 +19,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);
@@ -45,7 +45,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),
@@ -66,7 +66,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, READ_ONCE(msk->token), server_side);

	pr_debug("msk=%p, token=%u side=%d\n", msk, READ_ONCE(msk->token), server_side);



	WRITE_ONCE(pm->server_side, server_side);

	mptcp_event(MPTCP_EVENT_CREATED, msk, ssk, GFP_ATOMIC);
@@ -90,7 +90,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 */
@@ -114,7 +114,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;
@@ -129,7 +129,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);
@@ -153,14 +153,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;
@@ -212,7 +212,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);
@@ -245,7 +245,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);
@@ -269,7 +269,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]);
@@ -301,19 +301,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);

	}

}

net/mptcp/pm_netlink.c

+10 −10
Original line number Diff line number Diff line
@@ -289,7 +289,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;
@@ -308,7 +308,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);
@@ -727,7 +727,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);
@@ -800,7 +800,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);
@@ -831,7 +831,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);
@@ -863,7 +863,7 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk, 
			if (rm_type == MPTCP_MIB_RMSUBFLOW && 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);
@@ -920,7 +920,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);
@@ -1502,7 +1502,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);



	while ((msk = mptcp_token_iter_next(net, &s_slot, &s_num)) != NULL) {

		struct sock *sk = (struct sock *)msk;