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 DC0F4C43381 for ; Thu, 28 Feb 2019 23:17:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9CAB62075B for ; Thu, 28 Feb 2019 23:17:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="pH969ewU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728891AbfB1XRm (ORCPT ); Thu, 28 Feb 2019 18:17:42 -0500 Received: from mail-pf1-f201.google.com ([209.85.210.201]:39406 "EHLO mail-pf1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725955AbfB1XRm (ORCPT ); Thu, 28 Feb 2019 18:17:42 -0500 Received: by mail-pf1-f201.google.com with SMTP id u8so13114469pfm.6 for ; Thu, 28 Feb 2019 15:17:41 -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=aI/169E4sefqx91X1yDE/BjE6IoJKtHk0xxe+YuYTqg=; b=pH969ewUA7cNXfbdso2Nh4vSXjvVv/uF8Q4UHPL7Q6fCHgLgV6/gTtmIQZvsbDoqw2 IBr9iO1AzK108mMtZm1uHz1JeVxm9wzTIOs/K+jUx3XUM9IFYsU2aLlJYdyH/5POYFHb gAmBSSS4XO9TLNtZd786uUdTm9Q1WwK4ebviKZ/QHK4JrQCdIe/wkbjladydgedF8W+d USWb/rv5O4xK4lHCgrKD4skJj/hibR3697arXv+7Ds8325LnB3IZQ3Q7cxKCrVoqBbub c/TykZQjZbD308nND3CnVMusVpKqEiRIA7oPI3+/fSH9IzBMir43GDZrmEvWcL54DFLF Zi/Q== 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=aI/169E4sefqx91X1yDE/BjE6IoJKtHk0xxe+YuYTqg=; b=t6FDHJh/XU6RSAxgIktlaEN7gn8XUYisYuoVbLPKep1Mwq+XuO0G/RtqegEu5e3KNi RHHOvznAusxyTMtT8TPgURL1wzRQZdmbciU56gL2Tynw+0K6hgc8xYFNFAvT5lzGpdn4 R0mG8/2x7IKXPPPO/QSIngnRsna9eLhoSzWGtDwwTTHZOoh4cHTPe9TMu+yy2oNVlPRK s4K5d8Buqfaml52clKqWDp0cLfTk5Wr+mxCdZ7IK16m8+Zk4r7MV0iYmC8mXXTgohAes lr/C2VkW3LOyeyNoHJ5wlqKUCGM3qU73WmOJJo1AWrxgYHXzLVNDzOuKaGaPEI88pNWF zYvA== X-Gm-Message-State: APjAAAVNO5y4eZPKlp6K6go5M2xaIAWBwGWvEWqOmQr062B57PJcL3yR MPonSBy4WmmgP7ig46lGELi9cWqMoVCixQ== X-Google-Smtp-Source: APXvYqyDwIR6mrr7j481yAopJ0i6SMcIho//BV8UHUvbBmPR5+z+FebrUihRrW6r/4VEdsgavlGCRm1Jiw+29w== X-Received: by 2002:a63:64c:: with SMTP id 73mr786454pgg.118.1551395861482; Thu, 28 Feb 2019 15:17:41 -0800 (PST) Date: Thu, 28 Feb 2019 15:17:28 -0800 In-Reply-To: <20190228231728.242461-1-edumazet@google.com> Message-Id: <20190228231728.242461-3-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 2/2] net: support 64bit rates for getsockopt(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 For legacy applications using 32bit variable, SO_MAX_PACING_RATE has to cap the returned value to 0xFFFFFFFF, meaning that rates above 34.35 Gbit are capped. This patch allows applications to read socket pacing rate at full resolution, if they provide a 64bit variable to store it, and the kernel is 64bit. Signed-off-by: Eric Dumazet --- net/core/sock.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index 23aa02ffd6b811a294e232af0bd25f84d3c848cc..782343bb925b643348cc906a70b97caa0388178d 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1219,6 +1219,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname, union { int val; u64 val64; + unsigned long ulval; struct linger ling; struct old_timeval32 tm32; struct __kernel_old_timeval tm; @@ -1464,8 +1465,13 @@ int sock_getsockopt(struct socket *sock, int level, int optname, #endif case SO_MAX_PACING_RATE: - /* 32bit version */ - v.val = min_t(unsigned long, sk->sk_max_pacing_rate, ~0U); + if (sizeof(v.ulval) != sizeof(v.val) && len >= sizeof(v.ulval)) { + lv = sizeof(v.ulval); + v.ulval = sk->sk_max_pacing_rate; + } else { + /* 32bit version */ + v.val = min_t(unsigned long, sk->sk_max_pacing_rate, ~0U); + } break; case SO_INCOMING_CPU: -- 2.21.0.352.gf09ad66450-goog