From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 13BA1A054A for ; Thu, 26 May 2022 16:35:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 05D9342BA4; Thu, 26 May 2022 16:35:26 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2104.outbound.protection.outlook.com [40.107.220.104]) by mails.dpdk.org (Postfix) with ESMTP id E77DF40150; Thu, 26 May 2022 16:35:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yz1DkMD9rVgeXLB+qQ3gCpwxoDrHp1rMs5DwkOcGTaBjvvQn2KgLuI7bmEy0sUPNXskZqCyUJtm4+SE8xTOrmDxZBXCHLWaQjfecgU1pGrtPgY+JnZ4BQKlLGaQYEfh9vrL2wWVIbCaKP5v5pChbQ0duE6iDcdUsz+74ZRT3b2BQIgkf/rxpQu8/g8YSWH2+cXaiLlVgM4yW1m1DlsrRqMTi4MgzIfHGwiigwwP3knzngJsVn2KPVXKrLzCjwrh6DzpkAY4BCxmGUgcoa+S7wl8DZDdlUCWMEuC/pdG7qoNNyN8SvuT7jDqMD8eM7zWjmBvnYisMAW92ahxY3lVVIA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5xvWXpYnNB9cdq4iCgaciOMuZxtBmBwZvDB2tuw6SsQ=; b=Sw8eeK6Yn0ysYLyfLLpAlC/mEy4oq99OakZ9v7swYlkfOfOcAOeQ4nU4etXGXNm6mMmKLk/UK12Fhku1xXfM75rl4xPNNyGwuQHDzBHiQhxNqa/bvUkWCRbax2LW9kqRejI2rQayNEMojt2bsS8oF+m5K1UOZ93iFn+PgEoXemxGK3T376pmAlNg6uwIT/UBYLAIkWLGP4F5wFEdcNpnOJ0h3ZqMfH+JUDLNOQG/3kwE4tAnUWgjC7FjfRxj1X7JAFIOeVtsFDB2uzmrR9Fhr4L/IBvtn82ITZEid/EGFTfNgq4t580NmlJGcSdzj4LasrM7AEIbWyj51mzniC4d+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5xvWXpYnNB9cdq4iCgaciOMuZxtBmBwZvDB2tuw6SsQ=; b=CtBWx+zrXLfEpginMr3TQj5L8+Bj/H2WRDII+JKyEPQ5U3sgJ4CsdhTFTyPgFlwh+OlkMWTRK1WB/YeRHlhxgb3zUy5D/WxDLy0nV0CY+pG5ZN/mZVeqz19B9y9xrYDMRd+1ESlQCv8kPLYXRMAITBo/axzWKPDYt9geT1odPUE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from DM5PR1301MB1994.namprd13.prod.outlook.com (2603:10b6:4:2d::36) by MWHPR13MB1709.namprd13.prod.outlook.com (2603:10b6:300:12f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.6; Thu, 26 May 2022 14:35:19 +0000 Received: from DM5PR1301MB1994.namprd13.prod.outlook.com ([fe80::ecb7:bb70:9e83:d660]) by DM5PR1301MB1994.namprd13.prod.outlook.com ([fe80::ecb7:bb70:9e83:d660%5]) with mapi id 15.20.5293.013; Thu, 26 May 2022 14:35:19 +0000 From: Peng Zhang To: dev@dpdk.org Cc: niklas.soderlund@corigine.com, oss-drivers@corigine.com, Peng Zhang , stable@dpdk.org, Yong Xu , Chaoyong He Subject: [PATCH v2] net/nfp: fix bug of disable VLAN strip Date: Thu, 26 May 2022 16:34:44 +0200 Message-Id: <20220526143444.990674-1-peng.zhang@corigine.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220419083857.409261-1-peng.zhang@corigine.com> References: <20220419083857.409261-1-peng.zhang@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: LO4P123CA0178.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:18a::21) To DM5PR1301MB1994.namprd13.prod.outlook.com (2603:10b6:4:2d::36) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: db554fa4-a343-4664-f1f7-08da3f24f4e8 X-MS-TrafficTypeDiagnostic: MWHPR13MB1709:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ppUJAbZiJUCjAQ5Oq5dFL7MKdyoTBqddJYrymPu3VjPldXkCPGfxlkuOSoOSDn0yRT4kPRlcTw9/RCQnDB0zrePS12UkKW8Xm2AOPXMMhVSrpCazYfihOnXorPe60ddkITj62HDbehc94U3A315+f/FCOcuoGkby7oOb1SVun9iny3j/AzWI09dJQlgXs5rRYZzIhlDGepdSk5X2MtlWeuPRt/i7IG67Y+GaXckDKtdV43ZgBsFkQNOgf9sC10sT3eJShbrM8bTCNmLl6/yTDY4Hxt1StVML4n8rfOH4pL/hevmOXA5FyMrKd8FowMpsv8EizfxOGOAl+1pnRHYagpFuim8j/bvuif/Xj6B5eGtmxcEUExKy9jsvWfqKe6YnMfPxGepc1JAmhUrx17gka4dzfMAwPO7vqwScwe2VlkkGk3idOl7Cdvbv3kR193TbHKpD7yomNskvUWpdqwwywQVpfLkDq6pFZYRvRM7x8Sor/HTx8c2ez5qOAs3KCC+VGUyJnlrPgoZw3ADs8won/HzMT1Pck/1f82ZKPbejEI1Vz4EdvfOG6PtmUlOnc3qKP5om6ESM2ZCyuHOoJT1mKvf5OkV1uWDPZZbu4UzR20ILimy91zL6xLnaNwCLGRRLS1EB+iQPY8tilEh2UdpYUdzhm6exIcJhPIQqJrSe8qp7pM+UPOncp4CZ4dYvjy+KmhZb0mjJ8ym9SFDzyOcnmA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR1301MB1994.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(136003)(396003)(366004)(39840400004)(376002)(346002)(6506007)(186003)(1076003)(52116002)(6666004)(36756003)(5660300002)(38100700002)(2906002)(6512007)(38350700002)(26005)(107886003)(8936002)(66574015)(44832011)(2616005)(41300700001)(316002)(6486002)(6916009)(54906003)(86362001)(83380400001)(8676002)(66946007)(66476007)(450100002)(66556008)(4326008)(508600001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SXNMcTAxbjVzaVNsNjRxZnpSazUxaTJFWWpDWldmaGZrZE5WNUh3ZUJCdmY3?= =?utf-8?B?S0RlTUd3RkJoSWdBNFRaVVQraSt6c1dBblZNcm4wU1E3Ky9xd1JBSTJuV2NR?= =?utf-8?B?QXFqZXI1Vyt6OXZNYkM3VWRqR2M3SWZpdTZBZVljR3VxT3hlblVyY1NwelFq?= =?utf-8?B?OE8xbjdCemFvOFJwckJhSEszOTUzVGFJaS83Wlk0UzFKUCszeHJtbDNKQUxD?= =?utf-8?B?cFlEc05ldVNUMExMZGY0NEhxTHhjdDhwSFB0Z2JjN2V3MlE3Vlc3K0dCakpR?= =?utf-8?B?SmM4YlJHcXlMamYzbVNSQWRrenJEM0FFWGcrZGV1SHNwaWhZR1lITFpmZnhh?= =?utf-8?B?WjBCUys2UWFHb2lFSjlORk5uV25xRkdyQ3hSZGVPSlNYRmxtdG1qMVpSRmFK?= =?utf-8?B?a2kvWWtjSm84ZStuTFVqV2JtTFcvVzBpS1RBL2I4Z3Q4OTBoMDZ2b0dEWWgz?= =?utf-8?B?SXhkQTBsSHY1SmJmeml3aHFSTGhIdUxzTExOQ3FMRmU1Ujhwb2JGVkc2KzJ2?= =?utf-8?B?Y2xMZWY1bkR1N0w4cG5uYWpuNnNvREpJL3h3czRmM3E4NklVQWdVeWdoZHJO?= =?utf-8?B?NTh0eGxGYzk0WnE0OHIxRllzODErdDErL2ptQzNJVXZidTEvd000UGNsUW9i?= =?utf-8?B?UUthVWhTMy9BOHRjR1FRUUw1MXZNREFWeU1wNkFxdXdjRFFKM0t2T3krdHVS?= =?utf-8?B?WENKVHdydkdBSE5mTEJhLzV6T0NDcmJlV0pXR3JyblUzdGZmd2RkWUY0cW1t?= =?utf-8?B?NGRSVnVEemNERUw0dUZ0bDlKNEMwd2pyRWFRNWVFQklWSGIxQTdnd25KMjdF?= =?utf-8?B?NDd6aG9HSDNoTWlEb1J0L3VSMDdTM04rU01KSnkrSFdscVRNTndvQ3hPazRJ?= =?utf-8?B?YVdWTkVGS0ZMY3hPR2tHVVBvc2NaQXhOS3R2bUFkYWplZ3YweGhoM0FkNis1?= =?utf-8?B?ZzJMMVJnK08wVHBhb3RSaWZWbjB6L0pmMlVqdW5oTm9ZL1VlbzQvSlo2SWxI?= =?utf-8?B?cVV2cGZhYjIycGNvcVdWT2lNaHB0NnBkdXN1OWo3Z1YrZnlzZkkrR1B4S1Ny?= =?utf-8?B?WHJqWXBrMDljZ1ptcVpUUGRZNVF2QlhJQlozT2VuQjM2Wm91UnZQa3JBUlRR?= =?utf-8?B?WFI5MkE3SnJpVUxjYTU0eEVPSFZpbjNoZ01Ga25ENVJjQWFIUGY0QUtUaVNl?= =?utf-8?B?QjdVd2ZGMXdHU3FrWC8rTDZ1bFNNL1VLdE0rK3dyak1oSFptQzJYVXRsOFpK?= =?utf-8?B?THJrQmJBOUp4MDVDZHBET2xXZHhESlpIMDNnRzVmSjFXT1QzL1JtSi95SXVG?= =?utf-8?B?Q3pYd1c5Mk85TDl6OFdtMU1MNTRQNFU3RHpMMGRYRWJ4cjViTk5LaUoybmN3?= =?utf-8?B?YWpNRWlpc3dWSEd0cXlQRU5XZUh1eGo2ckRWZmtMQy9GQkVEallyTFVnVkVu?= =?utf-8?B?N3VvRVZaU1UzM3lLYVU5ckRFSTNnWExSditBZEViZmkxRnZTYnRhY0dIdGNz?= =?utf-8?B?VUIwcEpnWDdjV2NaUHppckFqNlFqRFFTU1E2NmM4U2UzMUVRSVAxcmUrRlMx?= =?utf-8?B?S0hYNnVzZlhHaDNMQ1BiZzl2YjRpR2xwVVI1K3Z3a0N5MnhIeDloRENmeUJa?= =?utf-8?B?M2U2NW0yR2RvaEZyT1dvZE5JY1VTSENuYnZ5OFR4d25sdWFkUmF1VmNrSDdD?= =?utf-8?B?YWRWQVltM0w2amIxT3ZWVTFTVWsxUXczVmowbGFCSUYvaGN6bHVIUHltQ1NC?= =?utf-8?B?MmhWbHJxazBqNHNEaHNRaEVWUlptUGRLdXE3WDZ0NFc2cEdjVG5lNk12aGMx?= =?utf-8?B?QVpRclBQeVFHdWJrNFd0eC9wWXZOeGRZNmh5djhpNWxpUnZyWm50Z2p3bFFH?= =?utf-8?B?Zldub3E5YW5KcTVRc2c3RThiR0c0b1lkQUxGY0xBcFZZSzVIZlJ1cGJBOXJm?= =?utf-8?B?ZC9aUW92QWx6RFQyeERwajd2RnB5aWo3T2dmNFF1YWRmNHhrUThPSzc4U2c2?= =?utf-8?B?WStVMmFXZmFHK2p4Y09YQ3lUSTQvTEk4ZFQzb3pnZ3F6U1lodlkvZnlSME1J?= =?utf-8?B?ajhRb0pvbllvM2IyRmJEM1NTc2dkSmtreUNGa0pwVFluMExZOER6amhXeWE0?= =?utf-8?B?RENFRW1Idmw2RTlTV3k1ODNLbXFDcG4xbFVSMnJzakhsNmMyWDBWb3l6ZVh3?= =?utf-8?B?RlpBR1ZSZUx1d3BQMzlQY0hqMVNGNytMNWZjUmVIWDlmYnNURC9JTDQ0SkxX?= =?utf-8?B?QjBjcjlNRUtqZk1zSTZRczVRMW9hSlY1S0hnMW91bnB1UmE0OFhHQWdBMHNz?= =?utf-8?B?bGs3QTg5V3pML3JBVys4ajFqbXlxM21sMkFXa2xWdkFuKzhtRTN3OUtENGV4?= =?utf-8?Q?kvIySvLJbhc7GXng=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: db554fa4-a343-4664-f1f7-08da3f24f4e8 X-MS-Exchange-CrossTenant-AuthSource: DM5PR1301MB1994.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2022 14:35:19.3344 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YzaKw1vVMxmTewMRY8dwD475cgOijfweH8tpGYm11f2OwI28tUXUI78zGPP2N2guw9gGLUSfjrhrtkY0pjpo+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR13MB1709 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org "vlan set strip off 0" can't work, due to the incorrect usage of the mask, it just represent that the status is changed or not, not represent offloaded or not, so that the driver send the error control message to the nic. Now, by first inspect the mask of things that changed, and then change the requested state if VLAN stripping according the requested offload status. So this change can fix this bug. Fixes: d4a27a3b092a ("nfp: add basic features") Cc: stable@dpdk.org Signed-off-by: Peng Zhang Signed-off-by: Yong Xu Signed-off-by: Chaoyong He Signed-off-by: Niklas Söderlund --- drivers/net/nfp/nfp_common.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index b26770dbfb..57c50ec475 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -965,22 +965,25 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev, int mask) { uint32_t new_ctrl, update; struct nfp_net_hw *hw; + struct rte_eth_conf *dev_conf; int ret; hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); - new_ctrl = 0; - - /* Enable vlan strip if it is not configured yet */ - if ((mask & RTE_ETH_VLAN_STRIP_OFFLOAD) && - !(hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN)) - new_ctrl = hw->ctrl | NFP_NET_CFG_CTRL_RXVLAN; + dev_conf = &dev->data->dev_conf; + new_ctrl = hw->ctrl; - /* Disable vlan strip just if it is configured */ - if (!(mask & RTE_ETH_VLAN_STRIP_OFFLOAD) && - (hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN)) - new_ctrl = hw->ctrl & ~NFP_NET_CFG_CTRL_RXVLAN; + /* + * Vlan stripping setting + * Enable or disable VLAN stripping + */ + if (mask & RTE_ETH_VLAN_STRIP_MASK) { + if (dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) + new_ctrl |= NFP_NET_CFG_CTRL_RXVLAN; + else + new_ctrl &= ~NFP_NET_CFG_CTRL_RXVLAN; + } - if (new_ctrl == 0) + if (new_ctrl == hw->ctrl) return 0; update = NFP_NET_CFG_UPDATE_GEN; -- 2.27.0