Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp1488067pxb; Fri, 27 Aug 2021 09:56:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeI0RZ3V+jrm+M8kWI85qOrsdmAKUYtPHhqzu8Jqu+zcrGPRU5j66FGW84H3SLt5sblaUA X-Received: by 2002:a17:906:4c89:: with SMTP id q9mr11070830eju.118.1630083373328; Fri, 27 Aug 2021 09:56:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630083373; cv=none; d=google.com; s=arc-20160816; b=bhbDnAASwDoPVpWiDkiF76w3IsVp/OA9JVKO/IAxLLVryoA4r5pNXLYmNi9pylQYwN Otplf1CYYJfiziqKhSKT1zWw9CYah6etqIHiNq6PPhkcz0u8tevInUKcOiQgdLgIqmWL zGEso1zPPvTgkrbXfuk/jx88oGLRgzfmexvvBMP7wd2tvO1fZ1YI9/8BecxBB11Qaa1/ qIxmZBlu0PqQL0M/zGg1LgJH2DoS1YU7XWXUPcdEwmOGkEAQ1n75pzixPFKPMT8xQdVP gNs7oac2UgwU/k2ta2TFoWM/wmx4dFcEc7uwaTxJpAhdqdhhdGj10vNV0tcd4UbziAKG WuCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=My07z1Y3p4MapI2JxW+Vnbyo3VlenRO2PNVTehC852I=; b=YsiPv2nCSCDrsuNU+IH3/MMPSK4VRbCdJnNtwjXowVz8xfJiwUGO3R9icV4dO/gSHW MmWlOIx/XH4gWZ+6WynzLrUWIYlAb4UHjRLrWnez9ytt9gXc/upQkeSUu1gQm0W2GpLs bAEKrKrBXBEtXOTemp6Y3+iAmYYXKVs1jpkhNmorE/vUHizr/RTxQ6scJhcMr4qxtACP rq88HQEXs1Q4muvUxRJT4TVX6+cgxu9PHGUCSFguXWzp6XIrjF7rDpv8lc4M3rUGhb7Q uKsO1j+vR2Tn8RHImmH59mL2LzNx0+GLVz0emjubUIPhkxUktkvMLiZhXGhqu35RUMvn 4Uhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=hFnv8kph; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b6si8055561edu.115.2021.08.27.09.55.49; Fri, 27 Aug 2021 09:56:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=hFnv8kph; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238859AbhH0Qwp (ORCPT + 99 others); Fri, 27 Aug 2021 12:52:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41695 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238525AbhH0Qw1 (ORCPT ); Fri, 27 Aug 2021 12:52:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630083097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=My07z1Y3p4MapI2JxW+Vnbyo3VlenRO2PNVTehC852I=; b=hFnv8kphF498vSSLvXwzgQVIji3fifLM3rjZmkRQtQydDAAUd2k8b394g/5IocwKWvShf0 tlH0IMwEDJ7ht4mjp1Sjg5yIJAscYs+g+qYez/BfRE1wnbLn0WEISPjqSoJR82FdFaeqZd pOBd051cuRCIsrsXCYndo++CLAvoAHc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-383-R4BJH5iZPRy05u14XGzQwA-1; Fri, 27 Aug 2021 12:51:36 -0400 X-MC-Unique: R4BJH5iZPRy05u14XGzQwA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EBEDC1009E20; Fri, 27 Aug 2021 16:51:34 +0000 (UTC) Received: from max.com (unknown [10.40.194.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17BD660C82; Fri, 27 Aug 2021 16:51:26 +0000 (UTC) From: Andreas Gruenbacher To: Linus Torvalds , Alexander Viro , Christoph Hellwig , "Darrick J. Wong" Cc: Jan Kara , Matthew Wilcox , cluster-devel@redhat.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com, Andreas Gruenbacher Subject: [PATCH v7 18/19] iov_iter: Introduce nofault flag to disable page faults Date: Fri, 27 Aug 2021 18:49:25 +0200 Message-Id: <20210827164926.1726765-19-agruenba@redhat.com> In-Reply-To: <20210827164926.1726765-1-agruenba@redhat.com> References: <20210827164926.1726765-1-agruenba@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce a new nofault flag to indicate to get_user_pages to use the FOLL_NOFAULT flag. This will cause get_user_pages to fail when it would otherwise fault in a page. Currently, the noio flag is only checked in iov_iter_get_pages and iov_iter_get_pages_alloc. This is enough for iomaop_dio_rw, but it may make sense to check in other contexts as well. Signed-off-by: Andreas Gruenbacher --- include/linux/uio.h | 1 + lib/iov_iter.c | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/include/linux/uio.h b/include/linux/uio.h index ffa431aeb067..ea35e511268f 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -29,6 +29,7 @@ enum iter_type { struct iov_iter { u8 iter_type; + bool nofault; bool data_source; size_t iov_offset; size_t count; diff --git a/lib/iov_iter.c b/lib/iov_iter.c index 968f2d2595cd..22a82f272754 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -513,6 +513,7 @@ void iov_iter_init(struct iov_iter *i, unsigned int direction, WARN_ON(direction & ~(READ | WRITE)); *i = (struct iov_iter) { .iter_type = ITER_IOVEC, + .nofault = false, .data_source = direction, .iov = iov, .nr_segs = nr_segs, @@ -1523,13 +1524,17 @@ ssize_t iov_iter_get_pages(struct iov_iter *i, return 0; if (likely(iter_is_iovec(i))) { + unsigned int gup_flags = 0; unsigned long addr; + if (iov_iter_rw(i) != WRITE) + gup_flags |= FOLL_WRITE; + if (i->nofault) + gup_flags |= FOLL_NOFAULT; + addr = first_iovec_segment(i, &len, start, maxsize, maxpages); n = DIV_ROUND_UP(len, PAGE_SIZE); - res = get_user_pages_fast(addr, n, - iov_iter_rw(i) != WRITE ? FOLL_WRITE : 0, - pages); + res = get_user_pages_fast(addr, n, gup_flags, pages); if (unlikely(res <= 0)) return res; return (res == n ? len : res * PAGE_SIZE) - *start; @@ -1645,15 +1650,20 @@ ssize_t iov_iter_get_pages_alloc(struct iov_iter *i, return 0; if (likely(iter_is_iovec(i))) { + unsigned int gup_flags = 0; unsigned long addr; + if (iov_iter_rw(i) != WRITE) + gup_flags |= FOLL_WRITE; + if (i->nofault) + gup_flags |= FOLL_NOFAULT; + addr = first_iovec_segment(i, &len, start, maxsize, ~0U); n = DIV_ROUND_UP(len, PAGE_SIZE); p = get_pages_array(n); if (!p) return -ENOMEM; - res = get_user_pages_fast(addr, n, - iov_iter_rw(i) != WRITE ? FOLL_WRITE : 0, p); + res = get_user_pages_fast(addr, n, gup_flags, p); if (unlikely(res <= 0)) { kvfree(p); *pages = NULL; -- 2.26.3