From patchwork Sun Apr 4 08:14:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danielle Ratson X-Patchwork-Id: 12182213 X-Patchwork-Delegate: kuba@kernel.org 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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 1F6D0C433ED for ; Sun, 4 Apr 2021 08:15:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E685361353 for ; Sun, 4 Apr 2021 08:15:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230202AbhDDIPI (ORCPT ); Sun, 4 Apr 2021 04:15:08 -0400 Received: from mail-dm3nam07on2048.outbound.protection.outlook.com ([40.107.95.48]:20576 "EHLO NAM02-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229483AbhDDIPG (ORCPT ); Sun, 4 Apr 2021 04:15:06 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cBh8ssJRMooDqAuGGMhXI6SdiERIp3hJ8D4fOJ7aTvq1uUcXuhmLbCI4Ry9/ZbkQaLFzyXUOyLnGlnPC1GeDAp9E5qqB3krQKkKiOQd5B4XsxwVcssWW0vuwar6omILDJaCWLZ+Zh3tNdproFoQ0QYSK3veCPK2M+SJZUI4mhofTdzkjZp1UQFgRMrUdh6VX1yes8dz1NlrEoQmBKeG6MZoGhNQWccc/KlWGc0J4fZvdZybkhfjihML1jZAgGOzf1FcJysOrnYbYqsXQzD1o+5HD4IhUo6gZ/bcpZSUE+BBuJyLpN30xtOqoQb49LOfQdL+gdvrWGtRBzWg/9GNLMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YyzAfvy3Axgpy1j9w7I8lrMLRWEl7HfUilS/DU4rJpI=; b=oVaHUCsUv/jtqNIa2DMrWOM3wBixvmRrMKTNST9lhJRH5CPoeMWuy+LRCGICGgyCZqloia8Qmf8SEyROiYYho8vZOraKUONxPDFeRhB0PsYTHAwamKxOC20+PeHeWLElS1pu4mmdFrvO8xH8RD7w4VrHBVd5shrT0D+1EAZgfCBKzmkXkgSj6ezqX18Gwl4h05xgunNEYTFJ0BSnsD9rhR/OU4fbkGE8c/SJ/fwRrmsqTqtAxs0FOQTrkgFgcAey76HvJqIzUBxYXLX0ezzNH5HIUj2CiTUEar7KOwTlYiD98zJORMRDrMJVLch/blOq2/67/vglviXk4IlynS1SiQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=embeddedor.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YyzAfvy3Axgpy1j9w7I8lrMLRWEl7HfUilS/DU4rJpI=; b=HnZE/XIloKgMoQkkXRRopqk+EBTyTLC5qlu/CfSGdQTfZNliq2ME4TNG7JWrVKQEaHUNj+jIpO6WyZ35zvMEq4UaIydipxGZMlwqYzDZ4pUEWpKpsmx/Zf5kCwB6dd80kXrd0l++D2UUyLcMLs0QX7GE8af+vDxp+oWk4fbwOPx9XN2HKFgB9hb+GoWysUiplyqt/KC0leEvmgjeZX10+jouVrFBYJWbk8+vjPnWnxUdQrXFmdNTB1lCWxlPkluiqx1PB2w3D9Sfk3V7kv1mKSmvzCou6rHNVEkSHwYR6WC6pJcQuFlI+wU0Sk74HlxrU+YEonC+sLro2CIRk/vzmA== Received: from DM5PR19CA0037.namprd19.prod.outlook.com (2603:10b6:3:9a::23) by DM6PR12MB3322.namprd12.prod.outlook.com (2603:10b6:5:119::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.27; Sun, 4 Apr 2021 08:15:01 +0000 Received: from DM6NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:3:9a:cafe::e) by DM5PR19CA0037.outlook.office365.com (2603:10b6:3:9a::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.27 via Frontend Transport; Sun, 4 Apr 2021 08:15:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; embeddedor.com; dkim=none (message not signed) header.d=none;embeddedor.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT034.mail.protection.outlook.com (10.13.173.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.3999.28 via Frontend Transport; Sun, 4 Apr 2021 08:15:00 +0000 Received: from dev-r-vrt-156.mtr.labs.mlnx (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 4 Apr 2021 08:14:56 +0000 From: Danielle Ratson To: CC: , , , , , , , , , , , , , , Danielle Ratson Subject: [PATCH net v2 1/2] ethtool: Add link_mode parameter capability bit to ethtool_ops Date: Sun, 4 Apr 2021 11:14:32 +0300 Message-ID: <20210404081433.1260889-2-danieller@nvidia.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210404081433.1260889-1-danieller@nvidia.com> References: <20210404081433.1260889-1-danieller@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2eec65bb-e138-43cc-eb3d-08d8f741be46 X-MS-TrafficTypeDiagnostic: DM6PR12MB3322: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g55C/IX9ohLxDQFZbLalt0POcrcWmZEZIRpY5fuPCHiIgK5IRjHu4veXJRvFRoTm80YwqsjhYWrwECc1uusefvBtDUyvDXnw82tKdNi9Mo7Asb8sIdOXchOPh7y7PpDQ6dEsTHjcPJXhnkspxOWAfp5URIuolwZKSEQH32C/7upIo6YjHVwYdTgDCrpn8r8CqbyeQhMTr02hlrYKRodQ8UnQJsuwiRr3Jf935a2jYa15TjlcnzOPI3OjzWBQXP3rXESB87IBPiNQNDn9+cYlySd8vYAdLfZuVhrxBcYR2pK8zjz8+fhgX9QBHfYo1GRn1q/qDKFYD3MOZeBsmLsjeXLRABO6WHzMVtbKC6MrkiU6Y8HkGAB7mh9/vkleqhXSg+pef6Qsa2b0AcQstHfPc8jlnLU9Y3k58FYXe6jakyVynmaWnAQy8hhpQ2+hcrjK8nKSpbFRu1dMO7zhHIKrleP5fhncy9bElp6ewNkMCfPZ0/NJFHS2gHEolkpISyu+Xal6klZbGMgppNX6xlWR8/GMHjyRKNtNSuLJqB7++fqLlzh1+/byQnL66HidBrYS13mDpyXggtJ47w1odSfivaqJAZ/XZCSWxoJLfxkLEHdZ05Xa/1MKOO77avygEX0yc8wH9OWZ9YtP3tXLE/FPUvJGm/AILTkG+dH5DZhVG8c= X-Forefront-Antispam-Report: CIP:216.228.112.34;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:schybrid03.nvidia.com;CAT:NONE;SFS:(4636009)(136003)(346002)(376002)(39860400002)(396003)(36840700001)(46966006)(70586007)(316002)(8936002)(47076005)(70206006)(2906002)(82310400003)(7416002)(36756003)(83380400001)(6666004)(336012)(426003)(54906003)(86362001)(478600001)(356005)(82740400003)(2616005)(7636003)(5660300002)(36860700001)(6916009)(4326008)(1076003)(186003)(107886003)(16526019)(8676002)(36906005)(26005);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2021 08:15:00.8959 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2eec65bb-e138-43cc-eb3d-08d8f741be46 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.112.34];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3322 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Some drivers clear the 'ethtool_link_ksettings' struct in their get_link_ksettings() callback, before populating it with actual values. Such drivers will set the new 'link_mode' field to zero, resulting in user space receiving wrong link mode information given that zero is a valid value for the field. Fix this by introducing a new capability bit ('cap_link_mode_supported') to ethtool_ops, which indicates whether the driver supports 'link_mode' parameter or not. Set it to true in mlxsw which is currently the only driver supporting 'link_mode'. Another problem is that some drivers (notably tun) can report random values in the 'link_mode' field. This can result in a general protection fault when the field is used as an index to the 'link_mode_params' array [1]. This happens because such drivers implement their set_link_ksettings() callback by simply overwriting their private copy of 'ethtool_link_ksettings' struct with the one they get from the stack, which is not always properly initialized. Fix this by making sure that the implied parameters will be derived from the 'link_mode' parameter only when the 'cap_link_mode_supported' is set. v2: * Introduce 'cap_link_mode_supported' instead of adding a validity field to 'ethtool_link_ksettings' struct. [1] general protection fault, probably for non-canonical address 0xdffffc00f14cc32c: 0000 [#1] PREEMPT SMP KASAN KASAN: probably user-memory-access in range [0x000000078a661960-0x000000078a661967] CPU: 0 PID: 8452 Comm: syz-executor360 Not tainted 5.11.0-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:__ethtool_get_link_ksettings+0x1a3/0x3a0 net/ethtool/ioctl.c:446 Code: b7 3e fa 83 fd ff 0f 84 30 01 00 00 e8 16 b0 3e fa 48 8d 3c ed 60 d5 69 8a 48 b8 00 00 00 00 00 fc ff df 48 89 fa 48 c1 ea 03 <0f> b6 14 02 48 89 f8 83 e0 07 83 c0 03 +38 d0 7c 08 84 d2 0f 85 b9 RSP: 0018:ffffc900019df7a0 EFLAGS: 00010202 RAX: dffffc0000000000 RBX: ffff888026136008 RCX: 0000000000000000 RDX: 00000000f14cc32c RSI: ffffffff873439ca RDI: 000000078a661960 RBP: 00000000ffff8880 R08: 00000000ffffffff R09: ffff88802613606f R10: ffffffff873439bc R11: 0000000000000000 R12: 0000000000000000 R13: ffff88802613606c R14: ffff888011d0c210 R15: ffff888011d0c210 FS: 0000000000749300(0000) GS:ffff8880b9c00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00000000004b60f0 CR3: 00000000185c2000 CR4: 00000000001506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: linkinfo_prepare_data+0xfd/0x280 net/ethtool/linkinfo.c:37 ethnl_default_notify+0x1dc/0x630 net/ethtool/netlink.c:586 ethtool_notify+0xbd/0x1f0 net/ethtool/netlink.c:656 ethtool_set_link_ksettings+0x277/0x330 net/ethtool/ioctl.c:620 dev_ethtool+0x2b35/0x45d0 net/ethtool/ioctl.c:2842 dev_ioctl+0x463/0xb70 net/core/dev_ioctl.c:440 sock_do_ioctl+0x148/0x2d0 net/socket.c:1060 sock_ioctl+0x477/0x6a0 net/socket.c:1177 vfs_ioctl fs/ioctl.c:48 [inline] __do_sys_ioctl fs/ioctl.c:753 [inline] __se_sys_ioctl fs/ioctl.c:739 [inline] __x64_sys_ioctl+0x193/0x200 fs/ioctl.c:739 do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x44/0xa9 Fixes: c8907043c6ac9 ("ethtool: Get link mode in use instead of speed and duplex parameters") Signed-off-by: Danielle Ratson Reported-by: Eric Dumazet Reviewed-by: Ido Schimmel --- drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 1 + include/linux/ethtool.h | 5 ++++- net/ethtool/ioctl.c | 8 ++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c index 0bd64169bf81..54f04c94210c 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c @@ -1061,6 +1061,7 @@ mlxsw_sp_get_ts_info(struct net_device *netdev, struct ethtool_ts_info *info) const struct ethtool_ops mlxsw_sp_port_ethtool_ops = { .cap_link_lanes_supported = true, + .cap_link_mode_supported = true, .get_drvinfo = mlxsw_sp_port_get_drvinfo, .get_link = ethtool_op_get_link, .get_link_ext_state = mlxsw_sp_port_get_link_ext_state, diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index ec4cd3921c67..9e6eb6df375d 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -269,6 +269,8 @@ struct ethtool_pause_stats { * struct ethtool_ops - optional netdev operations * @cap_link_lanes_supported: indicates if the driver supports lanes * parameter. + * @cap_link_mode_supported: indicates if the driver supports link_mode + * parameter. * @supported_coalesce_params: supported types of interrupt coalescing. * @get_drvinfo: Report driver/device information. Should only set the * @driver, @version, @fw_version and @bus_info fields. If not @@ -424,7 +426,8 @@ struct ethtool_pause_stats { * of the generic netdev features interface. */ struct ethtool_ops { - u32 cap_link_lanes_supported:1; + u32 cap_link_lanes_supported:1, + cap_link_mode_supported:1; u32 supported_coalesce_params; void (*get_drvinfo)(struct net_device *, struct ethtool_drvinfo *); int (*get_regs_len)(struct net_device *); diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index 24783b71c584..cebbf93b27a7 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -436,12 +436,16 @@ int __ethtool_get_link_ksettings(struct net_device *dev, memset(link_ksettings, 0, sizeof(*link_ksettings)); - link_ksettings->link_mode = -1; err = dev->ethtool_ops->get_link_ksettings(dev, link_ksettings); if (err) return err; - if (link_ksettings->link_mode != -1) { + if (dev->ethtool_ops->cap_link_mode_supported && + link_ksettings->link_mode != -1) { + if (WARN_ON_ONCE(link_ksettings->link_mode >= + __ETHTOOL_LINK_MODE_MASK_NBITS)) + return -EINVAL; + link_info = &link_mode_params[link_ksettings->link_mode]; link_ksettings->base.speed = link_info->speed; link_ksettings->lanes = link_info->lanes; From patchwork Sun Apr 4 08:14:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danielle Ratson X-Patchwork-Id: 12182215 X-Patchwork-Delegate: kuba@kernel.org 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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 9443CC433B4 for ; Sun, 4 Apr 2021 08:15:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6173361353 for ; Sun, 4 Apr 2021 08:15:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230220AbhDDIPN (ORCPT ); Sun, 4 Apr 2021 04:15:13 -0400 Received: from mail-dm6nam11on2054.outbound.protection.outlook.com ([40.107.223.54]:10465 "EHLO NAM11-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229483AbhDDIPL (ORCPT ); Sun, 4 Apr 2021 04:15:11 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AyleZijr1xSbsuuQwNGq2pCLr1Qd2YVbCpg1o6OqL5ZcU2mVXlZwVQsTXA3bAWZKlRfKvTG6XE4f4zyP6iYQOvsup/l0lj9CSjrGbCSoRm8NeXcxHP/ziLTCNtxwBJmFVcLQGS6UuZUWOBD3cZ7e/X0D46n7dGNvPfDyogsUsR6i5Zo2cT5La+CHVtR51LqYz3bInYA75VBUY/P0GDnRmxM0luytrr9booIVUW8yS3jmpwOGN18mS3S3Y50i9XIPLMa570RMBB/Gm23aWSg9a9b9U9ErH+HnhlPNjNXf2r33HUm9BU/0+sBDlFvERHxzyyL0WclJmnMhZQukOBwJ2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SeNm3NyJAP1TJht/5vLt8u9uoVxSx2Jxc+dQhIgu2qE=; b=At/NNI5RdrTaxnrdIV9pP1GE4/+2IwY1E9kTJVHI0b9z1MbiTduXemuGeDI6WQhQL+XNWVfKAGuzg9yCyKkv4rGIHfIiBY1KodcCk1AWmhHrLkpc29uo8RUZvUYho9bk2KEkY6F617GDWhJI15OU5QpfJAvqqRN1vpvNWpdqODWoc5y0oVB7nqsqkI9SyxAlLKxlGCIcC1t1WQjob8K/YcWKKLBip4LgzlFbieghsXM5WIYttDEMZ8iXFzU2DldmhIgHwoSpT0zN3uEBNM69L75To++TbQwv6m92/U5AeXQOI7mliQKxtCNHSJJz0hStwo5EDIZul7R4uRszu1Fupw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=embeddedor.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SeNm3NyJAP1TJht/5vLt8u9uoVxSx2Jxc+dQhIgu2qE=; b=UOarSsgSGWDLiJAfnkdMOglq9Hf0Lw08xS/AgQwHD/c49o07BXMZm5pF6IZ0zjf45SjsH/O7YWuzyPHDXCgQSwAoEoNrP0r/Z1ZNLnmyMP0nClzAwTAZ9efVDYGSBwSl70E+EMjmiuUbYDWFvb7+bhILEweX1DpVxuC96k9wfShGvmIVYkImSHiszhdq8u0PZ6s/mYiasFtwMYclLO5Q5RCIKjoW132zD44KO2L8wijRbbtGY4aImutiUKIJrwtnZq2S9784qFL2geolYyEUjss8xL4vWkNbDnaADX7Glqhz91+8klQjszoxqJyicgrM+WTw1p7vkk9HoXabnuyqzQ== Received: from DS7PR03CA0153.namprd03.prod.outlook.com (2603:10b6:5:3b2::8) by BY5PR12MB4241.namprd12.prod.outlook.com (2603:10b6:a03:20c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28; Sun, 4 Apr 2021 08:15:05 +0000 Received: from DM6NAM11FT006.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b2:cafe::7b) by DS7PR03CA0153.outlook.office365.com (2603:10b6:5:3b2::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.26 via Frontend Transport; Sun, 4 Apr 2021 08:15:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; embeddedor.com; dkim=none (message not signed) header.d=none;embeddedor.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT006.mail.protection.outlook.com (10.13.173.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.3999.28 via Frontend Transport; Sun, 4 Apr 2021 08:15:04 +0000 Received: from dev-r-vrt-156.mtr.labs.mlnx (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 4 Apr 2021 08:15:00 +0000 From: Danielle Ratson To: CC: , , , , , , , , , , , , , , Danielle Ratson Subject: [PATCH net v2 2/2] ethtool: Derive parameters from link_mode in ioctl path Date: Sun, 4 Apr 2021 11:14:33 +0300 Message-ID: <20210404081433.1260889-3-danieller@nvidia.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210404081433.1260889-1-danieller@nvidia.com> References: <20210404081433.1260889-1-danieller@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b565a1f7-08fc-4ea4-bbe2-08d8f741c093 X-MS-TrafficTypeDiagnostic: BY5PR12MB4241: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fpszzyn1Wga2XghUkjGHNGwoAM5v9/+OywP9vPjhPjNt/Q96b43rAdIjOOjVj5Zu6O5VbGhVI3uZpEV5r+h0BvccVwIGobW+6hxqRvargaL5uezoy0a8GfWlxEJWERtag4Spri8ncMqb1QZNSAjXNcv7S0Are1BV1zzLjJxP1/QiEewq5qbngIPmA3dCbL5PUftkJIrHDIBD/lwTqdmO6M0S7hYUG/lDZOwgmfc4GeoOWQMmNTiFHf3kdUVQVn+pByQ6JgAekyTtDvl6vlCUcf2/w5dUdoNdxafalN+O49zlAVmjQHcjbU607UI+12ibhiwMwWkcbZ5MrOPQN0WNhfLogd+c4tofogRMWvh0g6eE0DwKdG4BVR3HUxkvtCQAUOk+QUkXTyWtYVo5FdDoG0b+PGLNKzernTqJoLkKxBA6ot9DOmgMqJT08JhzMrcMm8H0PJz3e/h8fqxY7xfFIhoeRMB8jmmI5UitOmWHNE5MfgIO3JRt8WfO5v2GzoC4mEMU5W+OO7SrH2x3kAMV+8o7rz8wWJZV4/kP6sT8v2qgyGyrKQQ8Urt3WDur/ibZ3GUk9JhbsCHDS7K0Ds9Fw4wj0zVpxuC6F63KEwkGt7ZI6xqk9JSXGiH99WM0KEl2q+VoV6m0hUFZgOtCfSiIRTSk//s+SQeCshVtu9ukquI= X-Forefront-Antispam-Report: CIP:216.228.112.34;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:schybrid03.nvidia.com;CAT:NONE;SFS:(4636009)(136003)(39860400002)(396003)(346002)(376002)(46966006)(36840700001)(70586007)(336012)(6916009)(426003)(2616005)(478600001)(82310400003)(36756003)(6666004)(2906002)(1076003)(356005)(36906005)(316002)(16526019)(8676002)(7416002)(186003)(8936002)(107886003)(4326008)(54906003)(26005)(86362001)(36860700001)(82740400003)(5660300002)(7636003)(83380400001)(70206006)(47076005);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2021 08:15:04.7548 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b565a1f7-08fc-4ea4-bbe2-08d8f741c093 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.112.34];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT006.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4241 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Currently, some ethtool link parameters, like speed, lanes and duplex, are derived from the link_mode parameter. These link parameters are only derived in __ethtool_get_link_ksettings(), but the ioctl path does not go through this function. This means that old ethtool (w/o netlink) won't get any reasonable values. Add a function that derives the parameters from link_mode and use it in ioctl paths as well. Output before: $ ethtool --version ethtool version 5.4 $ ethtool swp13 Settings for swp13: Supported ports: [ FIBRE Backplane ] Supported link modes: 1000baseKX/Full 10000baseKR/Full 25000baseCR/Full 25000baseKR/Full 25000baseSR/Full Supported pause frame use: Symmetric Receive-only Supports auto-negotiation: Yes Supported FEC modes: Not reported Advertised link modes: 1000baseKX/Full 10000baseKR/Full 25000baseCR/Full 25000baseKR/Full 25000baseSR/Full Advertised pause frame use: No Advertised auto-negotiation: Yes Advertised FEC modes: Not reported Speed: Unknown! Duplex: Half Port: Direct Attach Copper PHYAD: 0 Transceiver: internal Auto-negotiation: on Link detected: yes Output after: $ ethtool swp13 Settings for swp13: Supported ports: [ FIBRE Backplane ] Supported link modes: 1000baseKX/Full 10000baseKR/Full 25000baseCR/Full 25000baseKR/Full 25000baseSR/Full Supported pause frame use: Symmetric Receive-only Supports auto-negotiation: Yes Supported FEC modes: Not reported Advertised link modes: 1000baseKX/Full 10000baseKR/Full 25000baseCR/Full 25000baseKR/Full 25000baseSR/Full Advertised pause frame use: No Advertised auto-negotiation: Yes Advertised FEC modes: Not reported Speed: 25000Mb/s Duplex: Full Port: Direct Attach Copper PHYAD: 0 Transceiver: internal Auto-negotiation: on Link detected: yes Fixes: c8907043c6ac9 ("ethtool: Get link mode in use instead of speed and duplex parameters") Signed-off-by: Danielle Ratson Reported-by: Ido Schimmel Reviewed-by: Ido Schimmel --- net/ethtool/ioctl.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c index cebbf93b27a7..943162ef080c 100644 --- a/net/ethtool/ioctl.c +++ b/net/ethtool/ioctl.c @@ -422,11 +422,31 @@ struct ethtool_link_usettings { } link_modes; }; +static int +ethtool_params_from_link_mode(const struct net_device *dev, + struct ethtool_link_ksettings *link_ksettings) +{ + const struct link_mode_info *link_info; + + if (dev->ethtool_ops->cap_link_mode_supported && + link_ksettings->link_mode != -1) { + if (WARN_ON_ONCE(link_ksettings->link_mode >= + __ETHTOOL_LINK_MODE_MASK_NBITS)) + return -EINVAL; + + link_info = &link_mode_params[link_ksettings->link_mode]; + link_ksettings->base.speed = link_info->speed; + link_ksettings->lanes = link_info->lanes; + link_ksettings->base.duplex = link_info->duplex; + } + + return 0; +} + /* Internal kernel helper to query a device ethtool_link_settings. */ int __ethtool_get_link_ksettings(struct net_device *dev, struct ethtool_link_ksettings *link_ksettings) { - const struct link_mode_info *link_info; int err; ASSERT_RTNL(); @@ -440,17 +460,7 @@ int __ethtool_get_link_ksettings(struct net_device *dev, if (err) return err; - if (dev->ethtool_ops->cap_link_mode_supported && - link_ksettings->link_mode != -1) { - if (WARN_ON_ONCE(link_ksettings->link_mode >= - __ETHTOOL_LINK_MODE_MASK_NBITS)) - return -EINVAL; - - link_info = &link_mode_params[link_ksettings->link_mode]; - link_ksettings->base.speed = link_info->speed; - link_ksettings->lanes = link_info->lanes; - link_ksettings->base.duplex = link_info->duplex; - } + ethtool_params_from_link_mode(dev, link_ksettings); return 0; } @@ -572,6 +582,8 @@ static int ethtool_get_link_ksettings(struct net_device *dev, if (err < 0) return err; + ethtool_params_from_link_mode(dev, &link_ksettings); + /* make sure we tell the right values to user */ link_ksettings.base.cmd = ETHTOOL_GLINKSETTINGS; link_ksettings.base.link_mode_masks_nwords @@ -673,6 +685,8 @@ static int ethtool_get_settings(struct net_device *dev, void __user *useraddr) return err; convert_link_ksettings_to_legacy_settings(&cmd, &link_ksettings); + ethtool_params_from_link_mode(dev, &link_ksettings); + /* send a sensible cmd tag back to user */ cmd.cmd = ETHTOOL_GSET;