Message ID | Y5TB6E77vbpRMhIk@debian |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1428248wrr; Sat, 10 Dec 2022 09:35:28 -0800 (PST) X-Google-Smtp-Source: AA0mqf7JDsBZBeoEsAevbu3Md8NhFNZbfXdq5xMkiRBNoiMM7aHMDxkeHeccmdp1PNf5WFe/z7H0 X-Received: by 2002:a17:90a:f191:b0:21a:1b9b:139e with SMTP id bv17-20020a17090af19100b0021a1b9b139emr9588365pjb.8.1670693727786; Sat, 10 Dec 2022 09:35:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670693727; cv=none; d=google.com; s=arc-20160816; b=aNjnhyN176h18bZnHps0vWOxvzbSJ6dn7bihKK/v/7zcW6slbneZLPeHtART0itDN3 D3MM1dKWvGfu0yfS0OipDQ577FXGl2gQI5ndUaOyGK+RjBxed9uOyltQZiPLMUMLeCiQ QuZPwX4AxCU6CNUgoWLycOufVBQMPwOaVe72zJpe3D5pQRVB8v8YxG3bosm8jVa232j+ KLmd4OMKjnqdZfwEUyEgj3s14N2w0u34L+E+RmlpQaLxmjRn5cZW6bWBe0Q96cEEGIJh 8lobAem+HUWhLpzBnaC8eVGZPJURtAo1zOHwz4rA1IeRVHSG3OiUjlYTT30j5hXL9uXs Xlpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version :mail-followup-to:message-id:subject:cc:to:from:date:dkim-signature; bh=Ifv9uKQg6LcRDD7r3sF9Qy+n8W0LdPkzuFFx/OA8xpg=; b=RqVwHPUUnLsEDwdJzirNoUeLbj6Zr8mOYSxER+G5mhpAtXt/C/DR0PCd2KTKSOfR3Q MggikVvHUqMm6yXdg1wQfFfei2MkgKhpeLTuPyE+3O04kiT0juf9Tgrn6j/REqXmQmJ+ Cbjg5bOzUOSTi5m74JReGlqIy/kC+Pdo06B+CrCImULeO6VWB+Le8Bz6G8l/8XiQcABn qE53iFyvQ9Srjli3rmSDpts/TZudqS7Q+PUyILZ8C/YoRTJ/vlMPfk9eGLVWofYm18jA WeKRzn3nMbdHifj8Tq6PP1DS4wzgXS+m7GIlEcMWhVPMNtDjvRY9OOwdiALRaxd8ENbv rgcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kMSpuHF7; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f186-20020a636ac3000000b0047730522d4esi4788941pgc.95.2022.12.10.09.35.07; Sat, 10 Dec 2022 09:35:27 -0800 (PST) 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=@kernel.org header.s=k20201202 header.b=kMSpuHF7; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229634AbiLJR3Y (ORCPT <rfc822;jz.zhangjin@gmail.com> + 99 others); Sat, 10 Dec 2022 12:29:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229529AbiLJR3X (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sat, 10 Dec 2022 12:29:23 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 355751707B for <linux-kernel@vger.kernel.org>; Sat, 10 Dec 2022 09:29:22 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BB65D60C54 for <linux-kernel@vger.kernel.org>; Sat, 10 Dec 2022 17:29:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74EE5C433EF; Sat, 10 Dec 2022 17:29:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670693361; bh=wiKXS951R0J+e00NOnz0xf3GpSwcSCJH0lNaVupW9nI=; h=Date:From:To:Cc:Subject:From; b=kMSpuHF7sqpW85DL5XJkXQKYMtiAuEYhuNgN51FDAJvmcdOL6MssYdhHd6lO1h87I 1XVMiQWszGqFcDrS9LMJOh6rxSg4vmeXEKg8z7+/dfBQlHkmmzi0utn0gKsh9J3/ga fNdXeUlrSx0Bs62FCtIPqphI3/vS+bBW1ISf6lknyqvby+TIlK8sEYWPxysf/tcQFC gBLSkAKMBWeSwb4Guui3Bnm2EyohjiiWpBgYsBYHKZNAEQTPPkTzeKFfkj9FaTOOot OKLXUZRPEjFZ+AAqk8IQk5Ugx8LkhpZKKlpGh293g2YeHgKOAQOHQPdcQ7D1lAbz/+ tO8xEtS25vCMA== Date: Sun, 11 Dec 2022 01:29:12 +0800 From: Gao Xiang <xiang@kernel.org> To: Linus Torvalds <torvalds@linux-foundation.org> Cc: linux-erofs@lists.ozlabs.org, linux-cachefs@redhat.com, LKML <linux-kernel@vger.kernel.org>, David Howells <dhowells@redhat.com>, Jeff Layton <jlayton@kernel.org>, Chao Yu <chao@kernel.org>, Yue Hu <huyue2@coolpad.com>, Jingbo Xu <jefflexu@linux.alibaba.com>, Hou Tao <houtao1@huawei.com>, Chen Zhongjin <chenzhongjin@huawei.com> Subject: [GIT PULL] erofs updates for 6.2-rc1 (fscache part inclusive) Message-ID: <Y5TB6E77vbpRMhIk@debian> Mail-Followup-To: Linus Torvalds <torvalds@linux-foundation.org>, linux-erofs@lists.ozlabs.org, linux-cachefs@redhat.com, LKML <linux-kernel@vger.kernel.org>, David Howells <dhowells@redhat.com>, Jeff Layton <jlayton@kernel.org>, Chao Yu <chao@kernel.org>, Yue Hu <huyue2@coolpad.com>, Jingbo Xu <jefflexu@linux.alibaba.com>, Hou Tao <houtao1@huawei.com>, Chen Zhongjin <chenzhongjin@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751849346674617592?= X-GMAIL-MSGID: =?utf-8?q?1751849346674617592?= |
Series |
[GIT,PULL] erofs updates for 6.2-rc1 (fscache part inclusive)
|
|
Pull-request
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git tags/erofs-for-6.2-rc1Message
Gao Xiang
Dec. 10, 2022, 5:29 p.m. UTC
Hi Linus, Once the merge window opens, could you consider this pull request for 6.2-rc1? In this cycle, large folios are now enabled in the iomap/fscache mode for uncompressed files first. In order to do that, we've also cleaned up better interfaces between erofs and fscache, which are acked by fscache/netfs folks and included in this pull request. Other than that, there are random fixes around erofs over fscache and crafted images by syzbot, minor cleanups and documentation updates. Note that there could be a trivial conflict between erofs and vfs tree according to linux-next report [1]. Happy Holidays! Gao Xiang [1] https://lore.kernel.org/r/20221205092415.56cc6e19@canb.auug.org.au/ The following changes since commit eb7081409f94a9a8608593d0fb63a1aa3d6f95d8: Linux 6.1-rc6 (2022-11-20 16:02:16 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git tags/erofs-for-6.2-rc1 for you to fetch changes up to c505feba4c0d76084e56ec498ce819f02a7043ae: erofs: validate the extent length for uncompressed pclusters (2022-12-07 10:56:31 +0800) ---------------------------------------------------------------- Changes since the last update: - Enable large folios for iomap/fscache mode; - Avoid sysfs warning due to mounting twice with the same fsid and domain_id in fscache mode; - Refine fscache interface among erofs, fscache, and cachefiles; - Use kmap_local_page() only for metabuf; - Fixes around crafted images found by syzbot; - Minor cleanups and documentation updates. ---------------------------------------------------------------- Chen Zhongjin (1): erofs: Fix pcluster memleak when its block address is zero Gao Xiang (5): erofs: update documentation erofs: clean up cached I/O strategies erofs: use kmap_local_page() only for erofs_bread() erofs: fix missing unmap if z_erofs_get_extent_compressedlen() fails erofs: validate the extent length for uncompressed pclusters Hou Tao (1): erofs: check the uniqueness of fsid in shared domain in advance Jingbo Xu (5): erofs: enable large folios for iomap mode fscache,cachefiles: add prepare_ondemand_read() callback erofs: switch to prepare_ondemand_read() in fscache mode erofs: support large folios for fscache mode erofs: enable large folios for fscache mode Documentation/filesystems/erofs.rst | 38 ++-- fs/cachefiles/io.c | 77 ++++--- fs/erofs/data.c | 10 +- fs/erofs/fscache.c | 408 ++++++++++++++++-------------------- fs/erofs/inode.c | 2 + fs/erofs/internal.h | 13 +- fs/erofs/super.c | 2 +- fs/erofs/xattr.c | 8 +- fs/erofs/zdata.c | 80 +++---- fs/erofs/zmap.c | 15 +- include/linux/netfs.h | 8 + include/trace/events/cachefiles.h | 27 +-- 12 files changed, 344 insertions(+), 344 deletions(-)
Comments
Hi Linus, On Sun, Dec 11, 2022 at 01:29:21AM +0800, Gao Xiang wrote: > Hi Linus, > > Once the merge window opens, could you consider this pull request for > 6.2-rc1? > > In this cycle, large folios are now enabled in the iomap/fscache mode > for uncompressed files first. In order to do that, we've also cleaned > up better interfaces between erofs and fscache, which are acked by > fscache/netfs folks and included in this pull request. > > Other than that, there are random fixes around erofs over fscache and > crafted images by syzbot, minor cleanups and documentation updates. > > Note that there could be a trivial conflict between erofs and vfs > tree according to linux-next report [1]. > > Happy Holidays! > Gao Xiang > > [1] https://lore.kernel.org/r/20221205092415.56cc6e19@canb.auug.org.au/ > > The following changes since commit eb7081409f94a9a8608593d0fb63a1aa3d6f95d8: > > Linux 6.1-rc6 (2022-11-20 16:02:16 -0800) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git tags/erofs-for-6.2-rc1 > > for you to fetch changes up to c505feba4c0d76084e56ec498ce819f02a7043ae: > Sorry for bothering again. Just having seen v6.2 pull request requirements together with Linux 6.1 announcement. Comparing with the latest -next on the last Thursday, there was one-liner addition on commit 927e5010ff5b ("erofs: use kmap_local_page() only for erofs_bread()") as below: diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c index 85932086d23f..5b3a793103af 100644 --- a/fs/erofs/inode.c +++ b/fs/erofs/inode.c @@ -268,6 +268,7 @@ static int erofs_fill_inode(struct inode *inode) case S_IFDIR: inode->i_op = &erofs_dir_iops; inode->i_fop = &erofs_dir_fops; + inode_nohighmem(inode); break; case S_IFLNK: err = erofs_fill_symlink(inode, kaddr, ofs) since I found erofs_lookup() could break on x86 platform with HIGHMEM enabled this weekend and I made all dirs inode_nohighmem() and folded into the original patch since it's no needed to keep dirs in HIGHMEM. I don't find other strange other than this. Because there is no -next version on Monday, if you would like to take all commits in -next you could take git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git tags/erofs-for-6.2-rc1-alt instead (the top commit is e5293c693d68f705787480159c4cd332c09c5e67.) In that way I will send another patch to fix the issue above later, but if it's possible, it'd be better to apply "tags/erofs-for-6.2-rc1" directly... The diffstat of tags/erofs-for-6.2-rc1-alt is: Chen Zhongjin (1): erofs: Fix pcluster memleak when its block address is zero Gao Xiang (5): erofs: update documentation erofs: clean up cached I/O strategies erofs: use kmap_local_page() only for erofs_bread() erofs: fix missing unmap if z_erofs_get_extent_compressedlen() fails erofs: validate the extent length for uncompressed pclusters Hou Tao (1): erofs: check the uniqueness of fsid in shared domain in advance Jingbo Xu (5): erofs: enable large folios for iomap mode fscache,cachefiles: add prepare_ondemand_read() callback erofs: switch to prepare_ondemand_read() in fscache mode erofs: support large folios for fscache mode erofs: enable large folios for fscache mode Documentation/filesystems/erofs.rst | 38 ++-- fs/cachefiles/io.c | 77 ++++--- fs/erofs/data.c | 10 +- fs/erofs/fscache.c | 408 ++++++++++++++++-------------------- fs/erofs/inode.c | 1 + fs/erofs/internal.h | 13 +- fs/erofs/super.c | 2 +- fs/erofs/xattr.c | 8 +- fs/erofs/zdata.c | 80 +++---- fs/erofs/zmap.c | 15 +- include/linux/netfs.h | 8 + include/trace/events/cachefiles.h | 27 +-- 12 files changed, 343 insertions(+), 344 deletions(-) Thanks, Gao Xiang
On Sun, Dec 11, 2022 at 11:01 PM Gao Xiang <xiang@kernel.org> wrote: > > Comparing with the latest -next on the last Thursday, there was one-liner > addition commit 927e5010ff5b ("erofs: use kmap_local_page() > only for erofs_bread()") as below: [...] > Because there is no -next version on Monday, if you would like to > take all commits in -next you could take > git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git tags/erofs-for-6.2-rc1-alt No worries. That one-liner isn't a problem, and you sent the pull request to me early, so I'm perfectly happy with your original request and have pulled it. Thanks for being careful, Linus
On Mon, Dec 12, 2022 at 08:12:18PM -0800, Linus Torvalds wrote: > On Sun, Dec 11, 2022 at 11:01 PM Gao Xiang <xiang@kernel.org> wrote: > > > > Comparing with the latest -next on the last Thursday, there was one-liner > > addition commit 927e5010ff5b ("erofs: use kmap_local_page() > > only for erofs_bread()") as below: > [...] > > Because there is no -next version on Monday, if you would like to > > take all commits in -next you could take > > git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git tags/erofs-for-6.2-rc1-alt > > No worries. That one-liner isn't a problem, and you sent the pull > request to me early, so I'm perfectly happy with your original request > and have pulled it. > > Thanks for being careful, Thank you, Linus! Thanks, Gao Xiang > > Linus
The pull request you sent on Sun, 11 Dec 2022 01:29:12 +0800:
> git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git tags/erofs-for-6.2-rc1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/4a6bff1187409f2c2ba1b17234541d314f0680fc
Thank you!