linux-sctp.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Xin Long <lucien.xin@gmail.com>
To: network dev <netdev@vger.kernel.org>, linux-sctp@vger.kernel.org
Cc: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>,
	Neil Horman <nhorman@tuxdriver.com>,
	Michael Tuexen <tuexen@fh-muenster.de>,
	davem@davemloft.net, gnault@redhat.com, pabeni@redhat.com,
	willemdebruijn.kernel@gmail.com
Subject: [PATCHv4 net-next 07/16] sctp: add encap_port for netns sock asoc and transport
Date: Mon, 19 Oct 2020 20:25:24 +0800	[thread overview]
Message-ID: <d55a0eaefa4b8a671e54535a1899ea4c00bc2de8.1603110316.git.lucien.xin@gmail.com> (raw)
Message-ID: <20201019122524.JPnYkvXGDCbYafRKYlZ1Nrl70xX0BdklQH1UySqbEdc@z> (raw)
In-Reply-To: <7cfd72e42b8b1cde268ad4062c96c08a56c4b14f.1603110316.git.lucien.xin@gmail.com>
In-Reply-To: <cover.1603110316.git.lucien.xin@gmail.com>

encap_port is added as per netns/sock/assoc/transport, and the
latter one's encap_port inherits the former one's by default.
The transport's encap_port value would mostly decide if one
packet should go out with udp encapsulated or not.

This patch also allows users to set netns' encap_port by sysctl.

v1->v2:
  - Change to define encap_port as __be16 for sctp_sock, asoc and
    transport.
v2->v3:
  - No change.
v3->v4:
  - Add 'encap_port' entry in ip-sysctl.rst.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
 Documentation/networking/ip-sysctl.rst |  9 +++++++++
 include/net/netns/sctp.h               |  2 ++
 include/net/sctp/structs.h             |  6 ++++++
 net/sctp/associola.c                   |  4 ++++
 net/sctp/protocol.c                    |  3 +++
 net/sctp/socket.c                      |  1 +
 net/sctp/sysctl.c                      | 10 ++++++++++
 7 files changed, 35 insertions(+)

diff --git a/Documentation/networking/ip-sysctl.rst b/Documentation/networking/ip-sysctl.rst
index 837d51f..3909305 100644
--- a/Documentation/networking/ip-sysctl.rst
+++ b/Documentation/networking/ip-sysctl.rst
@@ -2640,6 +2640,15 @@ addr_scope_policy - INTEGER
 
 	Default: 1
 
+encap_port - INTEGER
+	The default remote UDP encapsalution port.
+	When UDP tunneling is enabled, this global value is used to set
+	the dest port for the udp header of outgoing packets by default.
+	Users can also change the value for each sock/asoc/transport by
+	using setsockopt.
+
+	Default: 0
+
 
 ``/proc/sys/net/core/*``
 ========================
diff --git a/include/net/netns/sctp.h b/include/net/netns/sctp.h
index 247b401..a0f315e 100644
--- a/include/net/netns/sctp.h
+++ b/include/net/netns/sctp.h
@@ -27,6 +27,8 @@ struct netns_sctp {
 	struct sock *udp6_sock;
 	/* UDP tunneling listening port. */
 	int udp_port;
+	/* UDP tunneling remote encap port. */
+	int encap_port;
 
 	/* This is the global local address list.
 	 * We actively maintain this complete list of addresses on
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 0bdff38..aa98e7e 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -178,6 +178,8 @@ struct sctp_sock {
 	 */
 	__u32 hbinterval;
 
+	__be16 encap_port;
+
 	/* This is the max_retrans value for new associations. */
 	__u16 pathmaxrxt;
 
@@ -877,6 +879,8 @@ struct sctp_transport {
 	 */
 	unsigned long last_time_ecne_reduced;
 
+	__be16 encap_port;
+
 	/* This is the max_retrans value for the transport and will
 	 * be initialized from the assocs value.  This can be changed
 	 * using the SCTP_SET_PEER_ADDR_PARAMS socket option.
@@ -1790,6 +1794,8 @@ struct sctp_association {
 	 */
 	unsigned long hbinterval;
 
+	__be16 encap_port;
+
 	/* This is the max_retrans value for new transports in the
 	 * association.
 	 */
diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index fdb69d4..336df4b 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -99,6 +99,8 @@ static struct sctp_association *sctp_association_init(
 	 */
 	asoc->hbinterval = msecs_to_jiffies(sp->hbinterval);
 
+	asoc->encap_port = sp->encap_port;
+
 	/* Initialize path max retrans value. */
 	asoc->pathmaxrxt = sp->pathmaxrxt;
 
@@ -624,6 +626,8 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
 	 */
 	peer->hbinterval = asoc->hbinterval;
 
+	peer->encap_port = asoc->encap_port;
+
 	/* Set the path max_retrans.  */
 	peer->pathmaxrxt = asoc->pathmaxrxt;
 
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index aa8e5b2..7c729d7 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -1359,6 +1359,9 @@ static int __net_init sctp_defaults_init(struct net *net)
 	/* Set UDP tunneling listening port to default value */
 	net->sctp.udp_port = SCTP_DEFAULT_UDP_PORT;
 
+	/* Set remote encap port to 0 by default */
+	net->sctp.encap_port = 0;
+
 	/* Set SCOPE policy to enabled */
 	net->sctp.scope_policy = SCTP_SCOPE_POLICY_ENABLE;
 
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 53d0a41..09b94cd 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -4876,6 +4876,7 @@ static int sctp_init_sock(struct sock *sk)
 	 * be modified via SCTP_PEER_ADDR_PARAMS
 	 */
 	sp->hbinterval  = net->sctp.hb_interval;
+	sp->encap_port  = htons(net->sctp.encap_port);
 	sp->pathmaxrxt  = net->sctp.max_retrans_path;
 	sp->pf_retrans  = net->sctp.pf_retrans;
 	sp->ps_retrans  = net->sctp.ps_retrans;
diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
index c16c809..ecc1b5e 100644
--- a/net/sctp/sysctl.c
+++ b/net/sctp/sysctl.c
@@ -36,6 +36,7 @@ static int rto_alpha_max = 1000;
 static int rto_beta_max = 1000;
 static int pf_expose_max = SCTP_PF_EXPOSE_MAX;
 static int ps_retrans_max = SCTP_PS_RETRANS_MAX;
+static int udp_port_max = 65535;
 
 static unsigned long max_autoclose_min = 0;
 static unsigned long max_autoclose_max =
@@ -291,6 +292,15 @@ static struct ctl_table sctp_net_table[] = {
 		.proc_handler	= proc_dointvec,
 	},
 	{
+		.procname	= "encap_port",
+		.data		= &init_net.sctp.encap_port,
+		.maxlen		= sizeof(int),
+		.mode		= 0644,
+		.proc_handler	= proc_dointvec,
+		.extra1		= SYSCTL_ZERO,
+		.extra2		= &udp_port_max,
+	},
+	{
 		.procname	= "addr_scope_policy",
 		.data		= &init_net.sctp.scope_policy,
 		.maxlen		= sizeof(int),
-- 
2.1.0


  parent reply	other threads:[~2020-10-19 12:26 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-19 12:25 [PATCHv4 net-next 00/16] sctp: Implement RFC6951: UDP Encapsulation of SCTP Xin Long
2020-10-19 12:25 ` Xin Long
2020-10-19 12:25 ` [PATCHv4 net-next 01/16] udp: check udp sock encap_type in __udp_lib_err Xin Long
2020-10-19 12:25   ` Xin Long
2020-10-19 12:25   ` [PATCHv4 net-next 02/16] udp6: move the mss check after udp gso tunnel processing Xin Long
2020-10-19 12:25     ` Xin Long
2020-10-19 12:25     ` [PATCHv4 net-next 03/16] udp: support sctp over udp in skb_udp_tunnel_segment Xin Long
2020-10-19 12:25       ` Xin Long
2020-10-19 12:25       ` [PATCHv4 net-next 04/16] sctp: create udp4 sock and add its encap_rcv Xin Long
2020-10-19 12:25         ` Xin Long
2020-10-19 12:25         ` [PATCHv4 net-next 05/16] sctp: create udp6 sock and set " Xin Long
2020-10-19 12:25           ` Xin Long
2020-10-19 12:25           ` [PATCHv4 net-next 06/16] sctp: add encap_err_lookup for udp encap socks Xin Long
2020-10-19 12:25             ` Xin Long
2020-10-19 12:25             ` Xin Long [this message]
2020-10-19 12:25               ` [PATCHv4 net-next 07/16] sctp: add encap_port for netns sock asoc and transport Xin Long
2020-10-19 12:25               ` [PATCHv4 net-next 08/16] sctp: add SCTP_REMOTE_UDP_ENCAPS_PORT sockopt Xin Long
2020-10-19 12:25                 ` Xin Long
2020-10-19 12:25                 ` [PATCHv4 net-next 09/16] sctp: allow changing transport encap_port by peer packets Xin Long
2020-10-19 12:25                   ` Xin Long
2020-10-19 12:25                   ` [PATCHv4 net-next 10/16] sctp: add udphdr to overhead when udp_port is set Xin Long
2020-10-19 12:25                     ` Xin Long
2020-10-19 12:25                     ` [PATCHv4 net-next 11/16] sctp: call sk_setup_caps in sctp_packet_transmit instead Xin Long
2020-10-19 12:25                       ` Xin Long
2020-10-19 12:25                       ` [PATCHv4 net-next 12/16] sctp: support for sending packet over udp4 sock Xin Long
2020-10-19 12:25                         ` Xin Long
2020-10-19 12:25                         ` [PATCHv4 net-next 13/16] sctp: support for sending packet over udp6 sock Xin Long
2020-10-19 12:25                           ` Xin Long
2020-10-19 12:25                           ` [PATCHv4 net-next 14/16] sctp: add the error cause for new encapsulation port restart Xin Long
2020-10-19 12:25                             ` Xin Long
2020-10-19 12:25                             ` [PATCHv4 net-next 15/16] sctp: handle the init chunk matching an existing asoc Xin Long
2020-10-19 12:25                               ` Xin Long
2020-10-19 12:25                               ` [PATCHv4 net-next 16/16] sctp: enable udp tunneling socks Xin Long
2020-10-19 12:25                                 ` Xin Long
2020-10-19 22:15                                 ` Marcelo Ricardo Leitner
2020-10-19 22:15                                   ` Marcelo Ricardo Leitner
2020-10-19 22:29                                   ` Marcelo Ricardo Leitner
2020-10-19 22:29                                     ` Marcelo Ricardo Leitner
2020-10-20  9:12                                   ` Xin Long
2020-10-20  9:12                                     ` Xin Long
2020-10-20 21:11                                     ` Marcelo Ricardo Leitner
2020-10-20 21:11                                       ` Marcelo Ricardo Leitner
2020-10-20 21:15                                       ` Michael Tuexen
2020-10-20 21:15                                         ` Michael Tuexen
2020-10-20 21:23                                         ` Marcelo Ricardo Leitner
2020-10-20 21:23                                           ` Marcelo Ricardo Leitner
2020-10-20 22:08                                           ` David Laight
2020-10-20 22:13                                             ` 'Marcelo Ricardo Leitner'
2020-10-20 22:13                                               ` 'Marcelo Ricardo Leitner'
2020-10-21  4:16                                           ` Xin Long
2020-10-21  9:13                                             ` Michael Tuexen
2020-10-22  3:12                                               ` Xin Long
2020-10-22  8:47                                                 ` David Laight
2020-10-26  5:58                                                   ` Xin Long
2020-10-22 11:38                                                 ` Michael Tuexen
2020-10-19 22:14               ` [PATCHv4 net-next 07/16] sctp: add encap_port for netns sock asoc and transport Marcelo Ricardo Leitner
2020-10-19 22:14                 ` Marcelo Ricardo Leitner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d55a0eaefa4b8a671e54535a1899ea4c00bc2de8.1603110316.git.lucien.xin@gmail.com \
    --to=lucien.xin@gmail.com \
    --cc=davem@davemloft.net \
    --cc=gnault@redhat.com \
    --cc=linux-sctp@vger.kernel.org \
    --cc=marcelo.leitner@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@tuxdriver.com \
    --cc=pabeni@redhat.com \
    --cc=tuexen@fh-muenster.de \
    --cc=willemdebruijn.kernel@gmail.com \
    --subject='Re: [PATCHv4 net-next 07/16] sctp: add encap_port for netns sock asoc and transport' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).