* [PATCH] Relax tcp.window_clamp value in INET restore
@ 2009-12-04 19:03 Dan Smith
[not found] ` <1259953399-8530-1-git-send-email-danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Dan Smith @ 2009-12-04 19:03 UTC (permalink / raw)
To: containers-qjLDD68F18O7TbgM5vRIOg
This value can grow higher than 16k, but it clamped at packet receive
time if over that limit. Instead of failing here, just clamp to the same
limit.
Signed-off-by: Dan Smith <danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
Cc: serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org
Cc: orenl-RdfvBDnrOixBDgjK7y7TUQ@public.gmane.org
---
net/ipv4/checkpoint.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/net/ipv4/checkpoint.c b/net/ipv4/checkpoint.c
index 788e110..c80324f 100644
--- a/net/ipv4/checkpoint.c
+++ b/net/ipv4/checkpoint.c
@@ -429,10 +429,8 @@ static int inet_precheck(struct socket *sock, struct ckpt_hdr_socket_inet *in)
/* do_tcp_setsockopt() quietly makes this coercion */
if (in->tcp.window_clamp < (SOCK_MIN_RCVBUF / 2))
in->tcp.window_clamp = SOCK_MIN_RCVBUF / 2;
- else if (in->tcp.window_clamp > 65535U) {
- ckpt_debug("invalid window_clamp value\n");
- return -EINVAL;
- }
+ else
+ in->tcp.window_clamp = min(in->tcp.window_clamp, 65535U);
if (in->tcp.rcv_ssthresh > (4U * in->tcp.advmss))
in->tcp.rcv_ssthresh = 4U * in->tcp.advmss;
--
1.6.2.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Relax tcp.window_clamp value in INET restore
[not found] ` <1259953399-8530-1-git-send-email-danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
@ 2009-12-05 3:32 ` Serge E. Hallyn
2009-12-06 19:56 ` Oren Laadan
1 sibling, 0 replies; 3+ messages in thread
From: Serge E. Hallyn @ 2009-12-05 3:32 UTC (permalink / raw)
To: Dan Smith; +Cc: containers-qjLDD68F18O7TbgM5vRIOg
Quoting Dan Smith (danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org):
> This value can grow higher than 16k, but it clamped at packet receive
> time if over that limit. Instead of failing here, just clamp to the same
> limit.
>
> Signed-off-by: Dan Smith <danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> Cc: serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org
Tested-by: Serge Hallyn <serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
Thanks, Dan.
-serge
> Cc: orenl-RdfvBDnrOixBDgjK7y7TUQ@public.gmane.org
> ---
> net/ipv4/checkpoint.c | 6 ++----
> 1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/net/ipv4/checkpoint.c b/net/ipv4/checkpoint.c
> index 788e110..c80324f 100644
> --- a/net/ipv4/checkpoint.c
> +++ b/net/ipv4/checkpoint.c
> @@ -429,10 +429,8 @@ static int inet_precheck(struct socket *sock, struct ckpt_hdr_socket_inet *in)
> /* do_tcp_setsockopt() quietly makes this coercion */
> if (in->tcp.window_clamp < (SOCK_MIN_RCVBUF / 2))
> in->tcp.window_clamp = SOCK_MIN_RCVBUF / 2;
> - else if (in->tcp.window_clamp > 65535U) {
> - ckpt_debug("invalid window_clamp value\n");
> - return -EINVAL;
> - }
> + else
> + in->tcp.window_clamp = min(in->tcp.window_clamp, 65535U);
>
> if (in->tcp.rcv_ssthresh > (4U * in->tcp.advmss))
> in->tcp.rcv_ssthresh = 4U * in->tcp.advmss;
> --
> 1.6.2.5
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Relax tcp.window_clamp value in INET restore
[not found] ` <1259953399-8530-1-git-send-email-danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2009-12-05 3:32 ` Serge E. Hallyn
@ 2009-12-06 19:56 ` Oren Laadan
1 sibling, 0 replies; 3+ messages in thread
From: Oren Laadan @ 2009-12-06 19:56 UTC (permalink / raw)
To: Dan Smith; +Cc: containers-qjLDD68F18O7TbgM5vRIOg
Queued for ckpt-v19-rc3, thanks.
Oren.
Dan Smith wrote:
> This value can grow higher than 16k, but it clamped at packet receive
> time if over that limit. Instead of failing here, just clamp to the same
> limit.
>
> Signed-off-by: Dan Smith <danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
> Cc: serue-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org
> Cc: orenl-RdfvBDnrOixBDgjK7y7TUQ@public.gmane.org
> ---
> net/ipv4/checkpoint.c | 6 ++----
> 1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/net/ipv4/checkpoint.c b/net/ipv4/checkpoint.c
> index 788e110..c80324f 100644
> --- a/net/ipv4/checkpoint.c
> +++ b/net/ipv4/checkpoint.c
> @@ -429,10 +429,8 @@ static int inet_precheck(struct socket *sock, struct ckpt_hdr_socket_inet *in)
> /* do_tcp_setsockopt() quietly makes this coercion */
> if (in->tcp.window_clamp < (SOCK_MIN_RCVBUF / 2))
> in->tcp.window_clamp = SOCK_MIN_RCVBUF / 2;
> - else if (in->tcp.window_clamp > 65535U) {
> - ckpt_debug("invalid window_clamp value\n");
> - return -EINVAL;
> - }
> + else
> + in->tcp.window_clamp = min(in->tcp.window_clamp, 65535U);
>
> if (in->tcp.rcv_ssthresh > (4U * in->tcp.advmss))
> in->tcp.rcv_ssthresh = 4U * in->tcp.advmss;
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-12-06 19:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-04 19:03 [PATCH] Relax tcp.window_clamp value in INET restore Dan Smith
[not found] ` <1259953399-8530-1-git-send-email-danms-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2009-12-05 3:32 ` Serge E. Hallyn
2009-12-06 19:56 ` Oren Laadan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.