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 D0E47A034F for ; Wed, 10 Nov 2021 07:44:12 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CB7214014D; Wed, 10 Nov 2021 07:44:12 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2087.outbound.protection.outlook.com [40.107.220.87]) by mails.dpdk.org (Postfix) with ESMTP id 615F44014D for ; Wed, 10 Nov 2021 07:44:11 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a1yYngQotaviODx/lmiyEwiZ+2A5oAgBulolFp+CWKsDqjJv9M6Xk3Va62X0IdXyfJ4QN9B5eLIJC3oMnk5KUVRWjocWMpc2S0/SCC5EX8nPxyi9Lq91PVRiNDBKF/7X3prVc7xUefGc4DJnTZelsGXNEK9wjtEGYelbMyoKfi+iBC2/Nw8Qz1zbh62wHbLDvifh/xarxz2z7vYNTEU+/xQx/l7tBNTQrv9UJO38YIk1Mk6gtD+o4U5yrXy/dp1rIujw4X30AQsx0524WCS4ClswrtaispiehaoJ21VCFi0zBIFNU1l0AZSK01ccods0ylbO6dZD0WFVprpUKaIMWQ== 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=ZVk/nJQB21F+nKW7DyNLZRMN4Ijg2XAavbVq4LSmTTQ=; b=HULp/h5ldnDTvMuotJIEGtSmk2PQUAJuWsYkO7SOhl8LMcuX7XHvd1UGkCfSoAPBlpZ3q1ApFDCkw1tVZNJm0bRgv3mogGbLnJhlhkNmRLQuYSwSC0MOAUovoJiyLplA7yU6TYwcoJam8K2a0ddseXSN+V91+aA/5g1Jh6+gzVoJyqY3+xRkcS1mHoVXHh1qkkpU5WyxnWbrEmx9kp5vF5mzgjuWnZsYMTKOAaeZ6jBwF8ketBcoAZi8p5SU9GodncdGyxYbxVRonDLqSkPMjSv2mnRQGtzHxmqAKlZ8rnqvZvZNo8kI0ZA31v9cn+nig9QN5j3vvGH3wJzGyusChw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=nxp.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=ZVk/nJQB21F+nKW7DyNLZRMN4Ijg2XAavbVq4LSmTTQ=; b=XiNbj0GJQdtkHn8RxNMgLCGlA/UANcPmsi3qidV1jrEJ6c+PMl0KSvFbjZJ7/R4dCZkpS+o3v7bxYLSArNPDv/56HaSX4WEg9PZDZnOTYUmlaeZs9MKeifJqdaTZoI/7V6g3r1TyxMRFYTJdRym8685Uy1hzNKwZJg/7G3TJTf4NdyhCOPxwPjd0NoVGZuRiII+eu7Ie932ChuIGUd1L+uIn506kokHeGDEiJZTEhhaWjXnuv9in7UMA8RNuYeqMHTyGjQm54aJKR1cduyPcZw5mKpMoUCtKQp7vehLnW94LlxuoYFPrrWMQ909oX0aFzkeY3N+gtsoZ0AB/+jWU/Q== Received: from DM6PR13CA0040.namprd13.prod.outlook.com (2603:10b6:5:134::17) by DM5PR12MB1818.namprd12.prod.outlook.com (2603:10b6:3:114::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Wed, 10 Nov 2021 06:44:09 +0000 Received: from DM6NAM11FT021.eop-nam11.prod.protection.outlook.com (2603:10b6:5:134:cafe::5b) by DM6PR13CA0040.outlook.office365.com (2603:10b6:5:134::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.7 via Frontend Transport; Wed, 10 Nov 2021 06:44:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.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 DM6NAM11FT021.mail.protection.outlook.com (10.13.173.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:44:09 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:44:05 +0000 From: Xueming Li To: Gagandeep Singh CC: Luca Boccassi , Nipun Gupta , Hemant Agrawal , dpdk stable Date: Wed, 10 Nov 2021 14:29:49 +0800 Message-ID: <20211110063216.2744012-106-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.6] 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: 28e8865b-087b-4c57-8870-08d9a4157f98 X-MS-TrafficTypeDiagnostic: DM5PR12MB1818: 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: FYhvLmuHAhERNwudYLHLDhuhVF2/Y9MFEfY3w32+4bGjNODY9+iQ/2ditRMWs7BSfCDJwiNeiK2aVaGpVbjJMZrwsUfpnTvsmtIDVitrcnAtbBJpTeO5drgOvWcrVlr8PcJJqiUxHHlcUN6jjulPSiXkenlZ0/rILci7hLd9FqPBs+fEcFzN5EorJiWJtoihN3M6VCtdDi2dMdBLScDnzSv/srzZXDHmPfjPmKUD/bLmS0fkgI9G2alo+K6MIIopOdAGmTfSF5AAD1bDl3DtFl5cDD34yE9bSOseEyTfmY2FOg9aA8DD5Z9UUaALTTuthj6VlT7rgj3JaVMLRXSLw2WORduWwYgsk7G/6teuRXvRE1/uBhg9eB6zLEWBd+0eBMUub/JxIWcc0eT/6b3rbbndsEM/s1ttEafQ4iXo/jO+xVxR5NBLYwSnZ6qKxQ1LfP7Sezvx9sxvJycvo+e2ToNRPDhHGnZYAcnk93pR/PKR7RcQJS2iUTtmZK5JRHBvcFzpQypS2PJuyCqfhC1/n4cNgUvSyRARqelDXZzZdFfzI81VVc/CL7qep9G73lSvKi00FgKA2x+OEojiit/9rCVgySC/c7BOOicM3YCQrJy/Vi6t9kB5jMmPDVid4BHe5wVUrL3SGlb3rMEnftdATBgOWV+Zrp0/QwJg1iIG10SdOV6cPP3NO+3E5txt0ynBo58jK8HSowwj2xJ76PLlpbqzT/G7rxCP2n/kOxve6LooVRSqC6bGIV8SbDI4cJ/t4M3kqCZ1kNgn2AbAbk4BbPJ5E/nN+SkuKmKG5iIQVF425JqiDJhDQ0yWj//GU9yLoEly8ZaWp8fh46pML8XOww== 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)(6916009)(16526019)(47076005)(82310400003)(356005)(53546011)(8676002)(83380400001)(508600001)(2616005)(8936002)(4001150100001)(86362001)(55016002)(26005)(5660300002)(426003)(2906002)(1076003)(36756003)(316002)(70206006)(36860700001)(7696005)(7636003)(4326008)(70586007)(6666004)(966005)(6286002)(336012)(36906005)(54906003)(186003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:44:09.0377 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 28e8865b-087b-4c57-8870-08d9a4157f98 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: DM6NAM11FT021.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1818 Subject: [dpdk-stable] patch 'common/dpaax: fix physical address conversion' 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/b4108eb62c345e0caf91e5d31180aef0b8131f06 Thanks. Xueming Li --- >From b4108eb62c345e0caf91e5d31180aef0b8131f06 Mon Sep 17 00:00:00 2001 From: Gagandeep Singh Date: Wed, 6 Oct 2021 22:31:31 +0530 Subject: [PATCH] common/dpaax: fix physical address conversion Cc: Xueming Li [ upstream commit c5e6bc12a319d4500d931ca84d4227e4d7495956 ] If some of the VA entries of table are somehow not populated and are NULL, it can add offset to NULL and return the invalid VA in PA to VA conversion. In this patch, adding a check if the VA entry has valid address only then add offset and return VA. Fixes: 2f3d633aa593 ("common/dpaax: add library for PA/VA translation table") Signed-off-by: Gagandeep Singh Signed-off-by: Nipun Gupta Acked-by: Hemant Agrawal --- drivers/common/dpaax/dpaax_iova_table.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/common/dpaax/dpaax_iova_table.h b/drivers/common/dpaax/dpaax_iova_table.h index 230fba8ba0..b1f2300c52 100644 --- a/drivers/common/dpaax/dpaax_iova_table.h +++ b/drivers/common/dpaax/dpaax_iova_table.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2018 NXP + * Copyright 2018-2021 NXP */ #ifndef _DPAAX_IOVA_TABLE_H_ @@ -101,6 +101,12 @@ dpaax_iova_table_get_va(phys_addr_t paddr) { /* paddr > entry->start && paddr <= entry->(start+len) */ index = (paddr_align - entry[i].start)/DPAAX_MEM_SPLIT; + /* paddr is within range, but no vaddr entry ever written + * at index + */ + if ((void *)(uintptr_t)entry[i].pages[index] == NULL) + return NULL; + vaddr = (void *)((uintptr_t)entry[i].pages[index] + offset); break; } while (1); -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:06.656966517 +0800 +++ 0105-common-dpaax-fix-physical-address-conversion.patch 2021-11-10 14:17:01.864079479 +0800 @@ -1 +1 @@ -From c5e6bc12a319d4500d931ca84d4227e4d7495956 Mon Sep 17 00:00:00 2001 +From b4108eb62c345e0caf91e5d31180aef0b8131f06 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c5e6bc12a319d4500d931ca84d4227e4d7495956 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org