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 BD830ECAAD1 for ; Wed, 31 Aug 2022 10:37:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 516A16B0072; Wed, 31 Aug 2022 06:37:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C61E8D0003; Wed, 31 Aug 2022 06:37:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 38E938D0002; Wed, 31 Aug 2022 06:37: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 29E8B6B0072 for ; Wed, 31 Aug 2022 06:37:54 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 1E0E38050A for ; Wed, 31 Aug 2022 10:37:52 +0000 (UTC) X-FDA: 79859537184.11.B30A565 Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by imf30.hostedemail.com (Postfix) with ESMTP id 1F54280061 for ; Wed, 31 Aug 2022 10:37:50 +0000 (UTC) Received: by mail-ej1-f47.google.com with SMTP id u9so27508846ejy.5 for ; Wed, 31 Aug 2022 03:37:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=szeredi.hu; s=google; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=4gYrLsowmI5GGuWghJMX58bQcBEnYZGfYoQ7YKZR6lk=; b=MG4erCNWjYHuSIEvvO741xtOx0OQLZr92W0tZx5zcIBAPX8bM6MALAcK3TActnS/CL onIOi9HOixErTpAkKfRcwfw9Iw6xjtu1vuufU5pwP3Eu8HphBTU/vxZRmM2vQsrnytBp v88VVo5ZXt/1O0WGeHz/QV+AY5566xeU1JoAI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=4gYrLsowmI5GGuWghJMX58bQcBEnYZGfYoQ7YKZR6lk=; b=ECWseFhNR/IFdYUbdFKxBHORw2nVkbJldz724cslZnevYhIsOR5F34eT2/uGwJhWA9 0cIl0LH2N9vnjtb4mkn6gZlEKgrcK+ZqCigjK8mYXZGv6Ot6cUBbWrGz3L4nkmGdwSsF a2hFwnre5SDlyt9op+ic0hNtDpty+S6SI18ln7eMkuhOZCAyyOkFWAfukDklkOgOmBV8 hcMLjYKW6khp1UdXABfQjBweCSnhpTWA2XPyPLjwna3oywDfqFTzYpnLRSQYzA3QppyQ zTOOMIhaNgcZ/CXWMZcnVUHDKG7ozfn+I5oxCyYs7x0tzrTGljMPB7+9obTtpGhxYCTT Y8mg== X-Gm-Message-State: ACgBeo3hIqIXA6py0G/amLODk/dU67bIutCS08NdfJ6gWof/rPqTh/RN OElDoqiwrBDZzxP7a5S91CcVlc+X7whgddUwtL/3aA== X-Google-Smtp-Source: AA6agR7DfkXT6qMIySIpM4SIr/GNRsiXgpnVMta7acmws5dJJtJteiwRbajkuBZzOw4S3rQpjWNqEBu6Ojdoat2ykNY= X-Received: by 2002:a17:906:8a4e:b0:740:2450:d69a with SMTP id gx14-20020a1709068a4e00b007402450d69amr15687098ejc.523.1661942269622; Wed, 31 Aug 2022 03:37:49 -0700 (PDT) MIME-Version: 1.0 References: <20220831041843.973026-1-jhubbard@nvidia.com> <20220831041843.973026-8-jhubbard@nvidia.com> In-Reply-To: <20220831041843.973026-8-jhubbard@nvidia.com> From: Miklos Szeredi Date: Wed, 31 Aug 2022 12:37:38 +0200 Message-ID: Subject: Re: [PATCH v2 7/7] fuse: convert direct IO paths to use FOLL_PIN To: John Hubbard Cc: Andrew Morton , Jens Axboe , Alexander Viro , Christoph Hellwig , "Darrick J . Wong" , Trond Myklebust , Anna Schumaker , Jan Kara , David Hildenbrand , Logan Gunthorpe , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-nfs@vger.kernel.org, linux-mm@kvack.org, LKML Content-Type: text/plain; charset="UTF-8" ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=szeredi.hu header.s=google header.b=MG4erCNW; spf=pass (imf30.hostedemail.com: domain of miklos@szeredi.hu designates 209.85.218.47 as permitted sender) smtp.mailfrom=miklos@szeredi.hu; dmarc=pass (policy=none) header.from=szeredi.hu ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1661942271; a=rsa-sha256; cv=none; b=naa3+RgsqHZiTOr1PFMUVE73VJVTVfM9D3QrsRRQ+WPR+pBgd8wJpE38IESpPq/uyWDJm1 TiaoCa7Di+XT4Ob7PmSMuQwG93eTchspbMK8CzYuhCQy52Aq6wf2xl/i9UIaW8MmhfFQTi TJcFbbonGGnSFTPTu0F1FcHi7CrxW80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1661942271; 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=4gYrLsowmI5GGuWghJMX58bQcBEnYZGfYoQ7YKZR6lk=; b=DuaO8slLAOuSyeo8RoIIqds/MwB1gsPQxj7xej9Waz1gXJ6vWlNwazcMCvqJG/fTq4TwIN XrzxkNF2XQQDfhGOOV9KuGoVw+WHC/9f6u8p49BNXLcpnvBs52j+W+h11K8j0sTRm1TTbv VFYy1QNF+iZruwTenJY5KG6W7ELTGU4= Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=szeredi.hu header.s=google header.b=MG4erCNW; spf=pass (imf30.hostedemail.com: domain of miklos@szeredi.hu designates 209.85.218.47 as permitted sender) smtp.mailfrom=miklos@szeredi.hu; dmarc=pass (policy=none) header.from=szeredi.hu X-Stat-Signature: 4i4jkoqcykdf8tt5escbdr55kjnnsk7y X-Rspamd-Queue-Id: 1F54280061 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1661942270-873549 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, 31 Aug 2022 at 06:19, John Hubbard wrote: > > Convert the fuse filesystem to use pin_user_pages_fast() and > unpin_user_page(), instead of get_user_pages_fast() and put_page(). > > The user of pin_user_pages_fast() depends upon: > > 1) CONFIG_BLK_USE_PIN_USER_PAGES_FOR_DIO, and > > 2) User-space-backed pages or ITER_BVEC pages. > > Signed-off-by: John Hubbard > --- > fs/fuse/dev.c | 11 +++++++++-- > fs/fuse/file.c | 32 +++++++++++++++++++++----------- > fs/fuse/fuse_i.h | 1 + > 3 files changed, 31 insertions(+), 13 deletions(-) > > diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c > index 51897427a534..5de98a7a45b1 100644 > --- a/fs/fuse/dev.c > +++ b/fs/fuse/dev.c > @@ -675,7 +675,12 @@ static void fuse_copy_finish(struct fuse_copy_state *cs) > flush_dcache_page(cs->pg); > set_page_dirty_lock(cs->pg); > } > - put_page(cs->pg); > + if (!cs->pipebufs && > + (user_backed_iter(cs->iter) || iov_iter_is_bvec(cs->iter))) > + dio_w_unpin_user_page(cs->pg); > + > + else > + put_page(cs->pg); Why not move the logic into a helper and pass a "bool pinned" argument? > } > cs->pg = NULL; > } > @@ -730,7 +735,9 @@ static int fuse_copy_fill(struct fuse_copy_state *cs) > } > } else { > size_t off; > - err = iov_iter_get_pages2(cs->iter, &page, PAGE_SIZE, 1, &off); > + > + err = dio_w_iov_iter_pin_pages(cs->iter, &page, PAGE_SIZE, 1, > + &off); > if (err < 0) > return err; > BUG_ON(!err); > diff --git a/fs/fuse/file.c b/fs/fuse/file.c > index 1a3afd469e3a..01da38928d0b 100644 > --- a/fs/fuse/file.c > +++ b/fs/fuse/file.c > @@ -625,14 +625,19 @@ void fuse_read_args_fill(struct fuse_io_args *ia, struct file *file, loff_t pos, > } > > static void fuse_release_user_pages(struct fuse_args_pages *ap, > - bool should_dirty) > + bool should_dirty, bool is_user_or_bvec) > { > unsigned int i; > > - for (i = 0; i < ap->num_pages; i++) { > - if (should_dirty) > - set_page_dirty_lock(ap->pages[i]); > - put_page(ap->pages[i]); > + if (is_user_or_bvec) { > + dio_w_unpin_user_pages_dirty_lock(ap->pages, ap->num_pages, > + should_dirty); > + } else { > + for (i = 0; i < ap->num_pages; i++) { > + if (should_dirty) > + set_page_dirty_lock(ap->pages[i]); > + put_page(ap->pages[i]); > + } Same here. > } > } > > @@ -733,7 +738,7 @@ static void fuse_aio_complete_req(struct fuse_mount *fm, struct fuse_args *args, > struct fuse_io_priv *io = ia->io; > ssize_t pos = -1; > > - fuse_release_user_pages(&ia->ap, io->should_dirty); > + fuse_release_user_pages(&ia->ap, io->should_dirty, io->is_user_or_bvec); > > if (err) { > /* Nothing */ > @@ -1414,10 +1419,10 @@ static int fuse_get_user_pages(struct fuse_args_pages *ap, struct iov_iter *ii, > while (nbytes < *nbytesp && ap->num_pages < max_pages) { > unsigned npages; > size_t start; > - ret = iov_iter_get_pages2(ii, &ap->pages[ap->num_pages], > - *nbytesp - nbytes, > - max_pages - ap->num_pages, > - &start); > + ret = dio_w_iov_iter_pin_pages(ii, &ap->pages[ap->num_pages], > + *nbytesp - nbytes, > + max_pages - ap->num_pages, > + &start); > if (ret < 0) > break; > > @@ -1483,6 +1488,10 @@ ssize_t fuse_direct_io(struct fuse_io_priv *io, struct iov_iter *iter, > fl_owner_t owner = current->files; > size_t nbytes = min(count, nmax); > > + /* For use in fuse_release_user_pages(): */ > + io->is_user_or_bvec = user_backed_iter(iter) || > + iov_iter_is_bvec(iter); > + How about io->is_pinned? And a iov_iter_is_pinned() helper? Thanks, Miklos