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 877C4A0C3F for ; Sat, 12 Jun 2021 01:08:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 81EB54003F; Sat, 12 Jun 2021 01:08:55 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08on2083.outbound.protection.outlook.com [40.107.102.83]) by mails.dpdk.org (Postfix) with ESMTP id 95A3740691 for ; Sat, 12 Jun 2021 01:08:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bbHYAabO61f9tv/fX4Q27BlPYkHRkXfNRs6zoVaQOj0qrJw4TpVFLu0VyzLpd4F9fe0wbd9FIIg43FkRW6tAFnZY6YlTloECw92SYgwJzqyDuw4gBNncnLd7ZbHZfUqe4PdB64kGXGugbl2EeQ9YDiqstDdWvw8Y8Myig3EDJMG+ydRjjg20718m50ADrmtWpt7b/4bmmhEvsZle/p2A+F9k1I8ARicbjfZ1EeSeHfgMC8zkkSjVAIRfe3kGhDesHU6nhN8KNCUHqUgtUo7e/y7m8/yK5WS6Knsatp1VkK3XolBr77qcmWJ1Atn7nm5ev176qAFdox0t6LGkMIzszA== 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=+w3eGCm8fFxOsm+cNRtMQW+o/NbBSNOjyK+VZGObKco=; b=B/bh1MiFrLHQSjlPn5O4KXhhlTd0ASyBf57sf+Ds+AxCgKspKEoupaKgHHZ1Lw7WfxLx40ifWlkZfB8heA78IDW8q/Q4hJlZg42fs+QSpjrqvYXHnXqiVHuJ3lcDDy16p4tTkjFDHOCt6Qwr1BdAgp5XBGtpDwau12clvlY86qx9jRLUiSkxKewwdcoVjA3I7BlT5rMcTE/O/s4FEMl37fayTeELBtBx6AITbbAx6XrdSE+cpVKtOkjf993jF4vZFN35IBTyWOAl5LknfnZbTiijDWdpDfHA/CTj1AAWuyNVpFeBvO5aO3xasfQPz3mqaOLXuYEdUMDadtyl57ZJZA== 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=+w3eGCm8fFxOsm+cNRtMQW+o/NbBSNOjyK+VZGObKco=; b=foTUZsbjPDqcpXLxfvQiUrW7EsrstM5iH+Vp4hhTDaX95yemCU4rVPWPfaqMZBS78O1TRFybUP1mvkGYrUZWLP6V2Guyz4LWZNgKUtkHd6NaZnUgg/O0yZywphByzMybCMbKI3jf15WJHVRNmPMLmLjyMlCwGvqMATrqq6U5X7EOR7LBujo2Wp74u/PGh4dfHUeNDJxxDYufNQFzIFPUADU3ZOcbUm2u2KU+yIj7R6VDt5qSPyJeOoMC6p9GfCDHnFwRiq53y0HpOSmfWIWvKEFShVYb72pQcMkeP7SEh9d9UKiKE2uA2dZ7ud83vkfbBsUbXMJkxeXu/OhiQNSqyg== Received: from MW4PR03CA0350.namprd03.prod.outlook.com (2603:10b6:303:dc::25) by DM6PR12MB3466.namprd12.prod.outlook.com (2603:10b6:5:3b::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Fri, 11 Jun 2021 23:08:53 +0000 Received: from CO1NAM11FT048.eop-nam11.prod.protection.outlook.com (2603:10b6:303:dc:cafe::c5) by MW4PR03CA0350.outlook.office365.com (2603:10b6:303:dc::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:08:53 +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 CO1NAM11FT048.mail.protection.outlook.com (10.13.175.148) 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:08:53 +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:08:50 +0000 From: Xueming Li To: Viacheslav Ovsiienko CC: Luca Boccassi , dpdk stable Date: Sat, 12 Jun 2021 07:02:16 +0800 Message-ID: <20210611230433.8208-42-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: 2049dbc6-62f2-42f6-ae22-08d92d2de196 X-MS-TrafficTypeDiagnostic: DM6PR12MB3466: 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: 5ihJi3oh82VYjbzW3dQ3yBQkdiaN25r6oCqPiK2GrTwOsFNqf3NScdNXQ51Hpl/RXcN8eVu19URTbgcRYXa6+t5u30iRGbgQPyuVAWx7Kum4fUmbDr0okytw7uVHlCXYx2+PNbJJcyyH7FP+Pz13noGccoDY6WXfcfZmLDsyh8K2YEVhIHtAJjBREoKT9ZD2sNXLClkEFA2ToCwRdif+7MjreClrrnDPRRFp8YpmsAp86Oz8uokuZtWeUHKisxyX5+XVD195YefhVnS67h+ypWwuvnsAOkYJ+u9pncXYSMfpsWGdFHpOy+crd7lwreNsNflUpsoubGWLbPqA0i4VysxLcTbX1VeuGFbTHNfWHPg0FYygm2CZB/eDHf1esBHxQavs5fNMtGp6WjAhWJcZjJIslDyskqGvZNJtbW/KfwfznCxUFfxSYDdQF82dwaQexdiElbZ+cvxX04RqMD1QmIXCa/z79l1lVO28UQ7TnEjsd2M60x4vh2v+s3dJa5jpk/5IK4Eq6hfgvhRHBvikugDy99XilMXM+wuJhjXM9hKdmtAQjc0qw5LTzhMHe/JXWa7yGNFd9pdh7lZg5jt2XACgUOPcasZgbI+alXR3IaqCcn1P5rcVhxUbOaPMJvsT+0n5QJuSF3XKq5Z5cWJZMkM9gLXqPx4oGaslugn7oqRVVFKRfXju7ZS1jTjpKbPX+mvu19ZWuv9HrJCgCRjS/wKdkEvKWpDtG7lML5nYyS6cGAhexyHvY8Xq19kBxyHeftTvbAmeZFhK1v/fnfdmK1qr6H7F1k/s7yQfHDI/y3pvgUK1TkKh3CR4tf6O2vHI 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)(346002)(376002)(136003)(396003)(39860400002)(46966006)(36840700001)(426003)(53546011)(36756003)(82310400003)(2616005)(336012)(5660300002)(1076003)(6286002)(2906002)(36906005)(6636002)(7696005)(26005)(37006003)(54906003)(966005)(16526019)(186003)(316002)(83380400001)(8936002)(7636003)(356005)(4326008)(70586007)(55016002)(478600001)(70206006)(8676002)(36860700001)(47076005)(82740400003)(6862004)(86362001)(6666004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:08:53.0033 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2049dbc6-62f2-42f6-ae22-08d92d2de196 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: CO1NAM11FT048.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3466 Subject: [dpdk-stable] patch 'net/mlx5: remove drop queue function prototypes' 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/04475743c84f76ba8d9cebeb31cf2e83619f91c3 Thanks. Xueming Li --- >From 04475743c84f76ba8d9cebeb31cf2e83619f91c3 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Mon, 5 Apr 2021 10:07:16 +0000 Subject: [PATCH] net/mlx5: remove drop queue function prototypes Cc: Luca Boccassi [ upstream commit a4af5eed4091f74c10381f1e5d5ec1a058f19a9a ] There are some leftovers of removed code - there are no drop queue handling routines anymore. Fixes: 78be885295b8 ("net/mlx5: handle drop queues as regular queues") Signed-off-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index cd701880ee..35f9bece05 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1217,8 +1217,6 @@ int mlx5_ctrl_flow(struct rte_eth_dev *dev, struct rte_flow_item_eth *eth_mask); int mlx5_flow_lacp_miss(struct rte_eth_dev *dev); struct rte_flow *mlx5_flow_create_esw_table_zero_flow(struct rte_eth_dev *dev); -int mlx5_flow_create_drop_queue(struct rte_eth_dev *dev); -void mlx5_flow_delete_drop_queue(struct rte_eth_dev *dev); void mlx5_flow_async_pool_query_handle(struct mlx5_dev_ctx_shared *sh, uint64_t async_id, int status); void mlx5_set_query_alarm(struct mlx5_dev_ctx_shared *sh); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:57.747492100 +0800 +++ 0042-net-mlx5-remove-drop-queue-function-prototypes.patch 2021-06-12 06:53:56.200000000 +0800 @@ -1 +1 @@ -From a4af5eed4091f74c10381f1e5d5ec1a058f19a9a Mon Sep 17 00:00:00 2001 +From 04475743c84f76ba8d9cebeb31cf2e83619f91c3 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit a4af5eed4091f74c10381f1e5d5ec1a058f19a9a ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index 378b68e4be..d4aec717f0 100644 +index cd701880ee..35f9bece05 100644 @@ -21 +23 @@ -@@ -1544,8 +1544,6 @@ int mlx5_ctrl_flow(struct rte_eth_dev *dev, +@@ -1217,8 +1217,6 @@ int mlx5_ctrl_flow(struct rte_eth_dev *dev,