Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 62748f32d501f5d3712a7c372bbb92abc7c62bc7

Authored by Eric Dumazet
Committed by David S. Miller
1 parent 4aa0a03f51
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

net: introduce SO_MAX_PACING_RATE 

As mentioned in commit afe4fd062416b ("pkt_sched: fq: Fair Queue packet
scheduler"), this patch adds a new socket option.

SO_MAX_PACING_RATE offers the application the ability to cap the
rate computed by transport layer. Value is in bytes per second.

u32 val = 1000000;
setsockopt(sockfd, SOL_SOCKET, SO_MAX_PACING_RATE, &val, sizeof(val));

To be effectively paced, a flow must use FQ packet scheduler.

Note that a packet scheduler takes into account the headers for its
computations. The effective payload rate depends on MSS and retransmits
if any.

I chose to make this pacing rate a SOL_SOCKET option instead of a
TCP one because this can be used by other protocols.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Steinar H. Gunderson <sesse@google.com>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 18 changed files with 45 additions and 2 deletions Side-by-side Diff

arch/alpha/include/uapi/asm/socket.h
Diff comments   View file @ 62748f3
... ... @@ -81,7 +81,9 @@
81 81  
82 82 #define SO_SELECT_ERR_QUEUE 45
83 83  
84   -#define SO_BUSY_POLL 46
  84 +#define SO_BUSY_POLL 46
  85 +
  86 +#define SO_MAX_PACING_RATE 47
85 87  
86 88 #endif /* _UAPI_ASM_SOCKET_H */
arch/avr32/include/uapi/asm/socket.h
Diff comments   View file @ 62748f3
... ... @@ -76,5 +76,7 @@
76 76  
77 77 #define SO_BUSY_POLL 46
78 78  
  79 +#define SO_MAX_PACING_RATE 47
  80 +
79 81 #endif /* __ASM_AVR32_SOCKET_H */
arch/cris/include/uapi/asm/socket.h
Diff comments   View file @ 62748f3
... ... @@ -78,5 +78,7 @@
78 78  
79 79 #define SO_BUSY_POLL 46
80 80  
  81 +#define SO_MAX_PACING_RATE 47
  82 +
81 83 #endif /* _ASM_SOCKET_H */
arch/frv/include/uapi/asm/socket.h
Diff comments   View file @ 62748f3
... ... @@ -76,5 +76,7 @@
76 76  
77 77 #define SO_BUSY_POLL 46
78 78  
  79 +#define SO_MAX_PACING_RATE 47
  80 +
79 81 #endif /* _ASM_SOCKET_H */
arch/h8300/include/uapi/asm/socket.h
Diff comments   View file @ 62748f3
... ... @@ -76,5 +76,7 @@
76 76  
77 77 #define SO_BUSY_POLL 46
78 78  
  79 +#define SO_MAX_PACING_RATE 47
  80 +
79 81 #endif /* _ASM_SOCKET_H */
arch/ia64/include/uapi/asm/socket.h
Diff comments   View file @ 62748f3
... ... @@ -85,5 +85,7 @@
85 85  
86 86 #define SO_BUSY_POLL 46
87 87  
  88 +#define SO_MAX_PACING_RATE 47
  89 +
88 90 #endif /* _ASM_IA64_SOCKET_H */
arch/m32r/include/uapi/asm/socket.h
Diff comments   View file @ 62748f3
... ... @@ -76,5 +76,7 @@
76 76  
77 77 #define SO_BUSY_POLL 46
78 78  
  79 +#define SO_MAX_PACING_RATE 47
  80 +
79 81 #endif /* _ASM_M32R_SOCKET_H */
arch/mips/include/uapi/asm/socket.h
Diff comments   View file @ 62748f3
... ... @@ -94,5 +94,7 @@
94 94  
95 95 #define SO_BUSY_POLL 46
96 96  
  97 +#define SO_MAX_PACING_RATE 47
  98 +
97 99 #endif /* _UAPI_ASM_SOCKET_H */
arch/mn10300/include/uapi/asm/socket.h
Diff comments   View file @ 62748f3
... ... @@ -76,5 +76,7 @@
76 76  
77 77 #define SO_BUSY_POLL 46
78 78  
  79 +#define SO_MAX_PACING_RATE 47
  80 +
79 81 #endif /* _ASM_SOCKET_H */
arch/parisc/include/uapi/asm/socket.h
Diff comments   View file @ 62748f3
... ... @@ -75,6 +75,8 @@
75 75  
76 76 #define SO_BUSY_POLL 0x4027
77 77  
  78 +#define SO_MAX_PACING_RATE 0x4048
  79 +
78 80 /* O_NONBLOCK clashes with the bits used for socket types. Therefore we
79 81 * have to define SOCK_NONBLOCK to a different value here.
80 82 */
arch/powerpc/include/uapi/asm/socket.h
Diff comments   View file @ 62748f3
... ... @@ -83,5 +83,7 @@
83 83  
84 84 #define SO_BUSY_POLL 46
85 85  
  86 +#define SO_MAX_PACING_RATE 47
  87 +
86 88 #endif /* _ASM_POWERPC_SOCKET_H */
arch/s390/include/uapi/asm/socket.h
Diff comments   View file @ 62748f3
... ... @@ -82,5 +82,7 @@
82 82  
83 83 #define SO_BUSY_POLL 46
84 84  
  85 +#define SO_MAX_PACING_RATE 47
  86 +
85 87 #endif /* _ASM_SOCKET_H */
arch/sparc/include/uapi/asm/socket.h
Diff comments   View file @ 62748f3
... ... @@ -72,6 +72,8 @@
72 72  
73 73 #define SO_BUSY_POLL 0x0030
74 74  
  75 +#define SO_MAX_PACING_RATE 0x0031
  76 +
75 77 /* Security levels - as per NRL IPv6 - don't actually do anything */
76 78 #define SO_SECURITY_AUTHENTICATION 0x5001
77 79 #define SO_SECURITY_ENCRYPTION_TRANSPORT 0x5002
arch/xtensa/include/uapi/asm/socket.h
Diff comments   View file @ 62748f3
... ... @@ -87,5 +87,7 @@
87 87  
88 88 #define SO_BUSY_POLL 46
89 89  
  90 +#define SO_MAX_PACING_RATE 47
  91 +
90 92 #endif /* _XTENSA_SOCKET_H */
... ... @@ -363,6 +363,7 @@
363 363 int sk_wmem_queued;
364 364 gfp_t sk_allocation;
365 365 u32 sk_pacing_rate; /* bytes per second */
  366 + u32 sk_max_pacing_rate;
366 367 netdev_features_t sk_route_caps;
367 368 netdev_features_t sk_route_nocaps;
368 369 int sk_gso_type;
include/uapi/asm-generic/socket.h
Diff comments   View file @ 62748f3
... ... @@ -78,5 +78,7 @@
78 78  
79 79 #define SO_BUSY_POLL 46
80 80  
  81 +#define SO_MAX_PACING_RATE 47
  82 +
81 83 #endif /* __ASM_GENERIC_SOCKET_H */
... ... @@ -914,6 +914,13 @@
914 914 }
915 915 break;
916 916 #endif
  917 +
  918 + case SO_MAX_PACING_RATE:
  919 + sk->sk_max_pacing_rate = val;
  920 + sk->sk_pacing_rate = min(sk->sk_pacing_rate,
  921 + sk->sk_max_pacing_rate);
  922 + break;
  923 +
917 924 default:
918 925 ret = -ENOPROTOOPT;
919 926 break;
... ... @@ -1177,6 +1184,10 @@
1177 1184 break;
1178 1185 #endif
1179 1186  
  1187 + case SO_MAX_PACING_RATE:
  1188 + v.val = sk->sk_max_pacing_rate;
  1189 + break;
  1190 +
1180 1191 default:
1181 1192 return -ENOPROTOOPT;
1182 1193 }
... ... @@ -2319,6 +2330,7 @@
2319 2330 sk->sk_ll_usec = sysctl_net_busy_read;
2320 2331 #endif
2321 2332  
  2333 + sk->sk_max_pacing_rate = ~0U;
2322 2334 /*
2323 2335 * Before updating sk_refcnt, we must commit prior changes to memory
2324 2336 * (Documentation/RCU/rculist_nulls.txt for details)
net/ipv4/tcp_input.c
Diff comments   View file @ 62748f3
... ... @@ -735,7 +735,7 @@
735 735 if (tp->srtt > 8 + 2)
736 736 do_div(rate, tp->srtt);
737 737  
738   - sk->sk_pacing_rate = min_t(u64, rate, ~0U);
  738 + sk->sk_pacing_rate = min_t(u64, rate, sk->sk_max_pacing_rate);
739 739 }
740 740  
741 741 /* Calculate rto without backoff. This is the second half of Van Jacobson's