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 9C07AA0543 for ; Tue, 21 Jun 2022 10:06:01 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 97E49427EE; Tue, 21 Jun 2022 10:06:01 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2065.outbound.protection.outlook.com [40.107.220.65]) by mails.dpdk.org (Postfix) with ESMTP id 81ADB4282A for ; Tue, 21 Jun 2022 10:06:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fDK+XsUcBYz4Gl46aGvMw/Dox3zuq8IMmq3CPMhUslOCosfLD6QT1/M0QDYEMKbGYsKKRAQsl6ixVNPnPizpoQGnxTgGEJiYiWxJPnWIwzH4LI27Z4TWCST6o/wPTStrZ39tKb5GnU0Rqi8BfgGxfhlgfgNwb1ugJ8ZHbzFlzsUQ2PeiVA1RCahpk4qLltppcreaaSFOzVzex+p5waKtPjo8I2dClsuluPLZjVyLA/aTmK6dt3sNbn/POos6p5Cl+FzLUNC/b/AFEHGPX2D3KSqM2xZG8TUpXuD2TT6HzGksj5ankR+5yxa4rqLVI8wj9NjkOElhQQQ1l3CGxodtnw== 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=304PFOfQzRf51YrvUJg5FdHOsFDX/GJav/xxvTaHBLg=; b=TxrmJ+3joTICl9ntq8nXVrxGpbI0iz8fvoPVpQxzujaXGOGmki1XNd9p1UZMcNQgPqV/Wl/imxb9qCspe85l1Kc2vKaqW4CvF18jz1OyloqsNA+CRH0qShcCLDgm0TBMTvwrJuNiD0dSOkDKuq0roQ+9lTMrfkdUhu9EBZN8TuSIr3mg6Oqo/dg1XAPWOIh2MiTz0oH/HX8PL0CV/UrOyTQJVo8WLyfqQ+5zBXFxedajxEcaozvfVBZn348W5wcgRkQBawVy3l2LYs41RcK/kMTD9RCJYnCf78RW3qo2FUlTP9P3GIYrbXhg2d39WYjSHlg3gncB2QA8thp6YAdKdQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=304PFOfQzRf51YrvUJg5FdHOsFDX/GJav/xxvTaHBLg=; b=uc8e6Xn2ZVTAfMvxsWruHakG6xja/nySsKpznXUqwIwnTcUkgezAXz1HaH3AJQwOj/aVp9D7xWwPfvfqiTL3H4UE3QfyO/iJss0Fpxl568b82Cdx+jfhcCbkYh6ATJkqyr13dnAPbl/J2bNZVBNKfnz1kllLJMyNoX17CovSLvX9M2BOUnuJxls5FsvopYDMatApOwyWZQYEoakvSaZ/P7aEwbXyDOUTqQynRt9kjV8hUjwtEOWz9TUK41VEIlldJzZ91JkpmJfN/jFyY2D8uO8RfJdIF8EmB/NDEJ52E5iK0aKAXKFqw0PbI7J2jWGLs535/hB/f3WaWvDuTjhEVg== Received: from MWHPR22CA0035.namprd22.prod.outlook.com (2603:10b6:300:69::21) by DM6PR12MB3611.namprd12.prod.outlook.com (2603:10b6:5:3c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.16; Tue, 21 Jun 2022 08:05:58 +0000 Received: from CO1NAM11FT005.eop-nam11.prod.protection.outlook.com (2603:10b6:300:69:cafe::4b) by MWHPR22CA0035.outlook.office365.com (2603:10b6:300:69::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.22 via Frontend Transport; Tue, 21 Jun 2022 08:05:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.235) by CO1NAM11FT005.mail.protection.outlook.com (10.13.174.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:05:58 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:05:57 +0000 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Tue, 21 Jun 2022 01:05:55 -0700 From: Xueming Li To: Gagandeep Singh CC: Hemant Agrawal , dpdk stable Subject: patch 'net/dpaa: fix event queue detach' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:01:39 +0300 Message-ID: <20220621080301.2315720-34-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3e189afd-303f-4916-283e-08da535cdfc0 X-MS-TrafficTypeDiagnostic: DM6PR12MB3611: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: 97BLLZJSMWercfFzpFjmDRQF4fq/AK+o7ZncGP7h0cucabgYIYmp1FGQ2+Y7Dg8KzTw8poZ38/3GTJInE2RTzhl0ZRH6mDAQqNMbEZaMHc6bHCuepUKzT8lqt0T0u1e7C0+I3FopDPm7Jok9GLTNRqPdhzeoR1g8NgnaEoQSx8o//whwFDqJBilBgHbCKozOovA3b+c3Q4ZydpTdYCYhEChCoZ7nP7TmRW0eZ0xAr/Ktgatu1oH1tEvKG9OVc9SC+UNT4W1F4oZYwuXRLtDyJ1cDKALbfT+wt/qrxP17vf4u849sq63XIUbrGpJhxVCa02uno2XAxi9cgTynMroCiHaR2lvnDSsOqGCTGIWTA/A4E3CKrktswbPmItjZidBve6CV0ZKUNN1WqoEKmDaHiMfHHPBD8bzHdvPFGfBg2oWIVutvFtrk33Da56jz/xC2nKtDVZ48Y28oEKZg7WPx7B4OhPBCJFnRRPiNz9rWfcs8xNEMASw73oYGhPXb86jt3SRaraiuKe5UneB55/FFMoH4LhtEiNiIny1Zb+MLyw+VlK7PnbOQTs5C6+M0n6/oqQIosAp4BU5HX20mRcChNUOpS8VdzsEMXcQ4pAqULuY9mDRNtV8sTv1+oliCEfCEyihnv4lMLd1I+eQxCcY9VwE1GXbITkhHGgyLBQTdexNsbwLgHePmnQcoRkkcHiqNb3IwU43cGqNulaXH1ltgE98Nsxw8NaxlSUeL4PPNDpm8l567A/SrL3hrS5uT3ug+MQFYsgIP0wa44A/qaswCu/MgzN365O/XKHgQkJGv8bIgwZdqJ0Y2uvApDEber5W9lRfUemW3/DI28mVIlRmIipCmxq4zR3KMVt4cbZgsJJc= X-Forefront-Antispam-Report: CIP:12.22.5.235; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(376002)(346002)(136003)(396003)(39860400002)(36840700001)(46966006)(40470700004)(8936002)(26005)(86362001)(5660300002)(2906002)(81166007)(6916009)(53546011)(6666004)(54906003)(6286002)(966005)(7696005)(316002)(478600001)(2616005)(41300700001)(70586007)(83380400001)(82310400005)(36860700001)(4326008)(70206006)(8676002)(82740400003)(356005)(36756003)(40480700001)(55016003)(426003)(47076005)(186003)(16526019)(40460700003)(1076003)(336012)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:05:58.1105 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3e189afd-303f-4916-283e-08da535cdfc0 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.235]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT005.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3611 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 Hi, FYI, your patch has been queued to stable release 20.11.6 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/23/22. 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/ad18b9f42d753edbf03371016e5c80fcc0f18da0 Thanks. Xueming Li --- >From ad18b9f42d753edbf03371016e5c80fcc0f18da0 Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Fri, 22 Apr 2022 10:27:29 +0530 Subject: [PATCH] net/dpaa: fix event queue detach Cc: Xueming Li [ upstream commit ee6647e0169bae7bb3d3a53c309cd280e4740e11 ] Calling the correct qman queue free APIs to de-attach the queue. Fixes: 5e7455931442 ("net/dpaa: support Rx queue configurations with eventdev") Signed-off-by: Gagandeep Singh Acked-by: Hemant Agrawal --- drivers/net/dpaa/dpaa_ethdev.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 71560d295d..a792c55b85 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -1207,23 +1207,17 @@ int dpaa_eth_eventq_detach(const struct rte_eth_dev *dev, int eth_rx_queue_id) { - struct qm_mcc_initfq opts; + struct qm_mcc_initfq opts = {0}; int ret; u32 flags = 0; struct dpaa_if *dpaa_intf = dev->data->dev_private; struct qman_fq *rxq = &dpaa_intf->rx_queues[eth_rx_queue_id]; - dpaa_poll_queue_default_config(&opts); - - if (dpaa_intf->cgr_rx) { - opts.we_mask |= QM_INITFQ_WE_CGID; - opts.fqd.cgid = dpaa_intf->cgr_rx[eth_rx_queue_id].cgrid; - opts.fqd.fq_ctrl |= QM_FQCTRL_CGE; - } - + qman_retire_fq(rxq, NULL); + qman_oos_fq(rxq); ret = qman_init_fq(rxq, flags, &opts); if (ret) { - DPAA_PMD_ERR("init rx fqid %d failed with ret: %d", + DPAA_PMD_ERR("detach rx fqid %d failed with ret: %d", rxq->fqid, ret); } -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:50.824815017 +0800 +++ 0033-net-dpaa-fix-event-queue-detach.patch 2022-06-21 15:37:49.011117824 +0800 @@ -1 +1 @@ -From ee6647e0169bae7bb3d3a53c309cd280e4740e11 Mon Sep 17 00:00:00 2001 +From ad18b9f42d753edbf03371016e5c80fcc0f18da0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ee6647e0169bae7bb3d3a53c309cd280e4740e11 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index bddb3bb15c..e5a072cf49 100644 +index 71560d295d..a792c55b85 100644 @@ -21 +23 @@ -@@ -1211,23 +1211,17 @@ int +@@ -1207,23 +1207,17 @@ int