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=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 AEED3C7C867 for ; Mon, 27 Apr 2020 08:48:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7A3672080C for ; Mon, 27 Apr 2020 08:48:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7A3672080C 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 DC7088E000D; Mon, 27 Apr 2020 04:48:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D509E8E000A; Mon, 27 Apr 2020 04:48:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C65B78E000D; Mon, 27 Apr 2020 04:48:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0140.hostedemail.com [216.40.44.140]) by kanga.kvack.org (Postfix) with ESMTP id A80BA8E000A for ; Mon, 27 Apr 2020 04:48:45 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 7057F181AC9CB for ; Mon, 27 Apr 2020 08:48:45 +0000 (UTC) X-FDA: 76753009410.07.order30_2e996ff4f1b2d X-HE-Tag: order30_2e996ff4f1b2d X-Filterd-Recvd-Size: 5884 Received: from heian.cn.fujitsu.com (mail.cn.fujitsu.com [183.91.158.132]) by imf11.hostedemail.com (Postfix) with ESMTP for ; Mon, 27 Apr 2020 08:48:38 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.73,323,1583164800"; d="scan'208";a="90547653" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 27 Apr 2020 16:48:32 +0800 Received: from G08CNEXMBPEKD05.g08.fujitsu.local (unknown [10.167.33.204]) by cn.fujitsu.com (Postfix) with ESMTP id 1A32F4BCC88C; Mon, 27 Apr 2020 16:37:52 +0800 (CST) Received: from G08CNEXCHPEKD05.g08.fujitsu.local (10.167.33.203) by G08CNEXMBPEKD05.g08.fujitsu.local (10.167.33.204) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 27 Apr 2020 16:48:34 +0800 Received: from localhost.localdomain (10.167.225.141) by G08CNEXCHPEKD05.g08.fujitsu.local (10.167.33.209) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 27 Apr 2020 16:48:34 +0800 From: Shiyang Ruan To: , , CC: , , , , , , , , , Goldwyn Rodrigues Subject: [RFC PATCH 3/8] fs/dax: Introduce dax_copy_edges() for COW Date: Mon, 27 Apr 2020 16:47:45 +0800 Message-ID: <20200427084750.136031-4-ruansy.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200427084750.136031-1-ruansy.fnst@cn.fujitsu.com> References: <20200427084750.136031-1-ruansy.fnst@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain X-yoursite-MailScanner-ID: 1A32F4BCC88C.AF766 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: ruansy.fnst@cn.fujitsu.com 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 address output in dax_iomap_pfn() in order to perform a memcpy() in C= oW case. Since this function both output address and pfn, rename it to dax_iomap_direct_access(). dax_copy_edges() is a helper functions performs a copy from one part of the device to another for data not page aligned. Signed-off-by: Goldwyn Rodrigues Signed-off-by: Shiyang Ruan --- fs/dax.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 58 insertions(+), 6 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 2f996c566103..8107ed10c851 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -1111,8 +1111,8 @@ static sector_t dax_iomap_sector(struct iomap *ioma= p, loff_t pos) return (iomap->addr + (pos & PAGE_MASK) - iomap->offset) >> 9; } =20 -static int dax_iomap_pfn(struct iomap *iomap, loff_t pos, size_t size, - pfn_t *pfnp) +static int dax_iomap_direct_access(struct iomap *iomap, loff_t pos, size= _t size, + pfn_t *pfnp, void **addr) { const sector_t sector =3D dax_iomap_sector(iomap, pos); pgoff_t pgoff; @@ -1123,12 +1123,14 @@ static int dax_iomap_pfn(struct iomap *iomap, lof= f_t pos, size_t size, if (rc) return rc; id =3D dax_read_lock(); - length =3D dax_direct_access(iomap->dax_dev, pgoff, PHYS_PFN(size), - NULL, pfnp); + length =3D dax_direct_access(iomap->dax_dev, pgoff, PHYS_PFN(size), add= r, + pfnp); if (length < 0) { rc =3D length; goto out; } + if (!pfnp) + goto out_check_addr; rc =3D -EINVAL; if (PFN_PHYS(length) < size) goto out; @@ -1138,11 +1140,59 @@ static int dax_iomap_pfn(struct iomap *iomap, lof= f_t pos, size_t size, if (length > 1 && !pfn_t_devmap(*pfnp)) goto out; rc =3D 0; + +out_check_addr: + if (!addr) + goto out; + if (!*addr) + rc =3D -EFAULT; out: dax_read_unlock(id); return rc; } =20 +/* + * dax_copy_edges - Copies the part of the pages not included in + * the write, but required for CoW because + * offset/offset+length are not page aligned. + */ +static int dax_copy_edges(loff_t pos, loff_t length, struct iomap *srcma= p, + void *daddr, bool pmd) +{ + size_t page_size =3D pmd ? PMD_SIZE : PAGE_SIZE; + loff_t offset =3D pos & (page_size - 1); + size_t size =3D ALIGN(offset + length, page_size); + loff_t end =3D pos + length; + loff_t pg_end =3D round_up(end, page_size); + void *saddr =3D 0; + int ret =3D 0; + + ret =3D dax_iomap_direct_access(srcmap, pos, size, NULL, &saddr); + if (ret) + return ret; + /* + * Copy the first part of the page + * Note: we pass offset as length + */ + if (offset) { + if (saddr) + ret =3D memcpy_mcsafe(daddr, saddr, offset); + else + memset(daddr, 0, offset); + } + + /* Copy the last part of the range */ + if (end < pg_end) { + if (saddr) + ret =3D memcpy_mcsafe(daddr + offset + length, + saddr + offset + length, pg_end - end); + else + memset(daddr + offset + length, 0, + pg_end - end); + } + return ret; +} + /* * The user has performed a load from a hole in the file. Allocating a = new * page in the file would cause excessive storage usage for workloads wi= th @@ -1462,7 +1512,8 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_fau= lt *vmf, pfn_t *pfnp, count_memcg_event_mm(vma->vm_mm, PGMAJFAULT); major =3D VM_FAULT_MAJOR; } - error =3D dax_iomap_pfn(&iomap, pos, PAGE_SIZE, &pfn); + error =3D dax_iomap_direct_access(&iomap, pos, PAGE_SIZE, &pfn, + NULL); if (error < 0) goto error_finish_iomap; =20 @@ -1680,7 +1731,8 @@ static vm_fault_t dax_iomap_pmd_fault(struct vm_fau= lt *vmf, pfn_t *pfnp, =20 switch (iomap.type) { case IOMAP_MAPPED: - error =3D dax_iomap_pfn(&iomap, pos, PMD_SIZE, &pfn); + error =3D dax_iomap_direct_access(&iomap, pos, PMD_SIZE, &pfn, + NULL); if (error < 0) goto finish_iomap; =20 --=20 2.26.2