Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp846424pxb; Thu, 19 Aug 2021 12:45:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9WreEi9M+1nzkt9FgjnUkxDwj7iW/jmIueSeNQMPUtNl6WE7UdNRyCBszyyrrTMwD9XTA X-Received: by 2002:aa7:c7c2:: with SMTP id o2mr18164527eds.166.1629402310340; Thu, 19 Aug 2021 12:45:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629402310; cv=none; d=google.com; s=arc-20160816; b=k/M3wLmGrfCs0PMYXaeRiIyorl6JMwgyUwYb75r1tX8DvEf4Co91v8MWP+RlIiNTha 7Up61YfglDbZ3k7DvOghPX/swJkVLkZ7dzR4hCr3ZzXKOjuwpdCE8DaHukeG8+si3xbD ZKBq0eT8QCJL6QMMSn/AF1Swv45PgUJPFVZMKfDgQswbeKkhtuG814A4oXaG/znc2LS/ eyD2FIhKfg2EVEA+JaV++ULruQHvG6ep8mbp4HmuVon5CTZMYDVM6PQBeyGXmJ5/63Lk TS1XYL3fUl4s/xKkvi53pfwx0AzMLIGZpUmMF1bkE5YU1OrMYXsLn7PLc+ELqp5sZAR7 6VuQ== 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=fwHo2yUgk1q/ZBnGSzeQzjbBJkRSnr5t5otXgl6CmYsIH6wlEUXFTM0Mfv7f8mhXt5 N68ov6b7zPUzpKJPgTG7K91mTZ1e4F1Hbvnr68egN6HG3Jw8KmS/6rKJPskDe1n/8ROg 3myjaASJeElu2ijOLLlZQ53npN5etP2OBY59oZHEXobNmMb9D45Prhg98JEAYNeX0AT/ 0fJpJj5TcFna71kb92cXbXRMnQSQ5QSsBFs/gE5SMHasGs0Y4ag/mTpG/NGLIkWLRy30 Y7vdz9acfhISrCPgz+BRnb0Ew95w2+bYkmZKRA29xCJfqF2Aj3ChpHU8H5CL0t/aEvff 7PFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=BHpEsuJZ; 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 nb28si5157858ejc.325.2021.08.19.12.44.47; Thu, 19 Aug 2021 12:45:10 -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=BHpEsuJZ; 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 S235671AbhHSTnH (ORCPT + 99 others); Thu, 19 Aug 2021 15:43:07 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:48688 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235771AbhHSTm5 (ORCPT ); Thu, 19 Aug 2021 15:42:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629402140; 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=BHpEsuJZmqjuRXt2SHI5c88uIXIvamB+FC2KpAVnUzpXQCAng/Kteo3c3V68IEYB26+5T8 zAMnhRHlydMVfibEe11JoP5VPKb0aE0QoEVbG50XMBADgvbjFFp/cxYPmgdrsqNX4XO5l8 aXrP4WKzeuwFZKjA9cCuTx6PuqzyvHk= 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-530-HPzvehwBMbq_nEE9O1MLjw-1; Thu, 19 Aug 2021 15:42:19 -0400 X-MC-Unique: HPzvehwBMbq_nEE9O1MLjw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 990BB190A7A1; Thu, 19 Aug 2021 19:42:17 +0000 (UTC) Received: from max.com (unknown [10.40.194.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id 31F5C1B46B; Thu, 19 Aug 2021 19:42:15 +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 v6 17/19] iov_iter: Introduce nofault flag to disable page faults Date: Thu, 19 Aug 2021 21:41:00 +0200 Message-Id: <20210819194102.1491495-18-agruenba@redhat.com> In-Reply-To: <20210819194102.1491495-1-agruenba@redhat.com> References: <20210819194102.1491495-1-agruenba@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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