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 B4DFCEE01E0 for ; Wed, 13 Sep 2023 16:57:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 901296B01FF; Wed, 13 Sep 2023 12:57:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8AE7C6B0200; Wed, 13 Sep 2023 12:57:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7292E6B0201; Wed, 13 Sep 2023 12:57:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 5F5E66B01FF for ; Wed, 13 Sep 2023 12:57:21 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4514A80351 for ; Wed, 13 Sep 2023 16:57:21 +0000 (UTC) X-FDA: 81232179882.05.3D632FD Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf15.hostedemail.com (Postfix) with ESMTP id 87E3AA0037 for ; Wed, 13 Sep 2023 16:57:19 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FCn0jFFg; spf=pass (imf15.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1694624239; 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=p+t8ChtS3C0mCAtd18JzNSIJcCnKtYlpMvVgh9PlkwE=; b=dFeA0ei4Y1pvkHbZjVojdC+Z5wxQEJxy3399AgZRz14Ph8ivuo10Mf+SMfonhJ+vg2HShA QnsHJ0EK5YYu63AQhtmXqecCFGHrm9tiLiP5pS6MJi/i/VVCaJkORph4SNu4zwg0iiWNUN vw24fU0H0oCsMmedqt+ldAUbvO9jXvo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694624239; a=rsa-sha256; cv=none; b=ZiuP4jJQELx9P9r1nYvcBKhUo4L19bPTWbi9o+J7/XQe8stxrhSD3GnbUUemiEToamEYlf uwGpzg4KH2Oi9nfyYHIruZFeO3/7+TnKIu1AjbJpuHA+7aKwqYAufUzLXBoWvDyjFWfH1+ 9EbuIcWMHecznw7Fmt3uNqR1zS0qgXY= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FCn0jFFg; spf=pass (imf15.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1694624238; 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=p+t8ChtS3C0mCAtd18JzNSIJcCnKtYlpMvVgh9PlkwE=; b=FCn0jFFgFML3ZQz2s8axxaM05t/MuIAlVnMPJ+LnbpNxYlkBT2Eel+MfaobEQtF9NOvMmI 2UqojYup1cI4MQBAhxR+KSmhnUIQM/EVrHlk9n4gOU03GBCZWmI9z1K7Lef/XU9N0lhnw0 ZdygDC04K2SJ5uZfNuDBdRxxlB/hEFk= 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-542-5xC_0HubPGGLzilTHkSTMQ-1; Wed, 13 Sep 2023 12:57:13 -0400 X-MC-Unique: 5xC_0HubPGGLzilTHkSTMQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 783FB85531D; Wed, 13 Sep 2023 16:57:12 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id D43F240C6EA8; Wed, 13 Sep 2023 16:57:10 +0000 (UTC) From: David Howells To: Al Viro , Linus Torvalds Cc: David Howells , Jens Axboe , 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 v4 08/13] iov_iter: Remove the copy_mc flag and associated functions Date: Wed, 13 Sep 2023 17:56:43 +0100 Message-ID: <20230913165648.2570623-9-dhowells@redhat.com> In-Reply-To: <20230913165648.2570623-1-dhowells@redhat.com> References: <20230913165648.2570623-1-dhowells@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Rspamd-Queue-Id: 87E3AA0037 X-Rspam-User: X-Stat-Signature: 9xcbqt99yhqqc36dzgywbyn5qk1koqnf X-Rspamd-Server: rspam03 X-HE-Tag: 1694624239-619319 X-HE-Meta: U2FsdGVkX1/HULi65kd2ij/TFaAF36AnVFj+Zgxgj9ITtiJd/tBYTqHiERgJLtwFjmtyKxSM8oj+sxM6xDf8cZ1pbd86WInIMZyDZH2npHMocjhmxM3LlBLvgt0vLmWSIgMV6rcQf1h+mjuoWmZ4qLLbLni0IqrlnVMkckRVEdWSF4cadz/Oi8bx+R0+Pu+ExPqjBkQfVh6FEFGMeLBAUWfIz8he+vpd48CyheAetPMHMPqZ2dKNsFdTDxdPjnFx8+3ppPZbP2HxQPaAl1kpwD/DXBTRlTdp7GZmXFdD/ZkW0/jauYoZJygi3mdNXL6JAhYF7h6L+jGGvxxr7HmvGaqOnwy2PE/lE3YnNCqPI+GspDZT+URr6xpX34KH+9ueyj4ZfzPRvnt+bnek879wjbv6DFE2w4xbKFFPY+V3NnoGtHIk+88WfVa5RHfEyWlDeMHELftIzqsRf5HqoJnAB4yJ0/KJilmpiSV60KGIyRhSkf2qwGB0CDnnoSbZVSU6trC8KlDTpaX2iHgikvZ6IhNxtVFp/dSpe+glPRYQEVz8clV6IITlKPYRmcSvbEofmaj+98Z27oZ3LZ7isyDK92VDqOeK3fIe6oMPpGFrHSoREAxraQEtn02lIR8Rvtgbn9FZRzz++1voIr3egLTcx7/C1Kdvp0ZYvdTTCRai6h3DN/q7jebiGlVv7zOTbS9gVIK9P8CXSvYBzoCbBc+1VigZuiynvqMP7c9u7Pw5YVBWHKkOmq0+kH+/REntQWEd0LI4afLPR7dtRymgX5m77fGfLvPWIDojQ83GEJ2PT3r0yRaRaCD1lRhVhNo7pqT1FwGiyHVWkUfN2JZQMTzhe7xOaBhWBrZ5nN09rrkw+25d8sKzNT/sCLbKxiEZIj2ueEeLmMabYtFbFyhhTRYmQRpk0ot7ugIa5TniwJWIejHnx1YM4IZ8ObyhZ6M2P8F9bjoxWsR9zj8OlOFHcgR k4kX31Ws f7dNtOFumcMsLySnsHEis+iN+sQKvFc/28bXaQXLddrCIDSGpzkZ7htX9P7BABYsEfcqum8aOEjt1VIlsmurQ0Vdq2E5InVZEKZ+D6R78TEoOUMaMj698DsHvSzxgD+sOGqRAL8p2IZRWNflKbOuaIxBj+5KosFKgsOnAGP5qY0G/bs6yW0ECI/D4ZgH5rEs9ErzT2abdQpK4LbiCI9+rFlCN0CZ58gzRrrE3M4Nz9Jau7auifXJYMYU78USJXpKIsFzqFB2F9UbqOdrffawB7hyIXFFk2XhIZwQDE/NpJMKnQoGkcPQHEClJLOHXzdyXK6+KC3wAuFlbK0FmSo8RabrEAGE3mZlmb1mVBFrPafBMvWNWJB8NZj4dT2j9O1gpaV6FY4xx1xyLWnL4ABLf85qd1xgoH2w9quedXLoRbO+zG+NeeDybzJHLiTVNeOMTcODGnlYgcwyW8nVoklM0m/Nr4XxmzXB9p1oWPWVrkQ7xhaZ6XUE/mwffyCXdxXrYusHFH07aD3Spjn60P2HpQdtrURllCiHR5RdIF8cuGeEE2RlhRMy50gQ6x0viDtQtnMQ9i0w/ea8x6Ak= 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: copy_to/from_iter() now always return a short copy on MCE, so we don't need to have special handling. 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 | 16 ---------------- lib/iov_iter.c | 5 ----- 2 files changed, 21 deletions(-) diff --git a/include/linux/uio.h b/include/linux/uio.h index e2a248dad80b..cc250892872e 100644 --- a/include/linux/uio.h +++ b/include/linux/uio.h @@ -40,7 +40,6 @@ struct iov_iter_state { struct iov_iter { u8 iter_type; - bool copy_mc; bool nofault; bool data_source; union { @@ -251,22 +250,8 @@ size_t _copy_from_iter_flushcache(void *addr, size_t bytes, struct iov_iter *i); #ifdef CONFIG_ARCH_HAS_COPY_MC size_t _copy_mc_to_iter(const void *addr, size_t bytes, struct iov_iter *i); -static inline void iov_iter_set_copy_mc(struct iov_iter *i) -{ - i->copy_mc = true; -} - -static inline bool iov_iter_is_copy_mc(const struct iov_iter *i) -{ - return i->copy_mc; -} #else #define _copy_mc_to_iter _copy_to_iter -static inline void iov_iter_set_copy_mc(struct iov_iter *i) { } -static inline bool iov_iter_is_copy_mc(const struct iov_iter *i) -{ - return false; -} #endif size_t iov_iter_zero(size_t bytes, struct iov_iter *); @@ -381,7 +366,6 @@ static inline void iov_iter_ubuf(struct iov_iter *i, unsigned int direction, WARN_ON(direction & ~(READ | WRITE)); *i = (struct iov_iter) { .iter_type = ITER_UBUF, - .copy_mc = false, .data_source = direction, .ubuf = buf, .count = count, diff --git a/lib/iov_iter.c b/lib/iov_iter.c index b574601783bc..66d2a16774fe 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -169,7 +169,6 @@ void iov_iter_init(struct iov_iter *i, unsigned int direction, WARN_ON(direction & ~(READ | WRITE)); *i = (struct iov_iter) { .iter_type = ITER_IOVEC, - .copy_mc = false, .nofault = false, .data_source = direction, .__iov = iov, @@ -629,7 +628,6 @@ void iov_iter_kvec(struct iov_iter *i, unsigned int direction, WARN_ON(direction & ~(READ | WRITE)); *i = (struct iov_iter){ .iter_type = ITER_KVEC, - .copy_mc = false, .data_source = direction, .kvec = kvec, .nr_segs = nr_segs, @@ -646,7 +644,6 @@ void iov_iter_bvec(struct iov_iter *i, unsigned int direction, WARN_ON(direction & ~(READ | WRITE)); *i = (struct iov_iter){ .iter_type = ITER_BVEC, - .copy_mc = false, .data_source = direction, .bvec = bvec, .nr_segs = nr_segs, @@ -675,7 +672,6 @@ void iov_iter_xarray(struct iov_iter *i, unsigned int direction, BUG_ON(direction & ~1); *i = (struct iov_iter) { .iter_type = ITER_XARRAY, - .copy_mc = false, .data_source = direction, .xarray = xarray, .xarray_start = start, @@ -699,7 +695,6 @@ void iov_iter_discard(struct iov_iter *i, unsigned int direction, size_t count) BUG_ON(direction != READ); *i = (struct iov_iter){ .iter_type = ITER_DISCARD, - .copy_mc = false, .data_source = false, .count = count, .iov_offset = 0