[net-next,v6,0/2] Add IP_LOCAL_PORT_RANGE socket option

Message

Jakub Sitnicki Jan. 24, 2023, 1:36 p.m. UTC

This patch set is a follow up to the "How to share IPv4 addresses by
partitioning the port space" talk given at LPC 2022 [1].

Please see patch #1 for the motivation & the use case description.
Patch #2 adds tests exercising the new option in various scenarios.

Documentation
-------------

Proposed update to the ip(7) man-page:

       IP_LOCAL_PORT_RANGE (since Linux X.Y)
              Set or get the per-socket default local  port  range.  This
              option  can  be  used  to  clamp down the global local port
              range, defined by the ip_local_port_range  /proc  interface
              described below, for a given socket.

              The  option  takes  an uint32_t value with the high 16 bits
              set to the upper range bound, and the low 16  bits  set  to
              the  lower  range  bound.  Range  bounds are inclusive. The
              16-bit values should be in host byte order.

              The lower bound has to be less than the  upper  bound  when
              both  bounds  are  not  zero. Otherwise, setting the option
              fails with EINVAL.

              If either bound is outside of the global local port  range,
              or is zero, then that bound has no effect.

              To  reset  the setting, pass zero as both the upper and the
              lower bound.

Interaction with SELinux bind() hook
------------------------------------

SELinux bind() hook - selinux_socket_bind() - performs a permission check
if the requested local port number lies outside of the netns ephemeral port
range.

The proposed socket option cannot be used change the ephemeral port range
to extend beyond the per-netns port range, as set by
net.ipv4.ip_local_port_range.

Hence, there is no interaction with SELinux, AFAICT.
	      
Changelog:
---------

v5 -> v6:
v5: https://lore.kernel.org/r/[e-mail]

 * Move changelog in individual patches below the trailer. (Leon)

v4 -> v5:
v4: https://lore.kernel.org/r/[e-mail]

 * Code changes called out in individual patches.

v3 -> v4:
v3: https://lore.kernel.org/r/[e-mail]

 * Highlight that port bounds should be in host byte order. (Neal)

v2 -> v3:
v2: https://lore.kernel.org/r/[e-mail]

 * Describe interaction considerations with SELinux.
 * Code changes called out in individual patches.

v1 -> v2:
v1: https://lore.kernel.org/netdev/[e-mail]/

 * Fix the corner case when the per-socket range doesn't overlap with the
   per-netns range. Fallback correctly to the per-netns range. (Kuniyuki)

 * selftests: Instead of iterating over socket families (ip4, ip6) and types
   (tcp, udp), generate tests for each combo from a template. This keeps the
   code indentation level down and makes tests more granular.

 * Rewrite man-page prose:
   - explain how to unset the option,
   - document when EINVAL is returned.

RFC -> v1
RFC: https://lore.kernel.org/netdev/[e-mail]/

 * Allow either the high bound or the low bound, or both, to be zero
 * Add getsockopt support
 * Add selftests

Links:
------

[1]: https://lpc.events/event/16/contributions/1349/

To: [e-mail]
Cc: "David S. Miller" <[e-mail]>
Cc: Eric Dumazet <[e-mail]>
Cc: Jakub Kicinski <[e-mail]>
Cc: Paolo Abeni <[e-mail]>
Cc: Kuniyuki Iwashima <[e-mail]>
Cc: Neal Cardwell <[e-mail]>
Cc: Leon Romanovsky <[e-mail]>
Cc: [e-mail]
Cc: Paul Moore <[e-mail]>
Cc: Stephen Smalley <[e-mail]>
Cc: Eric Paris <[e-mail]>
Cc: [e-mail]
Signed-off-by: Jakub Sitnicki <[e-mail]>

---
Jakub Sitnicki (2):
      inet: Add IP_LOCAL_PORT_RANGE socket option
      selftests/net: Cover the IP_LOCAL_PORT_RANGE socket option

 include/net/inet_sock.h                            |   4 +
 include/net/ip.h                                   |   3 +-
 include/uapi/linux/in.h                            |   1 +
 net/ipv4/inet_connection_sock.c                    |  25 +-
 net/ipv4/inet_hashtables.c                         |   2 +-
 net/ipv4/ip_sockglue.c                             |  18 +
 net/ipv4/udp.c                                     |   2 +-
 net/sctp/socket.c                                  |   2 +-
 tools/testing/selftests/net/Makefile               |   2 +
 tools/testing/selftests/net/ip_local_port_range.c  | 447 +++++++++++++++++++++
 tools/testing/selftests/net/ip_local_port_range.sh |   5 +
 11 files changed, 505 insertions(+), 6 deletions(-)

Comments

Leon Romanovsky Jan. 24, 2023, 6:15 p.m. UTC | #1

On Tue, Jan 24, 2023 at 02:36:43PM +0100, Jakub Sitnicki wrote:
> This patch set is a follow up to the "How to share IPv4 addresses by
> partitioning the port space" talk given at LPC 2022 [1].

<...>

> 	      
> Changelog:
> ---------
> 
> v5 -> v6:
> v5: https://lore.kernel.org/r/[e-mail]
> 
>  * Move changelog in individual patches below the trailer. (Leon)

Thank you for doing that.

[e-mail] Jan. 26, 2023, 7:20 a.m. UTC | #2

Hello:

This series was applied to netdev/net-next.git (master)
by Jakub Kicinski <[e-mail]>:

On Tue, 24 Jan 2023 14:36:43 +0100 you wrote:
> This patch set is a follow up to the "How to share IPv4 addresses by
> partitioning the port space" talk given at LPC 2022 [1].
> 
> Please see patch #1 for the motivation & the use case description.
> Patch #2 adds tests exercising the new option in various scenarios.
> 
> Documentation
> 
> [...]

Here is the summary with links:
  - [net-next,v6,1/2] inet: Add IP_LOCAL_PORT_RANGE socket option
    https://git.kernel.org/netdev/net-next/c/91d0b78c5177
  - [net-next,v6,2/2] selftests/net: Cover the IP_LOCAL_PORT_RANGE socket option
    https://git.kernel.org/netdev/net-next/c/ae5439658cce

You are awesome, thank you!