From patchwork Fri Apr 12 19:31:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10899063 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 7A81C14DB for ; Fri, 12 Apr 2019 19:31:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5F34F28E86 for ; Fri, 12 Apr 2019 19:31:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 530E428E8F; Fri, 12 Apr 2019 19:31:34 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY 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 D371C28E86 for ; Fri, 12 Apr 2019 19:31:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726870AbfDLTbd (ORCPT ); Fri, 12 Apr 2019 15:31:33 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:57086 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726832AbfDLTbd (ORCPT ); Fri, 12 Apr 2019 15:31:33 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x3CJNc4r074040; Fri, 12 Apr 2019 19:31:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=corp-2018-07-02; bh=4sGZJzeJQMp1bs2GQvENljlobbzz8fKZHBHBSpx7vns=; b=qZ18Mz7FZYbAROo3q6VyLkKGNpoNd++09pRLSh5Zr40W7jaxWOrlPFIhWdESPpiWvrRg zt7Hp0MUBiIKgf9QTCzWb91GQ+7M31I/c0r34tkwAPc9KzdYAfxUzS3llM9UkQ5j16bb 34FOUhF4C414sANSLk2X6xTRYOuGO3zDzN44ej8dlXtHl4FfjWkUaOSKY9lioSLfUt9u jietuqFLpK2UephzFoQra4wErcjkHg+kX8resXh2CcNs/oOuLQp+psYDwLO7Av4GBmJN t9+AsNiGMi2/bboNB1kiCmD+u6sw2Aqaxpf22Gi4MiIyICYTWHYvQJDZDtZVcKts5Ze5 uw== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2120.oracle.com with ESMTP id 2rpmrqr648-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Apr 2019 19:31:29 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x3CJTiCm138546; Fri, 12 Apr 2019 19:31:28 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserp3030.oracle.com with ESMTP id 2rt9uqaqpe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Apr 2019 19:31:28 +0000 Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x3CJVRgA003723; Fri, 12 Apr 2019 19:31:27 GMT Received: from localhost (/10.145.178.52) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 12 Apr 2019 12:31:27 -0700 Date: Fri, 12 Apr 2019 12:31:26 -0700 From: "Darrick J. Wong" To: sandeen@sandeen.net Cc: linux-xfs@vger.kernel.org Subject: [PATCH v2 19/36] mkfs: validate extent size hint parameters Message-ID: <20190412193126.GJ1019523@magnolia> References: <155259742281.31886.17157720770696604377.stgit@magnolia> <155259754740.31886.13886644609473939892.stgit@magnolia> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <155259754740.31886.13886644609473939892.stgit@magnolia> User-Agent: Mutt/1.9.4 (2018-02-28) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9224 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904120130 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9224 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904120130 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 From: Darrick J. Wong Validate extent and cow extent size hints that are passed to mkfs so that we avoid formatting a filesystem that will never mount. Signed-off-by: Darrick J. Wong --- v2: simulate extsize hint validation on a directory --- mkfs/xfs_mkfs.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c index d1387ddf..d7951faa 100644 --- a/mkfs/xfs_mkfs.c +++ b/mkfs/xfs_mkfs.c @@ -2202,6 +2202,85 @@ validate_rtextsize( ASSERT(cfg->rtextblocks); } +/* Validate the incoming extsize hint. */ +static void +validate_extsize_hint( + struct xfs_mount *mp, + struct cli_params *cli) +{ + xfs_failaddr_t fa; + uint16_t flags = 0; + + /* + * First we validate the extent size inherit hint on a directory so + * that we know that we'll be propagating a correct hint and flag to + * new files on the data device. + */ + if (cli->fsx.fsx_xflags & FS_XFLAG_EXTSZINHERIT) + flags |= XFS_DIFLAG_EXTSZINHERIT; + + fa = libxfs_inode_validate_extsize(mp, cli->fsx.fsx_extsize, S_IFDIR, + flags); + if (fa) { + fprintf(stderr, +_("illegal extent size hint %lld, must be less than %u.\n"), + (long long)cli->fsx.fsx_extsize, + min(MAXEXTLEN, mp->m_sb.sb_agblocks / 2)); + usage(); + } + + /* + * Now we do it again with a realtime file so that we know the hint and + * flag that get passed on to realtime files will be correct. + */ + if (mp->m_sb.sb_rextsize == 0) + return; + + flags = XFS_DIFLAG_REALTIME; + if (cli->fsx.fsx_xflags & FS_XFLAG_EXTSZINHERIT) + flags |= XFS_DIFLAG_EXTSIZE; + + fa = libxfs_inode_validate_extsize(mp, cli->fsx.fsx_extsize, S_IFREG, + flags); + + if (fa) { + fprintf(stderr, +_("illegal extent size hint %lld, must be less than %u and a multiple of %u.\n"), + (long long)cli->fsx.fsx_extsize, + min(MAXEXTLEN, mp->m_sb.sb_agblocks / 2), + mp->m_sb.sb_rextsize); + usage(); + } +} + +/* Validate the incoming CoW extsize hint. */ +static void +validate_cowextsize_hint( + struct xfs_mount *mp, + struct cli_params *cli) +{ + xfs_failaddr_t fa; + uint64_t flags2 = 0; + + /* + * Validate the copy on write extent size inherit hint on a directory + * so that we know that we'll be propagating a correct hint and flag to + * new files on the data device. + */ + if (cli->fsx.fsx_xflags & FS_XFLAG_COWEXTSIZE) + flags2 |= XFS_DIFLAG2_COWEXTSIZE; + + fa = libxfs_inode_validate_cowextsize(mp, cli->fsx.fsx_cowextsize, + S_IFDIR, 0, flags2); + if (fa) { + fprintf(stderr, +_("illegal CoW extent size hint %lld, must be less than %u.\n"), + (long long)cli->fsx.fsx_cowextsize, + min(MAXEXTLEN, mp->m_sb.sb_agblocks / 2)); + usage(); + } +} + /* * Validate the configured stripe geometry, or is none is specified, pull * the configuration from the underlying device. @@ -3945,6 +4024,10 @@ main( finish_superblock_setup(&cfg, mp, sbp); + /* Validate the extent size hints now that @mp is fully set up. */ + validate_extsize_hint(mp, &cli); + validate_cowextsize_hint(mp, &cli); + /* Print the intended geometry of the fs. */ if (!quiet || dry_run) { struct xfs_fsop_geom geo;