From patchwork Thu Apr 23 23:31:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11506835 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 411F4159A for ; Thu, 23 Apr 2020 23:31:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A27D20784 for ; Thu, 23 Apr 2020 23:31:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="gHpegKb+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728103AbgDWXbW (ORCPT ); Thu, 23 Apr 2020 19:31:22 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:58280 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726071AbgDWXbW (ORCPT ); Thu, 23 Apr 2020 19:31:22 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 03NNSZIb140236; Thu, 23 Apr 2020 23:31:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2020-01-29; bh=3DepZGjQ7/a+0HELHMzy9KHgzM9W0XFzc0YjxZLcjho=; b=gHpegKb+P9bIIDF/deltZie4B/J25xe5dkon5PinM0Hi2Qe35oSGRqJFFdEywHHmnSB1 ar+ge34if5zQvwSUL5qmaPh+91ZXYO1qlku3y0ogFUJJUIbsQupLF6iEMbCghuwuR0PO W+nN5IiMMxnqOjqInBakveRgEDmUi74S/dieHttndBcZqeqw7pjpKAyzMylUJavk+tP4 PjYolWIehzxf1YJGQWUSOItqv0HTz3lX0vE/5iJ3TxAhECEG3PxBd0ShY357aUmMsuXE wm/rL+aVPEns3e1m8KU8nJbC2wwbHHvwC4vHNY0weLZKkiTr0R0UnEpESV6upc/gkJVo EQ== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by userp2130.oracle.com with ESMTP id 30ketdhm4g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 Apr 2020 23:31:20 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 03NNSNbE031685; Thu, 23 Apr 2020 23:31:20 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userp3030.oracle.com with ESMTP id 30gb1nmruu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 Apr 2020 23:31:20 +0000 Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 03NNVJbd021353; Thu, 23 Apr 2020 23:31:19 GMT Received: from localhost (/10.159.232.248) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 23 Apr 2020 16:31:19 -0700 Subject: [PATCH 1/5] generic/590: fix the xfs feature detection logic From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Thu, 23 Apr 2020 16:31:18 -0700 Message-ID: <158768467794.3019327.1909486240720460347.stgit@magnolia> In-Reply-To: <158768467175.3019327.8681440148230401150.stgit@magnolia> References: <158768467175.3019327.8681440148230401150.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9600 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0 spamscore=0 mlxlogscore=999 mlxscore=0 malwarescore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004230168 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9600 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 spamscore=0 impostorscore=0 bulkscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 priorityscore=1501 clxscore=1011 suspectscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004230168 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong The setup code in this regression test case tries to figure out if certain features known to be incompatible with realtime are known to mkfs, and if so, to forcibly disable them. Unfortunately, the reflink feature detection logic here is broken, because we have no way of distinguishing between the helper function _scratch_mkfs_xfs_supported returning nonzero because reflink isn't compatible with mkfs's defaults (e.g. your mkfs has rmapbt=1 by default) vs. reflink isn't recognized at all vs. something else broke. However, we can grep the mkfs output to look for reflink support, and if we find it then we disable it. That's fine for this test, since on XFS it's trying to set up the exact conditions to test a known bug. Second, rmapbt isn't currently compatible with realtime either, so we need to detect and mask that off too. Third, the test only needs to perform this feature detection if the test runner didn't set SCRATCH_RTDEV, because we require that if the runner configured SCRATCH_RTDEV, they also set MKFS_OPTIONS appropriately. Signed-off-by: Darrick J. Wong --- tests/generic/590 | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/tests/generic/590 b/tests/generic/590 index 45f443c3..284bd49d 100755 --- a/tests/generic/590 +++ b/tests/generic/590 @@ -41,6 +41,21 @@ bs=4096 rextsize=4 filesz=$(((maxextlen + 1) * bs)) +must_disable_feature() { + local feat="$1" + + # If mkfs doesn't know about the feature, we don't need to disable it + $MKFS_XFS_PROG --help 2>&1 | grep -q "${feat}=0" || return 1 + + # If turning the feature on works, we don't need to disable it + _scratch_mkfs_xfs_supported -m "${feat}=1" "${disabled_features[@]}" \ + > /dev/null 2>&1 && return 1 + + # Otherwise mkfs knows of the feature and formatting with it failed, + # so we do need to mask it. + return 0 +} + extra_options="" # If we're testing XFS, set up the realtime device to reproduce the bug. if [[ $FSTYP = xfs ]]; then @@ -54,14 +69,20 @@ if [[ $FSTYP = xfs ]]; then loop="$(_create_loop_device "$TEST_DIR/$seq")" USE_EXTERNAL=yes SCRATCH_RTDEV="$loop" + disabled_features=() + + # disable reflink if not supported by realtime devices + must_disable_feature reflink && + disabled_features=(-m reflink=0) + + # disable rmap if not supported by realtime devices + must_disable_feature rmapbt && + disabled_features+=(-m rmapbt=0) fi extra_options="$extra_options -r extsize=$((bs * rextsize))" extra_options="$extra_options -d agsize=$(((maxextlen + 1) * bs / 2)),rtinherit=1" - # disable reflink as reflink not supported with realtime devices - if _scratch_mkfs_xfs_supported -m reflink=0 >/dev/null 2>&1; then - extra_options="$extra_options -m reflink=0" - fi - _scratch_mkfs $extra_options >>$seqres.full 2>&1 + + _scratch_mkfs $extra_options "${disabled_features[@]}" >>$seqres.full 2>&1 _try_scratch_mount >>$seqres.full 2>&1 || \ _notrun "mount failed, kernel doesn't support realtime?" _scratch_unmount From patchwork Thu Apr 23 23:31:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11506861 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1BF99159A for ; Thu, 23 Apr 2020 23:33:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 03B2C2087E for ; Thu, 23 Apr 2020 23:33:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="rFFjH+GJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726173AbgDWXd2 (ORCPT ); Thu, 23 Apr 2020 19:33:28 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:59592 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726060AbgDWXd2 (ORCPT ); Thu, 23 Apr 2020 19:33:28 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 03NNWmDJ143365; Thu, 23 Apr 2020 23:33:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2020-01-29; bh=lRfXjblsE4bztCx00Kfg3lXe590/N1QhHeZ8dgeZhFg=; b=rFFjH+GJhzM7YJS/VcwTZxEKPbj4M0qol95jEZTgRB7vFM2HfmUI1uz2YFoqx92XpQQ7 Qvv9CPjoMD3wSzSVgFryA/PBeduhjAdJRU1sAK638IKdhEWo2WyeiQcSUmOHTWAFjwQt Pge8eaqVrqzq1WSMIceoxMkyh0vBT0VTAU0l8jnHPhZi+GVP5DS25um5OpXUuHghSV3x bztEbjWp4cb5QpH4kOFq6YRo0NyHsCJCxsf/q4/pvvdPfpmcuq46CLZptaI10hdYqoXY SZUEQncds618RU0HffxgHKCMyaxwzByw3M4I3wQFCDWsBPAx8WVt/16srUW721881gaz 5g== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2130.oracle.com with ESMTP id 30ketdhm8v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 Apr 2020 23:33:26 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 03NNRaDb160131; Thu, 23 Apr 2020 23:31:26 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userp3020.oracle.com with ESMTP id 30k7qw2bnw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 Apr 2020 23:31:26 +0000 Received: from abhmp0010.oracle.com (abhmp0010.oracle.com [141.146.116.16]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 03NNVPHx032379; Thu, 23 Apr 2020 23:31:25 GMT Received: from localhost (/10.159.232.248) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 23 Apr 2020 16:31:25 -0700 Subject: [PATCH 2/5] xfs/126: make sure we corrupt the attr leaf in a detectable way From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Thu, 23 Apr 2020 16:31:24 -0700 Message-ID: <158768468419.3019327.7338437062843317243.stgit@magnolia> In-Reply-To: <158768467175.3019327.8681440148230401150.stgit@magnolia> References: <158768467175.3019327.8681440148230401150.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9600 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 spamscore=0 mlxlogscore=930 adultscore=0 suspectscore=0 bulkscore=0 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004230168 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9600 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 spamscore=0 impostorscore=0 bulkscore=0 mlxlogscore=981 phishscore=0 mlxscore=0 priorityscore=1501 clxscore=1015 suspectscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004230169 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong Try harder to fuzz the attr leaf so this consistently trips a verifier. Signed-off-by: Darrick J. Wong --- tests/xfs/126 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/xfs/126 b/tests/xfs/126 index 4f9f8cf9..0d497779 100755 --- a/tests/xfs/126 +++ b/tests/xfs/126 @@ -72,7 +72,7 @@ echo "+ corrupt xattr" loff=1 while true; do _scratch_xfs_db -x -c "inode ${inode}" -c "ablock ${loff}" -c "stack" | grep -q 'file attr block is unmapped' && break - _scratch_xfs_db -x -c "inode ${inode}" -c "ablock ${loff}" -c "stack" -c "blocktrash -x 32 -y $((blksz * 8)) -z ${FUZZ_ARGS}" >> $seqres.full + _scratch_xfs_db -x -c "inode ${inode}" -c "ablock ${loff}" -c "stack" -c "blocktrash -x 4096 -y $((blksz * 8)) -z ${FUZZ_ARGS}" >> $seqres.full loff="$((loff + 1))" done From patchwork Thu Apr 23 23:31:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11506839 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 965F213B2 for ; Thu, 23 Apr 2020 23:31:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7ED3220CC7 for ; Thu, 23 Apr 2020 23:31:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="xrRzWCdn" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728015AbgDWXbg (ORCPT ); Thu, 23 Apr 2020 19:31:36 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:58456 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726071AbgDWXbf (ORCPT ); Thu, 23 Apr 2020 19:31:35 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 03NNSZhw140226; Thu, 23 Apr 2020 23:31:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2020-01-29; bh=IOsj+bExliai5MHbuopsJBvWMjXXGOg3kSDZexC961A=; b=xrRzWCdnCSHDIQBSFT3hRzihPyUpSgGZpqaiQM13/BcTTbqNnVG3j+yYf5i43nVIXLdl mWWP+Zz1PudIihj+7IY3pB8fPq1kGplHgfP0VLwuP8KCekWKFj6bcreY4TyIVc+Z7gOa uXwpkUnKdV08o5eLuO39fEMUwqgoeOfl5MuKHrqMwD0pOzU0tfkA1inFgFA3kFeG295F 8LhYW3yHEDmkLke/YqSIrbHrYKCrDacmPOhp2jEXud8a1GgMUp58wN5xMYVct7qvCZTc wgFR7qb6ReIOnFhnNUND62oskKfFtrMJDh6A3QZIVERnzwzH/kEUxQBhnIvSTJ3m+Jlw nA== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by userp2130.oracle.com with ESMTP id 30ketdhm4x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 Apr 2020 23:31:33 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 03NNSOYx031776; Thu, 23 Apr 2020 23:31:33 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userp3030.oracle.com with ESMTP id 30gb1nms46-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 Apr 2020 23:31:33 +0000 Received: from abhmp0020.oracle.com (abhmp0020.oracle.com [141.146.116.26]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 03NNVVJO032377; Thu, 23 Apr 2020 23:31:31 GMT Received: from localhost (/10.159.232.248) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 23 Apr 2020 16:31:31 -0700 Subject: [PATCH 3/5] generic/570: don't run this test on systems supporting userspace hibernate From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Thu, 23 Apr 2020 16:31:30 -0700 Message-ID: <158768469040.3019327.7570482503352003021.stgit@magnolia> In-Reply-To: <158768467175.3019327.8681440148230401150.stgit@magnolia> References: <158768467175.3019327.8681440148230401150.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9600 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0 spamscore=0 mlxlogscore=999 mlxscore=0 malwarescore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004230168 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9600 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 spamscore=0 impostorscore=0 bulkscore=0 mlxlogscore=999 phishscore=0 mlxscore=0 priorityscore=1501 clxscore=1015 suspectscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004230168 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong It turns out that userspace actually does need the ability to write to an active swapfile if userspace hibernation (uswsusp) is enabled. Therefore, this test doesn't apply under those conditions. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- tests/generic/570 | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/generic/570 b/tests/generic/570 index d574f4b7..e5da2381 100755 --- a/tests/generic/570 +++ b/tests/generic/570 @@ -32,6 +32,7 @@ _supported_fs generic _require_test_program swapon _require_scratch_nocheck _require_block_device $SCRATCH_DEV +test -e /dev/snapshot && _notrun "userspace hibernation to swap is enabled" rm -f $seqres.full From patchwork Thu Apr 23 23:31:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11506843 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2F208159A for ; Thu, 23 Apr 2020 23:31:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1736920784 for ; Thu, 23 Apr 2020 23:31:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="XTtpV6D4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728107AbgDWXbl (ORCPT ); Thu, 23 Apr 2020 19:31:41 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:44126 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726071AbgDWXbl (ORCPT ); Thu, 23 Apr 2020 19:31:41 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 03NNSZYL110765; Thu, 23 Apr 2020 23:31:39 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2020-01-29; bh=ICcM+3BZ9y71dmOw7Erd6v+N0K4kldhixQtPU0gRz8Q=; b=XTtpV6D4CUuQTa7SIjFi770jwlKWTg5HwhaFJ+mIpHaUjGGbF7uiRtRdQMtC8DuT5S+D 63S3xAeqM4gFzHBTvZUoRtiA+yRFZFzROPMd2+rdS5SEZqGMPJvaJJhQN+h6leynH9MZ Hff+LQLlkcwOIqVpjYHtKfUbD9qVGeEzzbfAu052eq4gdupfqSf5vXpwC2evw2jJWArS WKp9Bnfxi/jHX4Zx4U6q2FmdSVuym6Oek9MGQINOAGLy0w49cF+7OI5hkfQVIlFfLs0v TWz/+NYQm8wqn6/JAz5gzsrH7jRFD5F/ohYM+jVW/2mVftvsZDLM7TW4YEjbNpf4IY8/ KQ== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by aserp2120.oracle.com with ESMTP id 30jvq4xbpv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 Apr 2020 23:31:39 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 03NNSNJn031703; Thu, 23 Apr 2020 23:31:38 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userp3030.oracle.com with ESMTP id 30gb1nms7j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 Apr 2020 23:31:38 +0000 Received: from abhmp0020.oracle.com (abhmp0020.oracle.com [141.146.116.26]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 03NNVckB021389; Thu, 23 Apr 2020 23:31:38 GMT Received: from localhost (/10.159.232.248) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 23 Apr 2020 16:31:37 -0700 Subject: [PATCH 4/5] xfs/30[78]: fix regressions due to strengthened AGF checks From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Thu, 23 Apr 2020 16:31:36 -0700 Message-ID: <158768469665.3019327.1634286381311814235.stgit@magnolia> In-Reply-To: <158768467175.3019327.8681440148230401150.stgit@magnolia> References: <158768467175.3019327.8681440148230401150.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9600 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0 spamscore=0 mlxlogscore=923 mlxscore=0 malwarescore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004230168 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9600 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 malwarescore=0 mlxscore=0 adultscore=0 mlxlogscore=964 phishscore=0 impostorscore=0 clxscore=1015 bulkscore=0 spamscore=0 priorityscore=1501 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004230168 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong Reorder the order in which we tweak AGF fields to avoid falling afoul of the new AGF sanity checks. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- tests/xfs/307 | 2 +- tests/xfs/308 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/xfs/307 b/tests/xfs/307 index 705643da..2f517952 100755 --- a/tests/xfs/307 +++ b/tests/xfs/307 @@ -115,8 +115,8 @@ debris_bno=$((bno + len - debris_len)) echo "Remove the extent from the freesp btrees" _set_agf_data "recs[1].blockcount" $((len - debris_len)) -c 'addr bnoroot' _set_agf_data "recs[1].blockcount" $((len - debris_len)) -c 'addr cntroot' -_set_agf_data freeblks $((agf_freeblks - debris_len)) _set_agf_data longest $((len - debris_len)) +_set_agf_data freeblks $((agf_freeblks - debris_len)) _set_sb_data fdblocks $((sb_fdblocks - debris_len)) echo "Add the extent to the refcount btree" diff --git a/tests/xfs/308 b/tests/xfs/308 index f809b499..569a25f1 100755 --- a/tests/xfs/308 +++ b/tests/xfs/308 @@ -115,8 +115,8 @@ debris_bno=$((bno + len - debris_len)) echo "Remove the extent from the freesp btrees" _set_agf_data "recs[1].blockcount" $((len - debris_len)) -c 'addr bnoroot' _set_agf_data "recs[1].blockcount" $((len - debris_len)) -c 'addr cntroot' -_set_agf_data freeblks $((agf_freeblks - debris_len)) _set_agf_data longest $((len - debris_len)) +_set_agf_data freeblks $((agf_freeblks - debris_len)) _set_sb_data fdblocks $((sb_fdblocks - debris_len)) echo "Add the extent to the refcount btree" From patchwork Thu Apr 23 23:31:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 11506847 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9866C159A for ; Thu, 23 Apr 2020 23:31:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8045520736 for ; Thu, 23 Apr 2020 23:31:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="yU4AHFKj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728128AbgDWXbt (ORCPT ); Thu, 23 Apr 2020 19:31:49 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:44150 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726071AbgDWXbs (ORCPT ); Thu, 23 Apr 2020 19:31:48 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 03NNSi09110781; Thu, 23 Apr 2020 23:31:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2020-01-29; bh=RkWAWftHwPyILJRfbB5y32PffGbc+ts+Pv3Lqrrujjw=; b=yU4AHFKju18k9z0QX1JQsRfbRqsFN9+uymG6M2Ws/0uMe6s8HV2Rs4ZbCrwl0NBLiu2Q VZm5VFJEEA5JDOQPfOAEV7W+6yHxBTOgy1Wz7UjVzUtVOGvXheb2NGQX/7irJEzC5jbb y91/NBSFzVD0SodZ5R8EwVX0yk1x7f/iGLnMy4VtDTMnEvNjgnXWcFmjzl1GATGY/+5m isjDCccz37SQlQMre/aJIcbyVNXMETCLCRkvJeNtJWM+OojcRAD6s7o4GQl6l/5XEu40 fxI1yWTSYilzgx/b4IAtgvLMPapcFiu1TcLZGMdbT5o5RZs6NMYUJdbJ23qXBD890XJa SQ== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2120.oracle.com with ESMTP id 30jvq4xbq3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 Apr 2020 23:31:47 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 03NNRa1r160134; Thu, 23 Apr 2020 23:31:46 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userp3020.oracle.com with ESMTP id 30k7qw2c74-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 Apr 2020 23:31:46 +0000 Received: from abhmp0014.oracle.com (abhmp0014.oracle.com [141.146.116.20]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 03NNVj5o003277; Thu, 23 Apr 2020 23:31:45 GMT Received: from localhost (/10.159.232.248) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 23 Apr 2020 16:31:45 -0700 Subject: [PATCH 5/5] xfs/122: fix for linux 5.7 stuff From: "Darrick J. Wong" To: guaneryu@gmail.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Thu, 23 Apr 2020 16:31:42 -0700 Message-ID: <158768470283.3019327.12107082366634108750.stgit@magnolia> In-Reply-To: <158768467175.3019327.8681440148230401150.stgit@magnolia> References: <158768467175.3019327.8681440148230401150.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9600 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 spamscore=0 mlxlogscore=999 adultscore=0 suspectscore=0 bulkscore=0 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004230168 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9600 signatures=668686 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 lowpriorityscore=0 malwarescore=0 mlxscore=0 adultscore=0 mlxlogscore=999 phishscore=0 impostorscore=0 clxscore=1015 bulkscore=0 spamscore=0 priorityscore=1501 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004230168 Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong Fix some regressions on xfsprogs 5.7. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- tests/xfs/122 | 2 ++ tests/xfs/122.out | 1 + 2 files changed, 3 insertions(+) diff --git a/tests/xfs/122 b/tests/xfs/122 index 64b63cb1..dbf3a22b 100755 --- a/tests/xfs/122 +++ b/tests/xfs/122 @@ -181,6 +181,8 @@ xfs_fsop_getparents_handlereq_t xfs_dinode_core_t struct xfs_iext_cursor struct xfs_ino_geometry +struct xfs_attrlist +struct xfs_attrlist_ent EOF echo 'int main(int argc, char *argv[]) {' >>$cprog diff --git a/tests/xfs/122.out b/tests/xfs/122.out index 91a3bdae..45c42e59 100644 --- a/tests/xfs/122.out +++ b/tests/xfs/122.out @@ -58,6 +58,7 @@ offsetof(xfs_sb_t, sb_width) = 188 sizeof(struct xfs_acl) = 4 sizeof(struct xfs_acl_entry) = 12 sizeof(struct xfs_ag_geometry) = 128 +sizeof(struct xfs_agfl) = 36 sizeof(struct xfs_attr3_leaf_hdr) = 80 sizeof(struct xfs_attr3_leafblock) = 88 sizeof(struct xfs_attr3_rmt_hdr) = 56