Commit 0caf3ada authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

mptcp: add local addr info in mptcp_info 



Add mptcpi_local_addr_used and mptcpi_local_addr_max in struct mptcp_info.

Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7f76963b

include/uapi/linux/mptcp.h

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ struct mptcp_info { 
	__u64	mptcpi_write_seq;

	__u64	mptcpi_snd_una;

	__u64	mptcpi_rcv_nxt;

	__u8	mptcpi_local_addr_used;

	__u8	mptcpi_local_addr_max;

};



/*

net/mptcp/mptcp_diag.c

+2 −0
Original line number Diff line number Diff line
@@ -128,11 +128,13 @@ static void mptcp_diag_get_info(struct sock *sk, struct inet_diag_msg *r, 
	info->mptcpi_subflows = READ_ONCE(msk->pm.subflows);

	info->mptcpi_add_addr_signal = READ_ONCE(msk->pm.add_addr_signaled);

	info->mptcpi_add_addr_accepted = READ_ONCE(msk->pm.add_addr_accepted);

	info->mptcpi_local_addr_used = READ_ONCE(msk->pm.local_addr_used);

	info->mptcpi_subflows_max = mptcp_pm_get_subflows_max(msk);

	val = mptcp_pm_get_add_addr_signal_max(msk);

	info->mptcpi_add_addr_signal_max = val;

	val = mptcp_pm_get_add_addr_accept_max(msk);

	info->mptcpi_add_addr_accepted_max = val;

	info->mptcpi_local_addr_max = mptcp_pm_get_local_addr_max(msk);

	if (test_bit(MPTCP_FALLBACK_DONE, &msk->flags))

		flags |= MPTCP_INFO_FLAG_FALLBACK;

	if (READ_ONCE(msk->can_ack))

net/mptcp/pm_netlink.c

+2 −1
Original line number Diff line number Diff line
@@ -228,13 +228,14 @@ unsigned int mptcp_pm_get_subflows_max(struct mptcp_sock *msk) 
}

EXPORT_SYMBOL_GPL(mptcp_pm_get_subflows_max);



static unsigned int mptcp_pm_get_local_addr_max(struct mptcp_sock *msk)

unsigned int mptcp_pm_get_local_addr_max(struct mptcp_sock *msk)

{

	struct pm_nl_pernet *pernet;



	pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id);

	return READ_ONCE(pernet->local_addr_max);

}

EXPORT_SYMBOL_GPL(mptcp_pm_get_local_addr_max);



static void check_work_pending(struct mptcp_sock *msk)

{

net/mptcp/protocol.h

+1 −0
Original line number Diff line number Diff line
@@ -725,6 +725,7 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc); 
unsigned int mptcp_pm_get_add_addr_signal_max(struct mptcp_sock *msk);

unsigned int mptcp_pm_get_add_addr_accept_max(struct mptcp_sock *msk);

unsigned int mptcp_pm_get_subflows_max(struct mptcp_sock *msk);

unsigned int mptcp_pm_get_local_addr_max(struct mptcp_sock *msk);



static inline struct mptcp_ext *mptcp_get_ext(struct sk_buff *skb)

{