From patchwork Sat Nov 21 14:17:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 11923515 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18AB9C388F9 for ; Sat, 21 Nov 2020 14:17:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C5BE022226 for ; Sat, 21 Nov 2020 14:17:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LYN3/WQq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728399AbgKUORK (ORCPT ); Sat, 21 Nov 2020 09:17:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:46336 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727928AbgKUORJ (ORCPT ); Sat, 21 Nov 2020 09:17:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605968228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d87qXzclWdjG5Yvx06kiTnj6d7IqmRDOIVlZdO+mdY0=; b=LYN3/WQqViTNwSM4IAl9xghbfivAiUTKXSkmgGyelNxDrimuerxTwnOdLORj4hi2YnJ6v8 UYAbg9iJ0YFMdCwDJyI1WfsyboSeS2YBf+cIkH6gKz9z86W/Iu/95qo3xBHw/b8YHgKjE0 vRcWvy3GJtlwMohqPrEOpnpLIjivD78= 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-564-1lZL9I3jOhi78lr1D53rOw-1; Sat, 21 Nov 2020 09:17:04 -0500 X-MC-Unique: 1lZL9I3jOhi78lr1D53rOw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D66688042C6; Sat, 21 Nov 2020 14:17:02 +0000 (UTC) Received: from warthog.procyon.org.uk (ovpn-112-246.rdu2.redhat.com [10.10.112.246]) by smtp.corp.redhat.com (Postfix) with ESMTP id 35AD65C22B; Sat, 21 Nov 2020 14:17:01 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH 28/29] iov_iter: Split iov_iter_for_each_range() From: David Howells To: Pavel Begunkov , Matthew Wilcox , Jens Axboe , Alexander Viro Cc: dhowells@redhat.com, Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Date: Sat, 21 Nov 2020 14:17:00 +0000 Message-ID: <160596822038.154728.6350968091336040046.stgit@warthog.procyon.org.uk> In-Reply-To: <160596800145.154728.7192318545120181269.stgit@warthog.procyon.org.uk> References: <160596800145.154728.7192318545120181269.stgit@warthog.procyon.org.uk> User-Agent: StGit/0.23 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Split iov_iter_for_each_range() by type. Signed-off-by: David Howells --- lib/iov_iter.c | 41 +++++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/lib/iov_iter.c b/lib/iov_iter.c index ca0e94596eda..db798966823e 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -2282,7 +2282,7 @@ int import_single_range(int rw, void __user *buf, size_t len, } EXPORT_SYMBOL(import_single_range); -static int xxx_for_each_range(struct iov_iter *i, size_t bytes, +static int bvec_for_each_range(struct iov_iter *i, size_t bytes, int (*f)(struct kvec *vec, void *context), void *context) { @@ -2291,18 +2291,39 @@ static int xxx_for_each_range(struct iov_iter *i, size_t bytes, if (!bytes) return 0; - iterate_all_kinds(i, bytes, v, -EINVAL, ({ + iterate_over_bvec(i, bytes, v, ({ w.iov_base = kmap(v.bv_page) + v.bv_offset; w.iov_len = v.bv_len; err = f(&w, context); kunmap(v.bv_page); - err;}), ({ + err; + })); + return err; +} + +static int kvec_for_each_range(struct iov_iter *i, size_t bytes, + int (*f)(struct kvec *vec, void *context), + void *context) +{ + struct kvec w; + int err = -EINVAL; + if (!bytes) + return 0; + + iterate_over_kvec(i, bytes, v, ({ w = v; - err = f(&w, context);}) - ) + err = f(&w, context); + })); return err; } +static int no_for_each_range(struct iov_iter *i, size_t bytes, + int (*f)(struct kvec *vec, void *context), + void *context) +{ + return !bytes ? 0 : -EINVAL; +} + static const struct iov_iter_ops iovec_iter_ops = { .type = ITER_IOVEC, .copy_from_user_atomic = iovec_copy_from_user_atomic, @@ -2334,7 +2355,7 @@ static const struct iov_iter_ops iovec_iter_ops = { .get_pages_alloc = iovec_get_pages_alloc, .npages = iovec_npages, .dup_iter = iovec_kvec_dup_iter, - .for_each_range = xxx_for_each_range, + .for_each_range = no_for_each_range, }; static const struct iov_iter_ops kvec_iter_ops = { @@ -2368,7 +2389,7 @@ static const struct iov_iter_ops kvec_iter_ops = { .get_pages_alloc = no_get_pages_alloc, .npages = kvec_npages, .dup_iter = iovec_kvec_dup_iter, - .for_each_range = xxx_for_each_range, + .for_each_range = kvec_for_each_range, }; static const struct iov_iter_ops bvec_iter_ops = { @@ -2402,7 +2423,7 @@ static const struct iov_iter_ops bvec_iter_ops = { .get_pages_alloc = bvec_get_pages_alloc, .npages = bvec_npages, .dup_iter = bvec_dup_iter, - .for_each_range = xxx_for_each_range, + .for_each_range = bvec_for_each_range, }; static const struct iov_iter_ops pipe_iter_ops = { @@ -2436,7 +2457,7 @@ static const struct iov_iter_ops pipe_iter_ops = { .get_pages_alloc = pipe_get_pages_alloc, .npages = pipe_npages, .dup_iter = no_dup_iter, - .for_each_range = xxx_for_each_range, + .for_each_range = no_for_each_range, }; static const struct iov_iter_ops discard_iter_ops = { @@ -2470,5 +2491,5 @@ static const struct iov_iter_ops discard_iter_ops = { .get_pages_alloc = no_get_pages_alloc, .npages = discard_npages, .dup_iter = discard_dup_iter, - .for_each_range = xxx_for_each_range, + .for_each_range = no_for_each_range, };