From patchwork Tue May 15 19:55:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Sandeen X-Patchwork-Id: 10401911 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3573C601D2 for ; Tue, 15 May 2018 19:56:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2468328474 for ; Tue, 15 May 2018 19:56:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1905128478; Tue, 15 May 2018 19:56:24 +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=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8961028474 for ; Tue, 15 May 2018 19:56:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752920AbeEOT4V (ORCPT ); Tue, 15 May 2018 15:56:21 -0400 Received: from sandeen.net ([63.231.237.45]:47210 "EHLO sandeen.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753060AbeEOTz5 (ORCPT ); Tue, 15 May 2018 15:55:57 -0400 Received: from [10.0.0.4] (liberator [10.0.0.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by sandeen.net (Postfix) with ESMTPSA id 65CE8F89; Tue, 15 May 2018 14:55:55 -0500 (CDT) To: grub-devel@gnu.org References: Subject: [GRUB PATCH] xfs: accept filesystem with sparse inodes From: Eric Sandeen Cc: dkiper@net-space.pl, Peter Jones , linux-xfs , Chris Murphy Message-ID: Date: Tue, 15 May 2018 14:55:55 -0500 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 Content-Language: en-US Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The sparse inode metadata format became a mkfs.xfs default in xfsprogs-4.16.0, and such filesystems are now rejected by grub as containing an incompatible feature. In essence, this feature allows xfs to allocate inodes into fragmented freespace. (Without this feature, if xfs could not allocate contiguous space for 64 new inodes, inode creation would fail.) In practice, the disk format change is restricted to the inode btree, which as far as I can tell is not used by grub. If all you're doing today is parsing a directory, reading an inode number, and converting that inode number to a disk location, then ignoring this feature should be fine, so I've added it to XFS_SB_FEAT_INCOMPAT_SUPPORTED I did some brief testing of this patch by hacking up the regression tests to completely fragment freespace on the test xfs filesystem, and then write a large-ish number of inodes to consume any existing contiguous 64-inode chunk. This way any files the grub tests add and traverse would be in such a fragmented inode allocation. Tests passed, but I'm not sure how to cleanly integrate that into the test harness. Signed-off-by: Eric Sandeen --- -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c index c6031bd3f..effe9de17 100644 --- a/grub-core/fs/xfs.c +++ b/grub-core/fs/xfs.c @@ -79,9 +79,18 @@ GRUB_MOD_LICENSE ("GPLv3+"); #define XFS_SB_FEAT_INCOMPAT_SPINODES (1 << 1) /* sparse inode chunks */ #define XFS_SB_FEAT_INCOMPAT_META_UUID (1 << 2) /* metadata UUID */ -/* We do not currently verify metadata UUID so it is safe to read such filesystem */ +/* + * Directory entries with ftype are explicitly handled by grub code. + * + * We do not currently verify metadata UUID, so it is safe to read filesystems + * with the XFS_SB_FEAT_INCOMPAT_META_UUID feature. + * + * We do not currently read the inode btrees, so it is safe to read filesystems + * with the XFS_SB_FEAT_INCOMPAT_SPINODES feature. + */ #define XFS_SB_FEAT_INCOMPAT_SUPPORTED \ (XFS_SB_FEAT_INCOMPAT_FTYPE | \ + XFS_SB_FEAT_INCOMPAT_SPINODES | \ XFS_SB_FEAT_INCOMPAT_META_UUID) struct grub_xfs_sblock