From patchwork Fri Aug 14 13:16:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Mikityanskiy X-Patchwork-Id: 1345027 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=ddJUu/dL; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BSkVV0bLvz9sTH for ; Fri, 14 Aug 2020 23:16:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727901AbgHNNQr (ORCPT ); Fri, 14 Aug 2020 09:16:47 -0400 Received: from mail-eopbgr00073.outbound.protection.outlook.com ([40.107.0.73]:30530 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726283AbgHNNQq (ORCPT ); Fri, 14 Aug 2020 09:16:46 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vq9jDwW/OV7IR4Pg2ZTqHBc0hTEcksGsdhWx7JKTJB96+wHrvLhXOP9lhXYHbGFNR3tKYVDOXvuXbB3WH8C5Y50GLDRS5ypMkT5sA3IYGrwEghlrJ7NL5DUKjJ1JZ3sKk1JMF1SHmd+XJqouTOoVXhRNI8cfMpj0BIEaaBGlnSRuGiMccpFrhD0KQMkDO6wd/uT0Qg8qNs1V2N6pV0bTjVyFkX+Ld6uh0wLDZhyN/COnUjTV3m6j9qC1Q9jXj3+GGNGrZnA2yR0lm0C8iZOqLbi0wGostocRaTYXNMtzthIW1UCFXmPEfwIXlQfc0lY+fl8/8SIpajz3Quf4Z2rUcw== 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=xunhK4vIKc4e3Vw4a7mftzJWr9FGCtpyHS9dMl5ZzAs=; b=LJfVsukhGfVwFhUJnsG0px5GXAF3euLmojA+h4tTL7I2QDYXjoLFKavWbgg4UQEyDlRL8u5eYJQ5VVlt7rzZ6hPvKBq/dKJpIHuFmtHSKSL7zyp+SyRpI58VFKmm+O5dQMJKRw2iGUjfEWnFm6GcHg/vxuFxOqyehTO9PF1nj3hrhG3Y5f+iDDnbg3pzQ7iq/8WylCDgJho5BuC9Q/7yoAWZK3mjF+JpgRmp2mCKnS3pInSFOSC9zG7iwhwFCMTI7aAsPsjI+il8WJTHcH5ZndbnasVATwomUM3iZmZ/bZVLhsGoCRKyUVyTa3axyQM3zMZxoSSnUdluWy2hvbM66w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xunhK4vIKc4e3Vw4a7mftzJWr9FGCtpyHS9dMl5ZzAs=; b=ddJUu/dLOARbNADbAqmvjYfQwCih2qQX4ihCN84LsU+0TEqMnPybkSOds/w7hF+nLFwgKXwD30Ujx8obe1DXB6+PSwNwzNG1YNq9O/uxKBbyG76ULNHWxqJepY687lJl8Jk5kIL7pHnTQ8qG2plnJIgvvXANcvO9CV7r8caPBOs= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from AM6PR05MB5974.eurprd05.prod.outlook.com (2603:10a6:20b:a7::12) by AM6PR0502MB3605.eurprd05.prod.outlook.com (2603:10a6:209:7::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.19; Fri, 14 Aug 2020 13:16:39 +0000 Received: from AM6PR05MB5974.eurprd05.prod.outlook.com ([fe80::69be:d8:5dcd:cd71]) by AM6PR05MB5974.eurprd05.prod.outlook.com ([fe80::69be:d8:5dcd:cd71%3]) with mapi id 15.20.3283.016; Fri, 14 Aug 2020 13:16:39 +0000 From: Maxim Mikityanskiy To: "David S. Miller" , Michal Kubecek , Andrew Lunn Cc: Jakub Kicinski , netdev@vger.kernel.org, Maxim Mikityanskiy Subject: [PATCH net 1/3] ethtool: Fix preserving of wanted feature bits in netlink interface Date: Fri, 14 Aug 2020 16:16:25 +0300 Message-Id: <20200814131627.32021-2-maximmi@mellanox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200814131627.32021-1-maximmi@mellanox.com> References: <20200814131627.32021-1-maximmi@mellanox.com> X-ClientProxiedBy: AM0PR04CA0121.eurprd04.prod.outlook.com (2603:10a6:208:55::26) To AM6PR05MB5974.eurprd05.prod.outlook.com (2603:10a6:20b:a7::12) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from dev-l-vrt-208.mtl.labs.mlnx (94.188.199.18) by AM0PR04CA0121.eurprd04.prod.outlook.com (2603:10a6:208:55::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.16 via Frontend Transport; Fri, 14 Aug 2020 13:16:38 +0000 X-Mailer: git-send-email 2.20.1 X-Originating-IP: [94.188.199.18] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c5803568-5e0b-4c5a-dbd1-08d840544797 X-MS-TrafficTypeDiagnostic: AM6PR0502MB3605: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtFwd X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2089; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: toeAVU5w4jPL93TABHijYwyYS4XM9ROLmJidEUQAdDqAsLYrDM6DnYVUjcEa+/wMGaaKp5yVTLRD3BiYeqAKulUlFkeilnaXG1tg7zLTUqLggkcSisfdRNANQX8/TaMdMLX/AZxohW0FEXuV+ZzOkg+QqOAMX89UngSROwINuLMWWqmSvScedNT7G/F9LM8e/3GHBe1erdAc4yr+slQ4dffGYpq4Xm8khzOQMRHt7KzetoP2Hp33FkWlXpAXfKr4/yF4OeWqXKCPZHsUmsRmFfmyYKn1Xu7gPE5OO0dfZifdq9goBluSpnU/ZrMeNExO X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR05MB5974.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(39860400002)(136003)(396003)(376002)(346002)(366004)(6512007)(16526019)(8936002)(186003)(6666004)(6506007)(36756003)(83380400001)(1076003)(26005)(107886003)(110136005)(66946007)(316002)(54906003)(66476007)(66556008)(8676002)(956004)(2616005)(2906002)(478600001)(5660300002)(86362001)(52116002)(4326008)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: zgjeX0Lh+g4PZknry/TFK0Z5m5DT2isAowPeSbBb+VJjlEJX9JXgA+bqvZt6/QHwD6V/CAYJjXk7jOYEObTqSEob2R/VZD+SBP34PPcV3xy0X2/cKXRiUBKVn/UFyX7+94Xbhy4LFzdlgcKnGS3wT9Z0Rph/CFnQDEVsjlCtkbch6ZZVFh96zRV6+4xyxEDyq8cBHi/FZu6P5fGILNVtuyRWrmiY8I7YoQxDK72ikON1m7reHKwDLta06kVpaGooXxj299x23dC28+cDgmpZEIQ5bM7+7IxtCSqFF9/AsrZDGBT+WEW33+7pMKiUNxMEho6Muu5rbhXuYJ2tHElsKYu6V/SFvCM9EqAR+X3KSFkyEs12yw6bCQB5FZlabSk+6mwdh/Ln+bc5pVlmh/19h3RC5BBOVVnCx+KxWt8tPk2RKt3ySRppg/xgGm51HwZi38W/4RpdBVGJPK4zJzNsvUX0wY0t6jDSLJGezugt5BJvMPRX0ZH6LfRTQsEep9ekcqS4+xpucMP2H+1hICAQucNCsyAtZU4sJHcBmBHZdV5Y+sOynUGlWbhPcT/jTiLFsB1cqlKvAiFPMuPz+3MlUKaNHQ5jKzzBUgfLgc+8QrLRfOk88UbfPmWXHLR6LO3U1JMb6IDquGXq8tzQvkomnw== X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5803568-5e0b-4c5a-dbd1-08d840544797 X-MS-Exchange-CrossTenant-AuthSource: AM6PR05MB5974.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2020 13:16:39.8098 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: RItMmcwqxZr312dp3KiFagODBJdhy3/O9kEH4fgZMBEitEg840dEhkzAswzDHyDQGDr6i6KK3INEP4vEOthVrQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0502MB3605 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently, ethtool-netlink calculates new wanted bits as: (req_wanted & req_mask) | (old_active & ~req_mask) It completely discards the old wanted bits, so they are forgotten with the next ethtool command. Sample steps to reproduce: 1. ethtool -k eth0 tx-tcp-segmentation: on # TSO is on from the beginning 2. ethtool -K eth0 tx off tx-tcp-segmentation: off [not requested] 3. ethtool -k eth0 tx-tcp-segmentation: off [requested on] 4. ethtool -K eth0 rx off # Some change unrelated to TSO 5. ethtool -k eth0 tx-tcp-segmentation: off # "Wanted on" is forgotten This commit fixes it by changing the formula to: (req_wanted & req_mask) | (old_wanted & ~req_mask), where old_active was replaced by old_wanted to account for the wanted bits. The shortcut condition for the case where nothing was changed now compares wanted bitmasks, instead of wanted to active. Signed-off-by: Maxim Mikityanskiy --- net/ethtool/features.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/net/ethtool/features.c b/net/ethtool/features.c index 4e632dc987d8..ec196f0fddc9 100644 --- a/net/ethtool/features.c +++ b/net/ethtool/features.c @@ -224,7 +224,9 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info) DECLARE_BITMAP(wanted_diff_mask, NETDEV_FEATURE_COUNT); DECLARE_BITMAP(active_diff_mask, NETDEV_FEATURE_COUNT); DECLARE_BITMAP(old_active, NETDEV_FEATURE_COUNT); + DECLARE_BITMAP(old_wanted, NETDEV_FEATURE_COUNT); DECLARE_BITMAP(new_active, NETDEV_FEATURE_COUNT); + DECLARE_BITMAP(new_wanted, NETDEV_FEATURE_COUNT); DECLARE_BITMAP(req_wanted, NETDEV_FEATURE_COUNT); DECLARE_BITMAP(req_mask, NETDEV_FEATURE_COUNT); struct nlattr *tb[ETHTOOL_A_FEATURES_MAX + 1]; @@ -250,6 +252,7 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info) rtnl_lock(); ethnl_features_to_bitmap(old_active, dev->features); + ethnl_features_to_bitmap(old_wanted, dev->wanted_features); ret = ethnl_parse_bitset(req_wanted, req_mask, NETDEV_FEATURE_COUNT, tb[ETHTOOL_A_FEATURES_WANTED], netdev_features_strings, info->extack); @@ -261,11 +264,11 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info) goto out_rtnl; } - /* set req_wanted bits not in req_mask from old_active */ + /* set req_wanted bits not in req_mask from old_wanted */ bitmap_and(req_wanted, req_wanted, req_mask, NETDEV_FEATURE_COUNT); - bitmap_andnot(new_active, old_active, req_mask, NETDEV_FEATURE_COUNT); - bitmap_or(req_wanted, new_active, req_wanted, NETDEV_FEATURE_COUNT); - if (bitmap_equal(req_wanted, old_active, NETDEV_FEATURE_COUNT)) { + bitmap_andnot(new_wanted, old_wanted, req_mask, NETDEV_FEATURE_COUNT); + bitmap_or(req_wanted, new_wanted, req_wanted, NETDEV_FEATURE_COUNT); + if (bitmap_equal(req_wanted, old_wanted, NETDEV_FEATURE_COUNT)) { ret = 0; goto out_rtnl; } From patchwork Fri Aug 14 13:16:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Mikityanskiy X-Patchwork-Id: 1345028 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=euImF7Y3; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BSkVf5K3Wz9sTH for ; Fri, 14 Aug 2020 23:16:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727990AbgHNNQz (ORCPT ); Fri, 14 Aug 2020 09:16:55 -0400 Received: from mail-eopbgr00073.outbound.protection.outlook.com ([40.107.0.73]:30530 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726139AbgHNNQu (ORCPT ); Fri, 14 Aug 2020 09:16:50 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PBu2V8DhLlwK0qkfaFlm77psjHlGrBK+WxmdNhpDMv1zsRFWVx+a2xN2ieFCVpWF635TEF8Ijr03FMSp0QODdX0ye3tBrl6oJaS69X6+IgDZjZIvGqzMa/T9HUUZBZQLIJOesn355JN1AjODsJX4erkNosF/+k1pk7UChWwl77n9naMwETqF3uieNdjYX1e9+Jes4+HwlagzJjzQifPaM2cVBMvHEoPKTvdAl5nkYeSoVNdAJk04r2iYr6yR6F+ab8S40vLtzhmbUuHv9HEaxFPuq8mV0SVjSvL69pL9znXF7i4Tmd8Bsmc8Emx2BVWXVYTzed+1qF/BKMg9Zcb/5Q== 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=v5muxr6tf9lVTO+b4NqYASyK5oPldM8sc401berV73E=; b=mVy/kUQjcLWhcScDcopiHbW5/IHJvsyb5Rm0Puz9zQ5nOuTkEeRd6jc6sIJO1SL+H0cQ19WbBgiGUXs2veQFxCl+TvoMov6500jJp3JhTfwfCN67853vi1GBcg4W26jSYy0Y9KmZv7DxOL5kipBHfjM9qJvU6NiZbGupyH7m2zGUi0sU5uNMqqb26VmyBbFn/Lz+JhNJflkFiFB4r4wdYI1n09Bowc8msmDQ/OmDm4CnvrlhczJxEyvrPs+5J4jQkBpYN2LZgx/ov7vDeF9P9lKTf7kA7t26XwecFz9rES5Cl8hlpYpHA+CK7Gy/5LmDNY3nMUE5o3iCqMeBo/Vi+A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=v5muxr6tf9lVTO+b4NqYASyK5oPldM8sc401berV73E=; b=euImF7Y3+AGdhzJdCe3SDBuVhlikLRVRG58yCvopFmcSOlJp48Xid19E1Hl/sAv1JY9dX3igMSuo0Cxg7D1hJGHqSNi7HJw1u1HEux+Fui5Ow+UY0a+++RI3Oq0tL7rtXvz28qsb4Jn6aAOh/sot0Q3/zzJsHH59ztWT58kvf70= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from AM6PR05MB5974.eurprd05.prod.outlook.com (2603:10a6:20b:a7::12) by AM6PR0502MB3605.eurprd05.prod.outlook.com (2603:10a6:209:7::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.19; Fri, 14 Aug 2020 13:16:40 +0000 Received: from AM6PR05MB5974.eurprd05.prod.outlook.com ([fe80::69be:d8:5dcd:cd71]) by AM6PR05MB5974.eurprd05.prod.outlook.com ([fe80::69be:d8:5dcd:cd71%3]) with mapi id 15.20.3283.016; Fri, 14 Aug 2020 13:16:40 +0000 From: Maxim Mikityanskiy To: "David S. Miller" , Michal Kubecek , Andrew Lunn Cc: Jakub Kicinski , netdev@vger.kernel.org, Maxim Mikityanskiy Subject: [PATCH net 2/3] ethtool: Account for hw_features in netlink interface Date: Fri, 14 Aug 2020 16:16:26 +0300 Message-Id: <20200814131627.32021-3-maximmi@mellanox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200814131627.32021-1-maximmi@mellanox.com> References: <20200814131627.32021-1-maximmi@mellanox.com> X-ClientProxiedBy: AM0PR04CA0121.eurprd04.prod.outlook.com (2603:10a6:208:55::26) To AM6PR05MB5974.eurprd05.prod.outlook.com (2603:10a6:20b:a7::12) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from dev-l-vrt-208.mtl.labs.mlnx (94.188.199.18) by AM0PR04CA0121.eurprd04.prod.outlook.com (2603:10a6:208:55::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.16 via Frontend Transport; Fri, 14 Aug 2020 13:16:40 +0000 X-Mailer: git-send-email 2.20.1 X-Originating-IP: [94.188.199.18] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 9da5de8a-8746-4c1d-691a-08d840544833 X-MS-TrafficTypeDiagnostic: AM6PR0502MB3605: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtFwd X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rch9nABeEmcYifrjpUHfzukuRKtVBsb/PZtRs+aXel8+Ks5tGzYd46Nsr2gQb259K9BvuIoXIYXO6di7VacHstbjSnnJtVlGVR+PEKHBweB6dnYTjDY8BxXWp8JSslpQsrwDYr+73HirP0ezZhWA5cblWI3G3ppovfJ14+ao30goaYa9Q16lehNG98fTwSFXW8ODTHPDqqT35GgXa26REz4ELhYetRqqPUn8awALv8llz+vb2O58dmZOsDitE9yS4c89+HGU74G5NMbAvX9wBqZ5sHMW9JJXJc8kyndL1CyucQ9DpblDcPc/A8c7la2w2069Ly1MUrSunGj/b4M8Vw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR05MB5974.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(39860400002)(136003)(396003)(376002)(346002)(366004)(6512007)(16526019)(8936002)(186003)(6666004)(6506007)(36756003)(83380400001)(1076003)(26005)(107886003)(110136005)(66946007)(316002)(54906003)(66476007)(66556008)(8676002)(956004)(2616005)(2906002)(478600001)(5660300002)(86362001)(52116002)(4326008)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 59vmrne9XREQTYATdCiTzU09cmY+Vf/hzUlCVnxZO5piBouPa2Dd+BBDSMYgqU3f9bZUGqxfoS3P+v1z2EF5jUagH3/XpR/27k5cVG/9nAIK5S1HL0NaOsnFzuNDg3eZ4vroDNoVAj9FDHdeuQP33zipmeDt+IUExrummhak7sd7sFATfw4gt80I1qADHgtcbqGOS3gWHD9wA2L46ii9yslNagVsj/x3v+4dv797CAp5h+oMldsd9D+oiF1UZQfn6X545cJoPNd3jgHReJrh4zTd+TdDVkN9ZJGX4/8am43egQGvKWWWBNv0od95KnYq9iW2X5rH39Q9WDBm7hV+3BnrlW4wPt40J1GMI7okUNh8uqtrsuLHxryCYhZZbofH0gaXSWXCLtym386+BtNH8JlshvqkzI8ex7qt+TuW0WLKHHzn/5UC3rmc+KU3Xcl86cyFbcavA8IwydZevEouqs4ZU7YJ8e/JRFX5GLfomekHe7UemBTv6BhqZh9fSgkCxGE510Qgj4g5iSLVLt4PAEjrleSTp747jtbM+uADCuEs/4rsevpv+lplTPAztWsuqs3p/jhrGXr8GTTRq0vYajf8jg4K1dFkXPPDE5C+GsqndAnmk7vuClhqIb3tAdIXWxe/nY6uZ5SdCIT5NCk3mA== X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9da5de8a-8746-4c1d-691a-08d840544833 X-MS-Exchange-CrossTenant-AuthSource: AM6PR05MB5974.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2020 13:16:40.7823 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: e3qO1CNL8QoYiAIeQjgIXq8RYc39tflfChrZ4NfM17tEX5tLSrFY+rguNMtNvDT50GOg2z4rSJmf40DZuoF4fg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0502MB3605 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ethtool-netlink ignores dev->hw_features and may confuse the drivers by asking them to enable features not in the hw_features bitmask. For example: 1. ethtool -k eth0 tls-hw-tx-offload: off [fixed] 2. ethtool -K eth0 tls-hw-tx-offload on tls-hw-tx-offload: on 3. ethtool -k eth0 tls-hw-tx-offload: on [fixed] Fitler out dev->hw_features from req_wanted to fix it and to resemble the legacy ethtool behavior. Signed-off-by: Maxim Mikityanskiy --- net/ethtool/features.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ethtool/features.c b/net/ethtool/features.c index ec196f0fddc9..6b288bfd7678 100644 --- a/net/ethtool/features.c +++ b/net/ethtool/features.c @@ -273,7 +273,8 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info) goto out_rtnl; } - dev->wanted_features = ethnl_bitmap_to_features(req_wanted); + dev->wanted_features &= ~dev->hw_features; + dev->wanted_features |= ethnl_bitmap_to_features(req_wanted) & dev->hw_features; __netdev_update_features(dev); ethnl_features_to_bitmap(new_active, dev->features); mod = !bitmap_equal(old_active, new_active, NETDEV_FEATURE_COUNT); From patchwork Fri Aug 14 13:16:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Mikityanskiy X-Patchwork-Id: 1345029 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.a=rsa-sha256 header.s=selector1 header.b=kEkxXoCz; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BSkVq4l7Tz9sTH for ; Fri, 14 Aug 2020 23:17:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728057AbgHNNRH (ORCPT ); Fri, 14 Aug 2020 09:17:07 -0400 Received: from mail-eopbgr00073.outbound.protection.outlook.com ([40.107.0.73]:30530 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726268AbgHNNQy (ORCPT ); Fri, 14 Aug 2020 09:16:54 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lccLdSFtw1CTGt0iLLaTT5UcoL5G7PVUBKVTjsSnrI3BEXXdpsHKci9B3OO1MdABvXeXTxSnQ1MlrePsxV6DfNgTv9CAvIE4xRR7HeeDngVL48PVRfwr9Wb2cr2FM/0Wibt1Ai9moj2xU1erXYEyVBaMTKM6cqVT95Hi1XI7RD2clfcxU0v1UAEEVeKRegjCAgdOPcOzCIwU68nKZD1jA/epN+NR9RQoRiOOu5oynk5tAj0k0pS2GbSEFY0BgtKOFbhhZsB0VZYG95VrR5mT78MZhQDQU3Foz15OV7rNrLNstspStBOS4OFI6FiBonxfP6nLdFQClf5uf4HicUe/jw== 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=V31HHsGQ9mWGB4yXyaybpc3yldoBHNuvYXlentgiIAg=; b=jv8ym3jkXRh9u6jwvTSICNpqfg+23v6sQy7JDg7HiielM/461M7KbvBpFy891OiZNPcwt2ODvxKFLyKU3SnudHWYVBfZwegw4FMlrDuSJ35lR7Ldxm477aTcuF1zQXoh+o9l60jhy4rm1hGZRvJzRIH67hvhULfPwsW88a5mYw9mMQ/i9qYzc0uZmN0+iCkoVYHNgXSF8OLa/HeV8B0h2X1jg/N3cQgfE2eISdQGYx4zA+3TvFVPXFvsu1xDhFNeWgMuH6bqrLDtjOyyj9UFNY0rvGUTa98ySiqY5QKTBWzKquG+h8eqJIbdB55dDOWSeFzkCUUGxK0bmoELuQyHvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=V31HHsGQ9mWGB4yXyaybpc3yldoBHNuvYXlentgiIAg=; b=kEkxXoCzVNDMkbiFLnbaXFOhes4O8MI03u1bIgpxrYYnxqioOKbH0gXeV8FSfotv00P4kvz25puCbJ9rhJopINHXLb9psD0Z+iHHPR9qmKoTyB+kX4m7nnKjOp+GFMXT1QGkC2gNL4UATvckWSxwR9y/5SfPO5NBA/4PhfxSIqg= Authentication-Results: davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=none action=none header.from=mellanox.com; Received: from AM6PR05MB5974.eurprd05.prod.outlook.com (2603:10a6:20b:a7::12) by AM6PR0502MB3605.eurprd05.prod.outlook.com (2603:10a6:209:7::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3261.19; Fri, 14 Aug 2020 13:16:41 +0000 Received: from AM6PR05MB5974.eurprd05.prod.outlook.com ([fe80::69be:d8:5dcd:cd71]) by AM6PR05MB5974.eurprd05.prod.outlook.com ([fe80::69be:d8:5dcd:cd71%3]) with mapi id 15.20.3283.016; Fri, 14 Aug 2020 13:16:41 +0000 From: Maxim Mikityanskiy To: "David S. Miller" , Michal Kubecek , Andrew Lunn Cc: Jakub Kicinski , netdev@vger.kernel.org, Maxim Mikityanskiy Subject: [PATCH net 3/3] ethtool: Don't omit the netlink reply if no features were changed Date: Fri, 14 Aug 2020 16:16:27 +0300 Message-Id: <20200814131627.32021-4-maximmi@mellanox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200814131627.32021-1-maximmi@mellanox.com> References: <20200814131627.32021-1-maximmi@mellanox.com> X-ClientProxiedBy: AM0PR04CA0121.eurprd04.prod.outlook.com (2603:10a6:208:55::26) To AM6PR05MB5974.eurprd05.prod.outlook.com (2603:10a6:20b:a7::12) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from dev-l-vrt-208.mtl.labs.mlnx (94.188.199.18) by AM0PR04CA0121.eurprd04.prod.outlook.com (2603:10a6:208:55::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3283.16 via Frontend Transport; Fri, 14 Aug 2020 13:16:41 +0000 X-Mailer: git-send-email 2.20.1 X-Originating-IP: [94.188.199.18] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 22b0c6b8-3025-48cf-e994-08d8405448cb X-MS-TrafficTypeDiagnostic: AM6PR0502MB3605: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtFwd X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3173; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kUc+7b96uw105I+ePgk7zqCBAluiABZe1avrtbbar34mT5frvjtPusAum3JiGxai7VDjyouyX9ter0uL8pC+qaMkPNxq5e3NpIxnYt0Yap3hJlMjB0Rj0qaod1JkWXOoC/XlZ3kiA7emz7ZSYL8bpXjtVWBAfKIjAu6EBIyobJOMU1eY6pt2H3Hb+YFvbWmdqsb8Mta0HL37roIPje4aTeW97bHI+T7LNV475WHF1vpd8+frpmYVZs8mqgY7/RRA8a+QR2Xs4L5dY0yF6NrTL9FsxNrXwS/rGQCL1RUfWPFX0d1tLCXfFpDbKt0EWY4C X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR05MB5974.eurprd05.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(39860400002)(136003)(396003)(376002)(346002)(366004)(6512007)(16526019)(8936002)(186003)(6666004)(6506007)(36756003)(83380400001)(1076003)(26005)(107886003)(110136005)(66946007)(316002)(54906003)(66476007)(66556008)(8676002)(956004)(2616005)(2906002)(478600001)(5660300002)(86362001)(52116002)(4326008)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: YRMj4G0npgJq0IwFWBvIXkPcgOsNgeCUAQHMxs8/Wkjs/Bomn9pZGGKDMNZwwWCkKSjfqlgE2Wzo3qO0Gbt+BqZUIFgohzCCfXHAsc4YzjKVoQlb5tIsQCfmvvq2ntch5BNDarAgqKDK/DmQlpHxjb2d8/cs/xihoiUFwY51xwXAU+dhuIA3It/7rCayrTgma1IXPiWJB2X/JTDXjltVkOEZA56eUbIgHr73sPgV1Yw+xBvu1ornDGxtS/EEqI1gE5ebNZ7U/7eLYEfv40ABWQqsUIiC30KnBWXVdUUosAKQqr7IwpWeU4i9s+ub3kJ0wjcphWEbgEvsI0fNavUEkv4Eh23gX4fGObTTCmY3Y9YoxziR4f/kffeV/EdJEnOTN6TjYisDJZR2EwTF4QcLOtxCqSPV1OlrT1UNJUAmEBIG9CrRYziBGXeSiF0MFWzhpNNSPWG6jyxurfb0KTymzmg8iJR0UG84QFwtrShBYgR2+vK5SG6RcOPy0XDvuSq4Lp+kO64mOMVmBTWuMy71aXvOwP8sM4/QgEyA72DYeFqQviNur64DV8ev/ah5zxpnYmpSReJRYxey6INZK9Bv4vnmzjxU0f/nkBeigR6eU7k/c7NkKBTMBXfBdw58c593bohZUcjcmQjHzNntaLWT4A== X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22b0c6b8-3025-48cf-e994-08d8405448cb X-MS-Exchange-CrossTenant-AuthSource: AM6PR05MB5974.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2020 13:16:41.7687 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9LPDPVzz+1CK51eOmUoh4AFjSrvvzLsEIyqp0YqtanJ2kUwxv/2LgBebJtK1mmDcneDjOqNCG1Zgh67C0h6mqQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0502MB3605 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The legacy ethtool userspace tool shows an error when no features could be changed. It's useful to have a netlink reply to be able to show this error when __netdev_update_features wasn't called, for example: 1. ethtool -k eth0 large-receive-offload: off 2. ethtool -K eth0 rx-fcs on 3. ethtool -K eth0 lro on Could not change any device features rx-lro: off [requested on] 4. ethtool -K eth0 lro on # The output should be the same, but without this patch the kernel # doesn't send the reply, and ethtool is unable to detect the error. This commit makes ethtool-netlink always return a reply when requested, and it still avoids unnecessary calls to __netdev_update_features if the wanted features haven't changed. Signed-off-by: Maxim Mikityanskiy --- net/ethtool/features.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/net/ethtool/features.c b/net/ethtool/features.c index 6b288bfd7678..495635f152ba 100644 --- a/net/ethtool/features.c +++ b/net/ethtool/features.c @@ -268,14 +268,11 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info) bitmap_and(req_wanted, req_wanted, req_mask, NETDEV_FEATURE_COUNT); bitmap_andnot(new_wanted, old_wanted, req_mask, NETDEV_FEATURE_COUNT); bitmap_or(req_wanted, new_wanted, req_wanted, NETDEV_FEATURE_COUNT); - if (bitmap_equal(req_wanted, old_wanted, NETDEV_FEATURE_COUNT)) { - ret = 0; - goto out_rtnl; + if (!bitmap_equal(req_wanted, old_wanted, NETDEV_FEATURE_COUNT)) { + dev->wanted_features &= ~dev->hw_features; + dev->wanted_features |= ethnl_bitmap_to_features(req_wanted) & dev->hw_features; + __netdev_update_features(dev); } - - dev->wanted_features &= ~dev->hw_features; - dev->wanted_features |= ethnl_bitmap_to_features(req_wanted) & dev->hw_features; - __netdev_update_features(dev); ethnl_features_to_bitmap(new_active, dev->features); mod = !bitmap_equal(old_active, new_active, NETDEV_FEATURE_COUNT);