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.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 115CFC10F11 for ; Sun, 14 Apr 2019 00:25:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D152D2084D for ; Sun, 14 Apr 2019 00:25:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727178AbfDNAZe (ORCPT ); Sat, 13 Apr 2019 20:25:34 -0400 Received: from mail-vs1-f67.google.com ([209.85.217.67]:41520 "EHLO mail-vs1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727166AbfDNAZe (ORCPT ); Sat, 13 Apr 2019 20:25:34 -0400 Received: by mail-vs1-f67.google.com with SMTP id g187so7583994vsc.8; Sat, 13 Apr 2019 17:25:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PTHSl3adn1HGI4wrpJho2Z3iISMKR1PQH7sIRUCCeqo=; b=DBBbU5ZTiN8OIw+rBHCublDwMTa3w6CQ8dNtKJPtJYhQqwi0Hz+gEbcPSSxBAmSMXq viySC2YXm7XllBUsm56AgixSWeQmMBuSlOrhLwi5awYG6L9Xf9932hMtKZEwAPyk0ri/ wCSPy1TxT9fn+WQffPGEIMGEOJg6jSKjwOuGn//V1GdDPsI7WRwJhwqCKVoLzi1rbXJ9 m6fTA9tjcZGnwN9sGwOMNi2XCeKEOu4w1BfqpkB0CAPvWbiReZleBRL28R9gglVwe7Pw eoLG8O/d3Ct6X3TwU4W3fDOWzS/9ajgWmKYeRPFsn1XRSosD9NlkLhACZbzNO0eVld1/ cbKg== X-Gm-Message-State: APjAAAUGCdvTJOyg1wbBG8I2zCIQvWJwRsMpErJGo2jsKrtuwbwQsV1m sqlOdzbxcrQB9eHY/CVIuCixZw/U3vxdUw== X-Google-Smtp-Source: APXvYqydGHmi5dADD+BoVi7v+DCRRFqa/cnmzWEqQH75zyC1Rta5wFiCW0J75lXibWaTIaekx/kSCA== X-Received: by 2002:a67:2e8c:: with SMTP id u134mr36288314vsu.57.1555201533041; Sat, 13 Apr 2019 17:25:33 -0700 (PDT) Received: from localhost.localdomain ([201.240.145.139]) by smtp.gmail.com with ESMTPSA id d191sm8090695vka.39.2019.04.13.17.25.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Apr 2019 17:25:32 -0700 (PDT) From: Shawn Landden Cc: linux-api@vger.kernel.org, linux-dev@vger.kernel.org, linux-fsdevel@vger.kernel.org, Andy Lutomirski , Shawn Landden Subject: [PATCH] new flag COPY_FILE_RANGE_FILESIZE for copy_file_range() Date: Sat, 13 Apr 2019 19:25:19 -0500 Message-Id: <20190414002519.24991-1-shawn@git.icu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190413204947.9394-1-shawn@git.icu> References: <20190413204947.9394-1-shawn@git.icu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org If flags includes COPY_FILE_RANGE_FILESIZE then the length copied is the length of the file. off_in and off_out are ignored. len must be 0. This implementation saves a call to stat() in the common case of copying files. It does not fix any race conditions. EINVAL: If COPY_FILE_RANGE_FILESIZE was passed and len is not 0. Signed-off-by: Shawn Landden CC: v2: do not accept len == size. --- fs/read_write.c | 14 +++++++++++++- include/uapi/linux/stat.h | 4 ++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/fs/read_write.c b/fs/read_write.c index 61b43ad7608e..f5862849bff7 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -1557,7 +1557,7 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in, struct inode *inode_out = file_inode(file_out); ssize_t ret; - if (flags != 0) + if ((flags & ~COPY_FILE_RANGE_FILESIZE) != 0) return -EINVAL; if (S_ISDIR(inode_in->i_mode) || S_ISDIR(inode_out->i_mode)) @@ -1565,6 +1565,18 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in, if (!S_ISREG(inode_in->i_mode) || !S_ISREG(inode_out->i_mode)) return -EINVAL; + if (flags & COPY_FILE_RANGE_FILESIZE) { + struct kstat stat; + int error; + if (len != 0) + return -EINVAL; + error = vfs_getattr(&file_in->f_path, &stat, + STATX_SIZE, 0); + if (error < 0) + return error; + len = stat.size; + } + ret = rw_verify_area(READ, file_in, &pos_in, len); if (unlikely(ret)) return ret; diff --git a/include/uapi/linux/stat.h b/include/uapi/linux/stat.h index 7b35e98d3c58..1075aa4666ef 100644 --- a/include/uapi/linux/stat.h +++ b/include/uapi/linux/stat.h @@ -170,5 +170,9 @@ struct statx { #define STATX_ATTR_AUTOMOUNT 0x00001000 /* Dir: Automount trigger */ +/* + * Flags for copy_file_range() + */ +#define COPY_FILE_RANGE_FILESIZE 0x00000001 /* Copy the full length of the input file */ #endif /* _UAPI_LINUX_STAT_H */ -- 2.20.1