From patchwork Wed Sep 25 17:22:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 1989498 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XDNpx4qsNz1xt8 for ; Thu, 26 Sep 2024 03:23:05 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1stVir-0007Bg-7B; Wed, 25 Sep 2024 17:22:41 +0000 Received: from mail-mw2nam10on2059.outbound.protection.outlook.com ([40.107.94.59] helo=NAM10-MW2-obe.outbound.protection.outlook.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1stVip-0007AD-Cf for kernel-team@lists.ubuntu.com; Wed, 25 Sep 2024 17:22:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ltXK8c8e6T8KaYvG+KjsnkL9B1wVfNFq/oExAXRnD9g8gORA8f79qz0AP+J5Na7IGH/QGO6GpDFa66n1kZqobafxYIVmSqMXQgINJ01uPHHKy2s8BuHk1mEFSeKcKuGZupKN2+tOWSRMy0fK8Q5s/eFwfZCO9/q1fIlMR50hapbx8BizMHsRN42aUuVU6fUWGwSqLnKzoHXGT++9ueC7mPMbbUMdbagisMCSULbYpc5FQnGeMbb4KNHL4H53RgTuR1I36nvnYv+1KPv/43yYh0qQdXHv0XgpF47pfaNU9fV4LnrbvuO05DxuPP9Z5Vf/HGL/hKdDHhkiOZY7N050zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=yFC3xmVz1MIRSlx5zQS5CondPztMnj/Qz8Vzpzk8Fqo=; b=Ztpg48ocfUmV8MxndCfmDD64oJl2cAjNsBtK+bT+YCVRmNd4VqaIkq5nTWb88eHHY8ajWEHk/0ze5rUS0gmWEhkGuX4yrslY3QajLHgjZD4LMI41sgNSMmyvTNPtQNO0uvCHVvpxzK9stmE7PQSLyeWDM2CG3WB/lpVUnmuzbVbgthUc3cGLECcfwrePHoeZM9pf8PER1DdBWh443AtJbLKEjCD/UVylxqzm1BmMDaT5o1XdtcMLVfnHdybF0sbaQf2GT4AF6ES4bqTOLnXObPZIk5/mS2CrIMI4hnU5Sekq1+LW+MxUniLnn5BqiG4tT0igyVbToCpacWCP8ic6/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) smtp.rcpttodomain=lists.ubuntu.com 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 (0) Received: from SN1PR12CA0051.namprd12.prod.outlook.com (2603:10b6:802:20::22) by DS0PR12MB6582.namprd12.prod.outlook.com (2603:10b6:8:d2::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7982.25; Wed, 25 Sep 2024 17:22:34 +0000 Received: from SN1PEPF000252A3.namprd05.prod.outlook.com (2603:10b6:802:20:cafe::b2) by SN1PR12CA0051.outlook.office365.com (2603:10b6:802:20::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.19 via Frontend Transport; Wed, 25 Sep 2024 17:22:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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 216.228.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by SN1PEPF000252A3.mail.protection.outlook.com (10.167.242.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.15 via Frontend Transport; Wed, 25 Sep 2024 17:22:34 +0000 Received: from drhqmail203.nvidia.com (10.126.190.182) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 25 Sep 2024 10:22:23 -0700 Received: from drhqmail203.nvidia.com (10.126.190.182) by drhqmail203.nvidia.com (10.126.190.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Wed, 25 Sep 2024 10:22:23 -0700 Received: from vdi.nvidia.com (10.127.8.12) by mail.nvidia.com (10.126.190.182) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Wed, 25 Sep 2024 10:22:22 -0700 From: William Tu To: Subject: [SRU][J:linux-bluefield][PATCH v7 5/6] UBUNTU: SAUCE: vfio/pci: Fix p2p address Date: Wed, 25 Sep 2024 17:22:13 +0000 Message-ID: <20240925172214.1511114-6-witu@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240925172214.1511114-1-witu@nvidia.com> References: <20240925172214.1511114-1-witu@nvidia.com> MIME-Version: 1.0 X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000252A3:EE_|DS0PR12MB6582:EE_ X-MS-Office365-Filtering-Correlation-Id: 8a5db4e6-5572-43d0-8e2e-08dcdd86a4ea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: fj4IelknWRG/dYWeuiOi5qSqx9xNRhiba1k9VcOR6SXQJVCYGaPaEEmRxAA/B1WwF27Jrb5p+me29c0I3NUjVv8yuteGZcv66w9xkjeqCH1gHrAQmawmhljdgHDNq4rI4vQGjFsHOgV/JVM9vBqXLmla6GiwZPOOZMyDlTneM8VB/HVCzbn/HuFYIO2p+2WxHgwAgFHFTIA/qxA9X3WAT0SbURoImc4JY+4sP4L5aWAASTzbIPoR5NVofeBAPCaY7t48wwxC9+uHFgZAGRR9RJFcx1oFtMugh9mB/FPIM/zfevJf6LBpNMjHysXSrqRx4UI7MIzSm3c+7TE045ztZer+nGl80Rwre4x9lzIio8G1SIW9Ar+bsgQW7mR9jwaq0Idg/hvdqL07+xIaBzOpA3wRPBN4rXQvEJXQw99Dr3RAmkTfR/jWb1qnp7zFxiw6xorx+561aOT5Lm1iUKppYw1vutG5uHGnmHhfYth+wRRW4O+0iYW8J5ktVbOudwMMWD4a4nE/ieDVgsWHveN2CaFmNqgOUX6+vheK7Wq91QhfQeRqZXCMpQ8cevSuGNQSOQ/HVnLPCdSno0rp98bV9Rsbt8k6ZxFqXAKyyqHDWDRb9cge+KsA69iKfeOyw6T3Wuk8SjlaOn9CVAi9DKkmReVjibXRq9b5XMxTFrlN0AtGvIBivOyCR/u8AxgzO+ggFKoU04GIYiFXli4u5MSPWkOeQnPHngKcG04z+NWmHdcezMdNI8mxq0W0/q7vxGDjz/u4vk7hedgtc0CVNODx4HmiPufZJgQgBjTBHijn7AY6xVlDL/pl9lk23MIJNahk36yUfGZVNZxB4jug49EvstqXui0eK9QA/gOIyQmOYOi9QGG8R3wqOvyYrOmy32x69FtTC4+Hc+0IgZeWk0DjUXl2+18voI0kOYq30sE/nxBe1g8yev5JYmJ7JDrWJl7q8pCytDsrS92SfMV4zSG9lbs+OUv5DhpUaFODyCm3fSF/IEjEeRamy0ydSwGFTCb6TgNxhlr+c5af4FP67QB9vbuhIYnEGrcgjZrvhgh+TAi0K5nDef+uOLRtX5hyJTaRRMXVHrIyEysIHKwmuTaOTKLQIrSinkmzLnC/Mkt5LkP2hNPS0XUScStuoBk0Mg7cY5sbvbnKHbWtDDQD+HzNacYpzSCpvx2hGwyqSCaoqRiP87VCreOZy3yPeUahQW+in/WN4vLoG0jczWHZ3JXZnad5z9iUjnIxhSqdPnoO7wxYwC1livQWK9R5Jg5wKniPSKsNWzudI/+181bqLdCclawHRTd0g110jxVFQgTexwpZX6QStnaMgPjT77vtgeodmSp6gegAiXa0FN1/6cEkcZoBga0ssxmy80U1Lq81Wl1ZrM2ixFa9WB5WEnxtTXW+ X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(376014)(82310400026)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2024 17:22:34.0709 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8a5db4e6-5572-43d0-8e2e-08dcdd86a4ea X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF000252A3.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6582 Received-SPF: softfail client-ip=40.107.94.59; envelope-from=witu@nvidia.com; helo=NAM10-MW2-obe.outbound.protection.outlook.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: vlad@nvidia.com, bodong@nvidia.com, sergeygo@nvidia.com, jgg@nvidia.com, zwaksman@nvidia.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Sergey Gorenko BugLink: https://bugs.launchpad.net/bugs/2077887 Use pci_bus_address instead of pci_resource_start. Bus address must be used for P2PDMA operations. It is simple for x86_64 because bus address is equal to PA. However, bus address is not equal to PA for ARM (at least for BF, I did not tested the other ARM platforms.). That's why pci_resource_start() work fine on x86_64 and we had to replace it to pci_bus_address() on ARM. Co-authored-by: William Tu Signed-off-by: Sergey Gorenko Signed-off-by: William Tu --- drivers/vfio/pci/dma_buf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/vfio/pci/dma_buf.c b/drivers/vfio/pci/dma_buf.c index 14d32a580190..58fd3db9c249 100644 --- a/drivers/vfio/pci/dma_buf.c +++ b/drivers/vfio/pci/dma_buf.c @@ -4,6 +4,9 @@ #include #include #include +#include +#include +#include #include "vfio_pci_priv.h" @@ -81,7 +84,7 @@ vfio_pci_dma_buf_map(struct dma_buf_attachment *attachment, */ dma_addr = dma_map_resource( attachment->dev, - pci_resource_start(priv->vdev->pdev, priv->index) + + pci_bus_address(priv->vdev->pdev, priv->index) + priv->offset, priv->dmabuf->size, dir, DMA_ATTR_SKIP_CPU_SYNC); ret = dma_mapping_error(attachment->dev, dma_addr);