From patchwork Thu Oct 29 07:04:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 311260 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82EA2C4363A for ; Thu, 29 Oct 2020 07:21:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2D2FB221EB for ; Thu, 29 Oct 2020 07:21:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GCSJeAwB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726235AbgJ2HV3 (ORCPT ); Thu, 29 Oct 2020 03:21:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725980AbgJ2HVB (ORCPT ); Thu, 29 Oct 2020 03:21:01 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65C24C08E89B; Thu, 29 Oct 2020 00:05:20 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id x13so1575114pgp.7; Thu, 29 Oct 2020 00:05:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=XhPZ+7DUQwlRDaSu5lv7OXg3Gcfc+hMYdwSPQo1kNA4=; b=GCSJeAwBt1IDwsGpWUUH/GLbcfmUUQAAGeKn7lvd5Kxdmd2KKI+UzNmf7Z9s1oO3rP sQ7t9hFtBDdcEdm5RPwu3vUDgqTJj9fu5fa0Fo01g8ISG+qCbvTAvI6GbX3KiZfZZvjQ W58CMfw9sQUblhvn+gVfcP8sDrAIG8ASS7quSQ3b7IAxMCDd7f/qNACACJJ+ZQXugEMI McM9ymrv8+FWLAEtvUIj4QUiEg0V24keQmoo0p6SpqMltgOeyVdSOUZnQSnDTO9/7IIW kVOKkS5MCWXigtrxJjzPIQz3xinzYxy4n2HFXy0ig1//7WOdf/qP6xXOyuDcKMsUwERY KYSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=XhPZ+7DUQwlRDaSu5lv7OXg3Gcfc+hMYdwSPQo1kNA4=; b=kQA83pMx6TiwD2R0s9ywCiHHZ3sk/J5cj7ZYAIoa/HIGycguywAt62YuruslP2m0KY 9kUpXGkYEcOdxDfrX8SPTFPjnY1uXzNXetIEWE9ZuYqzOnU8N7ymhzdpkw3NHZgmmUDc UwpjSOGDrV5s5Q8meOLOXVVjiWGd9Azi9afiqyT4uBlBViXUy9iaJ4HEVYvZUT5f7LTk C+s9PymZCOZqSTM8RXsuyH98T/CE7vbNWqpiifyuBeYYXs0BK02W4LPHF3wZz+H0Dp2C Ip3d6UPIXLMHT/hYf9RWP/01lIaTis1beR25Mc4JtLEXjfwnD0uFmokyZ6RGEfPvWe82 sVsQ== X-Gm-Message-State: AOAM531tV7eJqRjX9MLI9rVzH8ItparBaTEsIRPAwWwp6QP6K+BXfxTG UkZqskSwJxnSv5B7nAZLy8l4f+kgMJg= X-Google-Smtp-Source: ABdhPJz/5TEGhQUu2sGpjVz71NQISEfuWzK5n4l6V8Ug2pcvFnR7RHYPqOZlTCLSkDue16cExMXE8Q== X-Received: by 2002:a17:90a:2ec1:: with SMTP id h1mr2959377pjs.51.1603955119142; Thu, 29 Oct 2020 00:05:19 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id v66sm1664558pfb.139.2020.10.29.00.05.17 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Oct 2020 00:05:18 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: Marcelo Ricardo Leitner , Neil Horman , Michael Tuexen , davem@davemloft.net, Jakub Kicinski , gnault@redhat.com, pabeni@redhat.com, willemdebruijn.kernel@gmail.com Subject: [PATCHv5 net-next 00/16] sctp: Implement RFC6951: UDP Encapsulation of SCTP Date: Thu, 29 Oct 2020 15:04:54 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Description From the RFC: The Main Reasons: o To allow SCTP traffic to pass through legacy NATs, which do not provide native SCTP support as specified in [BEHAVE] and [NATSUPP]. o To allow SCTP to be implemented on hosts that do not provide direct access to the IP layer. In particular, applications can use their own SCTP implementation if the operating system does not provide one. Implementation Notes: UDP-encapsulated SCTP is normally communicated between SCTP stacks using the IANA-assigned UDP port number 9899 (sctp-tunneling) on both ends. There are circumstances where other ports may be used on either end, and it might be required to use ports other than the registered port. Each SCTP stack uses a single local UDP encapsulation port number as the destination port for all its incoming SCTP packets, this greatly simplifies implementation design. An SCTP implementation supporting UDP encapsulation MUST maintain a remote UDP encapsulation port number per destination address for each SCTP association. Again, because the remote stack may be using ports other than the well-known port, each port may be different from each stack. However, because of remapping of ports by NATs, the remote ports associated with different remote IP addresses may not be identical, even if they are associated with the same stack. Because the well-known port might not be used, implementations need to allow other port numbers to be specified as a local or remote UDP encapsulation port number through APIs. Patches: This patchset is using the udp4/6 tunnel APIs to implement the UDP Encapsulation of SCTP with not much change in SCTP protocol stack and with all current SCTP features keeped in Linux Kernel. 1 - 4: Fix some UDP issues that may be triggered by SCTP over UDP. 5 - 7: Process incoming UDP encapsulated packets and ICMP packets. 8 -10: Remote encap port's update by sysctl, sockopt and packets. 11-14: Process outgoing pakects with UDP encapsulated and its GSO. 15-16: Add the part from draft-tuexen-tsvwg-sctp-udp-encaps-cons-03. 17: Enable this feature. Tests: - lksctp-tools/src/func_tests with UDP Encapsulation enabled/disabled: Both make v4test and v6test passed. - sctp-tests with UDP Encapsulation enabled/disabled: repeatability/procdumps/sctpdiag/gsomtuchange/extoverflow/ sctphashtable passed. Others failed as expected due to those "iptables -p sctp" rules. - netperf on lo/netns/virtio_net, with gso enabled/disabled and with ip_checksum enabled/disabled, with UDP Encapsulation enabled/disabled: No clear performance dropped. v1->v2: - Fix some incorrect code in the patches 5,6,8,10,11,13,14,17, suggested by Marcelo. - Append two patches 15-16 to add the Additional Considerations for UDP Encapsulation of SCTP from draft-tuexen-tsvwg-sctp-udp-encaps-cons-03. v2->v3: - remove the cleanup code in patch 2, suggested by Willem. - remove the patch 3 and fix the checksum in the new patch 3 after talking with Paolo, Marcelo and Guillaume. - add 'select NET_UDP_TUNNEL' in patch 4 to solve a compiling error. - fix __be16 type cast warning in patch 8. - fix the wrong endian orders when setting values in 14,16. v3->v4: - add entries in ip-sysctl.rst in patch 7,16, as Marcelo Suggested. - not create udp socks when udp_port is set to 0 in patch 16, as Marcelo noticed. v4->v5: - improve the description for udp_port and encap_port entries in patch 7, 16. - use 0 as the default udp_port. Xin Long (16): udp: check udp sock encap_type in __udp_lib_err udp6: move the mss check after udp gso tunnel processing udp: support sctp over udp in skb_udp_tunnel_segment sctp: create udp4 sock and add its encap_rcv sctp: create udp6 sock and set its encap_rcv sctp: add encap_err_lookup for udp encap socks sctp: add encap_port for netns sock asoc and transport sctp: add SCTP_REMOTE_UDP_ENCAPS_PORT sockopt sctp: allow changing transport encap_port by peer packets sctp: add udphdr to overhead when udp_port is set sctp: call sk_setup_caps in sctp_packet_transmit instead sctp: support for sending packet over udp4 sock sctp: support for sending packet over udp6 sock sctp: add the error cause for new encapsulation port restart sctp: handle the init chunk matching an existing asoc sctp: enable udp tunneling socks Documentation/networking/ip-sysctl.rst | 31 +++++++ include/linux/sctp.h | 20 +++++ include/net/netns/sctp.h | 8 ++ include/net/sctp/constants.h | 2 + include/net/sctp/sctp.h | 9 ++- include/net/sctp/sm.h | 4 + include/net/sctp/structs.h | 14 ++-- include/uapi/linux/sctp.h | 7 ++ net/ipv4/udp.c | 2 +- net/ipv4/udp_offload.c | 3 + net/ipv6/udp.c | 2 +- net/ipv6/udp_offload.c | 8 +- net/sctp/Kconfig | 1 + net/sctp/associola.c | 4 + net/sctp/ipv6.c | 44 +++++++--- net/sctp/offload.c | 6 +- net/sctp/output.c | 22 +++-- net/sctp/protocol.c | 143 ++++++++++++++++++++++++++++++--- net/sctp/sm_make_chunk.c | 21 +++++ net/sctp/sm_statefuns.c | 52 ++++++++++++ net/sctp/socket.c | 116 ++++++++++++++++++++++++++ net/sctp/sysctl.c | 62 ++++++++++++++ 22 files changed, 531 insertions(+), 50 deletions(-) Acked-by: Marcelo Ricardo Leitner