Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA47EC43381 for ; Thu, 28 Feb 2019 23:17:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B3DA42075B for ; Thu, 28 Feb 2019 23:17:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="oGCO2czq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728741AbfB1XRj (ORCPT ); Thu, 28 Feb 2019 18:17:39 -0500 Received: from mail-vk1-f201.google.com ([209.85.221.201]:53000 "EHLO mail-vk1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725955AbfB1XRj (ORCPT ); Thu, 28 Feb 2019 18:17:39 -0500 Received: by mail-vk1-f201.google.com with SMTP id y125so2804496vky.19 for ; Thu, 28 Feb 2019 15:17:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=D/YgDtveagFB71jiK8dYTtepFnN7dbMdyHzUPPLikzY=; b=oGCO2czqqpguTXly4Bu3i+CDkuYSBEfrNc7pF5PudM8A9hTAJSKLwvHD5RVpsd/PwA FPNWoXxuUgoQgyhs+jNmhkIFlCrqXzWKkGeNc9CfX7dGg7WOiTSEu6HLfAS9P4gWaEXm qU0akD+pzsmjNz0QN8hxFjEzQH0COWhHhs4uxXKhVNIYNiJg3h7DylOMsu31/ohAuyMM apAOgQGBIuTb5xM7vN+0v1om2IpkIARRlK9JINPi+CK4UNE36sCVLftMcHiPHvY5Y29Q gzCODoaKUI8Myk4v5yFCJNUHQjo8g+d98rwIZIEh5S8u8cJMum2mVpPjDHrKGqRRfalH 7Zug== 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; bh=D/YgDtveagFB71jiK8dYTtepFnN7dbMdyHzUPPLikzY=; b=hiLIl5EfP9HXvo7fFJKLoyPYfsKnXn7U1xHfk3p4sUkqjJ8SYhF6PQDLJK2LplkY7X mUeo7cMv+0FjhpG+tJdjkpwEdg9RD7i5kLt6lJ6yPn1xKurnGfC2k5gGAuEXBJOOJxfo ItuGJXWru9TVSAQWKmeg9fVzn9GCQduZBbHPdFNbpuAkaPRxmnB31QHtaljL98De4n2k dEwmN7ZF2ecjaHnYRzPuD/vTZ/PAaqcE72ahaWPrSHBCFX1rGt0bkdabOj9//rZWFqa3 rotFotA6rAtFQ2w37QeM+XdvTXcnA2DWQC2PGYmJ8paOipkQIiKE6BdiD+2mn1ioMKMY LuDg== X-Gm-Message-State: APjAAAVlBZ1oJznRRaZJ54W6drwBg62TjH6Yrub2umc8aQ9Ebk21IwGp Ury0KfaMU5c1yi45DqC0ZLu2d63qXUyb/Q== X-Google-Smtp-Source: APXvYqw2REwcTwiVQT7SdCjiw7FHY92VCtk3U7nU2wSzcXG9uL7pNhUv0Gwd57Krn9ORQBYzQNtqzy1HZB0Jog== X-Received: by 2002:a1f:16d4:: with SMTP id 203mr1448705vkw.3.1551395858275; Thu, 28 Feb 2019 15:17:38 -0800 (PST) Date: Thu, 28 Feb 2019 15:17:27 -0800 In-Reply-To: <20190228231728.242461-1-edumazet@google.com> Message-Id: <20190228231728.242461-2-edumazet@google.com> Mime-Version: 1.0 References: <20190228231728.242461-1-edumazet@google.com> X-Mailer: git-send-email 2.21.0.352.gf09ad66450-goog Subject: [PATCH net-next 1/2] net: support 64bit values for setsockopt(SO_MAX_PACING_RATE) From: Eric Dumazet To: "David S . Miller" Cc: netdev , Eric Dumazet , Eric Dumazet Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 64bit kernels now support 64bit pacing rates. This commit changes setsockopt() to accept 64bit values provided by applications. Old applications providing 32bit value are still supported, but limited to the old 34Gbit limitation. Signed-off-by: Eric Dumazet --- net/core/sock.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index f5d82f3fa474deb204257972d4f1492de4c161d4..23aa02ffd6b811a294e232af0bd25f84d3c848cc 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1108,15 +1108,23 @@ int sock_setsockopt(struct socket *sock, int level, int optname, #endif case SO_MAX_PACING_RATE: - if (val != ~0U) + { + unsigned long ulval = (val == ~0U) ? ~0UL : val; + + if (sizeof(ulval) != sizeof(val) && + optlen >= sizeof(ulval) && + get_user(ulval, (unsigned long __user *)optval)) { + ret = -EFAULT; + break; + } + if (ulval != ~0UL) cmpxchg(&sk->sk_pacing_status, SK_PACING_NONE, SK_PACING_NEEDED); - sk->sk_max_pacing_rate = (val == ~0U) ? ~0UL : val; - sk->sk_pacing_rate = min(sk->sk_pacing_rate, - sk->sk_max_pacing_rate); + sk->sk_max_pacing_rate = ulval; + sk->sk_pacing_rate = min(sk->sk_pacing_rate, ulval); break; - + } case SO_INCOMING_CPU: sk->sk_incoming_cpu = val; break; -- 2.21.0.352.gf09ad66450-goog