From patchwork Mon Sep 9 09:18:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huan Yang X-Patchwork-Id: 13796501 Received: from APC01-TYZ-obe.outbound.protection.outlook.com (mail-tyzapc01on2061.outbound.protection.outlook.com [40.107.117.61]) (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 D42C254673; Mon, 9 Sep 2024 09:19:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.117.61 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725873560; cv=fail; b=Z79t0BxiZOsp7O39A4vX+UwF4g2H37gFiTIoVNswYKz4A0x3b1MPQWcM3NQZCgFvNsu60q6L9FEZQuKssoxj3IujafzmU7Ce6b8ZAohH4Aw79WSerOvWTk3OUfEb5QOjbwy2/H3ou92mQzaC2qMfUvyhVr1I1EWa40zxw7G6E+M= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725873560; c=relaxed/simple; bh=c2NKNWx6oJ85fwqYqaleMgYSpIY2okaFfjEZb2+9Ikc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=WUhHS23ihn2v0Q6hKKIeKPmOU6c/e7Y/KCtK+1Ls1fc/VUNs0oWmntmIUpfzHXLKBP8YtHOV2LuYlWsYl1hZDO8iD+l1z0olZJ5WMdai4j8tI7SnBmbuHHViVgPLY3MLGuVbLQnNaelEUbcyS4Jfc22y+UdTdhCLAPPfI+A4Uuo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com; spf=pass smtp.mailfrom=vivo.com; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b=bN0sBakD; arc=fail smtp.client-ip=40.107.117.61 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=vivo.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vivo.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vivo.com header.i=@vivo.com header.b="bN0sBakD" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=T4WKhs7tbh27ZdL6TA8+CcO3DSRPJ/jGFBI2EpIUlkfI1AGSJMxsiEuq1NgXOxCLVtiw1VrgZgaa4oPZyUpkpmwAFNuTUB8/ofAOtReFoCjXIsrela2SW/7qwCbw0vk3CQkjg1HK4iTN+R48kkv905xY4xNfQ15K+3xrKtlnP86m0dglkHs6RFrQOFCcLE1nGff9ihZYmM3IemcmUHDusoyBhnfxt/erfwnYwY0GMW1j7z9MUfhCjQX7T4nuknKwwuvylZFxe4b8Y0aRWzrVH6dcrLIL3nVGWDV7H7rw3PcTUh3TpUodBKU8kvV1DYdJeOZMbsYs6ctmmphugeGzAg== 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=jP3zJl5GHA6Cli3QdnQ25Nfb1coEB05mLki2geoKI9I=; b=dH6ahMdZZUiDXPP4TAkjhWctAy4e5JiQ668MJ5PdJuoSLLMdq7cE/O5wUD8kLmD6ozXh1j/Sic2+1tneDv0uaJtBUvF/aK24ZDOq2xsu5Jf7RdBGVMHKpK15zqw3rVdoYK3lgPvoaKESSgcdPkF/svI/0wIR/NlKAPvC+7ogMTlOrib4hazphxcFWT1z8zjUpo7PgULpHM8/L5vJEoQCTNkrUwaYPcOv+ng1IarquWFDExLUGIULGPvzsuOngiD7B+4xiyU2zhVBnEcI6V72L2DgvCW4Pv0WVrLbG66lve6KXvjTq9tWNCJZQ32Gja2nQjrEihS89rhumEAlGFZw4g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jP3zJl5GHA6Cli3QdnQ25Nfb1coEB05mLki2geoKI9I=; b=bN0sBakD72MFvLD7r6soltjAy5Ftzx29x/XjdMbex0lMGCvRl58GW1OEB7vM4eSQgfcV+v7aeTMvxQhPD3RjOTjMVl4Slde1+s4lQoAONP5JyrnhbIY/PnI3LKpLD2JS0WS+aO/i6p8XXge1VKVx0OnlZLidFceuGSA9ETzgi64a21UwqPnLP7+D4dZwI0wb5pTYUCwx5mk1KlJuZkeMDL1b/MLOarWN7yh9HSIinYd/6kamDiIKRH4hL9w2nY0BmjDV7TRIL1rUiUoNsGgkWXddvyshMN7KC9OXaDlFu2JrHXVmCTCz06n3unIW3eBUh7zCpIQ378O2cZaiokZedA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from PUZPR06MB5676.apcprd06.prod.outlook.com (2603:1096:301:f8::10) by TYSPR06MB6292.apcprd06.prod.outlook.com (2603:1096:400:42d::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7939.23; Mon, 9 Sep 2024 09:19:15 +0000 Received: from PUZPR06MB5676.apcprd06.prod.outlook.com ([fe80::a00b:f422:ac44:636f]) by PUZPR06MB5676.apcprd06.prod.outlook.com ([fe80::a00b:f422:ac44:636f%6]) with mapi id 15.20.7939.017; Mon, 9 Sep 2024 09:19:15 +0000 From: Huan Yang To: vivek.kasireddy@intel.com, Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= , Gerd Hoffmann , linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org Cc: opensource.kernel@vivo.com, Huan Yang Subject: [PATCH v6 3/7] udmabuf: fix vmap_udmabuf error page set Date: Mon, 9 Sep 2024 17:18:41 +0800 Message-ID: <20240909091851.1165742-4-link@vivo.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240909091851.1165742-1-link@vivo.com> References: <20240909091851.1165742-1-link@vivo.com> X-ClientProxiedBy: SI1PR02CA0011.apcprd02.prod.outlook.com (2603:1096:4:1f7::19) To PUZPR06MB5676.apcprd06.prod.outlook.com (2603:1096:301:f8::10) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PUZPR06MB5676:EE_|TYSPR06MB6292:EE_ X-MS-Office365-Filtering-Correlation-Id: f636a370-eadf-4e9f-d312-08dcd0b07881 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: ncbFvZsOtIhqiaE4UJ2/MIJI2LFlEqeg6PRnjohZzySq+9K5eImOEBfdt/vr1y7WOqXbWlKN/vCeYf6ZBha7rIlJAXThtBYFMYHPm/s9MkI+Su330K8zm4xh9gbHd6hgephZmKAmD+hIJTazZO4ujWxs93Jz1XXniVZqgO6djThY2xY3E8FP1lex+32MOwMH+RWhUTXgrgf5IJ/KHhSYq54m6EEXEi7F0b3L/bcOP8AU/OcrbIJSqpIKWTL57NSWYpXoDOgcUNXWtClbCGRMsfcfzIkKysbd6hoXK9zUcrkECKDbz1+1aIbcZB7w9pQor67slm5CEh4vYBUATruJ2hHXRYKF2LhzhpKcizTx+yC/mbQMtMJ0eWBiex6eJSQNeGiUw9qKrv40JiUbzMIhavevEt2oQKj95T0xIWjN9kF6brh3n+WUq/u9SF281b+50xBwYsoTyyY9VlJVITCSsJu/BjQ738to/iD0sOzliz77erJJuKJyQ1zUE4yzm5d/CyePPTt/VcNolD1CLPjTmPM1pkELqshczHjiwX3SYDcGt7wEfffTYleticfWFaF6DuGpz2mFNtQuOgEFJMVCTSSRb1LNfGYeOmPmzKKyALm+QJDQ67+tfJhZkQoE+RMQEgd9/1+QsyBN49BegGM36JxT4x7UbRrR1jTqSffMKMLjnesfLtg6YE/YVFnweBjy2OIZsB6smrdJlQx2TFAoQG9oF/UL5ZGRuMdhl/otUnETBHGOLuijDXcLNAMxZO6G7f1WkHctstjiIdHXMIoHV2qGb/goh7qpvy+c79uDkb4YK3GfmP1V6m22kkyS+Lgp3ABc+wVTBRgHN8Va1L17EFbpbUpnR+k1+pwxqiHA5L4V52PwOjIwUcmG42Mu6BKGFF5P1Behz26b0BHoJdTqKtyQ9U3xXyeIKBcJajB2swA1p3tpkWEZEi+H5dX/cRm+Ps1K5QMXtbl/YmE4WUOQelEJ18pD20Il8LQND0sTMJV8jhgbrVjLiGNHIJpvYeJNH8AdIq932hqDotyqz/pXjRjkRlW05ERFPBMCYDUFwq48mQN7WOyJkjRHXQhRE/f8LsrR7hmgGDVOE5CsaNiPZMymjwkSECDM0xjkZYefLVBXsr7FJs2X5awd2QqeCYTlSB5oeDbngc1OS8wtndaeWvdu2+NVmlkGwKKVzDtR9t6sywPpeEJoVI2snCB+E+fJoYcdWmTVM4UfCnOhrrPv8IVV2xCgJESxQmIKxQfpTZA4zST7a3QtEdfFUfAoVGSJrTaypK+wYXNayNc/8BWPCWXb+nKPV2IO+hwN79kekj9HHI+NkT5/loz08Q3f6rzXZcXgmGFBiSntAMB/nkD2ErRjwxui8AgSAZu84tyRxecOoc+De0bG5raPXQKZUfl7Pdz9unxKs0FjB+M6XGWKJA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PUZPR06MB5676.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014)(52116014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n9l56f+gIFrCu+fQHxbv2Sy+F7exUClviXpkSFQlqGQaQn0IpqcW9SkAJ8DgB5XfekTUMH3thJ31/i4Y3NotwUCkgLbqtA/gdCBCICdcZZRuAGaeNusxC39RTDVk4KHiBXv9F9fC5JGi1aMBO32HxxkIjY/pSEI4v7rkoq8i1BG5fcx+3AYvJXkuGu7mXJfydDBFEU0TulSjj3xQbok0xD9E5B8u39eIxWIaohxxE6TchpxkSDGKN5rZ4/e9lS/IWOtQkd7wkoLRRVyGXoBZHsp14S0b/YqEC6ev1mnXDf2gV0YcaHDwJmE6jbSoARG6GeStwW9ct0XC2mzin/t3EwaQ8tetCC6kqD5pTvVfsJNdVvxhyvWlQDfII34AzcpPwEgdRzmeaJppiz4QYASbcoVi4GpwWFQWo6oyypktt1IMRBvmF1wpGnR4sjmrY7wy4+4/UiEpLcsQJ5Ph4zdPZ74CF6JCD4b9xxnu+MoGbPSr4M76QDIWcUtoYF+k3vvtHjW2Y0W5IsN4f0lHX+a6wkjEv37Yv/XNCxAyNrBOsveBpXF8vHao7HJ07FRyn9Z4Z9tmbZeXrkNK01lFkFSlxr52VOKeeBgb1K5Sp86bP0/oXXPk6i7538kgr8h6ubgg2xmCoTiAmWwzWjs9cDv+BnbCxVLMBwEve/QloTFw1OwlriWBpeWNHu5EqEcNqYhA4BHDXh5Ymoc9AO/KGj9251su3y2/Z/CKTZj9GOki1raXart3r2Fy+Yl4hKqVn5oUyagKCkOcVpvMZ0+nDTizL0Mwy6GBSWMVudybMfbVrhjPiMINlMOFgi6WFEsSmUfC/VFS53IreBVuZFkReBtnOQJlKoMawcqUtfddBkK6Q6FvBZhe0UHTWbm8Dji2lb22gZCbkpeo9H28gUV9+pdd7UHrqTHTs6hxE4iDLWXbqU7rpVnZncPFtZb/7vgyXvUOzFvcEO9Gt/VcUcZNEq0Cltiewljg5hQ5lhYIIlcdrk+lDTDIuczLdLw6dAYkkcBpFuBqly1conQr6KJkqZkJmvbG/x2k3W/l48hsMi2x31Lel3zxabVt5/llR+DpVZTQc0DDJjhStqNzuja4LBODPhdAvyqM2BRmK1EBDWMmUloJfaTtlnEtPhvzYFpu2ep4He2YHcEyz/ygkbkZjXaZjOd6RWEPZD48b6K+uoO0VeEhJposh52/uHmHpwIopG+nPKgjrK98pq3Ve3vun3cVaiB2duU3X0vccay/G0sj+iLJFWrdYMzauCQ/mHbK5Pa3X53kdPqh+sDMM8dmbKnUQpzQVmb1W7wVQbDonxo8HZS8kA2szms2D8CRKoxdpano3UwzG+JDs29pJz0PcS099Q3SLUrbetcJ98ayLJ5ROIZiFDnODEw7DlZbhAg/SuRVLjXzxBA1tflnOIutkofxnSzNRd6zki5iQtC2SfE7gn0baQGrd4jjkI+Zp78j0GTEM2AMHzGmTAu2movIWyx3oPE1Pu2ve2D0uqD1KdJWKK0l7T4an6k4DP15WEb1xWL10wRmIjltUzXRQac18BDBNnmH+/yKZWH4NaXkFD59OUi1w7+XqZ3gg7x1bs9BZVai X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: f636a370-eadf-4e9f-d312-08dcd0b07881 X-MS-Exchange-CrossTenant-AuthSource: PUZPR06MB5676.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2024 09:19:13.5860 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Rwwh51eqsbp2WVyN8VC/IUoaB4t+uHSf7+wOiIpWT+wGVpPhrE6v8cowix6ITN2y68WaupWLzQ6fc7gOdLTJcA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYSPR06MB6292 Currently vmap_udmabuf set page's array by each folio. But, ubuf->folios is only contain's the folio's head page. That mean we repeatedly mapped the folio head page to the vmalloc area. Due to udmabuf can use hugetlb, if HVO enabled, tail page may not exist, so, we can't use page array to map, instead, use pfn array. By this, we removed page usage in udmabuf totally. Suggested-by: Vivek Kasireddy Signed-off-by: Huan Yang Acked-by: Vivek Kasireddy --- drivers/dma-buf/Kconfig | 1 + drivers/dma-buf/udmabuf.c | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/drivers/dma-buf/Kconfig b/drivers/dma-buf/Kconfig index b46eb8a552d7..fee04fdb0822 100644 --- a/drivers/dma-buf/Kconfig +++ b/drivers/dma-buf/Kconfig @@ -36,6 +36,7 @@ config UDMABUF depends on DMA_SHARED_BUFFER depends on MEMFD_CREATE || COMPILE_TEST depends on MMU + select VMAP_PFN help A driver to let userspace turn memfd regions into dma-bufs. Qemu can use this to create host dmabufs for guest framebuffers. diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index ba9dbc7caf71..aa182a9dcdfa 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -103,21 +103,29 @@ static int mmap_udmabuf(struct dma_buf *buf, struct vm_area_struct *vma) static int vmap_udmabuf(struct dma_buf *buf, struct iosys_map *map) { struct udmabuf *ubuf = buf->priv; - struct page **pages; + unsigned long *pfns; void *vaddr; pgoff_t pg; dma_resv_assert_held(buf->resv); - pages = kvmalloc_array(ubuf->pagecount, sizeof(*pages), GFP_KERNEL); - if (!pages) + /** + * HVO may free tail pages, so just use pfn to map each folio + * into vmalloc area. + */ + pfns = kvmalloc_array(ubuf->pagecount, sizeof(*pfns), GFP_KERNEL); + if (!pfns) return -ENOMEM; - for (pg = 0; pg < ubuf->pagecount; pg++) - pages[pg] = &ubuf->folios[pg]->page; + for (pg = 0; pg < ubuf->pagecount; pg++) { + unsigned long pfn = folio_pfn(ubuf->folios[pg]); - vaddr = vm_map_ram(pages, ubuf->pagecount, -1); - kvfree(pages); + pfn += ubuf->offsets[pg] >> PAGE_SHIFT; + pfns[pg] = pfn; + } + + vaddr = vmap_pfn(pfns, ubuf->pagecount, PAGE_KERNEL); + kvfree(pfns); if (!vaddr) return -EINVAL;