From patchwork Fri Sep 22 12:02:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13395704 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 4A61BC04AAB for ; Fri, 22 Sep 2023 12:03:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 205C36B02CC; Fri, 22 Sep 2023 08:02:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 116AB6B02CD; Fri, 22 Sep 2023 08:02:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EFA556B02CE; Fri, 22 Sep 2023 08:02:54 -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 DF2836B02CC for ; Fri, 22 Sep 2023 08:02:54 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id B9CA7A10E8 for ; Fri, 22 Sep 2023 12:02:54 +0000 (UTC) X-FDA: 81264097068.09.2A4B6F1 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf02.hostedemail.com (Postfix) with ESMTP id 020598003A for ; Fri, 22 Sep 2023 12:02:52 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TPS5iQ50; spf=pass (imf02.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695384173; 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=4obcSyEH8f0LI+hqbulIObwIk6RPpIYigX0Ml5LHEtM=; b=AQOkFuosioaIDsvkXvjTRuBtJpu0ZqDgs3I99t7B22BEeygqZ9rZ6gbmfc5ZFfQYIZVt4I owxtct/1PrliJJU7FJ6fWSxdjejSqkbVV284qKy5pdPqGwsr8jlqmaWm5iKgSMFc0VSBaG 036CPU40a5N+vbKkmxG9V2aJyG07qlM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695384173; a=rsa-sha256; cv=none; b=MNGQKTWsRxZuU+I6De4mG7rbD6TLklF2cCSWNj6j1CVM38cypDwJbMDSBg/2hyZLsCCOeT xRo0wvVHrWGf8qWku7fg1wb0inmFzSft9WaNovPMgF+avjihYk+VCLO+hpe9Ags8D+HKqx udfnull3yeEaBzGk4s01EeN9b93iJCs= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TPS5iQ50; spf=pass (imf02.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695384172; 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=4obcSyEH8f0LI+hqbulIObwIk6RPpIYigX0Ml5LHEtM=; b=TPS5iQ5067BJzAECWHAtKm/kdhoCDBGEKGNd50ojZ7Y1ncBbeIfMJehG7GX9x7JZ8ccKtN jU3pnYKUYQtkT1PybKTNVedwInRq+de7Af36vjk9okQFUzQrLI0qpeDnFsRBvfcA3P2J3x KV7GmESoIw8uqrX7q4GVNUCZ1MHjRjU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-183-mKXZqPWoOu676PZGhvpTxw-1; Fri, 22 Sep 2023 08:02:48 -0400 X-MC-Unique: mKXZqPWoOu676PZGhvpTxw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7EEDD185A79B; Fri, 22 Sep 2023 12:02:47 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id D33FBC15BB8; Fri, 22 Sep 2023 12:02:45 +0000 (UTC) From: David Howells To: Jens Axboe Cc: David Howells , Al Viro , Linus Torvalds , Christoph Hellwig , Christian Brauner , David Laight , Matthew Wilcox , Jeff Layton , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 06/13] iov_iter: Derive user-backedness from the iterator type Date: Fri, 22 Sep 2023 13:02:20 +0100 Message-ID: <20230922120227.1173720-7-dhowells@redhat.com> In-Reply-To: <20230922120227.1173720-1-dhowells@redhat.com> References: <20230922120227.1173720-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Rspamd-Queue-Id: 020598003A X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 9taykbfy1wukk6xb9kh3fnkfcef4jdy6 X-HE-Tag: 1695384172-317294 X-HE-Meta: U2FsdGVkX1/slIMi73mKqxj6TRo6HjFvjbTIQFIkF1WKBsFCfqCMussMUZwHhzICNOHU8wF7BmYTsIZghoQ7+KWlOKLkUklqXNIiwjTNWDjuUEUgy7AP7/bvnjxTQ5hg5jbMONq9T6YWxtE9y0Ghodn6LuspkRFCUkEfJ0Z/F2fNM1GhnQx91iZS0BZihueVj9JvANEVAdhcf8TdrLz77mGItjrq6jFbvJ1j8xunO4jJt7KuhXiEkxpoGyuhqpf8CElN8XfWGXuizqFY1X22iHbpYPNqmGz2By5905X3XFrbyTH9TQ4NqwWKGQ0Ie/AC1lW9pWquEMFm78f0mgYh5E0bvYN6JZj90g7E5ILHPiHXycJ+p549hf+5kXCN68CZcGZloXVf0wGyip5IziPgou37LKVpQk6A4KkZ9gCGzud23c1i8hkZ+AHqYmwkUq8vW5RgNTouR2Vm6zn0S2dkwXgK9lpqr+jU+7+pRovtjgH9qRb99EAwRUAfowI5bNMCaksS+tnz/D31iFDP84ixya/ixNr1c8t8wBqCH6oUGcfHY/krr5DW+OMSEcUDOQXuaqJ6CrWdJnr7tKVIpnTvo1/yahufP+fZXOQAvtuDbT4sY3CyncLE3IxpKkZNdgg77GV4LnwPmD0NyHWqupGvHQf2U8SOwRZndDoJQhM7+fZb6H8r9+7lvsQ8yFgVP1vKAk3eHmu946o8/fiR4Nd6yghgoxXr8CtHgf8iBjBWhuxxLlPDDdBXyg/Cp182yDwXCBMLe1Y4LFx4GbiG2w65ZCCi/ea0k8AfCaYIOl+zJThrfMP0nxaqH2M9fz7CoikkUcH6saz1rjcIjVAfF2587daqFzTeveV+w8cs/NEx+zbHws6cTcD6HRScSBAia2H4owlLMpMfFNwpAoAfsfFRPtMIIPu6AwvnNY5xyRzyN0Dh+F4RkTPi6C+ElaELbti9MBNdqnlyVjgEpJqG4xV 3BoPlZ7t 7jQ17ZYw77RBZLzHuVqfCIlxFu1s5HgRefgVAmVKKw3lkEz+PQuTTwoHCeKqwhzE8bK9XEpLrPzTVpJovhuEyVJccJOYv3p4p3H876DTk7qwgxf1V2GSJZGaFflxFwC+lXCW1LISAZ3vmmkqc7VwcfJPqzihMo9GNhFYhK0YmI2yy3xTkGOKiaCNIjIzoOBH0+FFYNH8/aSzGMInHKsPfj5XNZuhDoZiysWLZWyvxiuKeQ8ozd3iTLESfyGXFneCzgbGiwzM8DOdphVQEOXBqypJ9m6Zma3H1yLQusLzSDmlUU2TlSETWY8tBchd8xM8IalQ/QxJNRqLvOxwCv1BxSbdxDZu+fnppuqmRBDUz3cfAcPA7YOtHDP+H5Cs0siMQt2d7cUoUCUfPJ65hW2/x8yrtSPJjczCaqdqU4kgrTPbW7jQn38mypv0J9TkmpOImkfCCG98COLHlZex+YtIdJOvSFoR9j6w2JtavI3osXkXlEOrhQqKF7MKEOggX5BZ6w6BBLrwonwDF5Uk24GHZ6HmWXu9KkUvNzIDRdU7uXedH1Q7GWRQjws/0gFRh5TW1zuaG2U1fNqZn/M0= 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: Use the iterator type to determine whether an iterator is user-backed or not rather than using a special flag for it. Now that ITER_UBUF and ITER_IOVEC are 0 and 1, they can be checked with a single comparison. Signed-off-by: David Howells cc: Alexander Viro cc: Jens Axboe cc: Christoph Hellwig cc: Christian Brauner cc: Matthew Wilcox cc: Linus Torvalds cc: David Laight cc: linux-block@vger.kernel.org cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org --- include/linux/uio.h | 4 +--- lib/iov_iter.c | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/linux/uio.h b/include/linux/uio.h index bef8e56aa45c..65d9143f83c8 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -43,7 +43,6 @@ struct iov_iter { bool copy_mc; bool nofault; bool data_source; - bool user_backed; size_t iov_offset; /* * Hack alert: overlay ubuf_iovec with iovec + count, so @@ -140,7 +139,7 @@ static inline unsigned char iov_iter_rw(const struct iov_iter *i) static inline bool user_backed_iter(const struct iov_iter *i) { - return i->user_backed; + return iter_is_ubuf(i) || iter_is_iovec(i); } /* @@ -380,7 +379,6 @@ static inline void iov_iter_ubuf(struct iov_iter *i, unsigned int direction, *i = (struct iov_iter) { .iter_type = ITER_UBUF, .copy_mc = false, - .user_backed = true, .data_source = direction, .ubuf = buf, .count = count, diff --git a/lib/iov_iter.c b/lib/iov_iter.c index 27234a820eeb..227c9f536b94 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -290,7 +290,6 @@ void iov_iter_init(struct iov_iter *i, unsigned int direction, .iter_type = ITER_IOVEC, .copy_mc = false, .nofault = false, - .user_backed = true, .data_source = direction, .__iov = iov, .nr_segs = nr_segs,