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 EFFB6A0C3F for ; Sat, 12 Jun 2021 01:10:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DFDAD4003F; Sat, 12 Jun 2021 01:10:21 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2049.outbound.protection.outlook.com [40.107.220.49]) by mails.dpdk.org (Postfix) with ESMTP id 431DF40691 for ; Sat, 12 Jun 2021 01:10:20 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bFbH7bd0LKMXzvCJUYgRqr47tIGyBFoimO7FceOBDVzeXJLW4lE+ykWSc9dSOoSJQgDXdVOumUmk1536Cc37qhxM/U0yHu+H6hrJzGrrQR5HoPfgoyTLvsTnsABCSvpsQkojsnuYsX31OqU/SLbAZdWteXohRzg8Dwz/azAI6c5Ad/QxNAEZxDdeKLDx81ceszAYLLHteWSIJXrM/IhPfcnlKHz+Jx3BhkaKzEmgish1wx8Y2CZpDUttc7XpdHCCweZvR0oOwlhNeH/rspaTkAz1Yt0xemLI94hOGQGKtBJgsx3armASBQu9VWFxgCm575Ab8I9yIi4ASKCW2d6OQw== 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=GWU2iP4FIZfxRFiyanerJEVElFqYqweIPtwrujGKQD4=; b=NYFcsPxr6Zo4W/mz+az8XpLvHInaWgnR16U9ZwtZ2CKdFEOh+Kob0IniwROXLLla7iKVbVgeHMHwdQV02GQ8QJPqxECAVZgPxU9ZlfdyKptWjHwFzBHgsseOFt7UBsMcgSJlOTkSb8/8+P/tFRqkIJYWlfdtplzC3CtNX2PRYjpYIUetBkftbDq1gavAChi99PKhCKIoUGOy9BswEgDBbTVh5+twNhsITSZ1tGPVtXasiL1mRNUEJiwDw5hAfDhVXTZSk0TP6qynzvwsnR4jIKRN7n4pOcfW2diutIPMwSfEFcGaTMPNDY5Fyi2RmHkTU428jGM1L0gp9HPqwTiFpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org 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=GWU2iP4FIZfxRFiyanerJEVElFqYqweIPtwrujGKQD4=; b=KIaEJ8S4HNTwJFyA+K8yNAkM0vXkbrJjas04ltxMwcjhDFs3YkIzEkwcqMguH2XVKZYu5ZXEs1tP6d2mfxqlqPuczFmiEsKe2Y7XCKcougBER5aTIeQJ9dTXNSGbO8576KwprCz7pIbgU/kV5ISkKF14O9K8NVT1xq7LpfpK7YNT1yX1HgbIKchFqAcQDcF6s3pqtDtdCMe5m2l8cNhRmHw85iMTDnzDLO9XhZeIJ5I0IsAlpgpBB5/6L/6CXRqo8W+HNWAVpA6hRDNtUW4J4fO/v12Tx9qAgsqK7mRji4EISoKQ4SnPKBtPTyT1bieL3PjYiXJnvtNUwrgXQbU/Lw== Received: from BN6PR1701CA0013.namprd17.prod.outlook.com (2603:10b6:405:15::23) by SN6PR12MB4671.namprd12.prod.outlook.com (2603:10b6:805:e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.24; Fri, 11 Jun 2021 23:10:18 +0000 Received: from BN8NAM11FT054.eop-nam11.prod.protection.outlook.com (2603:10b6:405:15:cafe::e6) by BN6PR1701CA0013.outlook.office365.com (2603:10b6:405:15::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23 via Frontend Transport; Fri, 11 Jun 2021 23:10:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; 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 BN8NAM11FT054.mail.protection.outlook.com (10.13.177.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:10:18 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:10:16 +0000 From: Xueming Li To: Michael Baum CC: Luca Boccassi , David Bouyeure , Matan Azrad , "dpdk stable" Date: Sat, 12 Jun 2021 07:02:31 +0800 Message-ID: <20210611230433.8208-57-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] 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: fc825d22-cdf6-4598-221a-08d92d2e1485 X-MS-TrafficTypeDiagnostic: SN6PR12MB4671: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JIB+N6Pq5q66E4TsSq62Pea8cc+qo0o2yoIf6CA7C9MVynMeRcMtHD+P7AeKILeuEcvzuuk6oDU5LT70I0GG581pWnpBZN83xkaJcVO9jFhfBM0suWQd931N567Te1PaCOEq5pAfwib2dFXZQKyRi9yZ/a7NgMXlp+6PTXpOHPKM+YtnzgsydLUXn566FCPZ9ukNiELq85KghsGhby8D/4WAEc9BV5/QXXzwf8uyZIOZyR6L4Td33guZ6xzj7h3NA7gkK32M+tySCzp+n0KqTf5XukUkeBck/czx7IkQnNB9CYdhKbAYJf5C7JL+KB0WvgYHQqpyHRL8UP8E3WKpqQ9Z52jlRi1DZvoQwViq5FLTzuz9psuli+/WeLUUOO4NFX+kicp3fK5iEDSkkXA5Zvtl9uuSlNbZ0OmgY3maf1KbHzMJk/hc7PDhs2W8YWDLJAx5KmIwx5I9Pik1FtFVny6e8Zw2WzSlhQLn5VF9z7Xqriqxd/rp7ETM1sqh64DdEwMHMGu0uXlSDtB8PzlhSJZ7sXXiR1TU+Jn0nK/+Bjistek7e4aac9cLMgSL5ieSKu/KbieZbsKPGsJvN1qUskmOhrznRinLVf9M6YsLmUJUI5pxXez8fXaZbEBYqm+AIZaC25fRA4iDcgEng6DPd9TADP2ycJJl8vwUwWMaf+Wzzm6Pt9EbqFWWoNHDQFHA3xR7B72Pj2Z5u9XxukZI+duy8UFs5FrBxsWC2xQ9AZmxWJVDgF/TYxZQ65y+4ow1V5GDyANU9wUZyZfW0fn1ktxa7s8Is7PkshOSnGQ+iRhvUaO52gEzg+KgsXV/ExeV 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)(396003)(376002)(346002)(39860400002)(136003)(46966006)(36840700001)(53546011)(4326008)(86362001)(83380400001)(7696005)(8936002)(82310400003)(8676002)(966005)(2906002)(26005)(7636003)(82740400003)(478600001)(37006003)(5660300002)(54906003)(16526019)(36906005)(55016002)(6666004)(6862004)(70586007)(426003)(47076005)(2616005)(1076003)(316002)(186003)(6636002)(336012)(356005)(36756003)(6286002)(36860700001)(70206006); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:10:18.3931 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fc825d22-cdf6-4598-221a-08d92d2e1485 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: BN8NAM11FT054.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB4671 Subject: [dpdk-stable] patch 'net/mlx5: fix flow age event triggering' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/14/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/cb6f74724dc2f6539709210fd1dc1725d8712718 Thanks. Xueming Li --- >From cb6f74724dc2f6539709210fd1dc1725d8712718 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Thu, 29 Apr 2021 12:55:41 +0300 Subject: [PATCH] net/mlx5: fix flow age event triggering Cc: Luca Boccassi [ upstream commit 447d4d797d21b35185d511b7c280d7fe171b29bd ] A FLOW_AGE event should be invoked when a new aged-out flow is detected by the PMD after the last user get-aged query calling. The PMD manages 2 flags for this information and check them in order to decide if an event should be invoked: MLX5_AGE_EVENT_NEW - a new aged-out flow was detected. after the last check. MLX5_AGE_TRIGGER - get-aged query was called after the last aged-out flow. The 2 flags were unset after the event invoking. When the user calls get-aged query from the event callback, the TRIGGER flag was set inside the user callback and unset directly after the callback what may stop the event invoking forever. Unset the TRIGGER flag before the event invoking in order to allow set it by the user callback. Fixes: f935ed4b645a ("net/mlx5: support flow hit action for aging") Reported-by: David Bouyeure Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5.c | 8 +++++--- drivers/net/mlx5/mlx5.h | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index b8f31497b2..f5c1c800fc 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -549,11 +549,13 @@ mlx5_age_event_prepare(struct mlx5_dev_ctx_shared *sh) age_info = &sh->port[i].age_info; if (!MLX5_AGE_GET(age_info, MLX5_AGE_EVENT_NEW)) continue; - if (MLX5_AGE_GET(age_info, MLX5_AGE_TRIGGER)) + MLX5_AGE_UNSET(age_info, MLX5_AGE_EVENT_NEW); + if (MLX5_AGE_GET(age_info, MLX5_AGE_TRIGGER)) { + MLX5_AGE_UNSET(age_info, MLX5_AGE_TRIGGER); rte_eth_dev_callback_process (&rte_eth_devices[sh->port[i].devx_ih_port_id], RTE_ETH_EVENT_FLOW_AGED, NULL); - age_info->flags = 0; + } } } @@ -562,7 +564,7 @@ mlx5_age_event_prepare(struct mlx5_dev_ctx_shared *sh) * * @param[in] sh * Pointer to mlx5_dev_ctx_shared object. - * @param[in] sh + * @param[in] config * Pointer to user dev config. */ static void diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 35f9bece05..9437f45480 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -538,6 +538,8 @@ struct mlx5_aso_age_mng { #define MLX5_AGE_TRIGGER 2 #define MLX5_AGE_SET(age_info, BIT) \ ((age_info)->flags |= (1 << (BIT))) +#define MLX5_AGE_UNSET(age_info, BIT) \ + ((age_info)->flags &= ~(1 << (BIT))) #define MLX5_AGE_GET(age_info, BIT) \ ((age_info)->flags & (1 << (BIT))) #define GET_PORT_AGE_INFO(priv) \ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:58.123925600 +0800 +++ 0057-net-mlx5-fix-flow-age-event-triggering.patch 2021-06-12 06:53:56.280000000 +0800 @@ -1 +1 @@ -From 447d4d797d21b35185d511b7c280d7fe171b29bd Mon Sep 17 00:00:00 2001 +From cb6f74724dc2f6539709210fd1dc1725d8712718 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 447d4d797d21b35185d511b7c280d7fe171b29bd ] @@ -24 +26,0 @@ -Cc: stable@dpdk.org @@ -35 +37 @@ -index 19ffa16769..10d44c7bbe 100644 +index b8f31497b2..f5c1c800fc 100644 @@ -38 +40 @@ -@@ -662,11 +662,13 @@ mlx5_age_event_prepare(struct mlx5_dev_ctx_shared *sh) +@@ -549,11 +549,13 @@ mlx5_age_event_prepare(struct mlx5_dev_ctx_shared *sh) @@ -54 +56 @@ -@@ -675,7 +677,7 @@ mlx5_age_event_prepare(struct mlx5_dev_ctx_shared *sh) +@@ -562,7 +564,7 @@ mlx5_age_event_prepare(struct mlx5_dev_ctx_shared *sh) @@ -64 +66 @@ -index efb80a4a49..79ae8fbef1 100644 +index 35f9bece05..9437f45480 100644 @@ -67 +69 @@ -@@ -563,6 +563,8 @@ struct mlx5_geneve_tlv_option_resource { +@@ -538,6 +538,8 @@ struct mlx5_aso_age_mng {