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 X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 AB71AC433DF for ; Fri, 7 Aug 2020 13:14:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 75970221E2 for ; Fri, 7 Aug 2020 13:14:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 75970221E2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=cn.fujitsu.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 928BA8D00AA; Fri, 7 Aug 2020 09:14:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 903478D003B; Fri, 7 Aug 2020 09:14:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8181E8D00AA; Fri, 7 Aug 2020 09:14:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0085.hostedemail.com [216.40.44.85]) by kanga.kvack.org (Postfix) with ESMTP id 717AB8D003B for ; Fri, 7 Aug 2020 09:14:10 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 2ECA7181AC9CB for ; Fri, 7 Aug 2020 13:14:10 +0000 (UTC) X-FDA: 77123815860.17.run53_031360626fc0 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id 48CBC180D0186 for ; Fri, 7 Aug 2020 13:14:08 +0000 (UTC) X-HE-Tag: run53_031360626fc0 X-Filterd-Recvd-Size: 5748 Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by imf32.hostedemail.com (Postfix) with ESMTP for ; Fri, 7 Aug 2020 13:13:58 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.75,445,1589212800"; d="scan'208";a="97774934" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 07 Aug 2020 21:13:54 +0800 Received: from G08CNEXMBPEKD06.g08.fujitsu.local (unknown [10.167.33.206]) by cn.fujitsu.com (Postfix) with ESMTP id BF32F4CE34EE; Fri, 7 Aug 2020 21:13:51 +0800 (CST) Received: from G08CNEXCHPEKD06.g08.fujitsu.local (10.167.33.205) by G08CNEXMBPEKD06.g08.fujitsu.local (10.167.33.206) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 7 Aug 2020 21:13:40 +0800 Received: from localhost.localdomain (10.167.225.141) by G08CNEXCHPEKD06.g08.fujitsu.local (10.167.33.209) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 7 Aug 2020 21:13:39 +0800 From: Shiyang Ruan To: , , CC: , , , , , , , , Subject: [RFC PATCH 4/8] fsdax: copy data before write Date: Fri, 7 Aug 2020 21:13:32 +0800 Message-ID: <20200807131336.318774-5-ruansy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200807131336.318774-1-ruansy.fnst@cn.fujitsu.com> References: <20200807131336.318774-1-ruansy.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain X-yoursite-MailScanner-ID: BF32F4CE34EE.AFF39 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: ruansy.fnst@cn.fujitsu.com X-Rspamd-Queue-Id: 48CBC180D0186 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam05 Content-Transfer-Encoding: quoted-printable 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: Add dax_copy_edges() into each dax actor functions to perform CoW. Signed-off-by: Shiyang Ruan --- fs/dax.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 308678c58d4d..65553e3f7602 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1208,7 +1208,8 @@ dax_iomap_actor(struct inode *inode, loff_t pos, lo= ff_t length, void *data, return iov_iter_zero(min(length, end - pos), iter); } =20 - if (WARN_ON_ONCE(iomap->type !=3D IOMAP_MAPPED)) + if (WARN_ON_ONCE(iomap->type !=3D IOMAP_MAPPED && + !(iomap->flags & IOMAP_F_SHARED))) return -EIO; =20 /* @@ -1247,6 +1248,12 @@ dax_iomap_actor(struct inode *inode, loff_t pos, l= off_t length, void *data, break; } =20 + if (iomap !=3D srcmap) { + ret =3D dax_copy_edges(pos, length, srcmap, kaddr, false); + if (ret) + break; + } + map_len =3D PFN_PHYS(map_len); kaddr +=3D offset; map_len -=3D offset; @@ -1358,6 +1365,7 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_fau= lt *vmf, pfn_t *pfnp, vm_fault_t ret =3D 0; void *entry; pfn_t pfn; + void *kaddr; =20 trace_dax_pte_fault(inode, vmf, ret); /* @@ -1439,19 +1447,27 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_f= ault *vmf, pfn_t *pfnp, =20 switch (iomap.type) { case IOMAP_MAPPED: +cow: if (iomap.flags & IOMAP_F_NEW) { count_vm_event(PGMAJFAULT); count_memcg_event_mm(vma->vm_mm, PGMAJFAULT); major =3D VM_FAULT_MAJOR; } error =3D dax_iomap_direct_access(&iomap, pos, PAGE_SIZE, &pfn, - NULL); + &kaddr); if (error < 0) goto error_finish_iomap; =20 entry =3D dax_insert_entry(&xas, mapping, vmf, iomap.addr, entry, pfn, 0, write && !sync); =20 + if (srcmap.type !=3D IOMAP_HOLE) { + error =3D dax_copy_edges(pos, PAGE_SIZE, &srcmap, kaddr, + false); + if (error) + goto error_finish_iomap; + } + /* * If we are doing synchronous page fault and inode needs fsync, * we can insert PTE into page tables only after that happens. @@ -1475,12 +1491,15 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_f= ault *vmf, pfn_t *pfnp, =20 goto finish_iomap; case IOMAP_UNWRITTEN: + if (write && iomap.flags & IOMAP_F_SHARED) + goto cow; + fallthrough; case IOMAP_HOLE: if (!write) { ret =3D dax_load_hole(&xas, mapping, &entry, vmf); goto finish_iomap; } - /*FALLTHRU*/ + fallthrough; default: WARN_ON_ONCE(1); error =3D -EIO; @@ -1582,6 +1601,7 @@ static vm_fault_t dax_iomap_pmd_fault(struct vm_fau= lt *vmf, pfn_t *pfnp, loff_t pos; int error; pfn_t pfn; + void *kaddr; =20 /* * Check whether offset isn't beyond end of file now. Caller is @@ -1663,14 +1683,22 @@ static vm_fault_t dax_iomap_pmd_fault(struct vm_f= ault *vmf, pfn_t *pfnp, =20 switch (iomap.type) { case IOMAP_MAPPED: +cow: error =3D dax_iomap_direct_access(&iomap, pos, PMD_SIZE, &pfn, - NULL); + &kaddr); if (error < 0) goto finish_iomap; =20 entry =3D dax_insert_entry(&xas, mapping, vmf, iomap.addr, entry, pfn, DAX_PMD, write && !sync); =20 + if (srcmap.type !=3D IOMAP_HOLE) { + error =3D dax_copy_edges(pos, PMD_SIZE, &srcmap, kaddr, + true); + if (error) + goto unlock_entry; + } + /* * If we are doing synchronous page fault and inode needs fsync, * we can insert PMD into page tables only after that happens. @@ -1689,6 +1717,9 @@ static vm_fault_t dax_iomap_pmd_fault(struct vm_fau= lt *vmf, pfn_t *pfnp, result =3D vmf_insert_pfn_pmd(vmf, pfn, write); break; case IOMAP_UNWRITTEN: + if (write && iomap.flags & IOMAP_F_SHARED) + goto cow; + fallthrough; case IOMAP_HOLE: if (WARN_ON_ONCE(write)) break; --=20 2.27.0