From patchwork Sat Dec 16 06:05:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kasireddy, Vivek" X-Patchwork-Id: 13495480 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09209C4167B for ; Sat, 16 Dec 2023 06:29:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 416296B00A9; Sat, 16 Dec 2023 01:29:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 318766B00A1; Sat, 16 Dec 2023 01:29:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 01A086B00A6; Sat, 16 Dec 2023 01:28:59 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id DBCEC6B00A7 for ; Sat, 16 Dec 2023 01:28:59 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id AD1A812064B for ; Sat, 16 Dec 2023 06:28:59 +0000 (UTC) X-FDA: 81571703598.20.1A5897B Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by imf11.hostedemail.com (Postfix) with ESMTP id DB2EB4000A for ; Sat, 16 Dec 2023 06:28:57 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=imxovGJr; spf=pass (imf11.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.11 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702708138; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OFWxI1i+p4efvmikRdB46knSq10ZwkVaViiQ0SsvQMA=; b=STP2suRRCkuerzzfKdHwoK8Zso2ZgHDP29JsorJAeuxvpCtkwmAvlizRUWAr8dVooyUiy3 tKwqqiLRnN77zUTeij9Af0Msr5QGXZ/VvrY/hISeLVVXGppJBAahqC0AmErV10T9m6icB1 9oS15bSn6yQGom0cXzicol8oRtOfl0U= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=imxovGJr; spf=pass (imf11.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.11 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702708138; a=rsa-sha256; cv=none; b=6SFUa0ImMOU47mRZUdkXyMxlGkXKNfaM/WT22V0iphDvWPEv6SbU3Dv/Y7zTy/0l/PB4rH BeDYd3shg3/clIn7q7vyZ+F6IGGeprXK/Rcz6UdKO9VeXlp4ESC+2YU6F45r0sX816oNC5 hbPtEswmJ/WfKJxU1XLLCB12aG4rzo0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702708138; x=1734244138; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=U5Op4CjhDDAHfKtiDzpe6+9a1b7R8CllBxVTE/TesJE=; b=imxovGJrZxh5oH2QSBvnxFgTkBy2JCYtYaPqDMlYGqPJKmjpaSeRFH3R Q/QWqZixMH9M7jg4Vgm9FZbJ94AbkzGU4NflmmwN22a+mE9x1udJxOAoR yyZ/Y/lRMQuO+sxF9ZQ8H4fil3ziukNrym9q5oQemLAGzb52TxN/OGHK2 PGjQgYv2LNLu1M1MPY2YZUUDQbuIcaLUjndx48kY65S2GOdqOh4GxtxKr tQGD223S0r2B9J7UxlPMndq9hwjGzIih4wF6RV09mbLVk3Bo8c9hCHlC1 CZQvkEOXaN7KGMW3yQRQfuocIMPci8MZXbSgM7eACxzS2sBgOLbBrpf0N Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10925"; a="2186018" X-IronPort-AV: E=Sophos;i="6.04,280,1695711600"; d="scan'208";a="2186018" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2023 22:28:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10925"; a="751178900" X-IronPort-AV: E=Sophos;i="6.04,280,1695711600"; d="scan'208";a="751178900" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2023 22:28:54 -0800 From: Vivek Kasireddy To: dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: Vivek Kasireddy , David Hildenbrand , Daniel Vetter , Mike Kravetz , Hugh Dickins , Peter Xu , Jason Gunthorpe , Gerd Hoffmann , Dongwon Kim , Junxiao Chang Subject: [PATCH v8 1/6] udmabuf: Use vmf_insert_pfn and VM_PFNMAP for handling mmap Date: Fri, 15 Dec 2023 22:05:31 -0800 Message-Id: <20231216060536.3716466-2-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231216060536.3716466-1-vivek.kasireddy@intel.com> References: <20231216060536.3716466-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: DB2EB4000A X-Rspam-User: X-Stat-Signature: k99678aokwi7uo4r7rfk5u5ertx6swfu X-Rspamd-Server: rspam01 X-HE-Tag: 1702708137-821810 X-HE-Meta: U2FsdGVkX18M+/p5JLPfparRFIr77D055KETgXwfGvfGSqOjj+MX4E1cCr8uav8J55kVENQT60KKqNZFxdShQv8sBwkUe2ON9HUBHlLcmkbsm90HEpzHhuSy1bycr4Jyt1oPLA/aKVGToPTB/AhzNcAdNWzaOziokKktAbSoRNibfJFu29gk8vP6nG20dkYk0ZCdy+KchIDBWEzK9AjToRZdp1/cnxpSvLbjftX+0X94/exbw0lV49yDEnYcM13ukIwf1tcKGtekKNcZFaqxtOysYL23n3rea9UbMnesuKWCpK+8apvq+yQBe7ZNmp1QMbJoZ+x8itbMsVFa8VK9KBDALACLnwU3GWaUelssWXuSW/vmh13VmoAt8AC0TPP8eds+bfxYW6+qKEEYbaDxn3OMrsrxodzeEIa5N7Y/5JamJp5DJSTYlbDhcfc42uS9DwzzSH0tD9UUWsXkeAm660RV5v2hECefWgIz9Y+6yZdKSGsuIE9l839DUNE/QN29Af2UOFMFVojYN4thHNNqm9j0Vx1QR2V6zNp5YtmsSjhJJ3zREsGo+i81W5MQkbGedCqtCCTayAIzKUb1REv6T/n3N4nM3NA0G2uBkVRDRymq98/xdA3TNLkmX6dlf0WnqKB+V96ya3cP/HXLP6qKZQyrGgtpc8UXeM3OlN7Lw5ez87ZGtk7xpY95cXeSz8GmKqiohm+qgAZ5QHIazujvpKf4kUKqGAeaJb4/xn/vopGV0rI4+wIo5HFohWgVM9CSPxbxq1DIb1wZlY3lqlLD1pzXWq6PRNmkazxFTnajhOdGFqFcVebGa6NBOPVuvTfdFLdbK6744YVhuEXoRy2dmEAnb6gPwZbjwR1r1Hll+4QZIsS+TCam5B0MLnITVc/pEqfKNluIREdXs/iszoiNUt0ujztzxeNJU/ytmBiS83C75LHJt0O42w== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Add VM_PFNMAP to vm_flags in the mmap handler to ensure that the mappings would be managed without using struct page. And, in the vm_fault handler, use vmf_insert_pfn to share the page's pfn to userspace instead of directly sharing the page (via struct page *). Cc: David Hildenbrand Cc: Daniel Vetter Cc: Mike Kravetz Cc: Hugh Dickins Cc: Peter Xu Cc: Jason Gunthorpe Cc: Gerd Hoffmann Cc: Dongwon Kim Cc: Junxiao Chang Suggested-by: David Hildenbrand Acked-by: David Hildenbrand Signed-off-by: Vivek Kasireddy --- drivers/dma-buf/udmabuf.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index c40645999648..820c993c8659 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -35,12 +35,13 @@ static vm_fault_t udmabuf_vm_fault(struct vm_fault *vmf) struct vm_area_struct *vma = vmf->vma; struct udmabuf *ubuf = vma->vm_private_data; pgoff_t pgoff = vmf->pgoff; + unsigned long pfn; if (pgoff >= ubuf->pagecount) return VM_FAULT_SIGBUS; - vmf->page = ubuf->pages[pgoff]; - get_page(vmf->page); - return 0; + + pfn = page_to_pfn(ubuf->pages[pgoff]); + return vmf_insert_pfn(vma, vmf->address, pfn); } static const struct vm_operations_struct udmabuf_vm_ops = { @@ -56,6 +57,7 @@ static int mmap_udmabuf(struct dma_buf *buf, struct vm_area_struct *vma) vma->vm_ops = &udmabuf_vm_ops; vma->vm_private_data = ubuf; + vm_flags_set(vma, VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP); return 0; } From patchwork Sat Dec 16 06:05:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kasireddy, Vivek" X-Patchwork-Id: 13495482 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC125C4167B for ; Sat, 16 Dec 2023 06:29:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 726036B00A1; Sat, 16 Dec 2023 01:29:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 525C96B00C0; Sat, 16 Dec 2023 01:29:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1A3FF6B00A8; Sat, 16 Dec 2023 01:29:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id EA44D6B00AA for ; Sat, 16 Dec 2023 01:29:01 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id BB5F08067D for ; Sat, 16 Dec 2023 06:29:01 +0000 (UTC) X-FDA: 81571703682.09.86A83ED Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by imf20.hostedemail.com (Postfix) with ESMTP id A3A071C000A for ; Sat, 16 Dec 2023 06:28:59 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=QpH7WN23; spf=pass (imf20.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.11 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702708139; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=gnFFCZ/4N7bQ8jwcsO7jGvxgDXP7BPVbDrHLX60MqX8=; b=L+VOhHzXNvn05pXRzeWOk05M8y7cOiWGA3M0t6HlTs411TOwsmAHgRHCM8T+IJEn+2O9O9 ZFZikbz7K17vrbKf/l4zQYgNhOt5xRncJ3x5NRrruHNK6q/u31jNF05DN2dwe2h7EfSp+h o/Y9rMU3IvS4QZU0kabGmZ5+YclQBMQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702708139; a=rsa-sha256; cv=none; b=Kt/7GfyWdMVS4z3Vv2/OFDoYhD9T6bAsZpyJTHUuxKlJ5LlrQMZMdmnFSA/pJ46J86PiMX XFu9BGfNjtu6SlnS3vRtODecP/Ei7LOOe0c9cS+2YmJLXner7GWba9NLRlmInHaNOYRev8 4UZ4iJ6A2d0ThLnVojcG7L9TtzY+s4I= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=QpH7WN23; spf=pass (imf20.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.11 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702708140; x=1734244140; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=O1c3JIhGATN1dxcRTvUuRK9RhQSZEkJPgfU5c33zkAo=; b=QpH7WN23x1UEgXmRoZhVdX37VCh9jF3m4ZEu15cEQiGkD2LcW0wZFE77 k4YmTPaGb9jARf5rEV2pjRfz3W5kuOraXU8DQl3BMMGHkZpK8TnTnppvB i2Q5w4SARgVXUvcKnUmWeN1djTX8bSr8EFeM8mkOmuC9EjswOmvbxXpq4 3d8NYj0l63R0gjch69V1KM6g2hT/6zyo203/ux7DfFTh461WEzBXhwczG q3SaFrBbmAZYgzD1W61IEVymahiMD/fFWEXGjeb4KEeGuwqKOmOJLYMnW rb2HgFXszS5xNWdQLgV1ES3IXMxs9I0FMAHvM3W+nSMtaaR/PTjLMlhTn w==; X-IronPort-AV: E=McAfee;i="6600,9927,10925"; a="2186021" X-IronPort-AV: E=Sophos;i="6.04,280,1695711600"; d="scan'208";a="2186021" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2023 22:28:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10925"; a="751178906" X-IronPort-AV: E=Sophos;i="6.04,280,1695711600"; d="scan'208";a="751178906" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2023 22:28:55 -0800 From: Vivek Kasireddy To: dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: Vivek Kasireddy , David Hildenbrand , Daniel Vetter , Mike Kravetz , Hugh Dickins , Peter Xu , Jason Gunthorpe , Gerd Hoffmann , Dongwon Kim , Junxiao Chang Subject: [PATCH v8 2/6] udmabuf: Add back support for mapping hugetlb pages (v6) Date: Fri, 15 Dec 2023 22:05:32 -0800 Message-Id: <20231216060536.3716466-3-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231216060536.3716466-1-vivek.kasireddy@intel.com> References: <20231216060536.3716466-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 X-Stat-Signature: qb8zqmrnknock61ghrr5yosg4gpaw3ja X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: A3A071C000A X-Rspam-User: X-HE-Tag: 1702708139-53920 X-HE-Meta: U2FsdGVkX18Mz01ItrEG98LgktgPiDQXgMxfcV9rWDX9pUknbeIPHpuy9sELAlZsDmXlQZB1I2Yb+5hx9a0hN3HzUpiV8Kfx7P8jax88LC+/Iy3Qfyc5QqCrKKtAJGb0JfYd86hGhR41QoTh8MHp/AKoMKYy0YCwwdQfxPQesaBxlbTaQaixCPKktxvkyYidbSYOlLg/fW3J0gOCl5Tvwb7rO2D3Fp0FBnUnrNQ4qrzUQXiRlpz49GgHdw545G1n+iL1q11gUlASS0kRGh0DFG6z308pUoiUdMS3zxnW/kAJQGNLoZyX7uOI4W4f/iZ5f/Zcw7mitaHC8HRhpYesoYqa5JSZx2d9GqUFce9poYHQUedi6b0pFo70+zl2BLn16M+8HcNgMTEYkHd7S+PGPPn458CFfoYeFvafkWpB8rKoNZ9oImXme+jnVmQ1yvLcc5VBIE/OiNpRlKHlqI313n1wR4jDmRrqrVJLgP72kwFKSPpRptTcgVpQOsP1oexCCrJcr6X4OEACL/hkb4OVNIXu9qc3ec3YuSvpuS/1fi5ZGddxnhYu87ws1MdImdUYC08AFeJ/h6pSmVojjMxRO+bILWSGND4eMo9Cbz/nVChlDTEy2iUfbEKHZNwELLHZmpSPcmXhqNtYCpnxh7D+8sCwssuEbYA5veS/gH9uK3f74ZVO0k8dYWnMwVJFl3Ma3Zhvdhc3zAkMZ6fIVv+OMr7O3NsB0o5cIDI80wvQdMd69xjO75prw3oh3T+bve+x1z5MG6GJSWd4hKVrSIqj7eMTBWsfuOYpc1yoEB20aA7WHWy2W2q3cSyxsYhLrxH6mNc6BagcMFiA+YbMTQTG/GjSNqXV9pJgiM16mk/xFD5P6jkIQGggUDFB3TJ5VyYdKg+AaqRlcokSfZ2hVob7Kos1i95sWFLNgyHk3JD/gUvkw4YSnN/PGfDY8jJnRqgxMzGXW2qLq+fp4arAyPh 4yn7koth jYd/6sKV2pH36eZodlGR0JjyeEHVkzLQhTgI/by8R0qvIBjnnbuOA3Qu3J4Kkcawe0OS9+BIlrVMW0F82Ch8sEGZP1Ylx3M+ZbzUvVOJtfsmVWVhXIcoCm20vWeDG/SQDgQlITumk9JkHqXr2roMBLRvybbhjWAT1k/VR8uNe9+AwHOuJFLf5eGcg6BtZ+iGRHDeEpb1Ojc9em/u1/RMhvzl9511l+TrtTtGBm97jqqgvrYDMlNW3dnpfQg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: A user or admin can configure a VMM (Qemu) Guest's memory to be backed by hugetlb pages for various reasons. However, a Guest OS would still allocate (and pin) buffers that are backed by regular 4k sized pages. In order to map these buffers and create dma-bufs for them on the Host, we first need to find the hugetlb pages where the buffer allocations are located and then determine the offsets of individual chunks (within those pages) and use this information to eventually populate a scatterlist. Testcase: default_hugepagesz=2M hugepagesz=2M hugepages=2500 options were passed to the Host kernel and Qemu was launched with these relevant options: qemu-system-x86_64 -m 4096m.... -device virtio-gpu-pci,max_outputs=1,blob=true,xres=1920,yres=1080 -display gtk,gl=on -object memory-backend-memfd,hugetlb=on,id=mem1,size=4096M -machine memory-backend=mem1 Replacing -display gtk,gl=on with -display gtk,gl=off above would exercise the mmap handler. v2: Updated get_sg_table() to manually populate the scatterlist for both huge page and non-huge-page cases. v3: s/offsets/subpgoff/g s/hpoff/mapidx/g v4: Replaced find_get_page_flags() with __filemap_get_folio() to ensure that we only obtain head pages from the mapping v5: Fix the calculation of mapidx to ensure that it is a order-n page multiple v6: - Split the processing of hugetlb or shmem pages into helpers to simplify the code in udmabuf_create() (Christoph) - Move the creation of offsets array out of hugetlb context and into common code Cc: David Hildenbrand Cc: Daniel Vetter Cc: Mike Kravetz Cc: Hugh Dickins Cc: Peter Xu Cc: Jason Gunthorpe Cc: Gerd Hoffmann Cc: Dongwon Kim Cc: Junxiao Chang Acked-by: Mike Kravetz (v2) Signed-off-by: Vivek Kasireddy --- drivers/dma-buf/udmabuf.c | 122 +++++++++++++++++++++++++++++++------- 1 file changed, 101 insertions(+), 21 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index 820c993c8659..274defd3fa3e 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -28,6 +29,7 @@ struct udmabuf { struct page **pages; struct sg_table *sg; struct miscdevice *device; + pgoff_t *offsets; }; static vm_fault_t udmabuf_vm_fault(struct vm_fault *vmf) @@ -41,6 +43,8 @@ static vm_fault_t udmabuf_vm_fault(struct vm_fault *vmf) return VM_FAULT_SIGBUS; pfn = page_to_pfn(ubuf->pages[pgoff]); + pfn += ubuf->offsets[pgoff] >> PAGE_SHIFT; + return vmf_insert_pfn(vma, vmf->address, pfn); } @@ -90,23 +94,29 @@ static struct sg_table *get_sg_table(struct device *dev, struct dma_buf *buf, { struct udmabuf *ubuf = buf->priv; struct sg_table *sg; + struct scatterlist *sgl; + unsigned int i = 0; int ret; sg = kzalloc(sizeof(*sg), GFP_KERNEL); if (!sg) return ERR_PTR(-ENOMEM); - ret = sg_alloc_table_from_pages(sg, ubuf->pages, ubuf->pagecount, - 0, ubuf->pagecount << PAGE_SHIFT, - GFP_KERNEL); + + ret = sg_alloc_table(sg, ubuf->pagecount, GFP_KERNEL); if (ret < 0) - goto err; + goto err_alloc; + + for_each_sg(sg->sgl, sgl, ubuf->pagecount, i) + sg_set_page(sgl, ubuf->pages[i], PAGE_SIZE, ubuf->offsets[i]); + ret = dma_map_sgtable(dev, sg, direction, 0); if (ret < 0) - goto err; + goto err_map; return sg; -err: +err_map: sg_free_table(sg); +err_alloc: kfree(sg); return ERR_PTR(ret); } @@ -143,6 +153,7 @@ static void release_udmabuf(struct dma_buf *buf) for (pg = 0; pg < ubuf->pagecount; pg++) put_page(ubuf->pages[pg]); + kfree(ubuf->offsets); kfree(ubuf->pages); kfree(ubuf); } @@ -196,17 +207,77 @@ static const struct dma_buf_ops udmabuf_ops = { #define SEALS_WANTED (F_SEAL_SHRINK) #define SEALS_DENIED (F_SEAL_WRITE) +static int handle_hugetlb_pages(struct udmabuf *ubuf, struct file *memfd, + pgoff_t offset, pgoff_t pgcnt, + pgoff_t *pgbuf) +{ + struct hstate *hpstate = hstate_file(memfd); + pgoff_t mapidx = offset >> huge_page_shift(hpstate); + pgoff_t subpgoff = (offset & ~huge_page_mask(hpstate)) >> PAGE_SHIFT; + pgoff_t maxsubpgs = huge_page_size(hpstate) >> PAGE_SHIFT; + struct page *hpage = NULL; + struct folio *folio; + pgoff_t pgidx; + + mapidx <<= huge_page_order(hpstate); + for (pgidx = 0; pgidx < pgcnt; pgidx++) { + if (!hpage) { + folio = __filemap_get_folio(memfd->f_mapping, + mapidx, + FGP_ACCESSED, 0); + if (IS_ERR(folio)) + return PTR_ERR(folio); + + hpage = &folio->page; + } + + get_page(hpage); + ubuf->pages[*pgbuf] = hpage; + ubuf->offsets[*pgbuf] = subpgoff << PAGE_SHIFT; + (*pgbuf)++; + if (++subpgoff == maxsubpgs) { + put_page(hpage); + hpage = NULL; + subpgoff = 0; + mapidx += pages_per_huge_page(hpstate); + } + } + + if (hpage) + put_page(hpage); + + return 0; +} + +static int handle_shmem_pages(struct udmabuf *ubuf, struct file *memfd, + pgoff_t offset, pgoff_t pgcnt, + pgoff_t *pgbuf) +{ + pgoff_t pgidx, pgoff = offset >> PAGE_SHIFT; + struct page *page; + + for (pgidx = 0; pgidx < pgcnt; pgidx++) { + page = shmem_read_mapping_page(memfd->f_mapping, + pgoff + pgidx); + if (IS_ERR(page)) + return PTR_ERR(page); + + ubuf->pages[*pgbuf] = page; + (*pgbuf)++; + } + + return 0; +} + static long udmabuf_create(struct miscdevice *device, struct udmabuf_create_list *head, struct udmabuf_create_item *list) { DEFINE_DMA_BUF_EXPORT_INFO(exp_info); struct file *memfd = NULL; - struct address_space *mapping = NULL; struct udmabuf *ubuf; struct dma_buf *buf; - pgoff_t pgoff, pgcnt, pgidx, pgbuf = 0, pglimit; - struct page *page; + pgoff_t pgcnt, pgbuf = 0, pglimit; int seals, ret = -EINVAL; u32 i, flags; @@ -234,6 +305,12 @@ static long udmabuf_create(struct miscdevice *device, ret = -ENOMEM; goto err; } + ubuf->offsets = kcalloc(ubuf->pagecount, sizeof(*ubuf->offsets), + GFP_KERNEL); + if (!ubuf->offsets) { + ret = -ENOMEM; + goto err; + } pgbuf = 0; for (i = 0; i < head->count; i++) { @@ -241,8 +318,7 @@ static long udmabuf_create(struct miscdevice *device, memfd = fget(list[i].memfd); if (!memfd) goto err; - mapping = memfd->f_mapping; - if (!shmem_mapping(mapping)) + if (!shmem_file(memfd) && !is_file_hugepages(memfd)) goto err; seals = memfd_fcntl(memfd, F_GET_SEALS, 0); if (seals == -EINVAL) @@ -251,16 +327,19 @@ static long udmabuf_create(struct miscdevice *device, if ((seals & SEALS_WANTED) != SEALS_WANTED || (seals & SEALS_DENIED) != 0) goto err; - pgoff = list[i].offset >> PAGE_SHIFT; - pgcnt = list[i].size >> PAGE_SHIFT; - for (pgidx = 0; pgidx < pgcnt; pgidx++) { - page = shmem_read_mapping_page(mapping, pgoff + pgidx); - if (IS_ERR(page)) { - ret = PTR_ERR(page); - goto err; - } - ubuf->pages[pgbuf++] = page; - } + + pgcnt = list[i].size >> PAGE_SHIFT; + if (is_file_hugepages(memfd)) + ret = handle_hugetlb_pages(ubuf, memfd, + list[i].offset, + pgcnt, &pgbuf); + else + ret = handle_shmem_pages(ubuf, memfd, + list[i].offset, + pgcnt, &pgbuf); + if (ret < 0) + goto err; + fput(memfd); memfd = NULL; } @@ -287,6 +366,7 @@ static long udmabuf_create(struct miscdevice *device, put_page(ubuf->pages[--pgbuf]); if (memfd) fput(memfd); + kfree(ubuf->offsets); kfree(ubuf->pages); kfree(ubuf); return ret; From patchwork Sat Dec 16 06:05:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kasireddy, Vivek" X-Patchwork-Id: 13495483 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11902C46CA2 for ; Sat, 16 Dec 2023 06:29:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8CE966B00A8; Sat, 16 Dec 2023 01:29:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6AF2B6B00BF; Sat, 16 Dec 2023 01:29:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3F93B6B00AA; Sat, 16 Dec 2023 01:29:02 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 0DE786B00BF for ; Sat, 16 Dec 2023 01:29:02 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D4164C0677 for ; Sat, 16 Dec 2023 06:29:01 +0000 (UTC) X-FDA: 81571703682.06.33F0113 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by imf13.hostedemail.com (Postfix) with ESMTP id CE6B02000A for ; Sat, 16 Dec 2023 06:28:59 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=fjQZyGlF; spf=pass (imf13.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.11 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702708140; a=rsa-sha256; cv=none; b=4OOKRUhJy9XcCy2e1oR2QpoyVCYd3PXHKPRf0kjOWChMMgypN3NXAPhw8wCBHykPmkJIbf uJfj1y7hH+rMDGzdVnL9kIwCSxjlbYgIm75+JKGYiX9IP7Gq61oOGqEzhEis7iGBmypM0A JguZ5tSXGFCT9TnlOqvm+XFDCHtfvMM= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=fjQZyGlF; spf=pass (imf13.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.11 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702708140; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=HgUf9xvNGhf0mKRtLxTACr98gQto6P+Ks3i2EimhJto=; b=Jr9N4ZI9tqxq2krcc1OvwSa17XrwSe26uHlCFiwJRPnGHV499u9KS9HABWOz1zN7HYjueF IPQ0e2XlQrkYuKfpuhuwf8LhKoxTdTMIilDoOfZVYFDsQTKd3NpPUIlbAH/jVYiUAxnP79 bS0RDSYRH9Si/BbUSJf1t9ercrAzBPM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702708140; x=1734244140; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=y7c0p+lPK1aglp77lTkz3x2+xm9XiI7T8TRoE4cz9K8=; b=fjQZyGlFMFF9tgkOLQWVXyQB/Xk8maIjCihcEydBuug3nnF11qlM98FA FMwEmJI7nBpQI5bOmlzfFBZxpOMrCj5RL+CjHL8Fzd5csLz0DkfJ6pGzU 9GagSEYnShdqdnCD+GK+iICXvSrZJv043WddwPMMXhmxSVVv7Dn7F6oSS Z7h+PZexLZmKgUoWhOSQrhwqtUHzfZWCYgTNcjwY/KCV7DFvPaXDzvGog tADzVsn7J+oMLVsW7uh5JtOBBjHeYRB1EwS6H5xlCCLFiqYE5tzanyqMa WkIPNWGAbxSsf71XsowHs/bxQpiZTxskojLNtKNkQg5MB/h3ppNXOkjsT g==; X-IronPort-AV: E=McAfee;i="6600,9927,10925"; a="2186028" X-IronPort-AV: E=Sophos;i="6.04,280,1695711600"; d="scan'208";a="2186028" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2023 22:28:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10925"; a="751178910" X-IronPort-AV: E=Sophos;i="6.04,280,1695711600"; d="scan'208";a="751178910" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2023 22:28:55 -0800 From: Vivek Kasireddy To: dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: Vivek Kasireddy , David Hildenbrand , Christoph Hellwig , Daniel Vetter , Mike Kravetz , Hugh Dickins , Peter Xu , Gerd Hoffmann , Dongwon Kim , Junxiao Chang , Jason Gunthorpe , Christoph Hellwig Subject: [PATCH v8 3/6] mm/gup: Introduce memfd_pin_folios() for pinning memfd folios (v8) Date: Fri, 15 Dec 2023 22:05:33 -0800 Message-Id: <20231216060536.3716466-4-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231216060536.3716466-1-vivek.kasireddy@intel.com> References: <20231216060536.3716466-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: CE6B02000A X-Stat-Signature: aehk9gkrth9szk7eqfowpecu3jmr35o8 X-Rspam-User: X-HE-Tag: 1702708139-476338 X-HE-Meta: U2FsdGVkX1+m2RxWglFqMrup20IO7+PvHJwNLfoUWRhWTS/vuG1aMUKs49vYU8YDil473i2kzjbvRDOF7PysBbp69Eq5DaotRtOdkpWJfwX576/t0lr4eQwjwJKE1JtzkAn5/Fm7MpyqcRYn8o1P/sxQuOMrqItStYJBcoxLSSFnSywVZpAYjANUSeNNid6x/72ShhYOT00FNRUWlz8zp2rxOIxd0MLihHxbgsIdKS8GXT3T4TR+egOXMq+ETdOoOv5sMf6mTnMY30T1KHJmsgV+KNDZhpsfK5dCeNVLfs8y5uIw5UssEijp2yXb1fuxMJXlXezRD0q04D1sBicTNrelfpeznvAT/okEL2/qp3mSuoJ/E100Z3tOk5aGBRoU23Djd3CP1yFNCltYT6eb5N+1C1sOXBf4TSdpS36JeQyAXd/CotnRMHpKwf3GfK2xoL/XA5Q7QPcbcJDKQNkxTPbfrHmJbMKMXtAC4skWo+GdBYiByfUqUoDLd86aEgC/KiV1N6ruBbxYFyE46d/ENcvpnRzaiA0NRdOr99nzKE5SHeHymmbwgRYneipmxtlCF7Y8fCAduRXYwyNmuMjTrCdZ94miOujWyP6cHcVCa41J4aRV68M0RRu7qszjbgVsO4fflKV8QDn/nIAxeG1N7eSIx846RZGaLmKjop6inTiYvgiH3J91xsh/6QizP7qxtJ1b0cyhCn7uepf/7x1Qj4QqEfd9pQU6leJeOAUI6Sg1X051gWg4IxQ9uIymWEnSaQyH9d/xs3H6tSWqgA2k9CSevJaCTJJmuTc0aI5dwt4vs5gG/QETUME1tyBxPF21iw1bLCHzlAxYrO2S6lj7zRFY2LQu7tqWge/427Nr202bXxsEQZOwGic1tfRgI7bMBuIKKUQl80/rW76PZtv7PBz9l9VJRGmDzhRN2hIIJr2eibS+CORyNTpO1ixCZq4xIGUpUf9d0avMMlCT87O bY7Nkm6S S5SImk9ELd8+5jaUBOI61MwaZhXtoCtn7sDIE0pdUU+SBg87O+i+PJ92rxMnpP5pgFbjx+M/xPSzIv7sW6AoBScRW3UARVw3ywRgiY6QeO19D9ORllHlvqvT6YFkdt1RO4CfVTeeWxUNCxggVOKpWW1AHhEQM4j/Emhg85TouUIsme0OqxszFIKu+1UVplsvONuLYTZPZuAHPzrgy8UqTrWWJGq2vBlJyZYRDsrludWP01KFxDELIqmcWYOiIlaa5Bspdm7FavS23cWEbvnG/y+oLncatR8R3hpgcP6fCcB0xWLeGMY+rRmkd6lby6tpTv7PGdq6rdxlg76zfmT7b4BDFMhs9sGKwm8bD8ucDT5+nHds= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: For drivers that would like to longterm-pin the folios associated with a memfd, the memfd_pin_folios() API provides an option to not only pin the folios via FOLL_PIN but also to check and migrate them if they reside in movable zone or CMA block. This API currently works with memfds but it should work with any files that belong to either shmemfs or hugetlbfs. Files belonging to other filesystems are rejected for now. The folios need to be located first before pinning them via FOLL_PIN. If they are found in the page cache, they can be immediately pinned. Otherwise, they need to be allocated using the filesystem specific APIs and then pinned. v2: - Drop gup_flags and improve comments and commit message (David) - Allocate a page if we cannot find in page cache for the hugetlbfs case as well (David) - Don't unpin pages if there is a migration related failure (David) - Drop the unnecessary nr_pages <= 0 check (Jason) - Have the caller of the API pass in file * instead of fd (Jason) v3: (David) - Enclose the huge page allocation code with #ifdef CONFIG_HUGETLB_PAGE (Build error reported by kernel test robot ) - Don't forget memalloc_pin_restore() on non-migration related errors - Improve the readability of the cleanup code associated with non-migration related errors - Augment the comments by describing FOLL_LONGTERM like behavior - Include the R-b tag from Jason v4: - Remove the local variable "page" and instead use 3 return statements in alloc_file_page() (David) - Add the R-b tag from David v5: (David) - For hugetlb case, ensure that we only obtain head pages from the mapping by using __filemap_get_folio() instead of find_get_page_flags() - Handle -EEXIST when two or more potential users try to simultaneously add a huge page to the mapping by forcing them to retry on failure v6: (Christoph) - Rename this API to memfd_pin_user_pages() to make it clear that it is intended for memfds - Move the memfd page allocation helper from gup.c to memfd.c - Fix indentation errors in memfd_pin_user_pages() - For contiguous ranges of folios, use a helper such as filemap_get_folios_contig() to lookup the page cache in batches v7: - Rename this API to memfd_pin_folios() and make it return folios and offsets instead of pages (David) - Don't continue processing the folios in the batch returned by filemap_get_folios_contig() if they do not have correct next_idx - Add the R-b tag from Christoph v8: (David) - Have caller pass [start, end], max_folios instead of start, nr_pages - Replace offsets array with just offset into the first page - Add comments explaning the need for next_idx - Pin (and return) the folio (via FOLL_PIN) only once Cc: David Hildenbrand Cc: Christoph Hellwig Cc: Daniel Vetter Cc: Mike Kravetz Cc: Hugh Dickins Cc: Peter Xu Cc: Gerd Hoffmann Cc: Dongwon Kim Cc: Junxiao Chang Suggested-by: Jason Gunthorpe Reviewed-by: Jason Gunthorpe (v2) Reviewed-by: David Hildenbrand (v3) Reviewed-by: Christoph Hellwig (v6) Signed-off-by: Vivek Kasireddy --- include/linux/memfd.h | 5 ++ include/linux/mm.h | 3 + mm/gup.c | 149 ++++++++++++++++++++++++++++++++++++++++++ mm/memfd.c | 34 ++++++++++ 4 files changed, 191 insertions(+) diff --git a/include/linux/memfd.h b/include/linux/memfd.h index e7abf6fa4c52..b38fb35f4271 100644 --- a/include/linux/memfd.h +++ b/include/linux/memfd.h @@ -6,11 +6,16 @@ #ifdef CONFIG_MEMFD_CREATE extern long memfd_fcntl(struct file *file, unsigned int cmd, unsigned int arg); +extern struct folio *memfd_alloc_folio(struct file *memfd, pgoff_t idx); #else static inline long memfd_fcntl(struct file *f, unsigned int c, unsigned int a) { return -EINVAL; } +static inline struct page *memfd_alloc_folio(struct file *memfd, pgoff_t idx) +{ + return ERR_PTR(-EINVAL); +} #endif #endif /* __LINUX_MEMFD_H */ diff --git a/include/linux/mm.h b/include/linux/mm.h index 418d26608ece..956f0ec24598 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2472,6 +2472,9 @@ long get_user_pages_unlocked(unsigned long start, unsigned long nr_pages, struct page **pages, unsigned int gup_flags); long pin_user_pages_unlocked(unsigned long start, unsigned long nr_pages, struct page **pages, unsigned int gup_flags); +long memfd_pin_folios(struct file *file, loff_t start, loff_t end, + struct folio **folios, unsigned int max_folios, + unsigned long *offset); int get_user_pages_fast(unsigned long start, int nr_pages, unsigned int gup_flags, struct page **pages); diff --git a/mm/gup.c b/mm/gup.c index 231711efa390..70ae653e4109 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -17,6 +18,7 @@ #include #include #include +#include #include #include @@ -3410,3 +3412,150 @@ long pin_user_pages_unlocked(unsigned long start, unsigned long nr_pages, &locked, gup_flags); } EXPORT_SYMBOL(pin_user_pages_unlocked); + +/** + * memfd_pin_folios() - pin folios associated with a memfd + * @memfd: the memfd whose folios are to be pinned + * @start: the first memfd offset + * @end: the last memfd offset (inclusive) + * @folios: array that receives pointers to the folios pinned + * @max_folios: maximum number of entries in @folios + * @offset: the offset into the first folio + * + * Attempt to pin folios associated with a memfd in the contiguous range + * [start, end]. Given that a memfd is either backed by shmem or hugetlb, + * the folios can either be found in the page cache or need to be allocated + * if necessary. Once the folios are located, they are all pinned via + * FOLL_PIN and @offset is populatedwith the offset into the first folio. + * And, eventually, these pinned folios must be released either using + * unpin_user_pages() or unpin_user_page(). + * + * It must be noted that the folios may be pinned for an indefinite amount + * of time. And, in most cases, the duration of time they may stay pinned + * would be controlled by the userspace. This behavior is effectively the + * same as using FOLL_LONGTERM with other GUP APIs. + * + * Returns number of folios pinned, which could be less than @max_folios + * as it depends on the folio sizes that cover the range [start, end]. + * If no folios were pinned, it returns -errno. + */ +long memfd_pin_folios(struct file *memfd, loff_t start, loff_t end, + struct folio **folios, unsigned int max_folios, + unsigned long *offset) +{ + unsigned int flags, nr_folios, nr_found; + unsigned int i, pgshift = PAGE_SHIFT; + pgoff_t start_idx, end_idx, next_idx; + struct folio *folio = NULL; + struct folio_batch fbatch; + struct page **pages; + struct hstate *h; + long ret; + + if (start > end || !max_folios) + return -EINVAL; + + if (!memfd) + return -EINVAL; + + if (!shmem_file(memfd) && !is_file_hugepages(memfd)) + return -EINVAL; + + pages = kmalloc_array(max_folios, sizeof(*pages), GFP_KERNEL); + if (!pages) + return -ENOMEM; + + if (is_file_hugepages(memfd)) { + h = hstate_file(memfd); + pgshift = huge_page_shift(h); + } + + flags = memalloc_pin_save(); + do { + nr_folios = 0; + start_idx = start >> pgshift; + end_idx = end >> pgshift; + if (is_file_hugepages(memfd)) { + start_idx <<= huge_page_order(h); + end_idx <<= huge_page_order(h); + } + + folio_batch_init(&fbatch); + while (start_idx <= end_idx && nr_folios < max_folios) { + /* + * In most cases, we should be able to find the folios + * in the page cache. If we cannot find them for some + * reason, we try to allocate them and add them to the + * page cache. + */ + nr_found = filemap_get_folios_contig(memfd->f_mapping, + &start_idx, + end_idx, + &fbatch); + if (folio) { + folio_put(folio); + folio = NULL; + } + + next_idx = 0; + for (i = 0; i < nr_found; i++) { + /* + * As there can be multiple entries for a + * given folio in the batch returned by + * filemap_get_folios_contig(), the below + * check is to ensure that we pin and return a + * unique set of folios between start and end. + */ + if (next_idx && + next_idx != folio_index(fbatch.folios[i])) + continue; + + folio = try_grab_folio(&fbatch.folios[i]->page, + 1, FOLL_PIN); + if (!folio) { + folio_batch_release(&fbatch); + kfree(pages); + goto err; + } + + if (nr_folios == 0) + *offset = offset_in_folio(folio, start); + + folios[nr_folios] = folio; + pages[nr_folios] = folio_page(folio, 0); + next_idx = folio_next_index(folio); + + if (++nr_folios == max_folios) + break; + } + + folio = NULL; + folio_batch_release(&fbatch); + if (!nr_found) { + folio = memfd_alloc_folio(memfd, start_idx); + if (IS_ERR(folio)) { + ret = PTR_ERR(folio); + if (ret != -EEXIST) { + kfree(pages); + goto err; + } + } + } + } + + ret = check_and_migrate_movable_pages(nr_folios, pages); + } while (ret == -EAGAIN); + + kfree(pages); + memalloc_pin_restore(flags); + return ret ? ret : nr_folios; +err: + memalloc_pin_restore(flags); + while (i-- > 0) + if (folios[i]) + gup_put_folio(folios[i], 1, FOLL_PIN); + + return ret; +} +EXPORT_SYMBOL_GPL(memfd_pin_folios); + diff --git a/mm/memfd.c b/mm/memfd.c index d3a1ba4208c9..36a75e8249f8 100644 --- a/mm/memfd.c +++ b/mm/memfd.c @@ -63,6 +63,40 @@ static void memfd_tag_pins(struct xa_state *xas) xas_unlock_irq(xas); } +/* + * This is a helper function used by memfd_pin_user_pages() in GUP (gup.c). + * It is mainly called to allocate a page in a memfd when the caller + * (memfd_pin_user_pages()) cannot find a page in the page cache at a given + * index in the mapping. + */ +struct folio *memfd_alloc_folio(struct file *memfd, pgoff_t idx) +{ +#ifdef CONFIG_HUGETLB_PAGE + struct folio *folio; + int err; + + if (is_file_hugepages(memfd)) { + folio = alloc_hugetlb_folio_nodemask(hstate_file(memfd), + NUMA_NO_NODE, + NULL, + GFP_USER); + if (folio && folio_try_get(folio)) { + err = hugetlb_add_to_page_cache(folio, + memfd->f_mapping, + idx); + if (err) { + folio_put(folio); + free_huge_folio(folio); + return ERR_PTR(err); + } + return folio; + } + return ERR_PTR(-ENOMEM); + } +#endif + return shmem_read_folio(memfd->f_mapping, idx); +} + /* * Setting SEAL_WRITE requires us to verify there's no pending writer. However, * via get_user_pages(), drivers might have some pending I/O without any active From patchwork Sat Dec 16 06:05:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kasireddy, Vivek" X-Patchwork-Id: 13495481 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A679C38147 for ; Sat, 16 Dec 2023 06:29:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3FC1E6B00AC; Sat, 16 Dec 2023 01:29:02 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3783A6B00A1; Sat, 16 Dec 2023 01:29:02 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 01B236B00AC; Sat, 16 Dec 2023 01:29:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id D128D6B00A1 for ; Sat, 16 Dec 2023 01:29:01 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A524F140682 for ; Sat, 16 Dec 2023 06:29:01 +0000 (UTC) X-FDA: 81571703682.10.0CCD743 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by imf11.hostedemail.com (Postfix) with ESMTP id D156540009 for ; Sat, 16 Dec 2023 06:28:59 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=hqhR8U3j; spf=pass (imf11.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.11 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702708140; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=WoOlj0+FN2u6l8eE8sI64entA6PFFPqd725ekkUPvt0=; b=wLwTbAXsYZt6K2kvt6PvdPjdY4VxtasvonHA3j98sFFWJYJmv85AVHR3PUbwH4w8V9deOJ w1ZxoF6gACVqbbz4GMWZBLSTW0rZq7ciua+PggsevjplV5Ne0e0v/imNiMWPQHJqMTZ+aq FTgEmBneW0Qgifpx/Ppe2ZxVaW7Y4aw= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=hqhR8U3j; spf=pass (imf11.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.11 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702708140; a=rsa-sha256; cv=none; b=YThkVN82Wg+Qk7XIZ8Oir6SdmW4xrw+TrAOm9JdwjcitXKgh9hB+42POCRrSqWLmDgbrC9 eHTTFbkSIWzFVSIWW5/fhNVkJN9ZYfOCULk56Nww/czlsMYdGnrPOxvECvxTYazQqtMM+S BmZDuK8HDo3j5HgCuz3BYZh1gK9PEAM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702708140; x=1734244140; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=srh+pDeiF4x93Sp9cmg48dB8ma2fshhkeNl1Nqm5xC4=; b=hqhR8U3javNilUdx8wMEf4uJw2TJIACj6sWgo4OBrVTBVcP19qFX9GgZ 5Fj4gFbqw2ALJgohrJY4o324aG8rMxKaenQnBN4eq4nQMYVT25pSZx8xM 6qWPREYVMoceziQS3p7Gk/B7HlAQxj7fgJ5cz9Z/KK+ZE+RN9dmZu57lf k6iL+WY6corr1FGORQYH7DBQsx9gK0B00sKWn1gAXpSTpfWstVGAjlrz+ b9JSz4WfInUSEGw997LSGAj95n7AiCKjZY8d3LN3Rjg8C76CBH2dyoN9I zl9GAXqP+oN9AJv4fUmY6MdK5EBbZFPCH5higExCuMa7oAOXM7q7kk/ut A==; X-IronPort-AV: E=McAfee;i="6600,9927,10925"; a="2186038" X-IronPort-AV: E=Sophos;i="6.04,280,1695711600"; d="scan'208";a="2186038" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2023 22:28:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10925"; a="751178913" X-IronPort-AV: E=Sophos;i="6.04,280,1695711600"; d="scan'208";a="751178913" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2023 22:28:56 -0800 From: Vivek Kasireddy To: dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: Vivek Kasireddy , David Hildenbrand , Matthew Wilcox , Daniel Vetter , Mike Kravetz , Hugh Dickins , Peter Xu , Jason Gunthorpe , Gerd Hoffmann , Dongwon Kim , Junxiao Chang Subject: [PATCH v8 4/6] udmabuf: Convert udmabuf driver to use folios (v2) Date: Fri, 15 Dec 2023 22:05:34 -0800 Message-Id: <20231216060536.3716466-5-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231216060536.3716466-1-vivek.kasireddy@intel.com> References: <20231216060536.3716466-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: D156540009 X-Rspam-User: X-Stat-Signature: hdoii7bf6q9w47tpoamu8yf4bxo48pac X-Rspamd-Server: rspam01 X-HE-Tag: 1702708139-109048 X-HE-Meta: U2FsdGVkX1+4Qwt3n8C83Z1/eg35PgdBc9fysYsO44Wox+WGUwaUZsB9+EdKe9ybKvfB1FSPLNtRWeoMarFK1hiNOQSqrwgzbl15XAu2XvTdpbldf38/VXAQ1HPt5j+tYrJ+fUsY111vXoSb1V+jyik7WYMitehNmFIBkrARcixoxXlyGSBMYW7yf3aPhO/cNjrYp890MHyJ52nM29EhktiBZuC0inmai2VPEmknUsLvagXlDW05ylqAg+IbRwbKaHfs4IQ1Sdwsmec36PMtNPbr1RHwVE8Y2Ex8kieyQ4lpE4I9D+AptOte36fUhViTr8fXH81dD0qU9zO6UNv9iGbFeA+429SKVNzGQp8lgkLT2d1fM9M0zUulkrM6F/1qmCjaerDuRMP+QAZoxH91Bp5HxDcgIu77PnYbjVHkkylvRKVUTN93l5Lhtef/V6Bj5LYW/wtwRRQNrQ2evI/P9BilD9Kcr10jAIgj8hZuN1jRTnsy5xZkruGiLjA6Yl1Y5j2rTDBTEC8Kj62tqCbSZ1JCwfsAYFcrUpIU+W2gBgx/5wkJuz07uyF1yayBw23FL77FPZRN0i2/VTW1j+FsTTVglIfIQ/q8saHHxPDq1GhHXQRCemwgriO2jXPBxjBQBj+/Ib1tDJ9rU4FcbvG/q8GUIh1Ha5y/8sXX45wdPKDhYoLJV7xhjm3dD1DFkfJ64Hn+nnrhfAWsq6sj7XzOdAelvh1N8n9wnZHJ1pTWnIIjR6X+UZDmNT5+MFq8CdkjFSfTPIy5Ub9Xv1PvQ6EehDOAMkpy0FpTMBUnBYWURg/YVqumPPqMf6iA55Vvuyl4TrMgSeK3mdA0lFjU9nfDOumhZgFDKMBmggBHjVipLWVYSBGSgYUs1y3fgjaT1zgRT81vgTEL8QY= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: This is mainly a preparatory patch to use memfd_pin_folios() API for pinning folios. Using folios instead of pages makes sense as the udmabuf driver needs to handle both shmem and hugetlb cases. However, the function vmap_udmabuf() still needs a list of pages; so, we collect all the head pages into a local array in this case. Other changes in this patch include the addition of helpers for checking the memfd seals and exporting dmabuf. Moving code from udmabuf_create() into these helpers improves readability given that udmabuf_create() is a bit long. v2: (Matthew) - Use folio_pfn() on the folio instead of page_to_pfn() on head page - Don't split the arguments to shmem_read_folio() on multiple lines Cc: David Hildenbrand Cc: Matthew Wilcox Cc: Daniel Vetter Cc: Mike Kravetz Cc: Hugh Dickins Cc: Peter Xu Cc: Jason Gunthorpe Cc: Gerd Hoffmann Cc: Dongwon Kim Cc: Junxiao Chang Signed-off-by: Vivek Kasireddy --- drivers/dma-buf/udmabuf.c | 140 ++++++++++++++++++++++---------------- 1 file changed, 83 insertions(+), 57 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index 274defd3fa3e..a8f3af61f7f2 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -26,7 +26,7 @@ MODULE_PARM_DESC(size_limit_mb, "Max size of a dmabuf, in megabytes. Default is struct udmabuf { pgoff_t pagecount; - struct page **pages; + struct folio **folios; struct sg_table *sg; struct miscdevice *device; pgoff_t *offsets; @@ -42,7 +42,7 @@ static vm_fault_t udmabuf_vm_fault(struct vm_fault *vmf) if (pgoff >= ubuf->pagecount) return VM_FAULT_SIGBUS; - pfn = page_to_pfn(ubuf->pages[pgoff]); + pfn = folio_pfn(ubuf->folios[pgoff]); pfn += ubuf->offsets[pgoff] >> PAGE_SHIFT; return vmf_insert_pfn(vma, vmf->address, pfn); @@ -68,11 +68,21 @@ 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; void *vaddr; + pgoff_t pg; dma_resv_assert_held(buf->resv); - vaddr = vm_map_ram(ubuf->pages, ubuf->pagecount, -1); + pages = kmalloc_array(ubuf->pagecount, sizeof(*pages), GFP_KERNEL); + if (!pages) + return -ENOMEM; + + for (pg = 0; pg < ubuf->pagecount; pg++) + pages[pg] = &ubuf->folios[pg]->page; + + vaddr = vm_map_ram(pages, ubuf->pagecount, -1); + kfree(pages); if (!vaddr) return -EINVAL; @@ -107,7 +117,8 @@ static struct sg_table *get_sg_table(struct device *dev, struct dma_buf *buf, goto err_alloc; for_each_sg(sg->sgl, sgl, ubuf->pagecount, i) - sg_set_page(sgl, ubuf->pages[i], PAGE_SIZE, ubuf->offsets[i]); + sg_set_folio(sgl, ubuf->folios[i], PAGE_SIZE, + ubuf->offsets[i]); ret = dma_map_sgtable(dev, sg, direction, 0); if (ret < 0) @@ -152,9 +163,9 @@ static void release_udmabuf(struct dma_buf *buf) put_sg_table(dev, ubuf->sg, DMA_BIDIRECTIONAL); for (pg = 0; pg < ubuf->pagecount; pg++) - put_page(ubuf->pages[pg]); + folio_put(ubuf->folios[pg]); kfree(ubuf->offsets); - kfree(ubuf->pages); + kfree(ubuf->folios); kfree(ubuf); } @@ -215,36 +226,33 @@ static int handle_hugetlb_pages(struct udmabuf *ubuf, struct file *memfd, pgoff_t mapidx = offset >> huge_page_shift(hpstate); pgoff_t subpgoff = (offset & ~huge_page_mask(hpstate)) >> PAGE_SHIFT; pgoff_t maxsubpgs = huge_page_size(hpstate) >> PAGE_SHIFT; - struct page *hpage = NULL; - struct folio *folio; + struct folio *folio = NULL; pgoff_t pgidx; mapidx <<= huge_page_order(hpstate); for (pgidx = 0; pgidx < pgcnt; pgidx++) { - if (!hpage) { + if (!folio) { folio = __filemap_get_folio(memfd->f_mapping, mapidx, FGP_ACCESSED, 0); if (IS_ERR(folio)) return PTR_ERR(folio); - - hpage = &folio->page; } - get_page(hpage); - ubuf->pages[*pgbuf] = hpage; + folio_get(folio); + ubuf->folios[*pgbuf] = folio; ubuf->offsets[*pgbuf] = subpgoff << PAGE_SHIFT; (*pgbuf)++; if (++subpgoff == maxsubpgs) { - put_page(hpage); - hpage = NULL; + folio_put(folio); + folio = NULL; subpgoff = 0; mapidx += pages_per_huge_page(hpstate); } } - if (hpage) - put_page(hpage); + if (folio) + folio_put(folio); return 0; } @@ -254,31 +262,69 @@ static int handle_shmem_pages(struct udmabuf *ubuf, struct file *memfd, pgoff_t *pgbuf) { pgoff_t pgidx, pgoff = offset >> PAGE_SHIFT; - struct page *page; + struct folio *folio = NULL; for (pgidx = 0; pgidx < pgcnt; pgidx++) { - page = shmem_read_mapping_page(memfd->f_mapping, - pgoff + pgidx); - if (IS_ERR(page)) - return PTR_ERR(page); + folio = shmem_read_folio(memfd->f_mapping, pgoff + pgidx); + if (IS_ERR(folio)) + return PTR_ERR(folio); - ubuf->pages[*pgbuf] = page; + ubuf->folios[*pgbuf] = folio; (*pgbuf)++; } return 0; } +static int check_memfd_seals(struct file *memfd) +{ + int seals; + + if (!memfd) + return -EBADFD; + + if (!shmem_file(memfd) && !is_file_hugepages(memfd)) + return -EBADFD; + + seals = memfd_fcntl(memfd, F_GET_SEALS, 0); + if (seals == -EINVAL) + return -EBADFD; + + if ((seals & SEALS_WANTED) != SEALS_WANTED || + (seals & SEALS_DENIED) != 0) + return -EINVAL; + + return 0; +} + +static int export_udmabuf(struct udmabuf *ubuf, + struct miscdevice *device, + u32 flags) +{ + DEFINE_DMA_BUF_EXPORT_INFO(exp_info); + struct dma_buf *buf; + + ubuf->device = device; + exp_info.ops = &udmabuf_ops; + exp_info.size = ubuf->pagecount << PAGE_SHIFT; + exp_info.priv = ubuf; + exp_info.flags = O_RDWR; + + buf = dma_buf_export(&exp_info); + if (IS_ERR(buf)) + return PTR_ERR(buf); + + return dma_buf_fd(buf, flags); +} + static long udmabuf_create(struct miscdevice *device, struct udmabuf_create_list *head, struct udmabuf_create_item *list) { - DEFINE_DMA_BUF_EXPORT_INFO(exp_info); + pgoff_t pgcnt, pgbuf = 0, pglimit; struct file *memfd = NULL; struct udmabuf *ubuf; - struct dma_buf *buf; - pgoff_t pgcnt, pgbuf = 0, pglimit; - int seals, ret = -EINVAL; + int ret = -EINVAL; u32 i, flags; ubuf = kzalloc(sizeof(*ubuf), GFP_KERNEL); @@ -299,9 +345,9 @@ static long udmabuf_create(struct miscdevice *device, if (!ubuf->pagecount) goto err; - ubuf->pages = kmalloc_array(ubuf->pagecount, sizeof(*ubuf->pages), + ubuf->folios = kmalloc_array(ubuf->pagecount, sizeof(*ubuf->folios), GFP_KERNEL); - if (!ubuf->pages) { + if (!ubuf->folios) { ret = -ENOMEM; goto err; } @@ -314,18 +360,9 @@ static long udmabuf_create(struct miscdevice *device, pgbuf = 0; for (i = 0; i < head->count; i++) { - ret = -EBADFD; memfd = fget(list[i].memfd); - if (!memfd) - goto err; - if (!shmem_file(memfd) && !is_file_hugepages(memfd)) - goto err; - seals = memfd_fcntl(memfd, F_GET_SEALS, 0); - if (seals == -EINVAL) - goto err; - ret = -EINVAL; - if ((seals & SEALS_WANTED) != SEALS_WANTED || - (seals & SEALS_DENIED) != 0) + ret = check_memfd_seals(memfd); + if (ret < 0) goto err; pgcnt = list[i].size >> PAGE_SHIFT; @@ -341,33 +378,22 @@ static long udmabuf_create(struct miscdevice *device, goto err; fput(memfd); - memfd = NULL; } - exp_info.ops = &udmabuf_ops; - exp_info.size = ubuf->pagecount << PAGE_SHIFT; - exp_info.priv = ubuf; - exp_info.flags = O_RDWR; - - ubuf->device = device; - buf = dma_buf_export(&exp_info); - if (IS_ERR(buf)) { - ret = PTR_ERR(buf); + flags = head->flags & UDMABUF_FLAGS_CLOEXEC ? O_CLOEXEC : 0; + ret = export_udmabuf(ubuf, device, flags); + if (ret < 0) goto err; - } - flags = 0; - if (head->flags & UDMABUF_FLAGS_CLOEXEC) - flags |= O_CLOEXEC; - return dma_buf_fd(buf, flags); + return ret; err: while (pgbuf > 0) - put_page(ubuf->pages[--pgbuf]); + folio_put(ubuf->folios[--pgbuf]); if (memfd) fput(memfd); kfree(ubuf->offsets); - kfree(ubuf->pages); + kfree(ubuf->folios); kfree(ubuf); return ret; } From patchwork Sat Dec 16 06:05:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kasireddy, Vivek" X-Patchwork-Id: 13495484 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B42A7C38147 for ; Sat, 16 Dec 2023 06:29:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1363C6B00C2; Sat, 16 Dec 2023 01:29:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 023A76B00C1; Sat, 16 Dec 2023 01:29:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D63136B00C0; Sat, 16 Dec 2023 01:29:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id BAFF76B00AA for ; Sat, 16 Dec 2023 01:29:03 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 8EB47A064C for ; Sat, 16 Dec 2023 06:29:03 +0000 (UTC) X-FDA: 81571703766.27.5C1F679 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by imf11.hostedemail.com (Postfix) with ESMTP id C72DC40009 for ; Sat, 16 Dec 2023 06:29:01 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=LhbP9UJ7; spf=pass (imf11.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.11 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702708142; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=wm0uWWOliBqGDsOJOOgqJXJjk8V5r0h+apclQel9KLM=; b=i/laZ+nXfpHm6y3OLbqsZvpiWV3DLe7BfZFDj4ZfI3Oc7enAogICJvd2SKCfkT/VUmDPe3 EqBA3zHeozYvDp1C/Ww0Lw2+UGP5ChQpy4BZxS3CJT6DQaEh6DGgIL4NOqAl2SZ3G0bXgT 82ZlAhnWoQvjCXwaSyETdY/qhK581gs= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=LhbP9UJ7; spf=pass (imf11.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.11 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702708142; a=rsa-sha256; cv=none; b=6XJS5nDglcPc4azMWD4UfX+NxbBEG4tY8XQ6S2VqPENSAc7C/kS7kVwUeX/RTQqcdLa8Wv FeqAhUnvi++KkHYOKO9Z7ZTnVkHUgJAXoMRKPtmeefVN7/NmS5WR5lc7Uq2JMlrruhBoWD QSQwWphdv9FT2YXozY/mhBIDm6aETtg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702708142; x=1734244142; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KZifQoWRpsSYXJ0ERWQORaReoIuSKvbcn4vSOcCzi/s=; b=LhbP9UJ7biD1m2XdncLDO8858wG0BeHbm9x9+V5W3cakHUqQS3YnMXiN jMwcyqrKP08QFXKgN3gp3jTV/Aq5PtLBpnB1ZTnzpGBJQZYipjcas7bhP v94Cbt5mNGKnI3aa+0rrbW2wlAeT2ENSTeB7+BXpb7tuHH+oRxbekZfd7 edBgkcYKb/S4ONLX4HHmjbJA+yPRoeFbEMnoDk6Z33cG4KugLv5JIfqH7 iUZf3i93R665n3c14dqiUXhj43TFmP9/dtJagVYGn3IwxvR7Pny45NCH5 1lsSfrNhM6bn+9mescWqn83ZhfEzIr0nGgeYzcYiq5NAXeDNwIqX8tlGP g==; X-IronPort-AV: E=McAfee;i="6600,9927,10925"; a="2186047" X-IronPort-AV: E=Sophos;i="6.04,280,1695711600"; d="scan'208";a="2186047" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2023 22:28:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10925"; a="751178916" X-IronPort-AV: E=Sophos;i="6.04,280,1695711600"; d="scan'208";a="751178916" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2023 22:28:56 -0800 From: Vivek Kasireddy To: dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: Vivek Kasireddy , David Hildenbrand , Matthew Wilcox , Daniel Vetter , Mike Kravetz , Hugh Dickins , Peter Xu , Jason Gunthorpe , Gerd Hoffmann , Dongwon Kim , Junxiao Chang Subject: [PATCH v8 5/6] udmabuf: Pin the pages using memfd_pin_folios() API (v6) Date: Fri, 15 Dec 2023 22:05:35 -0800 Message-Id: <20231216060536.3716466-6-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231216060536.3716466-1-vivek.kasireddy@intel.com> References: <20231216060536.3716466-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: C72DC40009 X-Rspam-User: X-Stat-Signature: as3br8a9qzfphpo5symtaqf1fnnbxiyf X-Rspamd-Server: rspam01 X-HE-Tag: 1702708141-26552 X-HE-Meta: U2FsdGVkX19mj0hP9l0fwQTaqZWuxWR9Qq1+an5FowXqeyMF5Ti5PK7QtgVvK1FQNiqXMEOW7SP+Nav/MX9CD0XfizPFV0unv5MugNBnw2Lc8G6AN4d95n/s4h0EIBfjPFJU2ygb+1FhInJt1z6VHIJmw1ZVXMjvDqb5MivP2HS7c+3+Gk3qWOQ1AJi9qldyO3vEw+deLyMpgzGpQs9CGGBV8QeqKpSLjGMP0EUH3b6O1QUpVIcF+BOAoEo3DQ35i96Y3zcHDRTlQsnLMIzOqJmqv3xH/FruPuexv2ewvQoFk3sWIlViYwx6TuornrV5vJOdtATbhcaFscUtpruNyi9QTkiJB6h0+FA2PyGuCEa2SBIKk97nIp+bZnyZbFLl7o7kiZmM2u+K0q/wdfMrSKpgojPmKMc1hu6zece8YYflU+Wd2/krIzjKVtYVrpaSl7+WXaPPvKDmHPFO9lr1v2UG31uAU5spOYg0OpLoMbmAWmHQU23XpStjS5+KWF/6skv0m25DC/WApmZvfnQKNiHfBtBXX167ax2+kXzSs2hOJ8Mpsvxq9xjRrCAfgc+D8/jKgP9S+RmFsnhRgnFcQ7j31M0mK+gP3mt9jO4VmFpnA2lkEB4IC8wl2jsxx0OpWT7qeFZlTw3BE9I8M6pasaleK2d1Z2cTqlGmxQtKDF/sQ/9NHvvAZ0NobvPT+OkbpuEA5wIe02hinFqPjyHS/cFdKFuCXbWRG2Z84JckK+YKrwX+ARkxYPthqBg7hNgB1QB9Pf4eQUhNcju0g0SSKGxxfOdYfUUhqCWnTjZpLPPhNCq9TCkxIBJlJb7qFUbBQWuxRIysEPjPCe/n7CtpVJ1In6b3oANYB+Mv8uaK+MnycNhltAZ6goHXgxexLlLVR6R6kC/4+XnXsDFkug6ePAkMyxnBddUgDhZJ5N/Wss5fflvBjrz0Qw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Using memfd_pin_folios() will ensure that the pages are pinned correctly using FOLL_PIN. And, this also ensures that we don't accidentally break features such as memory hotunplug as it would not allow pinning pages in the movable zone. Using this new API also simplifies the code as we no longer have to deal with extracting individual pages from their mappings or handle shmem and hugetlb cases separately. v2: - Adjust to the change in signature of pin_user_pages_fd() by passing in file * instead of fd. v3: - Limit the changes in this patch only to those that are required for using pin_user_pages_fd() - Slightly improve the commit message v4: - Adjust to the change in name of the API (memfd_pin_user_pages) v5: - Adjust to the changes in memfd_pin_folios which now populates a list of folios and offsets v6: - Don't unnecessarily use folio_page() (Matthew) - Pass [start, end] and max_folios to memfd_pin_folios() - Create another temporary array to hold the folios returned by memfd_pin_folios() as we populate ubuf->folios. - Unpin the folios only once as memfd_pin_folios pins them once Cc: David Hildenbrand Cc: Matthew Wilcox Cc: Daniel Vetter Cc: Mike Kravetz Cc: Hugh Dickins Cc: Peter Xu Cc: Jason Gunthorpe Cc: Gerd Hoffmann Cc: Dongwon Kim Cc: Junxiao Chang Signed-off-by: Vivek Kasireddy --- drivers/dma-buf/udmabuf.c | 124 +++++++++++++++----------------------- 1 file changed, 49 insertions(+), 75 deletions(-) diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index a8f3af61f7f2..088f3a64e94c 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c @@ -153,17 +153,30 @@ static void unmap_udmabuf(struct dma_buf_attachment *at, return put_sg_table(at->dev, sg, direction); } +static void unpin_all_folios(struct udmabuf *ubuf, pgoff_t pgbuf) +{ + unsigned int i = 0, j; + + while (i < pgbuf) { + for (j = i + 1; j < pgbuf; j++) { + if (ubuf->folios[i] != ubuf->folios[j]) + break; + } + + unpin_user_page(&ubuf->folios[i]->page); + i = j; + } +} + static void release_udmabuf(struct dma_buf *buf) { struct udmabuf *ubuf = buf->priv; struct device *dev = ubuf->device->this_device; - pgoff_t pg; if (ubuf->sg) put_sg_table(dev, ubuf->sg, DMA_BIDIRECTIONAL); - for (pg = 0; pg < ubuf->pagecount; pg++) - folio_put(ubuf->folios[pg]); + unpin_all_folios(ubuf, ubuf->pagecount); kfree(ubuf->offsets); kfree(ubuf->folios); kfree(ubuf); @@ -218,64 +231,6 @@ static const struct dma_buf_ops udmabuf_ops = { #define SEALS_WANTED (F_SEAL_SHRINK) #define SEALS_DENIED (F_SEAL_WRITE) -static int handle_hugetlb_pages(struct udmabuf *ubuf, struct file *memfd, - pgoff_t offset, pgoff_t pgcnt, - pgoff_t *pgbuf) -{ - struct hstate *hpstate = hstate_file(memfd); - pgoff_t mapidx = offset >> huge_page_shift(hpstate); - pgoff_t subpgoff = (offset & ~huge_page_mask(hpstate)) >> PAGE_SHIFT; - pgoff_t maxsubpgs = huge_page_size(hpstate) >> PAGE_SHIFT; - struct folio *folio = NULL; - pgoff_t pgidx; - - mapidx <<= huge_page_order(hpstate); - for (pgidx = 0; pgidx < pgcnt; pgidx++) { - if (!folio) { - folio = __filemap_get_folio(memfd->f_mapping, - mapidx, - FGP_ACCESSED, 0); - if (IS_ERR(folio)) - return PTR_ERR(folio); - } - - folio_get(folio); - ubuf->folios[*pgbuf] = folio; - ubuf->offsets[*pgbuf] = subpgoff << PAGE_SHIFT; - (*pgbuf)++; - if (++subpgoff == maxsubpgs) { - folio_put(folio); - folio = NULL; - subpgoff = 0; - mapidx += pages_per_huge_page(hpstate); - } - } - - if (folio) - folio_put(folio); - - return 0; -} - -static int handle_shmem_pages(struct udmabuf *ubuf, struct file *memfd, - pgoff_t offset, pgoff_t pgcnt, - pgoff_t *pgbuf) -{ - pgoff_t pgidx, pgoff = offset >> PAGE_SHIFT; - struct folio *folio = NULL; - - for (pgidx = 0; pgidx < pgcnt; pgidx++) { - folio = shmem_read_folio(memfd->f_mapping, pgoff + pgidx); - if (IS_ERR(folio)) - return PTR_ERR(folio); - - ubuf->folios[*pgbuf] = folio; - (*pgbuf)++; - } - - return 0; -} - static int check_memfd_seals(struct file *memfd) { int seals; @@ -321,11 +276,13 @@ static long udmabuf_create(struct miscdevice *device, struct udmabuf_create_list *head, struct udmabuf_create_item *list) { - pgoff_t pgcnt, pgbuf = 0, pglimit; + pgoff_t pgoff, pgcnt, pglimit, pgbuf = 0; + long nr_folios, ret = -EINVAL; struct file *memfd = NULL; + struct folio **folios; struct udmabuf *ubuf; - int ret = -EINVAL; - u32 i, flags; + u32 i, j, k, flags; + loff_t end; ubuf = kzalloc(sizeof(*ubuf), GFP_KERNEL); if (!ubuf) @@ -366,17 +323,35 @@ static long udmabuf_create(struct miscdevice *device, goto err; pgcnt = list[i].size >> PAGE_SHIFT; - if (is_file_hugepages(memfd)) - ret = handle_hugetlb_pages(ubuf, memfd, - list[i].offset, - pgcnt, &pgbuf); - else - ret = handle_shmem_pages(ubuf, memfd, - list[i].offset, - pgcnt, &pgbuf); - if (ret < 0) + folios = kmalloc_array(pgcnt, sizeof(*folios), GFP_KERNEL); + if (!folios) { + ret = -ENOMEM; goto err; + } + end = list[i].offset + (pgcnt << PAGE_SHIFT) - 1; + ret = memfd_pin_folios(memfd, list[i].offset, end, + folios, pgcnt, &pgoff); + if (ret < 0) { + kfree(folios); + goto err; + } + + nr_folios = ret; + pgoff >>= PAGE_SHIFT; + for (j = 0, k = 0; j < pgcnt; j++) { + ubuf->folios[pgbuf] = folios[k]; + ubuf->offsets[pgbuf] = pgoff << PAGE_SHIFT; + pgbuf++; + + if (++pgoff == folio_nr_pages(folios[k])) { + pgoff = 0; + if (++k == nr_folios) + break; + } + } + + kfree(folios); fput(memfd); } @@ -388,10 +363,9 @@ static long udmabuf_create(struct miscdevice *device, return ret; err: - while (pgbuf > 0) - folio_put(ubuf->folios[--pgbuf]); if (memfd) fput(memfd); + unpin_all_folios(ubuf, pgbuf); kfree(ubuf->offsets); kfree(ubuf->folios); kfree(ubuf); From patchwork Sat Dec 16 06:05:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kasireddy, Vivek" X-Patchwork-Id: 13495485 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 281CBC46CA2 for ; Sat, 16 Dec 2023 06:29:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5EA8A6B00AA; Sat, 16 Dec 2023 01:29:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4FF916B00C0; Sat, 16 Dec 2023 01:29:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 131F56B00BF; Sat, 16 Dec 2023 01:29:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id EA6146B00AA for ; Sat, 16 Dec 2023 01:29:03 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C64B912064B for ; Sat, 16 Dec 2023 06:29:03 +0000 (UTC) X-FDA: 81571703766.30.FE80B39 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by imf20.hostedemail.com (Postfix) with ESMTP id D7EE61C0008 for ; Sat, 16 Dec 2023 06:29:01 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=hv+NpUBp; spf=pass (imf20.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.11 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702708142; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=h3emmYlObQz4YBWvxea89j9SxvY/uMNOIgA3BV8wvNU=; b=g5rBE66Hy84IGf+86ZxNp6yZGNXbEt3ISZ69czw+sU6mheNwnAvs+3r6Y+bxNxgUoQZu8U /35zVeJdJq55qtc/cwTPBp2/mdjyzSGhYOXPzVzqumVLlpglDYF7Z7FkYyDeDkHND4SNtI M433aUQYDQ2l8amIoXfATOrdsJ3qR78= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702708142; a=rsa-sha256; cv=none; b=XH6XxIz3uUxJkukXWcLsFW0DtbJUxSQOM7DOD/tNPGfet0IQYRk1F7FD0sQ6vczFJiYe3v llEZavhdpZaux7W713lCenB+A6rSUd0YlRNGFOm/LsEsq4VAEGMlwQ6FUbPbDywb13Wyln qycoqjvgga3f8Hsxi+pUHm2g8Le5wRE= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=hv+NpUBp; spf=pass (imf20.hostedemail.com: domain of vivek.kasireddy@intel.com designates 192.198.163.11 as permitted sender) smtp.mailfrom=vivek.kasireddy@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702708142; x=1734244142; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=r39C9fURv/tYjjTgfRvVfOiacLkGBXJF65fG2x4l+b0=; b=hv+NpUBpi345XijfznS0g+DmDtrXP05bF4dscPI0FGOm3hsD4V9MZWhA mYcMdjj9uAHMJ5i8Ce+smeXTnS6M+NvDfm+1Ek8eA7tygIPE0l4As1JGt fm5/tSQL4uYTGXFOuBNbKL1/BmRgUqWvQKduqqcj/PmwcxxsIjJcSZ04C 7zhTcYKkJo0upJJb1rRWYd7mTy3HvWQlr529itxlv1fd3o6b4Cq+H9Bdu dEixkFJexLM/vhr9YZx0DZHLtD8SZan5GK6zuNr6OD377eUvno4WvYKNI chliHPR40Z8AFcg9e8ULndIujE/yLb1LqthPn67g4fKHOljdhKryuGCyF w==; X-IronPort-AV: E=McAfee;i="6600,9927,10925"; a="2186056" X-IronPort-AV: E=Sophos;i="6.04,280,1695711600"; d="scan'208";a="2186056" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2023 22:28:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10925"; a="751178920" X-IronPort-AV: E=Sophos;i="6.04,280,1695711600"; d="scan'208";a="751178920" Received: from vkasired-desk2.fm.intel.com ([10.105.128.132]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2023 22:28:57 -0800 From: Vivek Kasireddy To: dri-devel@lists.freedesktop.org, linux-mm@kvack.org Cc: Vivek Kasireddy , Shuah Khan , David Hildenbrand , Daniel Vetter , Mike Kravetz , Hugh Dickins , Peter Xu , Jason Gunthorpe , Gerd Hoffmann , Dongwon Kim , Junxiao Chang Subject: [PATCH v8 6/6] selftests/dma-buf/udmabuf: Add tests to verify data after page migration Date: Fri, 15 Dec 2023 22:05:36 -0800 Message-Id: <20231216060536.3716466-7-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231216060536.3716466-1-vivek.kasireddy@intel.com> References: <20231216060536.3716466-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 X-Stat-Signature: trk3b98eiqtc4gqi5opsipfbzyziunwu X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: D7EE61C0008 X-Rspam-User: X-HE-Tag: 1702708141-203594 X-HE-Meta: U2FsdGVkX1+I4LtLhOdg0Mmflx4R/6h1KMJ0wVgJM8AGB04wrUgRxzY2+IDD3cSthEgPNvNIX5JUoruVRwThYhLisw9D8VliUdx9p9B+em8JlRYzvQ9iwSNNHiLvpP64SM8whfOQ/hY+d4lODERPOhkBQXmV14XWX+3x+j+OkQEGDYfCHATSH4Aguu6rTNC/9ysG12Tyvks/ZHCAb8OZpmZoKy88HLdhLEiO2WXC5xyVVyDIrYs/ky2Oxq8HOvUNu69Pk+9skzFVwB8i+OwGnbvK+MS98D2jls+rkGD/LN8JsMkLtvLAQRi9VtsSKyAeZtLUWxSkS9j9usoN9elN4kD+rSQbA2Tw94bazAygKa9n03KCV4vHVSS3gsi2kNRYklS24Eok5TsroyqwOK9hmWMLP/tPeYu7fTaMuw8udmTqQpp2WKsLSGCbo0hrnijQ7KsLGsEZUkLlkV+PqSzn3PL1nGExmcMKAYME6E8ulI9f8xIg1brk57MkFrs2mll+TSa86rjg8R2oa2MjmJoDyQE1tJ+trBgxDRln/ipBcwhQdx1o5VCo24dVlyj8kQnxuejz6GI84phuMqoNLb5mOCeIG8JIqiCQgUakzY/xHDTghck6bHWTbdY00ZMofBiVwJnGzpIs7UgOStDOV7zx55ViNgay6BSchviqiCUE4XrpPs88wz1b64NAgGDbY9CHOfGQH6233zQ1fIyu++/jbinwjJ649Cfzb5XHnzPZUsCsCXuwiAZtgOdKt6nxtV+gTbdV5j5TtczwzAoKHmj3HO0ovNWYifOHkyIdYiIQTHOK22oa2kSZ/+z8OMJcQLvGusQaoum+nbtJ9GDVqWT/UMdwQRBpzuL8Q4rICz4k4sS3vrVmVvw3Ha0GQgM69D7/pNporTgTTWFbeuNtZFcmrc+whi7NBTzYc8jqhQQAssuCMfNGbZzGTVfuxkYxQMyJqBFM3sWWeJ3VZsZCGum NzGNdOLD gjIE5owU81GX3X9N11giE8/HejAgbFtB0LCzQhlqDZoJoAnQJpRLAbIihiGDatlieHs0zXGVIjDr76As7YOF0NO6ilXumMDdjUitS5ay+VN72prNtl1Tok+5ycPezWmhMqUMqj4nKZj3ZxKTbSxYq9impQ3xQUj5Cj3OGpiu+0khy/tJx0j/GQI6LyNW7sMTE3YwzvoDRfLmC2HHg3/p8Jv/7omK12T+AQ4+Ac3VhVgm0cY8j0aPU263P++low70Vlt+oOg8NkQqONC6XDkvHzHuHdfLAEJ7bxcCyXigG+P4GHbVBSCM8BYtugw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Since the memfd pages associated with a udmabuf may be migrated as part of udmabuf create, we need to verify the data coherency after successful migration. The new tests added in this patch try to do just that using 4k sized pages and also 2 MB sized huge pages for the memfd. Successful completion of the tests would mean that there is no disconnect between the memfd pages and the ones associated with a udmabuf. And, these tests can also be augmented in the future to test newer udmabuf features (such as handling memfd hole punch). Cc: Shuah Khan Cc: David Hildenbrand Cc: Daniel Vetter Cc: Mike Kravetz Cc: Hugh Dickins Cc: Peter Xu Cc: Jason Gunthorpe Cc: Gerd Hoffmann Cc: Dongwon Kim Cc: Junxiao Chang Based-on-patch-by: Mike Kravetz Signed-off-by: Vivek Kasireddy --- .../selftests/drivers/dma-buf/udmabuf.c | 151 +++++++++++++++++- 1 file changed, 147 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/drivers/dma-buf/udmabuf.c b/tools/testing/selftests/drivers/dma-buf/udmabuf.c index c812080e304e..d76c813fe652 100644 --- a/tools/testing/selftests/drivers/dma-buf/udmabuf.c +++ b/tools/testing/selftests/drivers/dma-buf/udmabuf.c @@ -9,26 +9,132 @@ #include #include #include +#include #include #include +#include #include #include #define TEST_PREFIX "drivers/dma-buf/udmabuf" #define NUM_PAGES 4 +#define NUM_ENTRIES 4 +#define MEMFD_SIZE 1024 /* in pages */ -static int memfd_create(const char *name, unsigned int flags) +static unsigned int page_size; + +static int create_memfd_with_seals(off64_t size, bool hpage) +{ + int memfd, ret; + unsigned int flags = MFD_ALLOW_SEALING; + + if (hpage) + flags |= MFD_HUGETLB; + + memfd = memfd_create("udmabuf-test", flags); + if (memfd < 0) { + printf("%s: [skip,no-memfd]\n", TEST_PREFIX); + exit(77); + } + + ret = fcntl(memfd, F_ADD_SEALS, F_SEAL_SHRINK); + if (ret < 0) { + printf("%s: [skip,fcntl-add-seals]\n", TEST_PREFIX); + exit(77); + } + + ret = ftruncate(memfd, size); + if (ret == -1) { + printf("%s: [FAIL,memfd-truncate]\n", TEST_PREFIX); + exit(1); + } + + return memfd; +} + +static int create_udmabuf_list(int devfd, int memfd, off64_t memfd_size) +{ + struct udmabuf_create_list *list; + int ubuf_fd, i; + + list = malloc(sizeof(struct udmabuf_create_list) + + sizeof(struct udmabuf_create_item) * NUM_ENTRIES); + if (!list) { + printf("%s: [FAIL, udmabuf-malloc]\n", TEST_PREFIX); + exit(1); + } + + for (i = 0; i < NUM_ENTRIES; i++) { + list->list[i].memfd = memfd; + list->list[i].offset = i * (memfd_size / NUM_ENTRIES); + list->list[i].size = getpagesize() * NUM_PAGES; + } + + list->count = NUM_ENTRIES; + list->flags = UDMABUF_FLAGS_CLOEXEC; + ubuf_fd = ioctl(devfd, UDMABUF_CREATE_LIST, list); + free(list); + if (ubuf_fd < 0) { + printf("%s: [FAIL, udmabuf-create]\n", TEST_PREFIX); + exit(1); + } + + return ubuf_fd; +} + +static void write_to_memfd(void *addr, off64_t size, char chr) +{ + int i; + + for (i = 0; i < size / page_size; i++) { + *((char *)addr + (i * page_size)) = chr; + } +} + +static void *mmap_fd(int fd, off64_t size) { - return syscall(__NR_memfd_create, name, flags); + void *addr; + + addr = mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); + if (addr == MAP_FAILED) { + printf("%s: ubuf_fd mmap fail\n", TEST_PREFIX); + exit(1); + } + + return addr; +} + +static int compare_chunks(void *addr1, void *addr2, off64_t memfd_size) +{ + off64_t off; + int i = 0, j, k = 0, ret = 0; + char char1, char2; + + while (i < NUM_ENTRIES) { + off = i * (memfd_size / NUM_ENTRIES); + for (j = 0; j < NUM_PAGES; j++, k++) { + char1 = *((char *)addr1 + off + (j * getpagesize())); + char2 = *((char *)addr2 + (k * getpagesize())); + if (char1 != char2) { + ret = -1; + goto err; + } + } + i++; + } +err: + munmap(addr1, memfd_size); + munmap(addr2, NUM_ENTRIES * NUM_PAGES * getpagesize()); + return ret; } int main(int argc, char *argv[]) { struct udmabuf_create create; int devfd, memfd, buf, ret; - off_t size; - void *mem; + off64_t size; + void *addr1, *addr2; devfd = open("/dev/udmabuf", O_RDWR); if (devfd < 0) { @@ -90,6 +196,9 @@ int main(int argc, char *argv[]) } /* should work */ + page_size = getpagesize(); + addr1 = mmap_fd(memfd, size); + write_to_memfd(addr1, size, 'a'); create.memfd = memfd; create.offset = 0; create.size = size; @@ -98,6 +207,40 @@ int main(int argc, char *argv[]) printf("%s: [FAIL,test-4]\n", TEST_PREFIX); exit(1); } + munmap(addr1, size); + close(buf); + close(memfd); + + /* should work (migration of 4k size pages)*/ + size = MEMFD_SIZE * page_size; + memfd = create_memfd_with_seals(size, false); + addr1 = mmap_fd(memfd, size); + write_to_memfd(addr1, size, 'a'); + buf = create_udmabuf_list(devfd, memfd, size); + addr2 = mmap_fd(buf, NUM_PAGES * NUM_ENTRIES * getpagesize()); + write_to_memfd(addr1, size, 'b'); + ret = compare_chunks(addr1, addr2, size); + if (ret < 0) { + printf("%s: [FAIL,test-5]\n", TEST_PREFIX); + exit(1); + } + close(buf); + close(memfd); + + /* should work (migration of 2MB size huge pages)*/ + page_size = getpagesize() * 512; /* 2 MB */ + size = MEMFD_SIZE * page_size; + memfd = create_memfd_with_seals(size, true); + addr1 = mmap_fd(memfd, size); + write_to_memfd(addr1, size, 'a'); + buf = create_udmabuf_list(devfd, memfd, size); + addr2 = mmap_fd(buf, NUM_PAGES * NUM_ENTRIES * getpagesize()); + write_to_memfd(addr1, size, 'b'); + ret = compare_chunks(addr1, addr2, size); + if (ret < 0) { + printf("%s: [FAIL,test-6]\n", TEST_PREFIX); + exit(1); + } fprintf(stderr, "%s: ok\n", TEST_PREFIX); close(buf);