From mboxrd@z Thu Jan 1 00:00:00 1970 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 04D0BC77B77 for ; Fri, 14 Apr 2023 23:27:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 92EAF280002; Fri, 14 Apr 2023 19:27:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8DD806B007D; Fri, 14 Apr 2023 19:27:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7A569280002; Fri, 14 Apr 2023 19:27:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 6DFED6B007B for ; Fri, 14 Apr 2023 19:27:53 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 45F381204A4 for ; Fri, 14 Apr 2023 23:27:53 +0000 (UTC) X-FDA: 80681586426.13.627EC15 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by imf02.hostedemail.com (Postfix) with ESMTP id 55B2D80024 for ; Fri, 14 Apr 2023 23:27:51 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=PlJksDxU; spf=pass (imf02.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681514871; 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=8GS8ed+C9TZSDKqE7yJs3rXmG1XU+tjMZxFV1EPCP0I=; b=DB+nYqiqFjKYB/UJCDu9hcFXTi2QtGO9Mx3r4cofer4sBC7AWYV/A/v4CzvLmmBIsmI2EZ vZtgUurjRPNaePIwzLY8svd5sm+qROD+YugW0yfKm8hW2iitncPnFztS28gJTU4StqaPxj F3OB4hvUexMfD9qirRzjKarPfZiG/p0= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=PlJksDxU; spf=pass (imf02.hostedemail.com: domain of lstoakes@gmail.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=lstoakes@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681514871; a=rsa-sha256; cv=none; b=PuG2aDXZwLdycXrSNZa+FiF7AnEMiAyhc86MT4j8M6LKpsT56eYvtfTf3JMsZA2u4QrhxQ FwmoxyeUqOWWGbtg12RxPxah6Ciqupi5K/aWDY3PzA5iFBmP0A7PPCQe3EnKM3Avo9tdia bewFgG27Xy4w23Y74wG2i8cjH8yinXI= Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-2efbab47633so65618f8f.2 for ; Fri, 14 Apr 2023 16:27:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681514869; x=1684106869; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8GS8ed+C9TZSDKqE7yJs3rXmG1XU+tjMZxFV1EPCP0I=; b=PlJksDxUb5hQplwDvFaxMJP0+U8KcfMstaXF/Ydg3scwoxrJw6uTWy//QIrOU+Z1ZU uvZBfEzsO8dwMd0hFEXuz6FbNobdiojzzqmx4wCRgvt3WqO/jAM96chSioBfCyimq9MW 1Plxl2L+tI875o1BfeLrCMsG88RovrZ4W6Y0pt7lLykXy5oPJHYI0FiMII0YdaW9Qd3t /tMILivNmVgHap7jcjKg8GN4D91a+P8BtTebvVb4rOcwy+zaWtlwiLIv/vg/hHU9Z1fZ Sp+fQ0SXbMDe9NEBbWWDyCjalOKIMy3b/96mq8y7D42eveTU+xCmbnFChq+NnsB8FVXa B1uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681514869; x=1684106869; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8GS8ed+C9TZSDKqE7yJs3rXmG1XU+tjMZxFV1EPCP0I=; b=G9lOLjY1v3RxXMjPF8QQ9aXOknqnotgjp4FEwCBovPkbghLyMid/Dm/Fd31HSplyzi 1Dhm+WyhLNjp/3HWaeQbu5hoGivN355Te/Ih0k3HBJsaaZGlUhgQJuWezkTg3USuyXFA YzKMNEX9B21CF/166ZfywpDClw+9sC536gL3+2nVfQ6bqaeh7UTR+pZDF7Q7e9eO+tbL tV6zj2nGzU2Z+qKiMZeTILYbPHoMTj1yrIpxP0622An0LpxZlLXo+f9zF/csEVUYPrRA dXX6LyqK9tELQFnTwloMTINJMwqQDgJ7D1+k+gbdLpWMEgiCYN8v2S8nXBMYF0UnftcC XkHQ== X-Gm-Message-State: AAQBX9ecTKnO1D4jgJSEPoj2mzQiKVG/aRFcrBaAn9zE27UA28BzqfSR Zk0RLrF7sTscDVLaDW9MtcjoX2agcdZyBg== X-Google-Smtp-Source: AKy350aEKRNl4yEmWU3ls2e43huE46hCf94U9FbgI4T18fJMMqHHLwHuUQ5mYJ4TA1JhCVprgp02FA== X-Received: by 2002:a5d:6107:0:b0:2ef:b2fc:7e8f with SMTP id v7-20020a5d6107000000b002efb2fc7e8fmr221640wrt.42.1681514869607; Fri, 14 Apr 2023 16:27:49 -0700 (PDT) Received: from lucifer.home (host86-156-84-164.range86-156.btcentralplus.com. [86.156.84.164]) by smtp.googlemail.com with ESMTPSA id c11-20020a7bc84b000000b003ed2384566fsm5348810wml.21.2023.04.14.16.27.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 16:27:48 -0700 (PDT) From: Lorenzo Stoakes To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton Cc: Matthew Wilcox , David Hildenbrand , Jens Axboe , Pavel Begunkov , io-uring@vger.kernel.org, Lorenzo Stoakes Subject: [PATCH 5/7] io_uring: rsrc: use FOLL_SAME_FILE on pin_user_pages() Date: Sat, 15 Apr 2023 00:27:45 +0100 Message-Id: <17357dec04b32593b71e4fdf3c30a346020acf98.1681508038.git.lstoakes@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 69n4spypas8qpninm9mmgcb9sumcxddm X-Rspam-User: X-Rspamd-Queue-Id: 55B2D80024 X-Rspamd-Server: rspam06 X-HE-Tag: 1681514871-893945 X-HE-Meta: U2FsdGVkX1/bHDDnJotfsKRVsBngRZciN/fKSbdZ3V14YkELaE9jWMIBm2VueLEldeEb+gVMZJbEEQXu4RQfkeX+IguSlGX/k3IVfBtx8aEG6Xd5FjxCDakLBBjmXkk9lX75e7WczC2LbOw8MgLOnqtpW4i/jWZzr4pcOocBsjrTnXabsLNuR/h65G3VxfTEXeIsv9SDNwaAH6I1yu4JhdKFi/fUjN3kmETF2aqj4hFLZ5xzy7fWNv/CpN87UCgv8QhinpBE2CHnbuqe1y7Ioneb9jz742QCQ9dUvFxv3MJUyMSKPQrZ8fa+kNlNR+0RhYCAMi2A/jTuZz8FEVppTecJm0jTIP3WS7RtTuBeQ6eWL8iIOlfOcOMaIR01d/GpI6RfsLrGkUIhBtkD9Bl3Chqd18dqUoPFnrb7jmMQrC+NgkTgseeXbTP5o8dHvWw6s05r5fY49HQGPLHfCG65njhUOTyroRO3Ip+QrWzfFieZdqsP5PhAViUVy2Kw67ihsPe4hPIdnEnAls6x9fFYegG5cNwWXHfc857Wqs9ggfi9g/BHvNwInT64YPP7q+F29gw6zPDvebBvRgCjlsc+gnvsqmY9jvYPB4dyslzbtyLn3oQ4FJgQdQhRmDh1ehqWOlpF0wDVfAb1ouG7VSVS9cQF3t5eDxUQOighm73KKgp2/uLvZ8FMR9WLBGdGdmRu+YxoIkbT/VMDLsIhZsyn6Mm8YaNFgpZhQstf0R/K8E4McU3yW/0h0y4aeOwXEsTe0QhJPxZ7u3IIG8QiASvAn9fFL1XAH/ES/lR9/aGYS6ZXCzLymRGoROrX5k1EBqsUXq4WkHq5IxLLyy8e8Vh9KRrn0ajyG44BfTo0eqvOuA2Un1iRwHU+7Rjtkma8UrjJJba4iYMMSSVXN43Dx0p9TLpQ+tJfux9hQC9exOyKb7xdWOPI/1tgG+nKm3ySMIsUV6iZqf/5sk2bkGZZs1G A96rHttS XWwcVEGtAeAL2dD+sGJjWaQyo7NtWqj3IWJ9P1YNgt2RPoLLF7PwjtbxZ4ZjGLFUsH8npSPVX//ExcjESRUbOMpxNh4M6e7hD7IYwP+5GKwV2FEK44Gqhq2iTgHT74QgJde9X+MwqCDkpzdwWOjSnyawF6V5Bvnu4IB7DOT47OUUAogTxNZGaMdnroT+U1ZKO89uZXRju6fAsSSc9ev8XPV+Ex8iqFJxfIpD5AF0WxI9VMmjfUoZ7cPVnFPbs+O/CSNrP4iD17q/Hy1b3P7QNQp4xH79zRvFXUlaXKuUjEZV47XLaXfie1YVW9aN6xRj+HxJ+5uGA3saFnEyzOI3GMmd2e7C1PTPXEwRRCTVjqkhWvhZJpdlzTjXXGA1SXxer9mxA7IHOz+UmSGhYlWzFMl+r2Nr7QCfR8U+4xvqQvqczgyHwvIwLtS98pRawbjeYzN3ElunLkY9XwUb6gOGKmrAJWB+2zCdx/fZae96LVoGzfnOkLWaMV0DMYG3DUovP9cV7gMl1FD3nCNgcez0K1TVGmBwxp9ulsRouOeO+i6mp1/ZddI7DTgfpA6+H/1UE3sEWHX2oyRa4X/WlJISBth3GcbE3m7SKNn4Fyd4dVY7EPUniwdbrLonUgU9BngyxoeIB 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: Commit edd478269640 ("io_uring/rsrc: disallow multi-source reg buffers") prevents io_pin_pages() from pinning pages spanning multiple VMAs with permitted characteristics (anon/huge), requiring that all VMAs share the same vm_file. The newly introduced FOLL_SAME_FILE flag permits this to be expressed as a GUP flag rather than having to retrieve VMAs to perform the check. We then only need to perform a VMA lookup for the first VMA to assert the anon/hugepage requirement as we know the rest of the VMAs will possess the same characteristics. Doing this eliminates the one instance of vmas being used by pin_user_pages(). Signed-off-by: Lorenzo Stoakes Suggested-by: Matthew Wilcox (Oracle) --- io_uring/rsrc.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c index 7a43aed8e395..adc860bcbd4f 100644 --- a/io_uring/rsrc.c +++ b/io_uring/rsrc.c @@ -1141,9 +1141,8 @@ static int io_buffer_account_pin(struct io_ring_ctx *ctx, struct page **pages, struct page **io_pin_pages(unsigned long ubuf, unsigned long len, int *npages) { unsigned long start, end, nr_pages; - struct vm_area_struct **vmas = NULL; struct page **pages = NULL; - int i, pret, ret = -ENOMEM; + int pret, ret = -ENOMEM; end = (ubuf + len + PAGE_SIZE - 1) >> PAGE_SHIFT; start = ubuf >> PAGE_SHIFT; @@ -1153,31 +1152,26 @@ struct page **io_pin_pages(unsigned long ubuf, unsigned long len, int *npages) if (!pages) goto done; - vmas = kvmalloc_array(nr_pages, sizeof(struct vm_area_struct *), - GFP_KERNEL); - if (!vmas) - goto done; - ret = 0; mmap_read_lock(current->mm); - pret = pin_user_pages(ubuf, nr_pages, FOLL_WRITE | FOLL_LONGTERM, - pages, vmas); + + pret = pin_user_pages(ubuf, nr_pages, + FOLL_WRITE | FOLL_LONGTERM | FOLL_SAME_FILE, + pages, NULL); if (pret == nr_pages) { - struct file *file = vmas[0]->vm_file; + /* + * lookup the first VMA, we require that all VMAs in range + * maintain the same file characteristics, as enforced by + * FOLL_SAME_FILE + */ + struct vm_area_struct *vma = vma_lookup(current->mm, ubuf); + struct file *file; /* don't support file backed memory */ - for (i = 0; i < nr_pages; i++) { - if (vmas[i]->vm_file != file) { - ret = -EINVAL; - break; - } - if (!file) - continue; - if (!vma_is_shmem(vmas[i]) && !is_file_hugepages(file)) { - ret = -EOPNOTSUPP; - break; - } - } + file = vma->vm_file; + if (file && !vma_is_shmem(vma) && !is_file_hugepages(file)) + ret = -EOPNOTSUPP; + *npages = nr_pages; } else { ret = pret < 0 ? pret : -EFAULT; @@ -1194,7 +1188,6 @@ struct page **io_pin_pages(unsigned long ubuf, unsigned long len, int *npages) } ret = 0; done: - kvfree(vmas); if (ret < 0) { kvfree(pages); pages = ERR_PTR(ret); -- 2.40.0