From patchwork Tue Oct 16 03:20:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10643027 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D27F918BC for ; Tue, 16 Oct 2018 03:21:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE6C028E72 for ; Tue, 16 Oct 2018 03:21:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B25EC29AA8; Tue, 16 Oct 2018 03:21:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2960328E72 for ; Tue, 16 Oct 2018 03:21:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B6B536B0290; Mon, 15 Oct 2018 23:21:01 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B1A466B0292; Mon, 15 Oct 2018 23:21:01 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A095C6B0293; Mon, 15 Oct 2018 23:21:01 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by kanga.kvack.org (Postfix) with ESMTP id 5EAC56B0290 for ; Mon, 15 Oct 2018 23:21:01 -0400 (EDT) Received: by mail-pg1-f198.google.com with SMTP id b7-v6so16156245pgt.10 for ; Mon, 15 Oct 2018 20:21:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:subject:from:to:cc:date :message-id:in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=U+c62WV3nwGtgXT08G5op2c6SHTu+zXo82DM+p37XJg=; b=j/7CDxqcqj7PPUKYzG3RHSMzqoeMdddPUgORv47156hfTbBmg23sd8m2dc5zr/vs3j QmF/cZK8OWCgJaXvVXnCUyGLRpy9jWxpJVO3Z1M3DGUCGf/QSuka4Q+NFpaWX2Szxz6r b0IpUXowCRAnmiC3J+58hOEdMDeJfMhP4/D9qrplj8uvKQG3AvEpCxxjO3vyFHhU9PK9 qy5jtUiF/F4GxtouB7VqinPtYm24IBXrlaEgZMlQm9m/Xz9Dz1fhLMrDjDU5rETAingb j8VRQVuOTM+Yi5EjPDokEjvjy/b0YuBhTOHD8tTLP9pcOM+m0XMfaUKtQuiPsakusBzE 6FaA== X-Gm-Message-State: ABuFfohgSO5vD/i2So5WvavqTWCjCnWCmeHOhcl716nS6YSWIo+K6Cri EVO8bfctGtK/4GHbJPrHSEdUaJN+oDYqlY+UR4MLr0fK2IPexByx/7qWoZlU+0Y9mUf5qcc55L0 tUZR/UZBHMQv08mTG651m6yEMxBO4msYxfjSCTyOBFyQWxb0MPMeXIUZVaxj69bc10w== X-Received: by 2002:a65:528b:: with SMTP id y11-v6mr18593085pgp.269.1539660061060; Mon, 15 Oct 2018 20:21:01 -0700 (PDT) X-Google-Smtp-Source: ACcGV63K0St3BttyUpLhkE3JQYStKmdNwJ1qr/1znObaXkg1g8P4r6Qv+ZzPebaQosJ07wG0Wz4v X-Received: by 2002:a65:528b:: with SMTP id y11-v6mr18593051pgp.269.1539660060176; Mon, 15 Oct 2018 20:21:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539660060; cv=none; d=google.com; s=arc-20160816; b=ERMSM+O5Hah5Cpqp8ExTtU5/QDsmoXA+FpFSiK9yOt8y0BPHrFz7O4x10j/PMw7f3X qd9ze9nF72VB2MVtVED4vVxW7qokkXDqBVPXB09AeZVnMjqmPoVd7+GIjqkLcwuuoq83 U7GP3W0TI8+TGpA+QRibZHinZNAPiLVy70FTyxiwavsH9Cq1m95VuScNKVVr30C9LhuU upDSJkqQLIBrsXW+Q+TjuxjSuhiPBfBJfYTdi5n+GRRQ9aJJejnFZMEqRZejJsM97t9m KTNLOhN6DyDmsTTxGzv0eeCoXX81v2NPS9ud8H24dB2F+N14/2/y2+4OLWgZTiAxJqle 5Dsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:cc:to:from:subject:dkim-signature; bh=U+c62WV3nwGtgXT08G5op2c6SHTu+zXo82DM+p37XJg=; b=UTmWSUqcDcCWSoeHa0qmr6sQmrvenjImoEs6pKJB2R0qEUDzeP+UlD68S66N8yWQOc MsdiF7LUN+uKCYJTKbalB5tQEOjh6O4A8VUM915E1/Fu7dHPUYU/3YRuEnvpw2SQl2wM YgwhQzvGTpYbYMiD2+7z3d8QShsvt1htHTphLOq/qV0ZLxASuFdnJ2EABj9czf0FfVQh nr083qYYzqqlg6d9/r0MFBn0BXdCIjFi1nyf9lCGdgLdis+wkQv4ddub+e3yqZb4Xhb+ N15sLjMrAWUgRqHCExNA2e8TPMNeyczHkgtBRPyKwAHazb8p6d/HrG5eM2UqsOHrUhbl Fctw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=YgIfoOUW; spf=pass (google.com: domain of darrick.wong@oracle.com designates 156.151.31.85 as permitted sender) smtp.mailfrom=darrick.wong@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from userp2120.oracle.com (userp2120.oracle.com. [156.151.31.85]) by mx.google.com with ESMTPS id i23-v6si12393090pgl.230.2018.10.15.20.20.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Oct 2018 20:21:00 -0700 (PDT) Received-SPF: pass (google.com: domain of darrick.wong@oracle.com designates 156.151.31.85 as permitted sender) client-ip=156.151.31.85; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2018-07-02 header.b=YgIfoOUW; spf=pass (google.com: domain of darrick.wong@oracle.com designates 156.151.31.85 as permitted sender) smtp.mailfrom=darrick.wong@oracle.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w9G3JFW7005323; Tue, 16 Oct 2018 03:20:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2018-07-02; bh=U+c62WV3nwGtgXT08G5op2c6SHTu+zXo82DM+p37XJg=; b=YgIfoOUWUlhTgGdJirDNW4Ro0FidRDRX01vh9lpqC0g7N9nVAq5K5Zon3u9UZ9fpRwv/ vSDubFdyc5C9PQ/uI8IWSRyo7CBIdyHcGmBh6IhJXJwpHrOcCoB50CnCw4w/jyBrO9N/ P6msPg+nB3TgzWCZESZirwrdg9qeA2bvwTLP10m+0RVttPL47Gj9ej7W9Tg3HhMepS1s zFPuOF2j8LkvoESf3ahcrKXOyky0cPdiKp7qozNPxMtpoSYCa7x1QQy+VB4kxUOhUx78 86wuvIzTexXtY4xOd0KMmAy8uVAcP1SFGcWL+v9h+xe8F+O8pNTTlUngt7aoQzHD69tP uA== Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2n39br5s53-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 16 Oct 2018 03:20:59 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w9G3KvDX021602 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 16 Oct 2018 03:20:58 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w9G3Kv6A007693; Tue, 16 Oct 2018 03:20:57 GMT Received: from localhost (/10.159.227.150) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 15 Oct 2018 20:20:56 -0700 Subject: [PATCH 25/26] xfs: support returning partial reflink results From: "Darrick J. Wong" To: david@fromorbit.com, darrick.wong@oracle.com Cc: sandeen@redhat.com, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, linux-unionfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org, linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, ocfs2-devel@oss.oracle.com Date: Mon, 15 Oct 2018 20:20:55 -0700 Message-ID: <153966005536.3607.787445581785795364.stgit@magnolia> In-Reply-To: <153965939489.1256.7400115244528045860.stgit@magnolia> References: <153965939489.1256.7400115244528045860.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9047 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=812 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1810160028 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: X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Back when the XFS reflink code only supported clone_file_range, we were only able to return zero or negative error codes to userspace. However, now that copy_file_range (which returns bytes copied) can use XFS' clone_file_range, we have the opportunity to return partial results. For example, if userspace sends a 1GB clone request and we run out of space halfway through, we at least can tell userspace that we completed 512M of that request like a regular write. Signed-off-by: Darrick J. Wong --- fs/xfs/xfs_file.c | 5 +---- fs/xfs/xfs_reflink.c | 20 +++++++++++++++----- fs/xfs/xfs_reflink.h | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 38fde4e11714..7d42ab8fe6e1 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -928,14 +928,11 @@ xfs_file_remap_range( loff_t len, unsigned int remap_flags) { - int ret; - if (remap_flags & ~(REMAP_FILE_DEDUP | REMAP_FILE_ADVISORY)) return -EINVAL; - ret = xfs_reflink_remap_range(file_in, pos_in, file_out, pos_out, + return xfs_reflink_remap_range(file_in, pos_in, file_out, pos_out, len, remap_flags); - return ret < 0 ? ret : len; } STATIC int diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index e8e86646bb4b..af3368862c56 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c @@ -1123,6 +1123,7 @@ xfs_reflink_remap_blocks( struct xfs_inode *dest, xfs_fileoff_t destoff, xfs_filblks_t len, + xfs_filblks_t *remapped_len, xfs_off_t new_isize) { struct xfs_bmbt_irec imap; @@ -1130,6 +1131,7 @@ xfs_reflink_remap_blocks( int error = 0; xfs_filblks_t range_len; + *remapped_len = 0; /* drange = (destoff, destoff + len); srange = (srcoff, srcoff + len) */ while (len) { uint lock_mode; @@ -1168,6 +1170,7 @@ xfs_reflink_remap_blocks( srcoff += range_len; destoff += range_len; len -= range_len; + *remapped_len += range_len; } return 0; @@ -1382,7 +1385,7 @@ xfs_reflink_remap_prep( /* * Link a range of blocks from one file to another. */ -int +loff_t xfs_reflink_remap_range( struct file *file_in, loff_t pos_in, @@ -1397,9 +1400,10 @@ xfs_reflink_remap_range( struct xfs_inode *dest = XFS_I(inode_out); struct xfs_mount *mp = src->i_mount; xfs_fileoff_t sfsbno, dfsbno; - xfs_filblks_t fsblen; + xfs_filblks_t fsblen, remappedfsb = 0; + loff_t remapped_bytes = 0; xfs_extlen_t cowextsize; - ssize_t ret; + int ret; if (!xfs_sb_version_hasreflink(&mp->m_sb)) return -EOPNOTSUPP; @@ -1415,11 +1419,17 @@ xfs_reflink_remap_range( trace_xfs_reflink_remap_range(src, pos_in, len, dest, pos_out); + if (len == 0) { + ret = 0; + goto out_unlock; + } + dfsbno = XFS_B_TO_FSBT(mp, pos_out); sfsbno = XFS_B_TO_FSBT(mp, pos_in); fsblen = XFS_B_TO_FSB(mp, len); ret = xfs_reflink_remap_blocks(src, sfsbno, dest, dfsbno, fsblen, - pos_out + len); + &remappedfsb, pos_out + len); + remapped_bytes = min_t(loff_t, len, XFS_FSB_TO_B(mp, remappedfsb)); if (ret) goto out_unlock; @@ -1442,7 +1452,7 @@ xfs_reflink_remap_range( xfs_reflink_remap_unlock(file_in, file_out); if (ret) trace_xfs_reflink_remap_range_error(dest, ret, _RET_IP_); - return ret; + return remapped_bytes > 0 ? remapped_bytes : ret; } /* diff --git a/fs/xfs/xfs_reflink.h b/fs/xfs/xfs_reflink.h index c3c46c276fe1..cbc26ff79a8f 100644 --- a/fs/xfs/xfs_reflink.h +++ b/fs/xfs/xfs_reflink.h @@ -27,7 +27,7 @@ extern int xfs_reflink_cancel_cow_range(struct xfs_inode *ip, xfs_off_t offset, extern int xfs_reflink_end_cow(struct xfs_inode *ip, xfs_off_t offset, xfs_off_t count); extern int xfs_reflink_recover_cow(struct xfs_mount *mp); -extern int xfs_reflink_remap_range(struct file *file_in, loff_t pos_in, +extern loff_t xfs_reflink_remap_range(struct file *file_in, loff_t pos_in, struct file *file_out, loff_t pos_out, loff_t len, unsigned int remap_flags); extern int xfs_reflink_inode_has_shared_extents(struct xfs_trans *tp,