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 3C79BCD4F41 for ; Fri, 22 Sep 2023 09:32:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9FE756B02A6; Fri, 22 Sep 2023 05:32:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9AD626B02A7; Fri, 22 Sep 2023 05:32:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 89C896B02A8; Fri, 22 Sep 2023 05:32:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 77BB36B02A6 for ; Fri, 22 Sep 2023 05:32:40 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 30D75140EDD for ; Fri, 22 Sep 2023 09:32:40 +0000 (UTC) X-FDA: 81263718480.07.577F359 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf29.hostedemail.com (Postfix) with ESMTP id 795E312000E for ; Fri, 22 Sep 2023 09:32:38 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=o9nXd2ER; spf=pass (imf29.hostedemail.com: domain of horms@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=horms@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695375158; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+WpmPj40uZjZZL0peyRzGbmlrYopQn2Rm3Wh/gTy5H4=; b=0pkjtZnB3cWB2KeF+C5GXER8p4oVDT/P4FU8B3UIu+QcmKk+bBpx+vRvGrq16mNcF3n3ko YhLhOQcln1tZGM6t0zCl8c3DQDuEnKWtEO4XuYRKDLRSsMWIzQnCV2J7w+760ZJh8hlUuv uO57ZIOcThmcw/PsHH8M913mmllvFBw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695375158; a=rsa-sha256; cv=none; b=8KIhJGv5rP0CNdbizKyovJ5XctqMwvFo5YiMtHseRK68jNwSIPPuGX4ylCdRy1nTT5bwj5 dkuvH7vQpsns8DdkFPfGNM6wbOofJenQltbcXeH4x26nwqHT88SHg6NNen8QMpJQOZDjqb a8OhuIn03gs3UMho73tE16W/2uQhmEE= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=o9nXd2ER; spf=pass (imf29.hostedemail.com: domain of horms@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=horms@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 8E9B4B8220A; Fri, 22 Sep 2023 09:32:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B0F7C433C9; Fri, 22 Sep 2023 09:32:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695375155; bh=vwZUAYeEfWwnaGPU+f55fpprOAGYNnTdXdHwaC6Ti5o=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=o9nXd2ERc/xNm7w0xvgZ+jg3uIJWBrEPTC/DuLDyeLQ2YVjNrOfjXaCb5QoLcXhOQ s1yRC7V6cI8Gv0op5YlxFtha2SFI+Gs5PMt/+4yEo9dLmGjdlJbngdoYb/yDveICei SL4Jf1YHttuw0WFbBVRKI1FjVXO1bHFaJ/dCTHA6NGz9mUe6PglwaVqVwjKWo97lEr uGmtucbm6STBFJ37LXVZh9RAz7h3m0M6LsJ3X3hbbebUGAcM/q46hRo4yCB6F0Cml2 Q0jWXfW8jwWbgfYj8SCtNd5UhVXZL3ElDucO33i1B/6qbThCgKSjihp+5NfHv8K4Pl ql2vtkPWxGuNg== Date: Fri, 22 Sep 2023 10:32:27 +0100 From: Simon Horman To: David Howells Cc: Jens Axboe , 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: Re: [PATCH v5 05/11] iov_iter: Convert iterate*() to inline funcs Message-ID: <20230922093227.GV224399@kernel.org> References: <20230920222231.686275-1-dhowells@redhat.com> <20230920222231.686275-6-dhowells@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230920222231.686275-6-dhowells@redhat.com> X-Rspamd-Queue-Id: 795E312000E X-Rspam-User: X-Stat-Signature: sg41aqj3utmbmfdjssgt3xgz8o3rk6bu X-Rspamd-Server: rspam03 X-HE-Tag: 1695375158-211391 X-HE-Meta: U2FsdGVkX1+qJsbsHaHF7uA8dsZz7QnlorKp1JPqw8+/1+S8xHdcUvprwBYjNm3W1AVUPFigfoCSAPo7fB4u1eAWFpifN/ie+pXA+c6HLlvvJbBwrfPk8MAfu0RndZ61MrqCFJ4prGMobqG/jVA++xyEZQ+5qjHOu8jzGxsDnLbP3JWbFl3PnuQljPjF53GTHkvYfWwlJ3Tkx9yQciJNQFjpbWiNqfk5OaIBUeG3YpHso/cOGfNzrAnXyeZ1aDiLeELInX1ZI6mLlVkDXN89UgZmYo44q9dVofwb4rD9a0uOk9mWg/rxfha4yxYfCmEh11OYba/3V9St0hNAGW22xjjMsV/Jbp0OZrC3PRIv+h5NLmJWrmAu06xDI2rm0V5UuPlE6aBydjvWtxQ8H7osXEMfMxtSIkGmym5a5IIaGfx42RtbNEZ7fIZJ0SucwQnviUcV8+bC22tfRYDgCQFNrdE4YcbncpApqB2QhdDjQYqhHU2/2T5eZjRln9pMtRsiv59W5LXjfbdHXELcDQXzfiItFZWbVo1/jK/y1909RYzo4Qgnecs/LEExd9WwWJexf5iEYqTTo+FnGg5ucOvfYjmQ276eFNAIZ77ROt0z3RmrX0Gwm5USmGgLaLmP4TRJntcWkzuYb050iKgkOaTg+18JJzWT1vszM1w3ape4JvtjUWDrZkdF/Bw+BdzTbMUyuIaYnBjW/c5O3WbLVnKuUjEPpE3JUz2cd4yMzahKrU58SfMxp197dQUh8YPFj3FpkmULl+MCzbKefQNjpZuNi+CIlD20KVCKbPVEcLJ4jSkCtHQiabQ+CKX3ktBpNmeiH0u88oJ0yzGP7/hqQlwVXwoKwWiwXhPpaAg6WnCEKQyPL2oK6qM2YWmb8gmT1UNv/hzLb/joMA1QRxwMI9teVnnuBE9mTUsou+5CoChXaTA1DKDfFI/fdpb9xLcakUjcp8a163KCF/cetqhTVsw UPUU7yP0 nJ6MfN06vYpp6CwgWLHPNL4D1FrMTUiXviFOyULhhbzwd0RtdGP4Y9o2//rFq8IE/wNlcU4VoJOLE0EqHjkbBTR9wYdWZTHfUNo/fLE3H0Luvu1ITEPQKf6ndNNgaylpL71TXZATiJdeFKyUqc3wSoDmZjCBO/mpc1s0xnQLl1rwp5EfOdZkENIXl2TxPw3Xb/e7AHBHUAm64sB/WMqEgD24dvXeWD39qTIV+zbVhhvR/hEuBa3vbQWsrW+pOjrAn60ZuKg/BltTNVPn+IJDysiPIBdKZpO1kXtCtSCRGPNLF4FM7il3cBjwmTJjvEJVmntSnwoVXBSNjIsRQsq7o7sEiDA== 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: On Wed, Sep 20, 2023 at 11:22:25PM +0100, David Howells wrote: ... > @@ -312,23 +192,29 @@ size_t _copy_to_iter(const void *addr, size_t bytes, struct iov_iter *i) > return 0; > if (user_backed_iter(i)) > might_fault(); > - iterate_and_advance(i, bytes, base, len, off, > - copyout(base, addr + off, len), > - memcpy(base, addr + off, len) > - ) > - > - return bytes; > + return iterate_and_advance(i, bytes, (void *)addr, > + copy_to_user_iter, memcpy_to_iter); > } > EXPORT_SYMBOL(_copy_to_iter); > > #ifdef CONFIG_ARCH_HAS_COPY_MC > -static int copyout_mc(void __user *to, const void *from, size_t n) > -{ > - if (access_ok(to, n)) { > - instrument_copy_to_user(to, from, n); > - n = copy_mc_to_user((__force void *) to, from, n); > +static __always_inline > +size_t copy_to_user_iter_mc(void __user *iter_to, size_t progress, > + size_t len, void *from, void *priv2) > +{ > + if (access_ok(iter_to, len)) { > + from += progress; > + instrument_copy_to_user(iter_to, from, len); > + len = copy_mc_to_user(iter_to, from, len); Hi David, Sparse complains a bit about the line above, perhaps the '(__force void *)' should be retained from the old code? lib/iov_iter.c:208:39: warning: incorrect type in argument 1 (different address spaces) lib/iov_iter.c:208:39: expected void *to lib/iov_iter.c:208:39: got void [noderef] __user *iter_to > } > - return n; > + return len; > +} > + > +static __always_inline > +size_t memcpy_to_iter_mc(void *iter_to, size_t progress, > + size_t len, void *from, void *priv2) > +{ > + return copy_mc_to_kernel(iter_to, from + progress, len); > } > > /** ...