Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp815181pxf; Thu, 25 Mar 2021 14:51:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5beXzLbyfRNcooqguKi650BJJ9QBz1kLt7M3LnUsjPmzB4QDnsbRrRYx5npII2a70OSj1 X-Received: by 2002:a17:906:aac5:: with SMTP id kt5mr12141250ejb.548.1616709100240; Thu, 25 Mar 2021 14:51:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616709100; cv=none; d=google.com; s=arc-20160816; b=qK10Rwmntgg24IUntIvjeBVCZtWjEf7BG3iYo9ID8ICGr19eu+o4gFZ4fqaQuMNDXJ 8yAxs3maFYQPcszW6hADfyefwfY2UK34uLeuyHs4BjXrIu7v7CwxY5qBtU0LEfkiSPY0 WeZ+Py/Z+Rz5WDozsag03P8zsDxbLwgV/b+0riGhh78S0eaCGoPkbTpK251hmAqe9Et5 R52LJBZhNXbhHwfMm5x0bxLYkStj6Iqr65HM7dS4AKDzk5c5hN+aal0z74XzXnw7FDUZ M3gKUhNa21lMAQJnUuSjEpfvOkiY3fISAOH3c6IdqgyiTF55jzMnO5ZZ7kgDMG6R0c74 L6Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:date:message-id:subject:mime-version :content-transfer-encoding:from:dkim-signature; bh=HvRrQdHSok2zeZKp2kJcOzXJjsJYJ5UbdugaLvUYau4=; b=etPykzu/VnGdduHH3fnPUOM08icN5MAMYJk8iJMV+QF3tocbd6aNjSM+Kicg0TzI+R z+tl71G3C8TzxpvllSz5yEB4DXsk3wL4qfSHpwGdYY0haQscgAWngGW5DDllGYiPGvok 36ChQKEWRMBrtLmusIzjhBaZZJp5fvzcoLakL4SR0YyMt5e0cWAOE8/3Q3HwHzZ7L4Yq 9bQVYuPWLtQbolKnZMDkpj6ly318H8XH+3gu3OJAzJeSyUMUvvOvimt/CjJZU/ZNqWSG Sy6Mb9lIZUp+nAYDsKHTeff7hAzxtXMo60zbUzo4CTZYML31ILFjNqwsc9osByw9xWEX 8Lgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@apple.com header.s=20180706 header.b="fE8/sF6Z"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=REJECT dis=NONE) header.from=apple.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bt5si4917254edb.506.2021.03.25.14.51.17; Thu, 25 Mar 2021 14:51:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@apple.com header.s=20180706 header.b="fE8/sF6Z"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=REJECT dis=NONE) header.from=apple.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230467AbhCYVuM (ORCPT + 99 others); Thu, 25 Mar 2021 17:50:12 -0400 Received: from ma1-aaemail-dr-lapp03.apple.com ([17.171.2.72]:58916 "EHLO ma1-aaemail-dr-lapp03.apple.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230440AbhCYVt7 (ORCPT ); Thu, 25 Mar 2021 17:49:59 -0400 X-Greylist: delayed 10762 seconds by postgrey-1.27 at vger.kernel.org; Thu, 25 Mar 2021 17:49:59 EDT Received: from pps.filterd (ma1-aaemail-dr-lapp03.apple.com [127.0.0.1]) by ma1-aaemail-dr-lapp03.apple.com (8.16.0.42/8.16.0.42) with SMTP id 12PImwn6031904; Thu, 25 Mar 2021 11:50:33 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=from : content-type : content-transfer-encoding : mime-version : subject : message-id : date : to; s=20180706; bh=HvRrQdHSok2zeZKp2kJcOzXJjsJYJ5UbdugaLvUYau4=; b=fE8/sF6ZnxpaWRmjmy6TT9V9wS+TntK/HxOCFmTa8CzJ4XDtUjpf39sP7UUr/qnhgwT6 u1Fksx2eRdGyHiEeORwmO2gjz/l+3CvDf7dDzaV3vvUvCyqrPSOHauXbEKt5yraa29eg cSVW18wFlQOOdPNtQXGNMU14NYYsW/3HW+agSHPdxeX36luSaglt8raXK/KgZjNgZ+dm /3Cd0cJh6++KHEN77dG2e/FGc98Bk+zHdhm4B6CB4ULXLqHV89XIfa52guUd+uScJ8td EQgb/eO6REfEfFY0InNV5HeXHbxUz/t1DKL3nFO6ULlx/eqm63s1V9nonusNj5InVrKq vQ== Received: from crk-mailsvcp-mta-lapp04.euro.apple.com (crk-mailsvcp-mta-lapp04.euro.apple.com [17.66.55.17]) by ma1-aaemail-dr-lapp03.apple.com with ESMTP id 37dg1vkg0h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Thu, 25 Mar 2021 11:50:33 -0700 Received: from crk-mailsvcp-mmp-lapp02.euro.apple.com (crk-mailsvcp-mmp-lapp02.euro.apple.com [17.72.136.16]) by crk-mailsvcp-mta-lapp04.euro.apple.com (Oracle Communications Messaging Server 8.1.0.7.20201203 64bit (built Dec 3 2020)) with ESMTPS id <0QQJ00U0HGC8DA00@crk-mailsvcp-mta-lapp04.euro.apple.com>; Thu, 25 Mar 2021 18:50:32 +0000 (GMT) Received: from process_milters-daemon.crk-mailsvcp-mmp-lapp02.euro.apple.com by crk-mailsvcp-mmp-lapp02.euro.apple.com (Oracle Communications Messaging Server 8.1.0.7.20201203 64bit (built Dec 3 2020)) id <0QQJ00300GBY6700@crk-mailsvcp-mmp-lapp02.euro.apple.com>; Thu, 25 Mar 2021 18:50:32 +0000 (GMT) X-Va-A: X-Va-T-CD: bcd587c70f2b893a4541eb5ac66e0494 X-Va-E-CD: 148ad133188105e62a3bc79cff51a8db X-Va-R-CD: e1500ae658eab21eaee7bfe5430b4792 X-Va-CD: 0 X-Va-ID: a53b4dfa-6596-4489-a58b-ec431952f546 X-V-A: X-V-T-CD: bcd587c70f2b893a4541eb5ac66e0494 X-V-E-CD: 148ad133188105e62a3bc79cff51a8db X-V-R-CD: e1500ae658eab21eaee7bfe5430b4792 X-V-CD: 0 X-V-ID: d44ad4c3-bfcc-4bef-8e43-87676770cc53 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369,18.0.761 definitions=2021-03-25_07:2021-03-25,2021-03-25 signatures=0 Received: from [17.232.106.97] (unknown [17.232.106.97]) by crk-mailsvcp-mmp-lapp02.euro.apple.com (Oracle Communications Messaging Server 8.1.0.7.20201203 64bit (built Dec 3 2020)) with ESMTPSA id <0QQJ00LDQGC7IZ00@crk-mailsvcp-mmp-lapp02.euro.apple.com>; Thu, 25 Mar 2021 18:50:32 +0000 (GMT) From: Norman Maurer Content-type: text/plain; charset=us-ascii Content-transfer-encoding: quoted-printable MIME-version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: udp: Add support for getsockopt(..., ..., UDP_GRO, ..., ...); Message-id: <5AFF0F2A-96FD-40D6-9CE6-74F7CE8CEB4F@apple.com> Date: Thu, 25 Mar 2021 19:50:31 +0100 To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, davem@davemloft.net, dsahern@kernel.org X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369,18.0.761 definitions=2021-03-25_07:2021-03-25,2021-03-25 signatures=0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Support for UDP_GRO was added in the past but the implementation for getsockopt was missed which did lead to an error when we tried to retrieve the setting for UDP_GRO. This patch adds the missing switch case for UDP_GRO Fixes: e20cf8d3f1f7 ("udp: implement GRO for plain UDP sockets.") Signed-off-by: Norman Maurer --- net/ipv4/udp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 4a0478b17243..99d743eb9dc4 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -2754,6 +2754,10 @@ int udp_lib_getsockopt(struct sock *sk, int = level, int optname, val =3D up->gso_size; break; + case UDP_GRO: + val =3D up->gro_enabled; + break; + /* The following two cannot be changed on UDP sockets, the = return is * always 0 (which corresponds to the full checksum coverage of = UDP). */ case UDPLITE_SEND_CSCOV: -- 2.29.2