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 BB4EDA034F for ; Wed, 10 Nov 2021 07:35:01 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B43C340142; Wed, 10 Nov 2021 07:35:01 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2043.outbound.protection.outlook.com [40.107.220.43]) by mails.dpdk.org (Postfix) with ESMTP id AB01440142 for ; Wed, 10 Nov 2021 07:35:00 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H99m12WQ5sCOA2MxYbMKTLlp9BFS+MQ9pmPNjvcFJnPImZPuRBLRBApN18gk6KWCyBydU651wQlraTuEYHPFBkiL1eU7l2BgHlyIBO0MGjwrGsWLfA6NgsPTHoRK/Ort0WXXoUDsh0MAPvei0VYArXMS5PHQ3G6M01D677tHmv9AbHsbPSy0BxJrJOUO5c7QnrpmtKQSDokS2Ge3Ym/aP0hvKifQl3kNx1qL2wagzfg34UnqQhmqF63ws66KKVq3F+ZozhZjOalLDawfWQDjRbzuih2g6M+85nVhS5iSWbiYlKEdnS2Eei6lLEgsPbhZQ7HPDvR54N1tX3I81XHJNw== 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=wFgJqJWRMa1EZHB+2cu9Kfzy3i0S/XVvNEEWfAjuoo0=; b=QLZ1oTE9QF/D4jWo7Sv1W4m3qqpFOReLQ/AJHrPDX+vz/BGW72JVX7fB96ajZIrXCx0lHbKQyAkAh+8d2CEYqa7Td9RnXuON0TsIuL9/Yo1ILfiRKRA+tNxpKIOXijNTNsQWxtFA4RE4v1Nf5Oz/iwpkiTw90jadwKlncyzQfkhbDtLeRTiDx1dv+ZvYdB8ZIIAls39FLRzPO6NBaFrtAp0L9fM9aQcSgmsU3DrNkUPehhCeDr4AWmaXZbQXzMZe0MzuW4go/u2AF7iDwO7r4OOWjO98PWVZXjW3BA8lPC3cIvxtKPz1xxNu53LJSEZqYusX0zYI2808SPfZHv4LMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=wFgJqJWRMa1EZHB+2cu9Kfzy3i0S/XVvNEEWfAjuoo0=; b=PRBFSxAVsvACKnJuhlPb1NJQikoZ2tvGc54iSp2mZgDTo7cfX9wtNf235A1+2Hd78nXBER1QqJEIVirg5FAXVSEpOGPKsrXZbUJvJGoLo5jSk5mllwS8KVVWZ/sLGGBYw7S0XvrvrV1NBgwVw4ittJS/Xh9YAY79jO2VJGa9vijmDGNF+QV2w6qszjo+34mbvrU4T6qCQv7jFj7gzzp5F0lB2g11NE1EnVxBuJY5sc5Y80IAGqArc7hkIJVdwI2qmzMQybd3FV4aaUPLEXZ9/xI2kGmAtwHYOLjSfXC3OmOeR5CT6sA+yR3vuzR/zqQaF5n4dnFt3lJW5+PDDsUo9A== Received: from DM6PR03CA0001.namprd03.prod.outlook.com (2603:10b6:5:40::14) by BY5PR12MB3875.namprd12.prod.outlook.com (2603:10b6:a03:1ae::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 10 Nov 2021 06:34:58 +0000 Received: from DM6NAM11FT045.eop-nam11.prod.protection.outlook.com (2603:10b6:5:40:cafe::16) by DM6PR03CA0001.outlook.office365.com (2603:10b6:5:40::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 10 Nov 2021 06:34:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; 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 DM6NAM11FT045.mail.protection.outlook.com (10.13.173.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:34:58 +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.18; Wed, 10 Nov 2021 06:34:53 +0000 From: Xueming Li To: Jie Wang CC: Luca Boccassi , Qi Zhang , dpdk stable Date: Wed, 10 Nov 2021 14:28:28 +0800 Message-ID: <20211110063216.2744012-25-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-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: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d1ca2eb4-da82-41a0-6ca7-08d9a4143735 X-MS-TrafficTypeDiagnostic: BY5PR12MB3875: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d9M6Zeh/9FMquQja2c+24CaUWqvEHTKDJFM4qFZlwtedMFd1NwUgwkWsaQUUOPCr+hlAkEFZ/Fg0Uz1zBkOqMz5mkDIg3xS5Tounx5F+5V76fGtzuMtOslw+LJDcTy5u2AGwSe9FuMIxnVb1h5hSkUng4m5uW2kn/VVKQS5DXIj97OylwHV5qqWSLAaSWxCAMbagYQ9dgmeCutR3YDtOjEZB1a9mgWM69iyprHvyTX2zoI/Efd1xDemYPxT+q37mmdywebPmwWLAEtS+ANFATZ1C8lk0Fprgq9jf15iKtwKTHggSwHVbvx1adX5JAi3iKOsXcUlKJS3jKb4xhEvYEbuUlcvR2OBUQlMZr6SDYOWGftOAWG9E54G8piCgVbonxD6zTgoTj72dr8ComequQSDpT0VlaU5T99j/lSpE1Yo7g78n6caOEKXrgxlp35eEnMluqQy0BHLiM8H2ib8jNxkP7Vi5nH6AoIWN32vHEkbNV0xiT3AC6zyM13Aed2/wLUZ9N4EYznWbaUTBDRP2s2zAxYmQOknjbTHYfVaA8ZJf9zQ41FezanBoiwFNbsZHQNYzxRbElyw8W6NmA/47sewy50yskk8eZqp77vo66t/du4FkWKouQEnRGGfq+dL07Ek2VFWx6dR83Lvnv9aGIJEA05w388iOnH9rrKUJldHbIRHUz14RJWHDjkuH19LvHNhnlwyf+7ZSPWD2iUFjSr9YSUy2gumu0MqYnVUcu2OSBM+EfEkuw87mhmbeYMoS8ryS+B0GTxhokwgpCZuqCeD2isD9MlknYNS+PO5zOX5in3hjM+FsnT1FAPrjp+YRNCwR9pHMx48+ZlM24zi58Q== 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)(46966006)(36840700001)(82310400003)(70206006)(4001150100001)(6286002)(7636003)(8676002)(316002)(54906003)(5660300002)(70586007)(4326008)(2906002)(1076003)(8936002)(2616005)(55016002)(336012)(36860700001)(6666004)(7696005)(53546011)(356005)(36756003)(47076005)(16526019)(86362001)(26005)(186003)(966005)(508600001)(83380400001)(426003)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:34:58.1085 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d1ca2eb4-da82-41a0-6ca7-08d9a4143735 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: DM6NAM11FT045.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3875 Subject: [dpdk-stable] patch 'net/ice: fix queue config in DCF' has been queued to stable release 20.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/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/073599bf922da392da2107290727108ca3d1534c Thanks. Xueming Li --- >From 073599bf922da392da2107290727108ca3d1534c Mon Sep 17 00:00:00 2001 From: Jie Wang Date: Tue, 24 Aug 2021 15:13:17 +0000 Subject: [PATCH] net/ice: fix queue config in DCF Cc: Xueming Li [ upstream commit 415363e2fc58ad89caf65d3d170b004751376f1a ] When DCF configures rx_queues, it may cause the pointer of rx_queues to go out of bounds. This patch expands the scope of the judgment condition to fix this issue. Fixes: 4b0d391f0eab ("net/ice: add queue config in DCF") Signed-off-by: Jie Wang Acked-by: Qi Zhang --- drivers/net/ice/ice_dcf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_dcf.c b/drivers/net/ice/ice_dcf.c index 3925a51f12..6a24f4f36c 100644 --- a/drivers/net/ice/ice_dcf.c +++ b/drivers/net/ice/ice_dcf.c @@ -863,11 +863,11 @@ ice_dcf_configure_queues(struct ice_dcf_hw *hw) } vc_qp->rxq.vsi_id = hw->vsi_res->vsi_id; vc_qp->rxq.queue_id = i; - vc_qp->rxq.max_pkt_size = rxq[i]->max_pkt_len; if (i >= hw->eth_dev->data->nb_rx_queues) continue; + vc_qp->rxq.max_pkt_size = rxq[i]->max_pkt_len; vc_qp->rxq.ring_len = rxq[i]->nb_rx_desc; vc_qp->rxq.dma_ring_addr = rxq[i]->rx_ring_dma; vc_qp->rxq.databuffer_size = rxq[i]->rx_buf_len; -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:03.187932589 +0800 +++ 0024-net-ice-fix-queue-config-in-DCF.patch 2021-11-10 14:17:01.764080297 +0800 @@ -1 +1 @@ -From 415363e2fc58ad89caf65d3d170b004751376f1a Mon Sep 17 00:00:00 2001 +From 073599bf922da392da2107290727108ca3d1534c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 415363e2fc58ad89caf65d3d170b004751376f1a ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 5b23cc90e0..ee3c85b90d 100644 +index 3925a51f12..6a24f4f36c 100644 @@ -25 +27 @@ -@@ -882,11 +882,11 @@ ice_dcf_configure_queues(struct ice_dcf_hw *hw) +@@ -863,11 +863,11 @@ ice_dcf_configure_queues(struct ice_dcf_hw *hw)