From patchwork Wed Sep 26 04:59:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Maciej_=C5=BBenczykowski?= X-Patchwork-Id: 974846 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Km2P2nRGz9s89 for ; Wed, 26 Sep 2018 14:59:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726593AbeIZLKk convert rfc822-to-8bit (ORCPT ); Wed, 26 Sep 2018 07:10:40 -0400 Received: from mail-qk1-f202.google.com ([209.85.222.202]:33952 "EHLO mail-qk1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726266AbeIZLKk (ORCPT ); Wed, 26 Sep 2018 07:10:40 -0400 Received: by mail-qk1-f202.google.com with SMTP id y130-v6so29138049qka.1 for ; Tue, 25 Sep 2018 21:59:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=xSngxyKkDuTw3ggexWKsIfUBbQLuXTVHDQpT4IS/OVc=; b=VeQGvN5Pgf2icro8hjdQlYMRY8Qnzva7lp3+TGPBFAIzPRLUe+RXaEzSBJ3adXSKVY JLgpn7grH0UTYz4CvfkSDS3RmnOupRrsHZavYV02Ac3ybNjKn6N+sh4yLuyZtvP+7i/6 Kg9qhxNUOBGvi18UFApCbZwmR1MxfpwHj2jhJuZFQF6sVSb/1EQB4X0gs5qLC7YaKOQM hTvswNTmAzdWR3EmfVgLn7BWfnqKINd/5tj1iCEN6jV0dj/sfW3IFKv4YoMeWvrlOFVY +vTh2pjWGz27KK8wyZ+g3q7+CMSgl1pt7pxDt23cQJiG8tEv6wULDjkf08NA+vy/nMqv gnKQ== X-Gm-Message-State: ABuFfoham5PzD2eKKiynBT3uYWX7VREivlHCFvipZqpU/yEGxIJd/3Zm nD3srRKmSESYLb5cV8rkOxJx9Q== X-Google-Smtp-Source: ACcGV61w9kGUghcBI2+8lY103Mz0G+ILrK9O8c3CCRwJBSXMwUfrlP7yolTO3hbfMVIiT0a42zaH+QEs X-Received: by 2002:aed:23f5:: with SMTP id k50-v6mr1364798qtc.26.1537937977483; Tue, 25 Sep 2018 21:59:37 -0700 (PDT) Date: Tue, 25 Sep 2018 21:59:28 -0700 In-Reply-To: <95f0f122-9964-28c5-2c7c-72309c095e62@gmail.com> Message-Id: <20180926045928.94911-1-zenczykowski@gmail.com> Mime-Version: 1.0 References: <95f0f122-9964-28c5-2c7c-72309c095e62@gmail.com> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog Subject: [PATCH] net-tcp: /proc/sys/net/ipv4/tcp_probe_interval is a u32 not int From: "=?UTF-8?q?Maciej=20=C5=BBenczykowski?=" To: "=?UTF-8?q?Maciej=20=C5=BBenczykowski?=" , "David S . Miller" , Eric Dumazet Cc: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Maciej Żenczykowski (fix documentation and sysctl access to treat it as such) Tested: # zcat /proc/config.gz | egrep ^CONFIG_HZ CONFIG_HZ_1000=y CONFIG_HZ=1000 # echo $[(1<<32)/1000 + 1] | tee /proc/sys/net/ipv4/tcp_probe_interval 4294968 tee: /proc/sys/net/ipv4/tcp_probe_interval: Invalid argument # echo $[(1<<32)/1000] | tee /proc/sys/net/ipv4/tcp_probe_interval 4294967 # echo 0 | tee /proc/sys/net/ipv4/tcp_probe_interval # echo -1 | tee /proc/sys/net/ipv4/tcp_probe_interval -1 tee: /proc/sys/net/ipv4/tcp_probe_interval: Invalid argument Signed-off-by: Maciej Żenczykowski --- Documentation/networking/ip-sysctl.txt | 2 +- net/ipv4/sysctl_net_ipv4.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index 8313a636dd53..960de8fe3f40 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -425,7 +425,7 @@ tcp_mtu_probing - INTEGER 1 - Disabled by default, enabled when an ICMP black hole detected 2 - Always enabled, use initial MSS of tcp_base_mss. -tcp_probe_interval - INTEGER +tcp_probe_interval - UNSIGNED INTEGER Controls how often to start TCP Packetization-Layer Path MTU Discovery reprobe. The default is reprobing every 10 minutes as per RFC4821. diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index b92f422f2fa8..891ed2f91467 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c @@ -48,6 +48,7 @@ static int tcp_syn_retries_max = MAX_TCP_SYNCNT; static int ip_ping_group_range_min[] = { 0, 0 }; static int ip_ping_group_range_max[] = { GID_T_MAX, GID_T_MAX }; static int comp_sack_nr_max = 255; +static u32 u32_max_div_HZ = UINT_MAX / HZ; /* obsolete */ static int sysctl_tcp_low_latency __read_mostly; @@ -745,9 +746,10 @@ static struct ctl_table ipv4_net_table[] = { { .procname = "tcp_probe_interval", .data = &init_net.ipv4.sysctl_tcp_probe_interval, - .maxlen = sizeof(int), + .maxlen = sizeof(u32), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_douintvec_minmax, + .extra2 = &u32_max_div_HZ, }, { .procname = "igmp_link_local_mcast_reports",