From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from BL2PR02CU003.outbound.protection.outlook.com (mail-eastusazon11011034.outbound.protection.outlook.com [52.101.52.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F3CBD2E06ED for ; Sat, 26 Sep 2026 01:35:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.52.34 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790386528; cv=fail; b=DifO34MUthLPknxkeao+mKQGZAb1qg6LXOQAMVsXLP3jW2L60Uv5dxpSORDVAUZIRXMOSM8JTjXEhQfFwiCGX/6ckyJ+xbt9WRnljAqrnzhfkBunUTtkHAq9vy7/sCqLEQcdiEeejboVnvgfbs58qlMFePRsabIDeZ14zBAhino= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790386528; c=relaxed/simple; bh=S6szVLbngYoniMOzMGQdYZpcJZfegkAKjtT+6rDWtj8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rAowhd0JtnZFbUPF6HBphQjpli3XxNYfZQt563/EfrkKgIDBvMlhwdKtmfhc9RIgCC+iH9Ii4Im2WOz0tyLaEI0RbeERh34HAIqkY020GB7duvsP27GsOC3uSip/js7YLQ4DWtsBcJArzotcb5yM9R8ze2a+RTnsx5a9wtnOBGc= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=HK6RGaF3; arc=fail smtp.client-ip=52.101.52.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="HK6RGaF3" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=su/1mmGNCmDxs67K4QbPXutoVaZv0sIEv3r4G0yPXCxMc20EnrrI10I5FBS9Rj/RWMMVLIyLXg6Ix4AKrCe5J4rXfHrf7DgwUlVlBN8gXPh1L9FBNgVs05F3daWgGZBlpY2MwZCLpONF691FcFMbYaWQglhkT5P1Q0LTG2KWNJYn2OHmYWkhSmiciyJvCmzR+dNPjk8sWuv8w5bnER4+MuNuhWDHRgL9vkmLD5OMU5yJo/K5218lHonajhM5U2RHeXejhRPQ+PTLKgyJfZ/iM/EMScZ1XQxb7BNpUX05uufz9DrFO36CyGDk+VNeTICUnG/NjZRuZSuaP3asZYzjDQ== 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=3ByoS7oK0zCQ4rVcO3Rg5utKtvMo/eF5Dp6DYGgAl4g=; b=tx2xXgLDCdHeOGHRKqzmgLeiHyt0GIEmbPYRrRNEix51SZGGXKzRBkJ0sTDgRXTA5Qm2yU9OYEz5u4SqQt0iEvk5KNlNWU9CarzIb30L1gUKqPaVLaUq4FuoS9rJgLDPnI+BjitOgeR5/WkB4mybBLL3VpuJTtsWzHJsy300SjNU/aFsS4CIp0IJv1fBbvRAbDEbAbTRs3qT/ru1i/8oYku/r7KhBE2KUFIB3WurOU8TR5QfPNkA6ZxXKvqEAdJoYRN2IWcZE8WO3sSgV1ir0AGYJp0Yo8VJdiNHZEiNhasUfSwDbtxuXSeyYWr75gy4+wCILIpQyvnnNPNw0EPrJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=quicinc.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3ByoS7oK0zCQ4rVcO3Rg5utKtvMo/eF5Dp6DYGgAl4g=; b=HK6RGaF3jcWyGjNDZ429hsJKA4Yf50RRSs00FZrYx3uRq7sIytCdJeYjj0wCt9WyFkQ2Qiq/rBuwPjb5QKtO0tP8WURIvupKxbeSXkArJG3sNcc7D10TtJbafzbGj6rvJ49U5yoBbD6/N0Pt96IDCAWqwj1rHMjsqoEDQ8xp4Fs= Received: from BN9PR03CA0432.namprd03.prod.outlook.com (2603:10b6:408:113::17) by DS7PR12MB5741.namprd12.prod.outlook.com (2603:10b6:8:70::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.18; Sat, 26 Sep 2026 01:35:20 +0000 Received: from BN2PEPF0000A7FF.namprd02.prod.outlook.com (2603:10b6:408:113:cafe::7d) by BN9PR03CA0432.outlook.office365.com (2603:10b6:408:113::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.451.19 via Frontend Transport; Sat, 26 Sep 2026 01:35:19 +0000 X-MS-Exchange-Authentication-Results: mx.microsoft.com 1; spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BN2PEPF0000A7FF.mail.protection.outlook.com (10.167.245.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.451.8 via Frontend Transport; Sat, 26 Sep 2026 01:35:19 +0000 Received: from satlexmb07.amd.com (10.181.42.216) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.49; Fri, 25 Sep 2026 20:35:19 -0500 Received: from xsjdavidzha51.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.49 via Frontend Transport; Fri, 25 Sep 2026 20:35:18 -0500 From: David Zhang To: , , , , , , CC: David Zhang , , Subject: [PATCH V0 02/21] accel/amdxdna: Remove mmap for doorbell Date: Fri, 25 Sep 2026 18:34:29 -0700 Message-ID: <20260926013448.3840921-3-yidong.zhang@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260926013448.3840921-1-yidong.zhang@amd.com> References: <20260926013448.3840921-1-yidong.zhang@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF0000A7FF:EE_|DS7PR12MB5741:EE_ X-MS-Office365-Filtering-Correlation-Id: 0053eb43-051d-4972-accd-08df1b6e6cea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700016|1800799024|23010399003|10067099003|6133799003|56012099006|11063799006|4143699003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: 0pygz1w9wHzyVO/1a4ynKbxxnxg10cKH5+mA/0jLBYBkvbs9vK1oUS5SGvFN8HgxQZqHbSGveQnIJ1SK4yJeTuVQt0yRZPa5+SyySHyk6m0oQPakKmZvY+GKrDRz0i8bQdB7/R8koC65/jOuyYMLOwR66xFsrVG1kuyphSjhI1iit6N7TVaIYRvricAQPSj5ZDI7ESH8l0wY+zOUeLVfI//BRR+t93cB3j+05KDCZkdh5HFM+Pm1GMSdOae5z1uwoeXFFVtPYcJXXUnHfH5wEfn1nTvRA1qcbPvTE3392sDOOG4LptnqmtF0GISzDYyQZcwzFdb237OlKuurvZ50qhRQmdXbGgJdv3B9eHJ3manPgQIXcuR12bkK1RBvtSNkSj4/wOUSvy6qA4Hab2ZFOD0ISQXo90SYu77Z4uBPgpCcFMj73ZsrUbxWn6piFQfZjCJXnhbSLKm4Z5/C5bdRpNPiNZ9kzmwyplAjTFCOWxtHcyq6i5FXJVl8gcKXgM/LdHNLlekK7MynWvCV0IALfqmCSr1w5y4YglLL8bApkmfuV4evQ7b82cQ6jVD0wN/htJTbaQYlNJpedS4nCzIPBvvnrCOjCRfC4yFJOtQvvGWKZHwnbicOTbE6wajz1vQBt46H5q6l2MyFI/Zoc9MiBGcnCw75l0mmJzkKbwqy3H3k74771a9BZ0JP3ZjUG1I/GznxB9bMbGY/BuClfu5zQg== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(36860700016)(1800799024)(23010399003)(10067099003)(6133799003)(56012099006)(11063799006)(4143699003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K/M4MijKjj74X3W7uNyi2QhQwv9ZGS1MtHtpgCWRGI+vQ6Nl9OHNYFYQBmCnJ/GQEuhJ1hldvDfz981WvgrO1CHneZzBZq6UvouzlbhafXscmrwpKPzPNPlfZi3AlG3TwWhfj22KpWYuTi+xBNaJQUSMV9h50D8CWqY25//R+0mjt3KeGnPSTb68oN8Ply4eBbe5ctpZ/bXkkvtahYPkFgoDxYwHZZGf8j2CgwvLkRCuAAT9fPppM+3vc+LkVDXuvRz7J9XfGpimHPExNBaZln6/Rp74U5ofn4+od994qMGDmWIv+NoVp2LiTeVHmcVPRyfFTe6QEGyDb8RV9gT9OE93bRCvMD7KfldXrZDUUn0iLe4ajfGp8yp2uoUO5SK0o6wNw5ew/Lr7n1Ul817XbI7U6FTpj2opog+AqF6WuVZi7nhb9rsE3IlRPxHeYPEV X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2026 01:35:19.7176 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0053eb43-051d-4972-accd-08df1b6e6cea X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN2PEPF0000A7FF.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5741 Make kernel submission the default, so mapping the doorbell back to user space is not needed: - Remove .mmap handler and use standard drm_gem_mmap. - Set hwctx->doorbell_offset to AMDXDNA_INVALID_DOORBELL_OFFSET on context creation so userspace does not receive a valid-looking BAR offset. Signed-off-by: David Zhang --- drivers/accel/amdxdna/aie4_ctx.c | 20 +-------------- drivers/accel/amdxdna/aie4_pci.c | 33 ------------------------- drivers/accel/amdxdna/aie4_pci.h | 1 - drivers/accel/amdxdna/amdxdna_pci_drv.c | 17 +------------ drivers/accel/amdxdna/amdxdna_pci_drv.h | 1 - 5 files changed, 2 insertions(+), 70 deletions(-) diff --git a/drivers/accel/amdxdna/aie4_ctx.c b/drivers/accel/amdxdna/aie4_ctx.c index 8408b0d2696f..8157f2a6fd10 100644 --- a/drivers/accel/amdxdna/aie4_ctx.c +++ b/drivers/accel/amdxdna/aie4_ctx.c @@ -158,7 +158,7 @@ static int aie4_hwctx_create(struct amdxdna_hwctx *hwctx) } priv->hw_ctx_id = resp.hw_context_id; - hwctx->doorbell_offset = resp.doorbell_offset; + hwctx->doorbell_offset = AMDXDNA_INVALID_DOORBELL_OFFSET; return 0; } @@ -313,21 +313,3 @@ int aie4_cmd_wait(struct amdxdna_hwctx *hwctx, u64 seq, u32 timeout) return ret <= 0 ? ret : 0; } - -int aie4_hwctx_valid_doorbell(struct amdxdna_client *client, u32 vm_pgoff) -{ - struct amdxdna_hwctx *hwctx; - unsigned long hwctx_id; - int idx; - - idx = srcu_read_lock(&client->hwctx_srcu); - amdxdna_for_each_hwctx(client, hwctx_id, hwctx) { - if (vm_pgoff == (hwctx->doorbell_offset >> PAGE_SHIFT)) { - srcu_read_unlock(&client->hwctx_srcu, idx); - return 1; - } - } - srcu_read_unlock(&client->hwctx_srcu, idx); - - return 0; -} diff --git a/drivers/accel/amdxdna/aie4_pci.c b/drivers/accel/amdxdna/aie4_pci.c index a58a83af42a4..db02d25e3f4a 100644 --- a/drivers/accel/amdxdna/aie4_pci.c +++ b/drivers/accel/amdxdna/aie4_pci.c @@ -518,38 +518,6 @@ static int aie4m_pcidev_init(struct amdxdna_dev *xdna) return 0; } -static int aie4_doorbell_mmap(struct amdxdna_client *client, struct vm_area_struct *vma) -{ - struct amdxdna_dev *xdna = client->xdna; - struct pci_dev *pdev = to_pci_dev(xdna->ddev.dev); - const struct amdxdna_dev_priv *npriv = xdna->dev_info->dev_priv; - phys_addr_t res_start; - unsigned long pfn; - int ret; - - if (!aie4_hwctx_valid_doorbell(client, vma->vm_pgoff)) { - XDNA_ERR(xdna, "Invalid doorbell page offset 0x%lx", vma->vm_pgoff); - return -EINVAL; - } - - if (vma_pages(vma) != 1) { - XDNA_ERR(xdna, "can only map one page, got %ld", vma_pages(vma)); - return -EINVAL; - } - - res_start = pci_resource_start(pdev, xdna->dev_info->doorbell_bar) + npriv->doorbell_off; - pfn = PHYS_PFN(res_start) + vma->vm_pgoff; - vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); - vm_flags_set(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP); - ret = io_remap_pfn_range(vma, vma->vm_start, - pfn, - PAGE_SIZE, - vma->vm_page_prot); - - XDNA_DBG(xdna, "doorbell ret %d", ret); - return ret; -} - static int aie4_get_info(struct amdxdna_client *client, struct amdxdna_drm_get_info *args) { struct amdxdna_dev *xdna = client->xdna; @@ -661,7 +629,6 @@ const struct amdxdna_dev_ops aie4_vf_ops = { .fini = aie4_vf_fini, .hwctx_init = aie4_hwctx_init, .hwctx_fini = aie4_hwctx_fini, - .mmap = aie4_doorbell_mmap, .cmd_wait = aie4_cmd_wait, .get_aie_info = aie4_get_info, }; diff --git a/drivers/accel/amdxdna/aie4_pci.h b/drivers/accel/amdxdna/aie4_pci.h index 3fd5eace3ed7..c6219544dc0f 100644 --- a/drivers/accel/amdxdna/aie4_pci.h +++ b/drivers/accel/amdxdna/aie4_pci.h @@ -69,7 +69,6 @@ int aie4_attach_work_buffer(struct amdxdna_dev_hdl *ndev); int aie4_hwctx_init(struct amdxdna_hwctx *hwctx); void aie4_hwctx_fini(struct amdxdna_hwctx *hwctx); int aie4_cmd_wait(struct amdxdna_hwctx *hwctx, u64 seq, u32 timeout); -int aie4_hwctx_valid_doorbell(struct amdxdna_client *client, u32 vm_pgoff); /* aie4_sriov.c */ #if IS_ENABLED(CONFIG_PCI_IOV) diff --git a/drivers/accel/amdxdna/amdxdna_pci_drv.c b/drivers/accel/amdxdna/amdxdna_pci_drv.c index d9e2e71d3e05..3140af69e29c 100644 --- a/drivers/accel/amdxdna/amdxdna_pci_drv.c +++ b/drivers/accel/amdxdna/amdxdna_pci_drv.c @@ -250,21 +250,6 @@ static int amdxdna_drm_set_state_ioctl(struct drm_device *dev, void *data, struc return ret; } -static int amdxdna_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) -{ - struct drm_file *drm_filp = filp->private_data; - struct amdxdna_client *client = drm_filp->driver_priv; - struct amdxdna_dev *xdna = client->xdna; - - if (likely(vma->vm_pgoff >= DRM_FILE_PAGE_OFFSET_START)) - return drm_gem_mmap(filp, vma); - - if (!xdna->dev_info->ops->mmap) - return -EOPNOTSUPP; - - return xdna->dev_info->ops->mmap(client, vma); -} - static const struct drm_ioctl_desc amdxdna_drm_ioctls[] = { /* Context */ DRM_IOCTL_DEF_DRV(AMDXDNA_CREATE_HWCTX, amdxdna_drm_create_hwctx_ioctl, 0), @@ -323,7 +308,7 @@ static const struct file_operations amdxdna_fops = { .poll = drm_poll, .read = drm_read, .llseek = noop_llseek, - .mmap = amdxdna_drm_gem_mmap, + .mmap = drm_gem_mmap, .show_fdinfo = drm_show_fdinfo, .fop_flags = FOP_UNSIGNED_OFFSET, }; diff --git a/drivers/accel/amdxdna/amdxdna_pci_drv.h b/drivers/accel/amdxdna/amdxdna_pci_drv.h index a997d27a504d..84c8973e9197 100644 --- a/drivers/accel/amdxdna/amdxdna_pci_drv.h +++ b/drivers/accel/amdxdna/amdxdna_pci_drv.h @@ -57,7 +57,6 @@ struct amdxdna_dev_ops { int (*resume)(struct amdxdna_dev *xdna); int (*suspend)(struct amdxdna_dev *xdna); int (*sriov_configure)(struct amdxdna_dev *xdna, int num_vfs); - int (*mmap)(struct amdxdna_client *client, struct vm_area_struct *vma); int (*hwctx_init)(struct amdxdna_hwctx *hwctx); void (*hwctx_fini)(struct amdxdna_hwctx *hwctx); int (*hwctx_config)(struct amdxdna_hwctx *hwctx, u32 type, u64 value, void *buf, u32 size); -- 2.34.1