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: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h
index c91578aaab3278aa8560ff752bb3247b852fd5a8..e1172c1ffdfde264a429c5907a6a8235b8cb1abb 100644 (file)
--- a/include/uapi/linux/mptcp.h
+++ b/include/uapi/linux/mptcp.h
@@ -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;
 };
 
 /*

diff --git a/net/mptcp/mptcp_diag.c b/net/mptcp/mptcp_diag.c
index 00ed742f48a47eb995ee33fee83e2ffadfd7acad..f16d9b5ee978ec797c914d0dcd0f8e716230a6ad 100644 (file)
--- a/net/mptcp/mptcp_diag.c
+++ b/net/mptcp/mptcp_diag.c
@@ -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))

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 229fd1af2e2972fd7eeff982818a6e927ccfa394..8e8e35fa40026cb0eb88df5a3912dcfd20156eed 100644 (file)
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -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)
 {

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index d31edbae8da8170882d277fc25ee463503486a11..1b6ec1773678a9151dc14f88b78081649c58db8e 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -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)
 {