From nobody Sat Feb 7 04:09:45 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 44401AD35 for ; Thu, 6 Apr 2023 17:32:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680802342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i3weOfqRro6PgGD3KK5lLOw4Kv0/wG4afsY1+qIT9s0=; b=RYNjuYX3DNK6hIf7RdWSMZ+WuZMuVEvYAHKxeMa8dqFAJPSrCljQRCy7V4VVZiyRTSO+3H /510DuMDZsM493kFXUeFeJQS+8kjOBZROYwlf3rOMEqAyC3kVKuDlOnK4wsy/c1efVjtBO 2ymq5UmPGS1pPLMvD5QqhXjhEBDCAEo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-385-mQYlGptDNyq4iKcY7hDlgw-1; Thu, 06 Apr 2023 13:32:21 -0400 X-MC-Unique: mQYlGptDNyq4iKcY7hDlgw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 245B2185A794 for ; Thu, 6 Apr 2023 17:32:21 +0000 (UTC) Received: from dcaratti.users.ipa.redhat.com (unknown [10.45.225.137]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4E1E2027062 for ; Thu, 6 Apr 2023 17:32:20 +0000 (UTC) From: Davide Caratti To: mptcp@lists.linux.dev Subject: [PATCH RFC mptcp-net-next 1/5] tools: ynl: add uns-admin-perm to genetlink legacy Date: Thu, 6 Apr 2023 19:32:01 +0200 Message-ID: <37cd08b77ca9ebfee64b40c8948bd75cb12ce54e.1680801697.git.dcaratti@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID: <20230406173201.9mOqdNabRTXTsXCfDclNvOrbyj0iaNpI5QxQK8gBY88@z> Content-Type: text/plain; charset="utf-8"; x-default="true" this flag maps to GENL_UNS_ADMIN_PERM and will be used by future specs. Signed-off-by: Davide Caratti --- Documentation/netlink/genetlink-legacy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/netlink/genetlink-legacy.yaml b/Documentation/ne= tlink/genetlink-legacy.yaml index b33541a51d6b..6d075bfb712e 100644 --- a/Documentation/netlink/genetlink-legacy.yaml +++ b/Documentation/netlink/genetlink-legacy.yaml @@ -295,7 +295,7 @@ properties: description: Command flags. type: array items: - enum: [ admin-perm ] + enum: [ admin-perm, uns-admin-perm ] dont-validate: description: Kernel attribute validation flags. type: array --=20 2.39.2 From nobody Sat Feb 7 04:09:45 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E035AD29 for ; Thu, 6 Apr 2023 17:32:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680802343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uWqTrKBoFL4K91oztAnzJyBDedH/s/3xELJSVJ+uxUM=; b=Ga6pHxtxp1nfYXYo6gKTTNrckKJtVfW84YJoHG/yGo1AEGkCgynoJuHU2U6NeIu7+9T02W Etu9bs6OUcqmhEy7CRCwB9Lbbyr3IICZSeXueq/bomWmSTU46erleiNAZpwB7cBrvXZM3x oHnO25Fjn078mS3b4XnVRbgmoi93+yY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-646-O969kjGFN6aYOfEONPPSVw-1; Thu, 06 Apr 2023 13:32:22 -0400 X-MC-Unique: O969kjGFN6aYOfEONPPSVw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C7802884EC0 for ; Thu, 6 Apr 2023 17:32:21 +0000 (UTC) Received: from dcaratti.users.ipa.redhat.com (unknown [10.45.225.137]) by smtp.corp.redhat.com (Postfix) with ESMTP id 639AF202701F for ; Thu, 6 Apr 2023 17:32:21 +0000 (UTC) From: Davide Caratti To: mptcp@lists.linux.dev Subject: [PATCH RFC mptcp-net-next 2/5] tools: ynl: fix bug in case of multiple nested attributes of the same type Date: Thu, 6 Apr 2023 19:32:02 +0200 Message-ID: <9414bdc6d3d0212238cec12d4f2d80894910e944.1680801697.git.dcaratti@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID: <20230406173202.3IVAmSK0TruxY_7JCodfb0x3Mi6z6Zo37gLoprcdQUs@z> Content-Type: text/plain; charset="utf-8"; x-default="true" when a policy contains multiple nested attributes of the same type, avoid re-initializing .request and .reply members. Signed-off-by: Davide Caratti --- tools/net/ynl/ynl-gen-c.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/ynl-gen-c.py index cc2f8c945340..ba55f217a006 100755 --- a/tools/net/ynl/ynl-gen-c.py +++ b/tools/net/ynl/ynl-gen-c.py @@ -812,7 +812,8 @@ class Family(SpecFamily): inherit =3D set() nested =3D spec['nested-attributes'] if nested not in self.root_sets: - self.pure_nested_structs[nested] =3D Struct(self, = nested, inherited=3Dinherit) + if nested not in self.pure_nested_structs: + self.pure_nested_structs[nested] =3D Struct(se= lf, nested, inherited=3Dinherit) if attr in rs_members['request']: self.pure_nested_structs[nested].request =3D True if attr in rs_members['reply']: --=20 2.39.2 From nobody Sat Feb 7 04:09:45 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B859FAD38 for ; Thu, 6 Apr 2023 17:32:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680802343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ugh6oERBt9LyoxHLkuMuwnL58Uu7GrGim2/OC1ws9u0=; b=Znk5u1BAbst6C3nBAyzSR6+rTUiq0nJ19J9XeCJMmuMxHl90vB9DWhlGIJPDdhzAfMuj8b dd8LQ0wqOgVRgsOsWQQ+cVYmStR96O26YNQVXZTYKwmeoP7gqN4rcgmKEK/+cUwhpCVMxQ zCx2ctkhZoUJqnyTdwajzVrm+5j3ECU= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-12-zIhN9r-CPua6o-r56uM55A-1; Thu, 06 Apr 2023 13:32:22 -0400 X-MC-Unique: zIhN9r-CPua6o-r56uM55A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 765163811F24 for ; Thu, 6 Apr 2023 17:32:22 +0000 (UTC) Received: from dcaratti.users.ipa.redhat.com (unknown [10.45.225.137]) by smtp.corp.redhat.com (Postfix) with ESMTP id 11C36202701F for ; Thu, 6 Apr 2023 17:32:21 +0000 (UTC) From: Davide Caratti To: mptcp@lists.linux.dev Subject: [PATCH RFC mptcp-net-next 3/5] Documentation: netlink: add a YAML spec for mptcp Date: Thu, 6 Apr 2023 19:32:03 +0200 Message-ID: In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID: <20230406173203.RVg9aRBi91ImAKUJx_5ml6wJrCVFIQMmPdH7oEOevXw@z> Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Davide Caratti --- Documentation/netlink/specs/mptcp.yaml | 361 +++++++++++++++++++++++++ 1 file changed, 361 insertions(+) create mode 100644 Documentation/netlink/specs/mptcp.yaml diff --git a/Documentation/netlink/specs/mptcp.yaml b/Documentation/netlink= /specs/mptcp.yaml new file mode 100644 index 000000000000..910307b021ba --- /dev/null +++ b/Documentation/netlink/specs/mptcp.yaml @@ -0,0 +1,361 @@ +# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Cla= use) + +name: mptcp_pm +protocol: genetlink-legacy +doc: Multipath TCP. + +c-family-name: mptcp_pm_name +c-version-name: mptcp_pm_ver +max-by-define: true +kernel-policy: global + +definitions: + - + type: enum + name: event-type + enum-name: mptcp_event_type + name-prefix: mptcp_event_ + entries: + - + name: unspec + - + name: created + value: 1 + doc: + token, family, saddr4 | saddr6, daddr4 | daddr6, sport, dport + A new MPTCP connection has been created. It is the good time to + allocate memory and send ADD_ADDR if needed. Depending on the + traffic-patterns it can take a long time until the + MPTCP_EVENT_ESTABLISHED is sent. + - + name: established + value: 2 + doc: + token, family, saddr4 | saddr6, daddr4 | daddr6, sport, dport + A MPTCP connection is established (can start new subflows). + - + name: closed + value: 3 + doc: + token + A MPTCP connection has stopped. + - + name: announced + value: 6 + doc: + token, rem_id, family, daddr4 | daddr6 [, dport] + A new address has been announced by the peer. + - + name: removed + value: 7 + doc: + token, rem_id + An address has been lost by the peer. + - + name: sub_established + value: 10 + doc: + token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 | daddr6, s= port, + dport, backup, if_idx [, error] + A new subflow has been established. 'error' should not be set. + - + name: sub_closed + value: 11 + doc: + token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 | daddr6, s= port, + 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. + - + name: sub_priority + value: 13 + doc: + token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 | daddr6, s= port, + dport, backup, if_idx [, error] + The priority of a subflow has changed. 'error' should not be set. + - + name: listener_created + value: 15 + doc: + family, sport, saddr4 | saddr6 + A new PM listener is created. + - + name: listener_closed + value: 16 + doc: + family, sport, saddr4 | saddr6 + A PM listener is closed. + +attribute-sets: + - + name: addr + name-prefix: mptcp_pm_addr_attr_ + attributes: + - + name: unspec + type: unused + value: 0 + - + name: family + type: u16 + - + name: id + type: u8 + - + name: addr4 + type: u32 + byte-order: big-endian + - + name: addr6 + type: binary + checks: + min-len: 16 + - + name: port + type: u16 + byte-order: big-endian + - + name: flags + type: u32 + - + name: if_idx + type: s32 + - + name: subflow-attribute + name-prefix: mptcp_subflow_attr_ + attributes: + - + name: unspec + type: unused + value: 0 + - + name: token_rem + type: u32 + - + name: token_loc + type: u32 + - + name: relwrite_seq + type: u32 + - + name: map_seq + type: u64 + - + name: map_sfseq + type: u32 + - + name: ssn_offset + type: u32 + - + name: map_datalen + type: u16 + - + name: flags + type: u32 + - + name: id_rem + type: u8 + - + name: id_loc + type: u8 + - + name: pad + type: pad + - + name: attr + name-prefix: mptcp_pm_attr_ + attributes: + - + name: unspec + type: unused + value: 0 + - + name: addr + type: nest + nested-attributes: addr + - + name: rcv_add_addrs + type: u32 + - + name: subflows + type: u32 + - + name: token + type: u32 + - + name: loc_id + type: u8 + - + name: addr_remote + type: nest + nested-attributes: addr + - + name: event_attr + enum-name: mptcp_event_attr + name-prefix: mptcp_attr_ + attributes: + - + name: UNSPEC + type: unused + value: 0 + - + name: token + type: u32 + - + name: family + type: u16 + - + name: loc_id + type: u8 + - + name: rem_id + type: u8 + - + name: saddr4 + type: u32 + byte-order: big-endian + - + name: saddr6 + type: binary + checks: + min-len: 16 + - + name: daddr4 + type: u32 + byte-order: big-endian + - + name: daddr6 + type: binary + checks: + min-len: 16 + - + name: sport + type: u16 + byte-order: big-endian + - + name: dport + type: u16 + byte-order: big-endian + - + name: backup + type: u8 + - + name: error + type: u8 + - + name: flags + type: u16 + - + name: timeout + type: u32 + - + name: if_idx + type: u32 + - + name: reset_reason + type: u32 + - + name: reset_flags + type: u32 + - + name: server_side + type: u8 + +operations: + list: + - + name: unspec + doc: unused + value: 0 + - + name: add_addr + doc: Add endpoint + attribute-set: attr + flags: [ uns-admin-perm ] + + do: + request: &add_addr_attrs + attributes: + - addr + - + name: del_addr + doc: Delete endpoint + attribute-set: attr + flags: [ uns-admin-perm ] + do: + request: *add_addr_attrs + - + name: get_addr + doc: Get endpoint information + attribute-set: attr + flags: [ uns-admin-perm ] + do: + request: *add_addr_attrs + reply: *add_addr_attrs + + dump: + reply: *add_addr_attrs + - + name: flush_addrs + doc: flush addresses + attribute-set: attr + flags: [ uns-admin-perm ] + do: + request: *add_addr_attrs + - + name: set_limits + doc: Set protocol limits + attribute-set: attr + flags: [ uns-admin-perm ] + do: + request: &mptcp_limits + attributes: + - rcv_add_addrs + - subflows + - + name: get_limits + doc: Get protocol limits + attribute-set: attr + do: + request: *mptcp_limits + reply: *mptcp_limits + - + name: set_flags + doc: Change endpoint flags + attribute-set: attr + flags: [ uns-admin-perm ] + do: + request: *add_addr_attrs + - + name: announce + doc: announce new sf + attribute-set: attr + flags: [ uns-admin-perm ] + do: + request: *add_addr_attrs + reply: *add_addr_attrs + - + name: remove + doc: announce removal + attribute-set: attr + flags: [ uns-admin-perm ] + do: + request: *add_addr_attrs + reply: *add_addr_attrs + - + name: subflow_create + doc: todo + attribute-set: attr + flags: [ uns-admin-perm ] + do: + request: *add_addr_attrs + reply: *add_addr_attrs + - + name: subflow_destroy + doc: todo + attribute-set: attr + flags: [ uns-admin-perm ] + do: + request: *add_addr_attrs + reply: *add_addr_attrs + --=20 2.39.2 From nobody Sat Feb 7 04:09:45 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9EFDBAD29 for ; Thu, 6 Apr 2023 17:32:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680802344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9sMTjUgBCg5RQURuwZB7BqHBHTzaNNE52gijOTF87Lw=; b=Ye7EzEPSBZKo4IBpyaB2soF4AiYSNI8UxGRfOMMwrcqFSZJRSmNRLmhmqDe+ZGog3DxEoW bN3bSbLAnzjqcu26heuMWbC5lKY2XAiRzuBJ0a/fPwUYDtWMeWTeCCxOQkPUco0dP7IQ0O BKIB1qlOVpGGIW5LQ9Ap5PpC4X436gI= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-67-civxzVlCPF-rs2e6WFKHGg-1; Thu, 06 Apr 2023 13:32:23 -0400 X-MC-Unique: civxzVlCPF-rs2e6WFKHGg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2535C2A59560 for ; Thu, 6 Apr 2023 17:32:23 +0000 (UTC) Received: from dcaratti.users.ipa.redhat.com (unknown [10.45.225.137]) by smtp.corp.redhat.com (Postfix) with ESMTP id B58ED202701F for ; Thu, 6 Apr 2023 17:32:22 +0000 (UTC) From: Davide Caratti To: mptcp@lists.linux.dev Subject: [PATCH RFC mptcp-net-next 4/5] mptcp: uapi: add header files generated from YAML spec Date: Thu, 6 Apr 2023 19:32:04 +0200 Message-ID: <4c229365bc411badb667514dc5c06d6771b86a90.1680801697.git.dcaratti@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID: <20230406173204.Vmvbc_hdd45ECLw0HRYhazp9PN9ICaZOkRcLdecQsCE@z> Content-Type: text/plain; charset="utf-8"; x-default="true" $ ./tools/net/ynl/ynl-gen-c.py --mode uapi \ > --spec Documentation/netlink/specs/mptcp.yaml --header \ > -o include/uapi/linux/mptcp_pm.h and remove these definitions from mptcp.h Signed-off-by: Davide Caratti --- include/uapi/linux/mptcp.h | 167 +--------------------------------- include/uapi/linux/mptcp_pm.h | 145 +++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+), 163 deletions(-) create mode 100644 include/uapi/linux/mptcp_pm.h diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h index 32af2d278cb4..f919f43a178a 100644 --- a/include/uapi/linux/mptcp.h +++ b/include/uapi/linux/mptcp.h @@ -12,6 +12,10 @@ #include /* for sockaddr_in */ #include /* for sockaddr_in6 */ #include /* for sockaddr_storage and sa_family */ +#include /* for netlink interface */ + +#define __MPTCP_PM_CMD_AFTER_LAST __MPTCP_PM_CMD_MAX +#define __MPTCP_ATTR_AFTER_LAST __MPTCP_ATTR_MAX =20 #define MPTCP_SUBFLOW_FLAG_MCAP_REM _BITUL(0) #define MPTCP_SUBFLOW_FLAG_MCAP_LOC _BITUL(1) @@ -23,88 +27,12 @@ #define MPTCP_SUBFLOW_FLAG_CONNECTED _BITUL(7) #define MPTCP_SUBFLOW_FLAG_MAPVALID _BITUL(8) =20 -enum { - MPTCP_SUBFLOW_ATTR_UNSPEC, - MPTCP_SUBFLOW_ATTR_TOKEN_REM, - MPTCP_SUBFLOW_ATTR_TOKEN_LOC, - MPTCP_SUBFLOW_ATTR_RELWRITE_SEQ, - MPTCP_SUBFLOW_ATTR_MAP_SEQ, - MPTCP_SUBFLOW_ATTR_MAP_SFSEQ, - MPTCP_SUBFLOW_ATTR_SSN_OFFSET, - MPTCP_SUBFLOW_ATTR_MAP_DATALEN, - MPTCP_SUBFLOW_ATTR_FLAGS, - MPTCP_SUBFLOW_ATTR_ID_REM, - MPTCP_SUBFLOW_ATTR_ID_LOC, - MPTCP_SUBFLOW_ATTR_PAD, - __MPTCP_SUBFLOW_ATTR_MAX -}; - -#define MPTCP_SUBFLOW_ATTR_MAX (__MPTCP_SUBFLOW_ATTR_MAX - 1) - -/* netlink interface */ -#define MPTCP_PM_NAME "mptcp_pm" -#define MPTCP_PM_CMD_GRP_NAME "mptcp_pm_cmds" -#define MPTCP_PM_EV_GRP_NAME "mptcp_pm_events" -#define MPTCP_PM_VER 0x1 - -/* - * ATTR types defined for MPTCP - */ -enum { - MPTCP_PM_ATTR_UNSPEC, - - MPTCP_PM_ATTR_ADDR, /* nested address */ - MPTCP_PM_ATTR_RCV_ADD_ADDRS, /* u32 */ - 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 -}; - -#define MPTCP_PM_ATTR_MAX (__MPTCP_PM_ATTR_MAX - 1) - -enum { - MPTCP_PM_ADDR_ATTR_UNSPEC, - - MPTCP_PM_ADDR_ATTR_FAMILY, /* u16 */ - MPTCP_PM_ADDR_ATTR_ID, /* u8 */ - MPTCP_PM_ADDR_ATTR_ADDR4, /* struct in_addr */ - MPTCP_PM_ADDR_ATTR_ADDR6, /* struct in6_addr */ - MPTCP_PM_ADDR_ATTR_PORT, /* u16 */ - MPTCP_PM_ADDR_ATTR_FLAGS, /* u32 */ - MPTCP_PM_ADDR_ATTR_IF_IDX, /* s32 */ - - __MPTCP_PM_ADDR_ATTR_MAX -}; - -#define MPTCP_PM_ADDR_ATTR_MAX (__MPTCP_PM_ADDR_ATTR_MAX - 1) - #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) =20 -enum { - MPTCP_PM_CMD_UNSPEC, - - MPTCP_PM_CMD_ADD_ADDR, - MPTCP_PM_CMD_DEL_ADDR, - MPTCP_PM_CMD_GET_ADDR, - MPTCP_PM_CMD_FLUSH_ADDRS, - 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_SUBFLOW_CREATE, - MPTCP_PM_CMD_SUBFLOW_DESTROY, - - __MPTCP_PM_CMD_AFTER_LAST -}; - #define MPTCP_INFO_FLAG_FALLBACK _BITUL(0) #define MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED _BITUL(1) =20 @@ -125,93 +53,6 @@ struct mptcp_info { __u8 mptcpi_csum_enabled; }; =20 -/* - * MPTCP_EVENT_CREATED: token, family, saddr4 | saddr6, daddr4 | daddr6, - * sport, dport - * A new MPTCP connection has been created. It is the good time to allocate - * memory and send ADD_ADDR if needed. Depending on the traffic-patterns - * it can take a long time until the MPTCP_EVENT_ESTABLISHED is sent. - * - * MPTCP_EVENT_ESTABLISHED: token, family, saddr4 | saddr6, daddr4 | daddr= 6, - * sport, dport - * A MPTCP connection is established (can start new subflows). - * - * MPTCP_EVENT_CLOSED: token - * A MPTCP connection has stopped. - * - * MPTCP_EVENT_ANNOUNCED: token, rem_id, family, daddr4 | daddr6 [, dport] - * A new address has been announced by the peer. - * - * MPTCP_EVENT_REMOVED: token, rem_id - * An address has been lost by the peer. - * - * 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, 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, loc_id, rem_id, saddr4 | saddr= 6, - * daddr4 | daddr6, sport, dport, backup, if_idx - * [, error] - * The priority of a subflow has changed. 'error' should not be set. - * - * MPTCP_EVENT_LISTENER_CREATED: family, sport, saddr4 | saddr6 - * A new PM listener is created. - * - * MPTCP_EVENT_LISTENER_CLOSED: family, sport, saddr4 | saddr6 - * A PM listener is closed. - */ -enum mptcp_event_type { - MPTCP_EVENT_UNSPEC =3D 0, - MPTCP_EVENT_CREATED =3D 1, - MPTCP_EVENT_ESTABLISHED =3D 2, - MPTCP_EVENT_CLOSED =3D 3, - - MPTCP_EVENT_ANNOUNCED =3D 6, - MPTCP_EVENT_REMOVED =3D 7, - - MPTCP_EVENT_SUB_ESTABLISHED =3D 10, - MPTCP_EVENT_SUB_CLOSED =3D 11, - - MPTCP_EVENT_SUB_PRIORITY =3D 13, - - MPTCP_EVENT_LISTENER_CREATED =3D 15, - MPTCP_EVENT_LISTENER_CLOSED =3D 16, -}; - -enum mptcp_event_attr { - MPTCP_ATTR_UNSPEC =3D 0, - - MPTCP_ATTR_TOKEN, /* u32 */ - MPTCP_ATTR_FAMILY, /* u16 */ - MPTCP_ATTR_LOC_ID, /* u8 */ - MPTCP_ATTR_REM_ID, /* u8 */ - MPTCP_ATTR_SADDR4, /* be32 */ - MPTCP_ATTR_SADDR6, /* struct in6_addr */ - MPTCP_ATTR_DADDR4, /* be32 */ - MPTCP_ATTR_DADDR6, /* struct in6_addr */ - MPTCP_ATTR_SPORT, /* be16 */ - MPTCP_ATTR_DPORT, /* be16 */ - MPTCP_ATTR_BACKUP, /* u8 */ - MPTCP_ATTR_ERROR, /* u8 */ - MPTCP_ATTR_FLAGS, /* u16 */ - MPTCP_ATTR_TIMEOUT, /* u32 */ - MPTCP_ATTR_IF_IDX, /* s32 */ - MPTCP_ATTR_RESET_REASON,/* u32 */ - MPTCP_ATTR_RESET_FLAGS, /* u32 */ - MPTCP_ATTR_SERVER_SIDE, /* u8 */ - - __MPTCP_ATTR_AFTER_LAST -}; - -#define MPTCP_ATTR_MAX (__MPTCP_ATTR_AFTER_LAST - 1) - /* MPTCP Reset reason codes, rfc8684 */ #define MPTCP_RST_EUNSPEC 0 #define MPTCP_RST_EMPTCP 1 diff --git a/include/uapi/linux/mptcp_pm.h b/include/uapi/linux/mptcp_pm.h new file mode 100644 index 000000000000..37cdae7a871b --- /dev/null +++ b/include/uapi/linux/mptcp_pm.h @@ -0,0 +1,145 @@ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Cl= ause) */ +/* Do not edit directly, auto-generated from: */ +/* Documentation/netlink/specs/mptcp.yaml */ +/* YNL-GEN uapi header */ + +#ifndef _UAPI_LINUX_MPTCP_PM_H +#define _UAPI_LINUX_MPTCP_PM_H + +#define MPTCP_PM_NAME "mptcp_pm" +#define MPTCP_PM_VER 1 + +/** + * enum mptcp_pm_event_type + * @MPTCP_EVENT_CREATED: token, family, saddr4 | saddr6, daddr4 | daddr6, + * sport, dport A new MPTCP connection has been created. It is the good = time + * to allocate memory and send ADD_ADDR if needed. Depending on the + * traffic-patterns it can take a long time until the MPTCP_EVENT_ESTABL= ISHED + * is sent. + * @MPTCP_EVENT_ESTABLISHED: token, family, saddr4 | saddr6, daddr4 | dadd= r6, + * sport, dport A MPTCP connection is established (can start new subflow= s). + * @MPTCP_EVENT_CLOSED: token A MPTCP connection has stopped. + * @MPTCP_EVENT_ANNOUNCED: token, rem_id, family, daddr4 | daddr6 [, dport= ] A + * new address has been announced by the peer. + * @MPTCP_EVENT_REMOVED: token, rem_id An address has been lost by the pee= r. + * @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, 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, loc_id, rem_id, saddr4 | sadd= r6, + * daddr4 | daddr6, sport, dport, backup, if_idx [, error] The priority = of a + * subflow has changed. 'error' should not be set. + * @MPTCP_EVENT_LISTENER_CREATED: family, sport, saddr4 | saddr6 A new PM + * listener is created. + * @MPTCP_EVENT_LISTENER_CLOSED: family, sport, saddr4 | saddr6 A PM liste= ner + * is closed. + */ +enum mptcp_event_type { + MPTCP_EVENT_UNSPEC, + MPTCP_EVENT_CREATED, + MPTCP_EVENT_ESTABLISHED, + MPTCP_EVENT_CLOSED, + MPTCP_EVENT_ANNOUNCED =3D 6, + MPTCP_EVENT_REMOVED, + MPTCP_EVENT_SUB_ESTABLISHED =3D 10, + MPTCP_EVENT_SUB_CLOSED, + MPTCP_EVENT_SUB_PRIORITY =3D 13, + MPTCP_EVENT_LISTENER_CREATED =3D 15, + MPTCP_EVENT_LISTENER_CLOSED, +}; + +enum { + MPTCP_PM_ADDR_ATTR_UNSPEC, + MPTCP_PM_ADDR_ATTR_FAMILY, + MPTCP_PM_ADDR_ATTR_ID, + MPTCP_PM_ADDR_ATTR_ADDR4, + MPTCP_PM_ADDR_ATTR_ADDR6, + MPTCP_PM_ADDR_ATTR_PORT, + MPTCP_PM_ADDR_ATTR_FLAGS, + MPTCP_PM_ADDR_ATTR_IF_IDX, + + __MPTCP_PM_ADDR_ATTR_MAX +}; +#define MPTCP_PM_ADDR_ATTR_MAX (__MPTCP_PM_ADDR_ATTR_MAX - 1) + +enum { + MPTCP_SUBFLOW_ATTR_UNSPEC, + MPTCP_SUBFLOW_ATTR_TOKEN_REM, + MPTCP_SUBFLOW_ATTR_TOKEN_LOC, + MPTCP_SUBFLOW_ATTR_RELWRITE_SEQ, + MPTCP_SUBFLOW_ATTR_MAP_SEQ, + MPTCP_SUBFLOW_ATTR_MAP_SFSEQ, + MPTCP_SUBFLOW_ATTR_SSN_OFFSET, + MPTCP_SUBFLOW_ATTR_MAP_DATALEN, + MPTCP_SUBFLOW_ATTR_FLAGS, + MPTCP_SUBFLOW_ATTR_ID_REM, + MPTCP_SUBFLOW_ATTR_ID_LOC, + MPTCP_SUBFLOW_ATTR_PAD, + + __MPTCP_SUBFLOW_ATTR_MAX +}; +#define MPTCP_SUBFLOW_ATTR_MAX (__MPTCP_SUBFLOW_ATTR_MAX - 1) + +enum { + MPTCP_PM_ATTR_UNSPEC, + MPTCP_PM_ATTR_ADDR, + MPTCP_PM_ATTR_RCV_ADD_ADDRS, + MPTCP_PM_ATTR_SUBFLOWS, + MPTCP_PM_ATTR_TOKEN, + MPTCP_PM_ATTR_LOC_ID, + MPTCP_PM_ATTR_ADDR_REMOTE, + + __MPTCP_PM_ATTR_MAX +}; +#define MPTCP_PM_ATTR_MAX (__MPTCP_PM_ATTR_MAX - 1) + +enum mptcp_event_attr { + MPTCP_ATTR_UNSPEC, + MPTCP_ATTR_TOKEN, + MPTCP_ATTR_FAMILY, + MPTCP_ATTR_LOC_ID, + MPTCP_ATTR_REM_ID, + MPTCP_ATTR_SADDR4, + MPTCP_ATTR_SADDR6, + MPTCP_ATTR_DADDR4, + MPTCP_ATTR_DADDR6, + MPTCP_ATTR_SPORT, + MPTCP_ATTR_DPORT, + MPTCP_ATTR_BACKUP, + MPTCP_ATTR_ERROR, + MPTCP_ATTR_FLAGS, + MPTCP_ATTR_TIMEOUT, + MPTCP_ATTR_IF_IDX, + MPTCP_ATTR_RESET_REASON, + MPTCP_ATTR_RESET_FLAGS, + MPTCP_ATTR_SERVER_SIDE, + + __MPTCP_ATTR_MAX +}; +#define MPTCP_ATTR_MAX (__MPTCP_ATTR_MAX - 1) + +enum { + MPTCP_PM_CMD_UNSPEC, + MPTCP_PM_CMD_ADD_ADDR, + MPTCP_PM_CMD_DEL_ADDR, + MPTCP_PM_CMD_GET_ADDR, + MPTCP_PM_CMD_FLUSH_ADDRS, + 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_SUBFLOW_CREATE, + MPTCP_PM_CMD_SUBFLOW_DESTROY, + + __MPTCP_PM_CMD_MAX +}; +#define MPTCP_PM_CMD_MAX (__MPTCP_PM_CMD_MAX - 1) + +#define MPTCP_PM_CMD_GRP_NAME "mptcp_pm_cmds" +#define MPTCP_PM_EV_GRP_NAME "mptcp_pm_events" + +#endif /* _UAPI_LINUX_MPTCP_PM_H */ --=20 2.39.2 From nobody Sat Feb 7 04:09:45 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2DE8BAD29 for ; Thu, 6 Apr 2023 17:32:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680802371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GQ1Zdk1xwx0h2DGYS0+FcVgl2sWAzwC0rPSLw8NfjBA=; b=PkIdQ8Qzivgtkv6eI8u0UVaSZm73hie9wTw+o5dTm7jThdbXZcyj70LplStqI5LOhAwpai m4CcV7F18nuuYKn5QernIbPy61IWEa3urIa2EAeWRSC7BfnginBjdsthym05Tq4oZm+xt5 gejzzTbMoDedNR1/oHRzsDmigmZv+Tk= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-556-stsWw49POreQgqrwt23Ydg-1; Thu, 06 Apr 2023 13:32:26 -0400 X-MC-Unique: stsWw49POreQgqrwt23Ydg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C8F4D2A5955D for ; Thu, 6 Apr 2023 17:32:19 +0000 (UTC) Received: from dcaratti.users.ipa.redhat.com (unknown [10.45.225.137]) by smtp.corp.redhat.com (Postfix) with ESMTP id 445F5202701F for ; Thu, 6 Apr 2023 17:32:19 +0000 (UTC) From: Davide Caratti To: mptcp@lists.linux.dev Subject: [PATCH RFC mptcp-net-next 5/5] net/mptcp: use netlink policy generated from YAML spec Date: Thu, 6 Apr 2023 19:31:59 +0200 Message-ID: In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID: <20230406173159.vjKk7zJ6cyrQl9c5RwemQMbWO6eJd8GHzW-3jvtoa88@z> Content-Type: text/plain; charset="utf-8"; x-default="true" $ ./tools/net/ynl/ynl-gen-c.py --mode kernel \ > --spec Documentation/netlink/specs/mptcp.yaml --header \ > -o net/mptcp/pm_nl.h $ ./tools/net/ynl/ynl-gen-c.py --mode kernel \ > --spec Documentation/netlink/specs/mptcp.yaml --source \ > -o net/mptcp/pm_nl.c and remove the old ones we had in pm_netlink.c/pm_userspace.c Signed-off-by: Davide Caratti --- net/mptcp/Makefile | 3 +- net/mptcp/pm_netlink.c | 107 +++++---------------------------------- net/mptcp/pm_nl.c | 91 +++++++++++++++++++++++++++++++++ net/mptcp/pm_nl.h | 39 ++++++++++++++ net/mptcp/pm_userspace.c | 9 ++-- net/mptcp/protocol.h | 6 +-- 6 files changed, 152 insertions(+), 103 deletions(-) create mode 100644 net/mptcp/pm_nl.c create mode 100644 net/mptcp/pm_nl.h diff --git a/net/mptcp/Makefile b/net/mptcp/Makefile index 84e531f86b82..dedd1bf8d052 100644 --- a/net/mptcp/Makefile +++ b/net/mptcp/Makefile @@ -2,7 +2,8 @@ obj-$(CONFIG_MPTCP) +=3D mptcp.o =20 mptcp-y :=3D protocol.o subflow.o options.o token.o crypto.o ctrl.o pm.o d= iag.o \ - mib.o pm_netlink.o sockopt.o pm_userspace.o fastopen.o sched.o + mib.o pm_netlink.o sockopt.o pm_userspace.o fastopen.o sched.o \ + pm_nl.o =20 obj-$(CONFIG_SYN_COOKIES) +=3D syncookies.o obj-$(CONFIG_INET_MPTCP_DIAG) +=3D mptcp_diag.o diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index e8336b8bd30e..44cb7925aec1 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1116,28 +1116,6 @@ static const struct genl_multicast_group mptcp_pm_mc= grps[] =3D { }, }; =20 -static const struct nla_policy -mptcp_pm_addr_policy[MPTCP_PM_ADDR_ATTR_MAX + 1] =3D { - [MPTCP_PM_ADDR_ATTR_FAMILY] =3D { .type =3D NLA_U16, }, - [MPTCP_PM_ADDR_ATTR_ID] =3D { .type =3D NLA_U8, }, - [MPTCP_PM_ADDR_ATTR_ADDR4] =3D { .type =3D NLA_U32, }, - [MPTCP_PM_ADDR_ATTR_ADDR6] =3D - NLA_POLICY_EXACT_LEN(sizeof(struct in6_addr)), - [MPTCP_PM_ADDR_ATTR_PORT] =3D { .type =3D NLA_U16 }, - [MPTCP_PM_ADDR_ATTR_FLAGS] =3D { .type =3D NLA_U32 }, - [MPTCP_PM_ADDR_ATTR_IF_IDX] =3D { .type =3D NLA_S32 }, -}; - -static const struct nla_policy mptcp_pm_policy[MPTCP_PM_ATTR_MAX + 1] =3D { - [MPTCP_PM_ATTR_ADDR] =3D - NLA_POLICY_NESTED(mptcp_pm_addr_policy), - [MPTCP_PM_ATTR_RCV_ADD_ADDRS] =3D { .type =3D NLA_U32, }, - [MPTCP_PM_ATTR_SUBFLOWS] =3D { .type =3D NLA_U32, }, - [MPTCP_PM_ATTR_TOKEN] =3D { .type =3D NLA_U32, }, - [MPTCP_PM_ATTR_LOC_ID] =3D { .type =3D NLA_U8, }, - [MPTCP_PM_ATTR_ADDR_REMOTE] =3D - NLA_POLICY_NESTED(mptcp_pm_addr_policy), -}; =20 void mptcp_pm_nl_subflow_chk_stale(const struct mptcp_sock *msk, struct so= ck *ssk) { @@ -1200,7 +1178,7 @@ static int mptcp_pm_parse_pm_addr_attr(struct nlattr = *tb[], =20 /* no validation needed - was already done via nested policy */ err =3D nla_parse_nested_deprecated(tb, MPTCP_PM_ADDR_ATTR_MAX, attr, - mptcp_pm_addr_policy, info->extack); + mptcp_pm_addr_nl_policy, info->extack); if (err) return err; =20 @@ -1315,7 +1293,7 @@ static int mptcp_nl_add_subflow_or_signal_addr(struct= net *net) return 0; } =20 -static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *in= fo) +int mptcp_pm_nl_add_addr_doit(struct sk_buff *skb, struct genl_info *info) { struct nlattr *attr =3D info->attrs[MPTCP_PM_ATTR_ADDR]; struct pm_nl_pernet *pernet =3D genl_info_pm_nl(info); @@ -1507,7 +1485,7 @@ static int mptcp_nl_remove_id_zero_address(struct net= *net, return 0; } =20 -static int mptcp_nl_cmd_del_addr(struct sk_buff *skb, struct genl_info *in= fo) +int mptcp_pm_nl_del_addr_doit(struct sk_buff *skb, struct genl_info *info) { struct nlattr *attr =3D info->attrs[MPTCP_PM_ATTR_ADDR]; struct pm_nl_pernet *pernet =3D genl_info_pm_nl(info); @@ -1624,7 +1602,7 @@ static void __reset_counters(struct pm_nl_pernet *per= net) pernet->addrs =3D 0; } =20 -static int mptcp_nl_cmd_flush_addrs(struct sk_buff *skb, struct genl_info = *info) +int mptcp_pm_nl_flush_addrs_doit(struct sk_buff *skb, struct genl_info *in= fo) { struct pm_nl_pernet *pernet =3D genl_info_pm_nl(info); LIST_HEAD(free_list); @@ -1680,7 +1658,7 @@ static int mptcp_nl_fill_addr(struct sk_buff *skb, return -EMSGSIZE; } =20 -static int mptcp_nl_cmd_get_addr(struct sk_buff *skb, struct genl_info *in= fo) +int mptcp_pm_nl_get_addr_doit(struct sk_buff *skb, struct genl_info *info) { struct nlattr *attr =3D info->attrs[MPTCP_PM_ATTR_ADDR]; struct pm_nl_pernet *pernet =3D genl_info_pm_nl(info); @@ -1730,8 +1708,8 @@ static int mptcp_nl_cmd_get_addr(struct sk_buff *skb,= struct genl_info *info) return ret; } =20 -static int mptcp_nl_cmd_dump_addrs(struct sk_buff *msg, - struct netlink_callback *cb) +int mptcp_pm_nl_get_addr_dumpit(struct sk_buff *msg, + struct netlink_callback *cb) { struct net *net =3D sock_net(msg->sk); struct mptcp_pm_addr_entry *entry; @@ -1788,8 +1766,7 @@ static int parse_limit(struct genl_info *info, int id= , unsigned int *limit) return 0; } =20 -static int -mptcp_nl_cmd_set_limits(struct sk_buff *skb, struct genl_info *info) +int mptcp_pm_nl_set_limits_doit(struct sk_buff *skb, struct genl_info *inf= o) { struct pm_nl_pernet *pernet =3D genl_info_pm_nl(info); unsigned int rcv_addrs, subflows; @@ -1814,8 +1791,7 @@ mptcp_nl_cmd_set_limits(struct sk_buff *skb, struct g= enl_info *info) return ret; } =20 -static int -mptcp_nl_cmd_get_limits(struct sk_buff *skb, struct genl_info *info) +int mptcp_pm_nl_get_limits_doit(struct sk_buff *skb, struct genl_info *inf= o) { struct pm_nl_pernet *pernet =3D genl_info_pm_nl(info); struct sk_buff *msg; @@ -1889,7 +1865,7 @@ static int mptcp_nl_set_flags(struct net *net, return ret; } =20 -static int mptcp_nl_cmd_set_flags(struct sk_buff *skb, struct genl_info *i= nfo) +int mptcp_pm_nl_set_flags_doit(struct sk_buff *skb, struct genl_info *info) { struct mptcp_pm_addr_entry addr =3D { .addr =3D { .family =3D AF_UNSPEC }= , }, *entry; struct mptcp_pm_addr_entry remote =3D { .addr =3D { .family =3D AF_UNSPEC= }, }; @@ -2282,72 +2258,15 @@ void mptcp_event(enum mptcp_event_type type, const = struct mptcp_sock *msk, nlmsg_free(skb); } =20 -static const struct genl_small_ops mptcp_pm_ops[] =3D { - { - .cmd =3D MPTCP_PM_CMD_ADD_ADDR, - .doit =3D mptcp_nl_cmd_add_addr, - .flags =3D GENL_UNS_ADMIN_PERM, - }, - { - .cmd =3D MPTCP_PM_CMD_DEL_ADDR, - .doit =3D mptcp_nl_cmd_del_addr, - .flags =3D GENL_UNS_ADMIN_PERM, - }, - { - .cmd =3D MPTCP_PM_CMD_FLUSH_ADDRS, - .doit =3D mptcp_nl_cmd_flush_addrs, - .flags =3D GENL_UNS_ADMIN_PERM, - }, - { - .cmd =3D MPTCP_PM_CMD_GET_ADDR, - .doit =3D mptcp_nl_cmd_get_addr, - .dumpit =3D mptcp_nl_cmd_dump_addrs, - }, - { - .cmd =3D MPTCP_PM_CMD_SET_LIMITS, - .doit =3D mptcp_nl_cmd_set_limits, - .flags =3D GENL_UNS_ADMIN_PERM, - }, - { - .cmd =3D MPTCP_PM_CMD_GET_LIMITS, - .doit =3D mptcp_nl_cmd_get_limits, - }, - { - .cmd =3D MPTCP_PM_CMD_SET_FLAGS, - .doit =3D mptcp_nl_cmd_set_flags, - .flags =3D GENL_UNS_ADMIN_PERM, - }, - { - .cmd =3D MPTCP_PM_CMD_ANNOUNCE, - .doit =3D mptcp_nl_cmd_announce, - .flags =3D GENL_UNS_ADMIN_PERM, - }, - { - .cmd =3D MPTCP_PM_CMD_REMOVE, - .doit =3D mptcp_nl_cmd_remove, - .flags =3D GENL_UNS_ADMIN_PERM, - }, - { - .cmd =3D MPTCP_PM_CMD_SUBFLOW_CREATE, - .doit =3D mptcp_nl_cmd_sf_create, - .flags =3D GENL_UNS_ADMIN_PERM, - }, - { - .cmd =3D MPTCP_PM_CMD_SUBFLOW_DESTROY, - .doit =3D mptcp_nl_cmd_sf_destroy, - .flags =3D GENL_UNS_ADMIN_PERM, - }, -}; - static struct genl_family mptcp_genl_family __ro_after_init =3D { .name =3D MPTCP_PM_NAME, .version =3D MPTCP_PM_VER, .maxattr =3D MPTCP_PM_ATTR_MAX, - .policy =3D mptcp_pm_policy, + .policy =3D mptcp_pm_attr_nl_policy, .netnsok =3D true, .module =3D THIS_MODULE, - .small_ops =3D mptcp_pm_ops, - .n_small_ops =3D ARRAY_SIZE(mptcp_pm_ops), + .small_ops =3D mptcp_pm_nl_ops, + .n_small_ops =3D ARRAY_SIZE(mptcp_pm_nl_ops), .resv_start_op =3D MPTCP_PM_CMD_SUBFLOW_DESTROY + 1, .mcgrps =3D mptcp_pm_mcgrps, .n_mcgrps =3D ARRAY_SIZE(mptcp_pm_mcgrps), diff --git a/net/mptcp/pm_nl.c b/net/mptcp/pm_nl.c new file mode 100644 index 000000000000..5de927aa8a1d --- /dev/null +++ b/net/mptcp/pm_nl.c @@ -0,0 +1,91 @@ +// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Cl= ause) +/* Do not edit directly, auto-generated from: */ +/* Documentation/netlink/specs/mptcp.yaml */ +/* YNL-GEN kernel source */ + +#include +#include + +#include "pm_nl.h" + +#include + +/* Common nested types */ +const struct nla_policy mptcp_pm_addr_nl_policy[MPTCP_PM_ADDR_ATTR_IF_IDX = + 1] =3D { + [MPTCP_PM_ADDR_ATTR_FAMILY] =3D { .type =3D NLA_U16, }, + [MPTCP_PM_ADDR_ATTR_ID] =3D { .type =3D NLA_U8, }, + [MPTCP_PM_ADDR_ATTR_ADDR4] =3D { .type =3D NLA_U32, }, + [MPTCP_PM_ADDR_ATTR_ADDR6] =3D { .len =3D 16, }, + [MPTCP_PM_ADDR_ATTR_PORT] =3D { .type =3D NLA_U16, }, + [MPTCP_PM_ADDR_ATTR_FLAGS] =3D { .type =3D NLA_U32, }, + [MPTCP_PM_ADDR_ATTR_IF_IDX] =3D { .type =3D NLA_S32, }, +}; + +/* Global operation policy for mptcp_pm */ +const struct nla_policy mptcp_pm_attr_nl_policy[MPTCP_PM_ATTR_ADDR_REMOTE = + 1] =3D { + [MPTCP_PM_ATTR_ADDR] =3D NLA_POLICY_NESTED(mptcp_pm_addr_nl_policy), + [MPTCP_PM_ATTR_RCV_ADD_ADDRS] =3D { .type =3D NLA_U32, }, + [MPTCP_PM_ATTR_SUBFLOWS] =3D { .type =3D NLA_U32, }, + [MPTCP_PM_ATTR_TOKEN] =3D { .type =3D NLA_U32, }, + [MPTCP_PM_ATTR_LOC_ID] =3D { .type =3D NLA_U8, }, + [MPTCP_PM_ATTR_ADDR_REMOTE] =3D NLA_POLICY_NESTED(mptcp_pm_addr_nl_policy= ), +}; + +/* Ops table for mptcp_pm */ +const struct genl_small_ops mptcp_pm_nl_ops[11] =3D { + { + .cmd =3D MPTCP_PM_CMD_ADD_ADDR, + .doit =3D mptcp_pm_nl_add_addr_doit, + .flags =3D GENL_UNS_ADMIN_PERM, + }, + { + .cmd =3D MPTCP_PM_CMD_DEL_ADDR, + .doit =3D mptcp_pm_nl_del_addr_doit, + .flags =3D GENL_UNS_ADMIN_PERM, + }, + { + .cmd =3D MPTCP_PM_CMD_GET_ADDR, + .doit =3D mptcp_pm_nl_get_addr_doit, + .dumpit =3D mptcp_pm_nl_get_addr_dumpit, + .flags =3D GENL_UNS_ADMIN_PERM, + }, + { + .cmd =3D MPTCP_PM_CMD_FLUSH_ADDRS, + .doit =3D mptcp_pm_nl_flush_addrs_doit, + .flags =3D GENL_UNS_ADMIN_PERM, + }, + { + .cmd =3D MPTCP_PM_CMD_SET_LIMITS, + .doit =3D mptcp_pm_nl_set_limits_doit, + .flags =3D GENL_UNS_ADMIN_PERM, + }, + { + .cmd =3D MPTCP_PM_CMD_GET_LIMITS, + .doit =3D mptcp_pm_nl_get_limits_doit, + }, + { + .cmd =3D MPTCP_PM_CMD_SET_FLAGS, + .doit =3D mptcp_pm_nl_set_flags_doit, + .flags =3D GENL_UNS_ADMIN_PERM, + }, + { + .cmd =3D MPTCP_PM_CMD_ANNOUNCE, + .doit =3D mptcp_pm_nl_announce_doit, + .flags =3D GENL_UNS_ADMIN_PERM, + }, + { + .cmd =3D MPTCP_PM_CMD_REMOVE, + .doit =3D mptcp_pm_nl_remove_doit, + .flags =3D GENL_UNS_ADMIN_PERM, + }, + { + .cmd =3D MPTCP_PM_CMD_SUBFLOW_CREATE, + .doit =3D mptcp_pm_nl_subflow_create_doit, + .flags =3D GENL_UNS_ADMIN_PERM, + }, + { + .cmd =3D MPTCP_PM_CMD_SUBFLOW_DESTROY, + .doit =3D mptcp_pm_nl_subflow_destroy_doit, + .flags =3D GENL_UNS_ADMIN_PERM, + }, +}; diff --git a/net/mptcp/pm_nl.h b/net/mptcp/pm_nl.h new file mode 100644 index 000000000000..26dd13f3244d --- /dev/null +++ b/net/mptcp/pm_nl.h @@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Cl= ause) */ +/* Do not edit directly, auto-generated from: */ +/* Documentation/netlink/specs/mptcp.yaml */ +/* YNL-GEN kernel header */ + +#ifndef _LINUX_MPTCP_PM_GEN_H +#define _LINUX_MPTCP_PM_GEN_H + +#include +#include + +#include + +/* Common nested types */ +extern const struct nla_policy mptcp_pm_addr_nl_policy[MPTCP_PM_ADDR_ATTR_= IF_IDX + 1]; + +/* Global operation policy for mptcp_pm */ +extern const struct nla_policy mptcp_pm_attr_nl_policy[MPTCP_PM_ATTR_ADDR_= REMOTE + 1]; + +/* Ops table for mptcp_pm */ +extern const struct genl_small_ops mptcp_pm_nl_ops[11]; + +int mptcp_pm_nl_add_addr_doit(struct sk_buff *skb, struct genl_info *info); +int mptcp_pm_nl_del_addr_doit(struct sk_buff *skb, struct genl_info *info); +int mptcp_pm_nl_get_addr_doit(struct sk_buff *skb, struct genl_info *info); +int mptcp_pm_nl_get_addr_dumpit(struct sk_buff *skb, + struct netlink_callback *cb); +int mptcp_pm_nl_flush_addrs_doit(struct sk_buff *skb, struct genl_info *in= fo); +int mptcp_pm_nl_set_limits_doit(struct sk_buff *skb, struct genl_info *inf= o); +int mptcp_pm_nl_get_limits_doit(struct sk_buff *skb, struct genl_info *inf= o); +int mptcp_pm_nl_set_flags_doit(struct sk_buff *skb, struct genl_info *info= ); +int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info); +int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info); +int mptcp_pm_nl_subflow_create_doit(struct sk_buff *skb, + struct genl_info *info); +int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, + struct genl_info *info); + +#endif /* _LINUX_MPTCP_PM_GEN_H */ diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 27a275805c06..8936d0f80884 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -122,7 +122,7 @@ int mptcp_userspace_pm_get_local_id(struct mptcp_sock *= msk, return mptcp_userspace_pm_append_new_local_addr(msk, &new_entry); } =20 -int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info) +int mptcp_pm_nl_announce_doit(struct sk_buff *skb, struct genl_info *info) { struct nlattr *token =3D info->attrs[MPTCP_PM_ATTR_TOKEN]; struct nlattr *addr =3D info->attrs[MPTCP_PM_ATTR_ADDR]; @@ -184,7 +184,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct g= enl_info *info) return err; } =20 -int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) +int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) { struct nlattr *token =3D info->attrs[MPTCP_PM_ATTR_TOKEN]; struct nlattr *id =3D info->attrs[MPTCP_PM_ATTR_LOC_ID]; @@ -246,7 +246,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct gen= l_info *info) return err; } =20 -int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct genl_info *info) +int mptcp_pm_nl_subflow_create_doit(struct sk_buff *skb, struct genl_info = *info) { struct nlattr *raddr =3D info->attrs[MPTCP_PM_ATTR_ADDR_REMOTE]; struct nlattr *token =3D info->attrs[MPTCP_PM_ATTR_TOKEN]; @@ -361,7 +361,8 @@ static struct sock *mptcp_nl_find_ssk(struct mptcp_sock= *msk, return NULL; } =20 -int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct genl_info *info) +int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, + struct genl_info *info) { struct nlattr *raddr =3D info->attrs[MPTCP_PM_ATTR_ADDR_REMOTE]; struct nlattr *token =3D info->attrs[MPTCP_PM_ATTR_TOKEN]; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 5a35c77723e3..ca33d2808b61 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -13,6 +13,8 @@ #include #include =20 +#include "pm_nl.h" /* for netlink interface */ + #define MPTCP_SUPPORTED_VERSION 1 =20 /* MPTCP option bits */ @@ -849,10 +851,6 @@ void mptcp_pm_remove_addrs_and_subflows(struct mptcp_s= ock *msk, struct list_head *rm_list); =20 void mptcp_free_local_addr_list(struct mptcp_sock *msk); -int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info); -int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info); -int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct genl_info *info); -int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct genl_info *info); =20 void mptcp_event(enum mptcp_event_type type, const struct mptcp_sock *msk, const struct sock *ssk, gfp_t gfp); --=20 2.39.2