Add support for new upstream kernel PM commands.

.gitignore

@@ -50,6 +50,7 @@ tests/test-commands
 tests/test-configuration
 tests/test-cxx-build
 tests/test-id-manager
+tests/test-listener-manager
 tests/test-sockaddr
 tests/test-addr-info
 tests/test-murmur-hash

include/linux/mptcp_org.h

@@ -66,18 +66,20 @@ enum {
  *   - MPTCP_EVENT_REMOVED: token, rem_id
  *       An address has been lost by the peer.
  *
- *   - MPTCP_EVENT_SUB_ESTABLISHED: token, family, saddr4 | saddr6,
- *                                  daddr4 | daddr6, sport, dport, backup,
- *                                  if_idx [, error]
+ *   - MPTCP_EVENT_SUB_ESTABLISHED: token, family, loc_id, rem_id,
+ *                                  saddr4 | saddr6, daddr4 | daddr6, sport,
+ *                                  dport, backup, if_idx [, error]
  *       A new subflow has been established. 'error' should not be set.
  *
- *   - MPTCP_EVENT_SUB_CLOSED: token, family, saddr4 | saddr6, daddr4 | daddr6,
- *                             sport, dport, backup, if_idx [, error]
+ *   - MPTCP_EVENT_SUB_CLOSED: token, family, loc_id, rem_id, saddr4 | saddr6,
+ *                             daddr4 | daddr6, sport, dport, backup, if_idx
+ *                             [, error]
  *       A subflow has been closed. An error (copy of sk_err) could be set if an
  *       error has been detected for this subflow.
  *
- *   - MPTCP_EVENT_SUB_PRIORITY: token, family, saddr4 | saddr6, daddr4 | daddr6,
- *                               sport, dport, backup, if_idx [, error]
+ *   - MPTCP_EVENT_SUB_PRIORITY: token, family, loc_id, rem_id, saddr4 | saddr6,
+ *                               daddr4 | daddr6, sport, dport, backup, if_idx
+ *                               [, error]
  *       The priority of a subflow has changed. 'error' should not be set.
  *
  * Commands for MPTCP:
@@ -88,7 +90,7 @@ enum {
  *       Announce that an address has been lost to the peer.
  *
  *   - MPTCP_CMD_SUB_CREATE: token, family, loc_id, rem_id, daddr4 | daddr6,
- *                           dport [,saddr4 | saddr6, sport, backup, if_idx]
+ *                           dport [, saddr4 | saddr6, sport, backup, if_idx]
  *       Create a new subflow.
  *
  *   - MPTCP_CMD_SUB_DESTROY: token, family, saddr4 | saddr6, daddr4 | daddr6,

include/linux/mptcp_upstream.h

@@ -2,8 +2,16 @@
 #ifndef _UAPI_MPTCP_H
 #define _UAPI_MPTCP_H
 
+#ifndef __KERNEL__
+#include <netinet/in.h>		/* for sockaddr_in and sockaddr_in6	*/
+#include <sys/socket.h>		/* for struct sockaddr			*/
+#endif
+
 #include <linux/const.h>
 #include <linux/types.h>
+#include <linux/in.h>		/* for sockaddr_in			*/
+#include <linux/in6.h>		/* for sockaddr_in6			*/
+#include <linux/socket.h>	/* for sockaddr_storage and sa_family	*/
 
 #define MPTCP_SUBFLOW_FLAG_MCAP_REM		_BITUL(0)
 #define MPTCP_SUBFLOW_FLAG_MCAP_LOC		_BITUL(1)
@@ -50,6 +58,7 @@ enum {
 	MPTCP_PM_ATTR_SUBFLOWS,				/* u32 */
 	MPTCP_PM_ATTR_TOKEN,				/* u32 */
 	MPTCP_PM_ATTR_LOC_ID,				/* u8 */
+	MPTCP_PM_ATTR_ADDR_REMOTE,			/* nested address */
 
 	__MPTCP_PM_ATTR_MAX
 };
@@ -75,6 +84,8 @@ enum {
 #define MPTCP_PM_ADDR_FLAG_SIGNAL			(1 << 0)
 #define MPTCP_PM_ADDR_FLAG_SUBFLOW			(1 << 1)
 #define MPTCP_PM_ADDR_FLAG_BACKUP			(1 << 2)
+#define MPTCP_PM_ADDR_FLAG_FULLMESH			(1 << 3)
+#define MPTCP_PM_ADDR_FLAG_IMPLICIT			(1 << 4)
 
 enum {
 	MPTCP_PM_CMD_UNSPEC,
@@ -86,8 +97,10 @@ enum {
 	MPTCP_PM_CMD_SET_LIMITS,
 	MPTCP_PM_CMD_GET_LIMITS,
 	MPTCP_PM_CMD_SET_FLAGS,
-        MPTCP_PM_CMD_ANNOUNCE,
-        MPTCP_PM_CMD_REMOVE,
+	MPTCP_PM_CMD_ANNOUNCE,
+	MPTCP_PM_CMD_REMOVE,
+	MPTCP_PM_CMD_SUBFLOW_CREATE,
+	MPTCP_PM_CMD_SUBFLOW_DESTROY,
 
 	__MPTCP_PM_CMD_AFTER_LAST
 };
@@ -132,19 +145,21 @@ struct mptcp_info {
  * MPTCP_EVENT_REMOVED: token, rem_id
  * An address has been lost by the peer.
  *
- * MPTCP_EVENT_SUB_ESTABLISHED: token, family, saddr4 | saddr6,
- *                              daddr4 | daddr6, sport, dport, backup,
- *                              if_idx [, error]
+ * MPTCP_EVENT_SUB_ESTABLISHED: token, family, loc_id, rem_id,
+ *                              saddr4 | saddr6, daddr4 | daddr6, sport,
+ *                              dport, backup, if_idx [, error]
  * A new subflow has been established. 'error' should not be set.
  *
- * MPTCP_EVENT_SUB_CLOSED: token, family, saddr4 | saddr6, daddr4 | daddr6,
- *                         sport, dport, backup, if_idx [, error]
+ * MPTCP_EVENT_SUB_CLOSED: token, family, loc_id, rem_id, saddr4 | saddr6,
+ *                         daddr4 | daddr6, sport, dport, backup, if_idx
+ *                         [, error]
  * A subflow has been closed. An error (copy of sk_err) could be set if an
  * error has been detected for this subflow.
  *
- * MPTCP_EVENT_SUB_PRIORITY: token, family, saddr4 | saddr6, daddr4 | daddr6,
- *                           sport, dport, backup, if_idx [, error]
- *       The priority of a subflow has changed. 'error' should not be set.
+ * MPTCP_EVENT_SUB_PRIORITY: token, family, loc_id, rem_id, saddr4 | saddr6,
+ *                           daddr4 | daddr6, sport, dport, backup, if_idx
+ *                           [, error]
+ * The priority of a subflow has changed. 'error' should not be set.
  */
 enum mptcp_event_type {
 	MPTCP_EVENT_UNSPEC = 0,
@@ -181,6 +196,7 @@ enum mptcp_event_attr {
 	MPTCP_ATTR_IF_IDX,	/* s32 */
 	MPTCP_ATTR_RESET_REASON,/* u32 */
 	MPTCP_ATTR_RESET_FLAGS, /* u32 */
+	MPTCP_ATTR_SERVER_SIDE,	/* u8 */
 
 	__MPTCP_ATTR_AFTER_LAST
 };
@@ -196,4 +212,32 @@ enum mptcp_event_attr {
 #define MPTCP_RST_EBADPERF	5
 #define MPTCP_RST_EMIDDLEBOX	6
 
+struct mptcp_subflow_data {
+	__u32		size_subflow_data;		/* size of this structure in userspace */
+	__u32		num_subflows;			/* must be 0, set by kernel */
+	__u32		size_kernel;			/* must be 0, set by kernel */
+	__u32		size_user;			/* size of one element in data[] */
+} __attribute__((aligned(8)));
+
+struct mptcp_subflow_addrs {
+	union {
+		__kernel_sa_family_t sa_family;
+		struct sockaddr sa_local;
+		struct sockaddr_in sin_local;
+		struct sockaddr_in6 sin6_local;
+		struct __kernel_sockaddr_storage ss_local;
+	};
+	union {
+		struct sockaddr sa_remote;
+		struct sockaddr_in sin_remote;
+		struct sockaddr_in6 sin6_remote;
+		struct __kernel_sockaddr_storage ss_remote;
+	};
+};
+
+/* MPTCP socket options */
+#define MPTCP_INFO		1
+#define MPTCP_TCPINFO		2
+#define MPTCP_SUBFLOW_ADDRS	3
+
 #endif /* _UAPI_MPTCP_H */

include/mptcpd/Makefile.am

@@ -6,6 +6,7 @@ pkginclude_HEADERS =		\
 	addr_info.h		\
 	export.h		\
 	id_manager.h		\
+	listener_manager.h	\
 	network_monitor.h	\
 	path_manager.h		\
 	plugin.h		\
@@ -16,6 +17,7 @@ noinst_HEADERS =			\
 	private/config.h		\
 	private/configuration.h		\
 	private/id_manager.h		\
+	private/listener_manager.h	\
 	private/mptcp_org.h		\
 	private/mptcp_upstream.h	\
 	private/murmur_hash.h		\

include/mptcpd/listener_manager.h

@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/**
+ * @file listener_manager.h
+ *
+ * @brief Map of MPTCP local address to listener.
+ *
+ * Copyright (c) 2022, Intel Corporation
+ */
+
+#ifndef MPTCPD_LISTENER_MANAGER_H
+#define MPTCPD_LISTENER_MANAGER_H
+
+#include <stdbool.h>
+
+#include <mptcpd/export.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct mptcpd_lm;
+struct sockaddr;
+
+/**
+ * @brief Listen on the given MPTCP local address.
+ *
+ * Create a MPTCP listening socket for the given local address.  This
+ * is needed to accept subflows, e.g. during a @c MP_JOIN operation.
+ *
+ * @param[in]     lm The mptcpd address listener manager object.
+ * @param[in,out] sa The MPTCP local address.  If the port is zero an
+ *                   ephemeral port will be chosen, and assigned to
+ *                   the appropriate underlying address
+ *                   family-specific port member, e.g. @c sin_port or
+ *                   @c sin6_port.  The port will be in network byte
+ *                   order.
+ *
+ * @return @c 0 if operation was successful. -1 or @c errno otherwise.
+ */
+MPTCPD_API int mptcpd_lm_listen(struct mptcpd_lm *lm,
+                                struct sockaddr *sa);
+
+/**
+ * @brief Stop listening on a MPTCP local address.
+ *
+ * @param[in] lm The mptcpd address listener manager object.
+ * @param[in] sa The MPTCP local address with a non-zero port, such as
+ *               the one assigned by @c mptcpd_lm_listen(), i.e. the
+ *               non-zero port provided by the user or the ephemeral
+ *               port chosen by the kernel.
+ *
+ * @return @c 0 if operation was successful. -1 or @c errno otherwise.
+ */
+MPTCPD_API int mptcpd_lm_close(struct mptcpd_lm *lm,
+                               struct sockaddr const *sa);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* MPTCPD_LISTENER_MANAGER_H */
+
+
+/*
+  Local Variables:
+  c-file-style: "linux"
+  End:
+*/

include/mptcpd/path_manager.h

@@ -4,7 +4,7 @@
  *
  * @brief mptcpd generic netlink commands.
  *
- * Copyright (c) 2017-2021, Intel Corporation
+ * Copyright (c) 2017-2022, Intel Corporation
  */
 
 #ifndef MPTCPD_LIB_PATH_MANAGER_H
@@ -107,25 +107,31 @@ MPTCPD_API bool mptcpd_pm_ready(struct mptcpd_pm const *pm);
 /**
  * @brief Advertise new network address to peers.
  *
- * @param[in] pm    The mptcpd path manager object.
- * @param[in] addr  Local IP address and port to be advertised
- *                  through the MPTCP protocol @c ADD_ADDR
- *                  option.  The port is optional, and is
- *                  ignored if it is zero.
- * @param[in] id    MPTCP local address ID.
- * @param[in] token MPTCP connection token.
+ * @param[in]     pm    The mptcpd path manager object.
+ * @param[in,out] addr  Local IP address and port to be advertised
+ *                      through the MPTCP protocol @c ADD_ADDR
+ *                      option.  If the port is zero an ephemeral port
+ *                      will be chosen, and assigned to the
+ *                      appropriate underlying address family-specific
+ *                      port member, e.g. @c sin_port or
+ *                      @c sin6_port.  The port will be in network
+ *                      byte order.
+ * @param[in]     id    MPTCP local address ID.
+ * @param[in]     token MPTCP connection token.
  *
- * @return @c 0 if operation was successful. @c errno otherwise.
+ * @return @c 0 if operation was successful. -1 or @c errno otherwise.
  */
 MPTCPD_API int mptcpd_pm_add_addr(struct mptcpd_pm *pm,
-                                  struct sockaddr const *addr,
+                                  struct sockaddr *addr,
                                   mptcpd_aid_t id,
                                   mptcpd_token_t token);
 
 /**
  * @brief Stop advertising network address to peers.
  *
  * @param[in] pm         The mptcpd path manager object.
+ * @param[in] addr       Local IP address and port that should no longer
+ *                       be advertised through MPTCP.
  * @param[in] address_id MPTCP local address ID to be sent in the
  *                       MPTCP protocol @c REMOVE_ADDR option
  *                       corresponding to the local address that will
@@ -135,6 +141,7 @@ MPTCPD_API int mptcpd_pm_add_addr(struct mptcpd_pm *pm,
  * @return @c 0 if operation was successful. -1 or @c errno otherwise.
  */
 MPTCPD_API int mptcpd_pm_remove_addr(struct mptcpd_pm *pm,
+                                     struct sockaddr const *addr,
                                      mptcpd_aid_t address_id,
                                      mptcpd_token_t token);
 
@@ -368,6 +375,19 @@ mptcpd_pm_get_nm(struct mptcpd_pm const *pm);
 MPTCPD_API struct mptcpd_idm *
 mptcpd_pm_get_idm(struct mptcpd_pm const *pm);
 
+/**
+ * @brief Get pointer to the global MPTCP listener manager.
+ *
+ * @param[in] pm Mptcpd path manager data.
+ *
+ * @note The global MPTCP listener manager tracks MPTCP listening
+ *       sockets associated with a local address.
+ *
+ * @return Global mptcpd MPTCP listener manager.
+ */
+MPTCPD_API struct mptcpd_lm *
+mptcpd_pm_get_lm(struct mptcpd_pm const *pm);
+
 #ifdef __cplusplus
 }
 #endif

include/mptcpd/plugin.h

@@ -4,7 +4,7 @@
  *
  * @brief mptcpd user space path manager plugin header file.
  *
- * Copyright (c) 2017-2020, Intel Corporation
+ * Copyright (c) 2017-2020, 2022, Intel Corporation
  */
 
 #ifndef MPTCPD_PLUGIN_H
@@ -139,29 +139,37 @@ struct mptcpd_plugin_ops
          * A new MPTCP connection has been created, and pending
          * completion.
          *
-         * @param[in] token  MPTCP connection token.
-         * @param[in] laddr  Local address information.
-         * @param[in] raddr  Remote address information.
-         * @param[in] pm     Opaque pointer to mptcpd path manager
-         *                   object.
+         * @param[in] token       MPTCP connection token.
+         * @param[in] laddr       Local address information.
+         * @param[in] raddr       Remote address information.
+         * @param[in] server_side @c true if this peer was the
+         *                        listener (server), @c false if this
+         *                        peer initiated the connection.
+         * @param[in] pm          Opaque pointer to mptcpd path
+         *                        manager object.
          */
         void (*new_connection)(mptcpd_token_t token,
                                struct sockaddr const *laddr,
                                struct sockaddr const *raddr,
+                               bool server_side,
                                struct mptcpd_pm *pm);
 
         /**
          * @brief New MPTCP-capable connection has been established.
          *
-         * @param[in] token  MPTCP connection token.
-         * @param[in] laddr  Local address information.
-         * @param[in] raddr  Remote address information.
-         * @param[in] pm     Opaque pointer to mptcpd path manager
-         *                   object.
+         * @param[in] token       MPTCP connection token.
+         * @param[in] laddr       Local address information.
+         * @param[in] raddr       Remote address information.
+         * @param[in] server_side @c true if this peer was the
+         *                        listener (server), @c false if this
+         *                        peer initiated the connection.
+         * @param[in] pm          Opaque pointer to mptcpd path
+         *                        manager object.
          */
         void (*connection_established)(mptcpd_token_t token,
                                        struct sockaddr const *laddr,
                                        struct sockaddr const *raddr,
+                                       bool server_side,
                                        struct mptcpd_pm *pm);
 
         /**