From patchwork Mon May 22 13:49:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 97467 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1476024vqo; Mon, 22 May 2023 07:07:13 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4KhwnRkHLXkW+9iwuZKNn/rtLxewtcPeafZBUnjKNa7zQJOh7pVSIdPyCYJ6iFXJASRR5c X-Received: by 2002:a17:902:ecd0:b0:1ae:8741:d1ca with SMTP id a16-20020a170902ecd000b001ae8741d1camr10959332plh.45.1684764433409; Mon, 22 May 2023 07:07:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684764433; cv=none; d=google.com; s=arc-20160816; b=Nu1mZQKkl/9TCUsezutvep+uQUmdZAol7iv7kKb5roodiB+XA4Db6UGuwHaW3Gr0FS A7SLl9QA0aEqKUBQsRoCS7g2hmr6nwXBvlTZZ2HKoYEgoL+nK8Sb95UsaJ/iIJDLAEh9 r+POE0ELLLP+NrLN1i8MYqvl3c4jXMGfNFv9OJ1LQhLNEy4TDqebOCDw+eHH/ZdfKHl2 ZFGZSbxIys93DfxYjfvSTFLO8rSGl3X/rPaFDjvbUopzpaFqKJ5iZ26NP+7xS3oA/0V/ 9muTM1Eeec0Ycs1U7ddPTYEnCwCJe+fTpOuLSuJ/8IyKshlzwi9ffGF6yNY0SkmXE1Q1 NDng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5heG8daRS4C75Yq10maO32wWxD0HQE2hn6bd0CfPaUs=; b=pYq6R+aRigDjVSimevdWoddCRocYYnntuQv9sECAqhIVFlDA7YUl8RfvkvYNYot/pw aidN8E/SOBUyrhAtRXgEWgySZFl0ZIEr0kZZ1SH3In+vhW/f5rzFNBgxQMCg5ntj87VD tzPckuOAIkeKLE17W2l/tTrRiOgNQiiEsvF6p9kMSs0C2SRartTV17Y4Mpjwri/heBJ2 rIgflMPA4VAOM5frIProq5MKnkc5AwclVtlAj0a1MjOV86Aw8zMpFRIHnmSaNsWdHNnF EExdzFhVhupHsnosBwXFvudnMJC6ZeOZOgaAiWZhFwSWraLABkfh4cQ0bniV/B3lgwsV 0osQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LcWinW+b; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m5-20020a170902db0500b001aafb6fcf51si5058582plx.253.2023.05.22.07.06.57; Mon, 22 May 2023 07:07:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LcWinW+b; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233034AbjEVNvf (ORCPT + 99 others); Mon, 22 May 2023 09:51:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233544AbjEVNvX (ORCPT ); Mon, 22 May 2023 09:51:23 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E370BF9 for ; Mon, 22 May 2023 06:50:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684763436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5heG8daRS4C75Yq10maO32wWxD0HQE2hn6bd0CfPaUs=; b=LcWinW+bW/PspOWpoRrQcwd86QFCjcp5hGz1xlkqrT1LZRs7ubCT89WIV6RxnKeTFYCqck Z8f2Pdz4vWj0IPpAIrI7aNU8d3KHVRKeyri4L2plD/1b5Jw6CmqutZ0LhIZXuBaDuQIgJ1 KvHOdbsvf78TxLmz+18sdGb4zzU/S+k= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-155-ZtRXgNxwOsysPKvv-a1tRA-1; Mon, 22 May 2023 09:50:31 -0400 X-MC-Unique: ZtRXgNxwOsysPKvv-a1tRA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 759A9802A55; Mon, 22 May 2023 13:50:30 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.39.192.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id B886C40CFD46; Mon, 22 May 2023 13:50:26 +0000 (UTC) From: David Howells To: Jens Axboe , Al Viro , Christoph Hellwig Cc: David Howells , Matthew Wilcox , Jan Kara , Jeff Layton , David Hildenbrand , Jason Gunthorpe , Logan Gunthorpe , Hillf Danton , Christian Brauner , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Christoph Hellwig , Steve French , John Hubbard Subject: [PATCH v22 01/31] splice: Fix filemap_splice_read() to use the correct inode Date: Mon, 22 May 2023 14:49:48 +0100 Message-Id: <20230522135018.2742245-2-dhowells@redhat.com> In-Reply-To: <20230522135018.2742245-1-dhowells@redhat.com> References: <20230522135018.2742245-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766603550496434770?= X-GMAIL-MSGID: =?utf-8?q?1766603550496434770?= Fix filemap_splice_read() to use file->f_mapping->host, not file->f_inode, as the source of the file size because in the case of a block device, file->f_inode points to the block-special file (which is typically 0 length) and not the backing store. Fixes: 07073eb01c5f ("splice: Add a func to do a splice from a buffered file without ITER_PIPE") Signed-off-by: David Howells Reviewed-by: Christoph Hellwig Reviewed-by: Christian Brauner cc: Steve French cc: Jens Axboe cc: Al Viro cc: David Hildenbrand cc: John Hubbard cc: linux-mm@kvack.org cc: linux-block@vger.kernel.org cc: linux-fsdevel@vger.kernel.org --- mm/filemap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index b4c9bd368b7e..a2006936a6ae 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2900,7 +2900,7 @@ ssize_t filemap_splice_read(struct file *in, loff_t *ppos, do { cond_resched(); - if (*ppos >= i_size_read(file_inode(in))) + if (*ppos >= i_size_read(in->f_mapping->host)) break; iocb.ki_pos = *ppos; @@ -2916,7 +2916,7 @@ ssize_t filemap_splice_read(struct file *in, loff_t *ppos, * part of the page is not copied back to userspace (unless * another truncate extends the file - this is desired though). */ - isize = i_size_read(file_inode(in)); + isize = i_size_read(in->f_mapping->host); if (unlikely(*ppos >= isize)) break; end_offset = min_t(loff_t, isize, *ppos + len);