From patchwork Mon Jun 14 06:28:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ritesh Harjani X-Patchwork-Id: 1491535 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=nNhpUSsY; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4G3M3L2dxpz9sW7 for ; Mon, 14 Jun 2021 16:28:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232480AbhFNGar (ORCPT ); Mon, 14 Jun 2021 02:30:47 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:37226 "EHLO mx0b-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232390AbhFNGam (ORCPT ); Mon, 14 Jun 2021 02:30:42 -0400 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15E64G1g095887; Mon, 14 Jun 2021 02:28:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=upXP3Sd2M4kjGecgsbELRN4CsIWgtHqMxItELIeAUUE=; b=nNhpUSsYn/agNd5L+yje3ISu16tINN8mfjITPWftNBUvLAGCRxUeXMHqRgo25loyKiSk KHQOIErgQSLLk/3T1/Qc31M+mfMEReBOhHpEFI6mMVCGVY1yMsVgDhydbCp9F33pcTyf zuhJ9WakfXAnVmfbbjdfJwrDRWO6f2eLT2NKBkm9t6rFPCv/RovIUMl+q5S4QE9hGKUy H/RgELz/wWzwxOD6IjzFDz8fv1gH1hk/KBzePalvnJ0a2OpFsuOUo0vt8LgQekvZG366 iljfSHcHkK523jKDVTv4qw2iBuacKxpEdGDhFzmN0a7um0VF5c73PpeX9Dvqg2NuQW1q Gw== Received: from ppma04ams.nl.ibm.com (63.31.33a9.ip4.static.sl-reverse.com [169.51.49.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 39611h15fx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 02:28:39 -0400 Received: from pps.filterd (ppma04ams.nl.ibm.com [127.0.0.1]) by ppma04ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15E6P129032677; Mon, 14 Jun 2021 06:28:38 GMT Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by ppma04ams.nl.ibm.com with ESMTP id 394mj8rr5h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 06:28:38 +0000 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15E6SZj432047456 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Jun 2021 06:28:35 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 236624203F; Mon, 14 Jun 2021 06:28:35 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C078942049; Mon, 14 Jun 2021 06:28:34 +0000 (GMT) Received: from localhost (unknown [9.85.68.28]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 14 Jun 2021 06:28:34 +0000 (GMT) From: Ritesh Harjani To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, Ritesh Harjani Subject: [PATCH 1/9] ext4/003: Fix this test on 64K platform for dax config Date: Mon, 14 Jun 2021 11:58:05 +0530 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: DSPI-1gejBpDYKtlUBeBED9zB0gIyeRb X-Proofpoint-ORIG-GUID: DSPI-1gejBpDYKtlUBeBED9zB0gIyeRb X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761 definitions=2021-06-13_11:2021-06-11,2021-06-13 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxscore=0 phishscore=0 adultscore=0 bulkscore=0 mlxlogscore=999 priorityscore=1501 spamscore=0 suspectscore=0 malwarescore=0 lowpriorityscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106140045 Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org mkfs.ext4 by default uses 4K blocksize which doesn't mount when testing with dax config and the test fails. This patch fixes it. Signed-off-by: Ritesh Harjani --- tests/ext4/003 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/ext4/003 b/tests/ext4/003 index 00ea9150..1ddb3063 100755 --- a/tests/ext4/003 +++ b/tests/ext4/003 @@ -31,7 +31,8 @@ _require_scratch_ext4_feature "bigalloc" rm -f $seqres.full -$MKFS_EXT4_PROG -F -O bigalloc -C 65536 -g 256 $SCRATCH_DEV 512m \ +BLOCK_SIZE=$(get_page_size) +$MKFS_EXT4_PROG -F -b $BLOCK_SIZE -O bigalloc -C 65536 -g 256 $SCRATCH_DEV 512m \ >> $seqres.full 2>&1 _scratch_mount From patchwork Mon Jun 14 06:28:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ritesh Harjani X-Patchwork-Id: 1491536 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=E+N3Kgn8; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4G3M3M6Fsrz9sXb for ; Mon, 14 Jun 2021 16:28:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232499AbhFNGas (ORCPT ); Mon, 14 Jun 2021 02:30:48 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:15256 "EHLO mx0b-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232478AbhFNGan (ORCPT ); Mon, 14 Jun 2021 02:30:43 -0400 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15E65PY4029963; Mon, 14 Jun 2021 02:28:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : mime-version; s=pp1; bh=x19Y8x2t6YhLfL4jsMjExB3htEDo9KC+vhhmcTkU6Q8=; b=E+N3Kgn8Ka7WuNznIbDd4UYmTnMsosFQgx9/5d6XPN8GgTPTvK96zZe60bFcnLMpWySh 4DzXsLwnRcNy5BUzjZ9AP13AY7Y94ErlBRoVNS+aStsu15X4zFUdgkAi6NU6sW4DrPsF S9AMTSSlVHBCjCT5PfsWoql5OEglQS5ML548a26Fq13OLqyyamru8WnRDpYq/0XiUbAB 3VdxB8t2bsgStEIRcGGPcgdSostFgiEeYea1KdaH+XkG+jUL/WjcgkMffHoroDOP8cXi V4ojw4VDNx6bNj/5bBiAFVBN7Xsfk93ApjW3FarNUABvDE9Wx8WG9mg3YMcTceILPJ5Y 4Q== Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com with ESMTP id 395xmjvavw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 02:28:41 -0400 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15E6MB14001993; Mon, 14 Jun 2021 06:28:39 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma06ams.nl.ibm.com with ESMTP id 394m6hrrbq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 06:28:39 +0000 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15E6RYZ837159294 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Jun 2021 06:27:35 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5A86C4204B; Mon, 14 Jun 2021 06:28:36 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0781042041; Mon, 14 Jun 2021 06:28:36 +0000 (GMT) Received: from localhost (unknown [9.85.68.28]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 14 Jun 2021 06:28:35 +0000 (GMT) From: Ritesh Harjani To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, Ritesh Harjani Subject: [PATCH 2/9] ext4/027: Correct the right code of block and inode bitmap Date: Mon, 14 Jun 2021 11:58:06 +0530 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: X-TM-AS-GCONF: 00 X-Proofpoint-GUID: AA0cIJPSNhuA0USg3ntziwAdaXykRi8u X-Proofpoint-ORIG-GUID: AA0cIJPSNhuA0USg3ntziwAdaXykRi8u X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761 definitions=2021-06-13_11:2021-06-11,2021-06-13 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxlogscore=999 malwarescore=0 bulkscore=0 mlxscore=0 suspectscore=0 spamscore=0 clxscore=1015 adultscore=0 phishscore=0 impostorscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106140045 Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Observed occasional failure of this test sometimes say with 64k config and small device size. Reason is we were grepping for wrong values for inode and block bitmap. Correct those values according to [1] to fix this test. [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/fs/ext4/fsmap.h#n53 Signed-off-by: Ritesh Harjani Reviewed-by: Darrick J. Wong --- tests/ext4/027 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ext4/027 b/tests/ext4/027 index 97c14cf5..83d5a413 100755 --- a/tests/ext4/027 +++ b/tests/ext4/027 @@ -45,11 +45,11 @@ x=$(grep -c 'static fs metadata' $TEST_DIR/fsmap) test $x -gt 0 || echo "No fs metadata?" echo "Check block bitmap" | tee -a $seqres.full -x=$(grep -c 'special 102:1' $TEST_DIR/fsmap) +x=$(grep -c 'special 102:3' $TEST_DIR/fsmap) test $x -gt 0 || echo "No block bitmaps?" echo "Check inode bitmap" | tee -a $seqres.full -x=$(grep -c 'special 102:2' $TEST_DIR/fsmap) +x=$(grep -c 'special 102:4' $TEST_DIR/fsmap) test $x -gt 0 || echo "No inode bitmaps?" echo "Check inodes" | tee -a $seqres.full From patchwork Mon Jun 14 06:28:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ritesh Harjani X-Patchwork-Id: 1491537 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=NxdfQ0jT; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4G3M3N1qBBz9sf9 for ; Mon, 14 Jun 2021 16:28:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232502AbhFNGat (ORCPT ); Mon, 14 Jun 2021 02:30:49 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:54630 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232490AbhFNGap (ORCPT ); Mon, 14 Jun 2021 02:30:45 -0400 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15E6556X091388; Mon, 14 Jun 2021 02:28:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=7LV0U8ZOUT7CBrpPQI+6ZQum3VQOvtOSSR4egLHnqfw=; b=NxdfQ0jTS6+UyKuO4dEOmxq9emaApwgVDg8YdhE+GLZoNZj1T3+uCV9q5IcI//DolK6x m5v9R/hLwOO32UEcrEWdhH3P/ktvT0gNRGQL9KJb1T4eGQ9xBAKLExUuHRlus0Ge3v7K ByEAuWLXBoJ5D4No8myhJwAlpXb2+T4meyIY3FVZATPKaHJQu9z7xaxVq1WrmQNzz9Na LUTKeisGqs7gWaW/rIIOtSUavqd1f9MkY6gtcIImxR08kws9s56AiDvYoHu/ZUjAtzql v0pSRTWIAWZSQEt0ew5KTei///CiSdh7Fpp0xgRTQsyDd4V8DOntVoy5LWi1xV/YTpe7 WA== Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 395ypt2vxs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 02:28:42 -0400 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15E6O8tb019523; Mon, 14 Jun 2021 06:28:40 GMT Received: from b06avi18626390.portsmouth.uk.ibm.com (b06avi18626390.portsmouth.uk.ibm.com [9.149.26.192]) by ppma03ams.nl.ibm.com with ESMTP id 394mj8rr65-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 06:28:40 +0000 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15E6RcNw32833848 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Jun 2021 06:27:39 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 99B1442049; Mon, 14 Jun 2021 06:28:37 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 477D742045; Mon, 14 Jun 2021 06:28:37 +0000 (GMT) Received: from localhost (unknown [9.85.68.28]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 14 Jun 2021 06:28:37 +0000 (GMT) From: Ritesh Harjani To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, Ritesh Harjani Subject: [PATCH 3/9] ext4/306: Add -b blocksize parameter too to avoid failure with DAX config Date: Mon, 14 Jun 2021 11:58:07 +0530 Message-Id: <280020a9d6791ad4fc1c51bef9c20771f6791d69.1623651783.git.riteshh@linux.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Md0Ia6gMeqfZpEGyXQXoKt7ToSpgaupm X-Proofpoint-ORIG-GUID: Md0Ia6gMeqfZpEGyXQXoKt7ToSpgaupm X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761 definitions=2021-06-13_11:2021-06-11,2021-06-13 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 bulkscore=0 phishscore=0 mlxlogscore=999 mlxscore=0 malwarescore=0 suspectscore=0 spamscore=0 adultscore=0 priorityscore=1501 impostorscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106140045 Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org mkfs.ext4 by default uses 4K blocksize. On DAX config with a 64K pagesize platform (PPC64), this will fail to mount since DAX requires bs == ps. Hence add the -b blocksize paramter in ext4/306. Signed-off-by: Ritesh Harjani Reviewed-by: Theodore Ts'o --- tests/ext4/306 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/ext4/306 b/tests/ext4/306 index 146fdb39..1d45a9d0 100755 --- a/tests/ext4/306 +++ b/tests/ext4/306 @@ -38,7 +38,10 @@ features="^extents" if grep -q 64bit /etc/mke2fs.conf ; then features="^extents,^64bit" fi -$MKFS_EXT4_PROG -F -O "$features" $SCRATCH_DEV 512m >> $seqres.full 2>&1 + +blksz=$(get_page_size) + +$MKFS_EXT4_PROG -F -b $blksz -O "$features" $SCRATCH_DEV 512m >> $seqres.full 2>&1 _scratch_mount # Create a small non-extent-based file From patchwork Mon Jun 14 06:28:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ritesh Harjani X-Patchwork-Id: 1491538 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=O588Yhu9; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4G3M3N5qK2z9sW7 for ; Mon, 14 Jun 2021 16:28:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232490AbhFNGat (ORCPT ); Mon, 14 Jun 2021 02:30:49 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:34250 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232496AbhFNGaq (ORCPT ); Mon, 14 Jun 2021 02:30:46 -0400 Received: from pps.filterd (m0187473.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15E63hUx016077; Mon, 14 Jun 2021 02:28:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=q0Tn7eos6XPNRvYOKCBT93r3PKKxbsJngPoWRexw2bc=; b=O588Yhu9mxkghYVffC8o26p1G1qC5aB51KNrG9EDlDwqls6QX5x/4YwveceRmzUYEXxh 4OVXgLcFtJSVe1Ayst5G4CqaThlJUE4ID6dTVvdxGM6ptpnjxrqmVx5VS0/U3RhRiL6w wnVazzrqDfo5iZjiWPKiuAQ0rLW3e9iSrEIdpjyUhoteWZWskPdTPZWfcKGqiLr1KkRV ly8+yGw+SIeM76L9Tuu8IsvPKcsW4lyJHsJbucR75VLHK/n8c8VrnQNRYj5Wfz6O9rgS JHmxzychlgEC1au2E/wiexuiXUPwTcDFqVyYZZBpjvj3xp+GUXQD3RWlrheKHkNGusVY cw== Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0a-001b2d01.pphosted.com with ESMTP id 395xnqmavr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 02:28:44 -0400 Received: from pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15E6OJTc014174; Mon, 14 Jun 2021 06:28:42 GMT Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by ppma03fra.de.ibm.com with ESMTP id 394mj90d9s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 06:28:42 +0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15E6Scnl29557098 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Jun 2021 06:28:39 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D4C3542049; Mon, 14 Jun 2021 06:28:38 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 840C74203F; Mon, 14 Jun 2021 06:28:38 +0000 (GMT) Received: from localhost (unknown [9.85.68.28]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 14 Jun 2021 06:28:38 +0000 (GMT) From: Ritesh Harjani To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, Ritesh Harjani Subject: [PATCH 4/9] ext4/022: exclude this test for dax config on 64KB pagesize platform Date: Mon, 14 Jun 2021 11:58:08 +0530 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 9UIVwm01fqozGwnH13aZFFdNOI8dzw0H X-Proofpoint-GUID: 9UIVwm01fqozGwnH13aZFFdNOI8dzw0H X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761 definitions=2021-06-13_11:2021-06-11,2021-06-13 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 malwarescore=0 mlxlogscore=999 lowpriorityscore=0 bulkscore=0 adultscore=0 impostorscore=0 clxscore=1015 priorityscore=1501 phishscore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106140045 Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org This test case assumes blocksize to be 4KB and hence it fails to mount with "-o dax" option on a 64kb pagesize platform (e.g. PPC64). This leads to test case reported as failed with dax config on PPC64. This patch exclude this test when pagesize is 64KB and for dax config. Signed-off-by: Ritesh Harjani Reviewed-by: Theodore Ts'o --- tests/ext4/022 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/ext4/022 b/tests/ext4/022 index 3de7619a..ca58f34e 100755 --- a/tests/ext4/022 +++ b/tests/ext4/022 @@ -41,10 +41,13 @@ _require_dumpe2fs _require_command "$DEBUGFS_PROG" debugfs _require_attrs -# Use large inodes to have enough space for experimentation -INODE_SIZE=1024 # Block size BLOCK_SIZE=4096 +if [[ $(get_page_size) -ne $BLOCK_SIZE ]]; then + _exclude_scratch_mount_option dax +fi +# Use large inodes to have enough space for experimentation +INODE_SIZE=1024 # We leave this amount of bytes for xattrs XATTR_SPACE=256 # We grow extra_isize by this much From patchwork Mon Jun 14 06:28:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ritesh Harjani X-Patchwork-Id: 1491539 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=mfwubVRX; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4G3M3P3ZvGz9sjB for ; Mon, 14 Jun 2021 16:28:49 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232508AbhFNGau (ORCPT ); Mon, 14 Jun 2021 02:30:50 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:62434 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232394AbhFNGas (ORCPT ); Mon, 14 Jun 2021 02:30:48 -0400 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15E64mOA188852; Mon, 14 Jun 2021 02:28:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=EzAVJMIonmlWocRAMw/JzQoD9hDugKo7Zy8ZnDkQRGw=; b=mfwubVRX3dzZFC+wZIjsAUGWynNkD0X4J5DRoIFTVAH1+bNntXnk80H4FLE0ZcnBDUMb rw/vFdlXDjF1VuXAYTapS8Q+R7KbmFKFVMMC0NBxqHIXIGbAxmjqXaivoEiPvOnd0tki svl4D2U9U6/zgpTfsnrNyzofGOkooKuOHjNZk1XZnIo/7OWFZtjYy7z4u1icT0HRp/c6 Al51x9IqyifMU8fnfS1Wppz89WLrqjvfn2q53RoROwPOwakiYS/ViogKX3momFIizV0i rNKZZDWRJmcEZWcZnPkBHIFQrD90b7eP34q0JgYA/4T65icI+THd4ar7QF0GMXAcoxLU RA== Received: from ppma03fra.de.ibm.com (6b.4a.5195.ip4.static.sl-reverse.com [149.81.74.107]) by mx0b-001b2d01.pphosted.com with ESMTP id 39618sgvkp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 02:28:45 -0400 Received: from pps.filterd (ppma03fra.de.ibm.com [127.0.0.1]) by ppma03fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15E6OJTd014174; Mon, 14 Jun 2021 06:28:43 GMT Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by ppma03fra.de.ibm.com with ESMTP id 394mj90d9t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 06:28:43 +0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15E6Seut34210214 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Jun 2021 06:28:40 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 11E0442047; Mon, 14 Jun 2021 06:28:40 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B60A142041; Mon, 14 Jun 2021 06:28:39 +0000 (GMT) Received: from localhost (unknown [9.85.68.28]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 14 Jun 2021 06:28:39 +0000 (GMT) From: Ritesh Harjani To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, Ritesh Harjani Subject: [PATCH 5/9] generic/031: Fix the test case for 64k blocksize config Date: Mon, 14 Jun 2021 11:58:09 +0530 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: LQzBDMDaq2m6ra4vva-LIixNg0sX9xex X-Proofpoint-ORIG-GUID: LQzBDMDaq2m6ra4vva-LIixNg0sX9xex X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761 definitions=2021-06-13_11:2021-06-11,2021-06-13 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 mlxlogscore=999 clxscore=1015 priorityscore=1501 lowpriorityscore=0 adultscore=0 impostorscore=0 spamscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106140045 Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org This test fails with blocksize 64k since the test assumes 4k blocksize in fcollapse param. This patch fixes that and also tests for 64k blocksize. Signed-off-by: Ritesh Harjani --- tests/generic/031 | 37 ++++++++++++++++++---- tests/generic/031.out.64k | 19 +++++++++++ tests/generic/{031.out => 031.out.default} | 0 3 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 tests/generic/031.out.64k rename tests/generic/{031.out => 031.out.default} (100%) diff --git a/tests/generic/031 b/tests/generic/031 index db84031b..40cb23af 100755 --- a/tests/generic/031 +++ b/tests/generic/031 @@ -8,6 +8,7 @@ # correctly written and aren't left behind causing invalidation or data # corruption issues. # +seqfull=$0 seq=`basename $0` seqres=$RESULT_DIR/$seq echo "QA output created by $seq" @@ -39,12 +40,35 @@ testfile=$SCRATCH_MNT/testfile _scratch_mkfs > /dev/null 2>&1 _scratch_mount -$XFS_IO_PROG -f \ - -c "pwrite 185332 55756" \ - -c "fcollapse 28672 40960" \ - -c "pwrite 133228 63394" \ - -c "fcollapse 0 4096" \ -$testfile | _filter_xfs_io +# fcollapse need offset and len to be multiple of blocksize for filesystems +# hence make this test work with 64k blocksize as well. +blksz=$(_get_block_size $SCRATCH_MNT) + +rm -f $seqfull.out +if [ "$blksz" -eq 65536 ]; then + ln -s $seq.out.64k $seqfull.out +else + ln -s $seq.out.default $seqfull.out +fi + +if [[ $blksz -le 4096 ]]; then + $XFS_IO_PROG -f \ + -c "pwrite 185332 55756" \ + -c "fcollapse 28672 40960" \ + -c "pwrite 133228 63394" \ + -c "fcollapse 0 4096" \ + $testfile | _filter_xfs_io +elif [[ $blksz -eq 65536 ]]; then + fact=$blksz/4096 + $XFS_IO_PROG -f \ + -c "pwrite $((185332*fact + 12)) $((55756*fact + 12))" \ + -c "fcollapse $((28672 * fact)) $((40960 * fact))" \ + -c "pwrite $((133228 * fact + 12)) $((63394 * fact + 12))" \ + -c "fcollapse 0 $((4096 * fact))" \ + $testfile | _filter_xfs_io +else + _notrun "blocksize not supported" +fi echo "==== Pre-Remount ===" hexdump -C $testfile @@ -54,4 +78,3 @@ hexdump -C $testfile status=0 exit - diff --git a/tests/generic/031.out.64k b/tests/generic/031.out.64k new file mode 100644 index 00000000..7dfcfe41 --- /dev/null +++ b/tests/generic/031.out.64k @@ -0,0 +1,19 @@ +QA output created by 031 +wrote 892108/892108 bytes at offset 2965324 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 1014316/1014316 bytes at offset 2131660 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +==== Pre-Remount === +00000000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +* +001f86c0 00 00 00 00 00 00 00 00 00 00 00 00 cd cd cd cd |................| +001f86d0 cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd |................| +* +002fdc18 +==== Post-Remount == +00000000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +* +001f86c0 00 00 00 00 00 00 00 00 00 00 00 00 cd cd cd cd |................| +001f86d0 cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd cd |................| +* +002fdc18 diff --git a/tests/generic/031.out b/tests/generic/031.out.default similarity index 100% rename from tests/generic/031.out rename to tests/generic/031.out.default From patchwork Mon Jun 14 06:28:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ritesh Harjani X-Patchwork-Id: 1491540 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=ICA3tvsp; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4G3M3R5mFVz9sf8 for ; Mon, 14 Jun 2021 16:28:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232511AbhFNGav (ORCPT ); Mon, 14 Jun 2021 02:30:51 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:38828 "EHLO mx0b-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232501AbhFNGas (ORCPT ); Mon, 14 Jun 2021 02:30:48 -0400 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15E65P6N029960; Mon, 14 Jun 2021 02:28:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=dBuup0iFVekXUotKJXJporfakU/ZNXShyd+uI3H4cGM=; b=ICA3tvspuLSFEHzSjU1zWzFwOnIbxgThMC8jBVYmR15+LrMKjUJKTxQW9P8zdg1tNAz9 xzWWyfdtI9+wshSH7BXwlhpu4y32aecN3r90QAP6d9xbBOQYaMLSWr1LVP8mGOxT/0nF U5tj2L2+wqcseZeNXTfefzfJ8q1SQTwWJ2jIb6evWfSX1G6nKDmHBrkgYINtRA4RFg3I hexsdjcZbhDaNmFxh408F5L8jkVUvcYotHKhx4Lg2A5ZgnF9fcghhLkhvuS5d98fTsAP VeH0njId8mq1FLzLThsIBJGgMocBM2h6eWLIKkfL1EiGFQr8wGUP8+c6c3zz+Lqz8q28 EQ== Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com with ESMTP id 395xmjvaxm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 02:28:45 -0400 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15E6Nn9q002952; Mon, 14 Jun 2021 06:28:44 GMT Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by ppma06ams.nl.ibm.com with ESMTP id 394m6hrrbr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 06:28:44 +0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15E6SfFE34079192 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Jun 2021 06:28:41 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4303D4204B; Mon, 14 Jun 2021 06:28:41 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E648442042; Mon, 14 Jun 2021 06:28:40 +0000 (GMT) Received: from localhost (unknown [9.85.68.28]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 14 Jun 2021 06:28:40 +0000 (GMT) From: Ritesh Harjani To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, Ritesh Harjani Subject: [PATCH 6/9] gitignore: Add 031.out file to .gitignore Date: Mon, 14 Jun 2021 11:58:10 +0530 Message-Id: <1e987bceb2aca7c38dc375fd68cae0ac12b6d00c.1623651783.git.riteshh@linux.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: akYWahMtLES16yhyZk6I6HQL0kS5lP-4 X-Proofpoint-ORIG-GUID: akYWahMtLES16yhyZk6I6HQL0kS5lP-4 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761 definitions=2021-06-13_11:2021-06-11,2021-06-13 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxlogscore=768 malwarescore=0 bulkscore=0 mlxscore=0 suspectscore=0 spamscore=0 clxscore=1015 adultscore=0 phishscore=0 impostorscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106140045 Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Add 031.out file to .gitignore Signed-off-by: Ritesh Harjani Reviewed-by: Theodore Ts'o --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d3194e76..7a3be5e3 100644 --- a/.gitignore +++ b/.gitignore @@ -191,6 +191,7 @@ tags # Symlinked files /tests/generic/035.out /tests/generic/050.out +/tests/generic/031.out /tests/xfs/033.out /tests/xfs/071.out /tests/xfs/096.out From patchwork Mon Jun 14 06:28:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ritesh Harjani X-Patchwork-Id: 1491541 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=TRildPWw; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4G3M3S5KCMz9sf8 for ; Mon, 14 Jun 2021 16:28:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232418AbhFNGax (ORCPT ); Mon, 14 Jun 2021 02:30:53 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:53620 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232507AbhFNGau (ORCPT ); Mon, 14 Jun 2021 02:30:50 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15E63dSW179896; Mon, 14 Jun 2021 02:28:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=5/mmIfCHKIhqHpwRnwC1RxXpjFm1VabJGKfr8jJjc70=; b=TRildPWw/kQFQ4SB1Xjx5Q/Oa2H1ibx5V16MKeBMjuyR9Tv0qoZMwOclbBjS2kymcG1F 5kmY3eragFTOtwDQcdxlbJbDX/CNyhEl86BYfPrZ3nIEcLAPPIjzIVZhA5ZFUHwi3tJW IsWxzelvQguKzHR0AFdsU4jDs85LZjDtoITZlXsD5FJCzRQ2pY3ykmzoAUCRsr+XZLRx Wuo1sZsDtelU9op3YpPkfUj0ttJehizRdWp0Wbc5F8eFciLZQTcQbxjs3ma/rx+Hw7Ku DxkVCN+Izhxw3OtJfjdopftDq4QySzhqaphRFCqO9nvmKE8YHW6C16EeEZdverHR4Pdr fg== Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com with ESMTP id 3960u49g83-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 02:28:48 -0400 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15E6NSdk002913; Mon, 14 Jun 2021 06:28:46 GMT Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by ppma06ams.nl.ibm.com with ESMTP id 394m6hrrbs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 06:28:45 +0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15E6Sg4S33358214 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Jun 2021 06:28:42 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 905754204F; Mon, 14 Jun 2021 06:28:42 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 36A7C42045; Mon, 14 Jun 2021 06:28:42 +0000 (GMT) Received: from localhost (unknown [9.85.68.28]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 14 Jun 2021 06:28:42 +0000 (GMT) From: Ritesh Harjani To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, Ritesh Harjani Subject: [PATCH 7/9] generic/620: Remove -b blocksize option for ext4 Date: Mon, 14 Jun 2021 11:58:11 +0530 Message-Id: <8b3d5afe83ee6d1d35f57914a9b0cfa4b5bb4361.1623651783.git.riteshh@linux.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: H7EVy-kYL7M_jlXeQcKYEClM_3R1uey_ X-Proofpoint-ORIG-GUID: H7EVy-kYL7M_jlXeQcKYEClM_3R1uey_ X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761 definitions=2021-06-13_11:2021-06-11,2021-06-13 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 spamscore=0 impostorscore=0 lowpriorityscore=0 adultscore=0 clxscore=1015 suspectscore=0 bulkscore=0 phishscore=0 priorityscore=1501 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106140045 Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org ext4 with 64k blocksize fails with below error for this given test which requires dmhugedisk. Also since dax is not supported for this test, so make sure to remove -b option, if set by config file for ext4 FSTYP for the test to then use 4K blocksize by default. mkfs.ext4: Input/output error while writing out and closing file system Signed-off-by: Ritesh Harjani --- tests/generic/620 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/generic/620 b/tests/generic/620 index 60559441..3ccda5e4 100755 --- a/tests/generic/620 +++ b/tests/generic/620 @@ -50,6 +50,13 @@ _require_dmhugedisk sectors=$((2*1024*1024*1024*17)) chunk_size=128 +# ext4 with 64k blocksize fails to mkfs with below error. +# So remove -b option, if set by config file. +# mkfs.ext4: Input/output error while writing out and closing file system +if [[ $FSTYP = "ext4" ]]; then + MKFS_OPTIONS=$(echo $MKFS_OPTIONS | sed -rn 's/(.*)(-b ?+[0-9]+)(.*)/\1 \3/p') +fi + _dmhugedisk_init $sectors $chunk_size _mkfs_dev $DMHUGEDISK_DEV _mount $DMHUGEDISK_DEV $SCRATCH_MNT || _fail "mount failed for $DMHUGEDISK_DEV $SCRATCH_MNT" From patchwork Mon Jun 14 06:28:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ritesh Harjani X-Patchwork-Id: 1491542 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=O2pYW/4S; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4G3M3T4bX9z9sXb for ; Mon, 14 Jun 2021 16:28:53 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232520AbhFNGay (ORCPT ); Mon, 14 Jun 2021 02:30:54 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:57900 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232512AbhFNGav (ORCPT ); Mon, 14 Jun 2021 02:30:51 -0400 Received: from pps.filterd (m0187473.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15E63gPL016034; Mon, 14 Jun 2021 02:28:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=kBthOWjidHOlZ+s5KNIFqHVBRElK/KDOD1tuQr6UhuM=; b=O2pYW/4SEx4ScKI+Aa0ytksUWwsEsD/iBTFkZFrYWuT9QL5Kzo/QyChwZ/tjoOTuMuy6 A2iebkQaH9NrfJaOowcCtb7dXnbeo6fbT6QGKEatDyrqT8ZhWQ2aO1ZFkRMaf9YFh6FF AbStMg2EXTcLAchEN2IMuJjJAuE6R/zoeC5XD8vYBLbxcu0QR1ZOO3zeRzJmn3HbxoNI V/s2sRiLywVYKT9X4r49zxfI36EP1sKCxXvZUdze1TsYnWYOsXiK4uK3XO7IG3AgvrwN go91uJ5/1qMJUXJVTvjTpeHhG0RifBmpclxZLvbZDEWQbwK15uyT6lXjQJyKlwRy1pzo iw== Received: from ppma04ams.nl.ibm.com (63.31.33a9.ip4.static.sl-reverse.com [169.51.49.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 395xnqmaxu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 02:28:49 -0400 Received: from pps.filterd (ppma04ams.nl.ibm.com [127.0.0.1]) by ppma04ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15E6P12A032677; Mon, 14 Jun 2021 06:28:46 GMT Received: from b06avi18878370.portsmouth.uk.ibm.com (b06avi18878370.portsmouth.uk.ibm.com [9.149.26.194]) by ppma04ams.nl.ibm.com with ESMTP id 394mj8rr5n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 06:28:46 +0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15E6Rg2V37159312 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Jun 2021 06:27:42 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E04124203F; Mon, 14 Jun 2021 06:28:43 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 87B6142045; Mon, 14 Jun 2021 06:28:43 +0000 (GMT) Received: from localhost (unknown [9.85.68.28]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 14 Jun 2021 06:28:43 +0000 (GMT) From: Ritesh Harjani To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, Ritesh Harjani Subject: [PATCH 8/9] common/attr: Cleanup end of line whitespaces issues Date: Mon, 14 Jun 2021 11:58:12 +0530 Message-Id: <9c2d87969d29f34e0939fa3a524886e343fb96bb.1623651783.git.riteshh@linux.ibm.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: a6AhQAk1CrkxdlMJKJI1NFyM-4AP5Vng X-Proofpoint-GUID: a6AhQAk1CrkxdlMJKJI1NFyM-4AP5Vng X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761 definitions=2021-06-13_11:2021-06-11,2021-06-13 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 malwarescore=0 mlxlogscore=999 lowpriorityscore=0 bulkscore=0 adultscore=0 impostorscore=0 clxscore=1015 priorityscore=1501 phishscore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106140045 Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org This patch clears the end of line whitespace issues in this file. Mostly since many kernel developers also keep this editor config to clear any end of line whitespaces on file save. Signed-off-by: Ritesh Harjani Reviewed-by: Darrick J. Wong Reviewed-by: Theodore Ts'o --- common/attr | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/common/attr b/common/attr index 42ceab92..d3902346 100644 --- a/common/attr +++ b/common/attr @@ -59,10 +59,10 @@ _acl_setup_ids() j=1 for(i=1; i<1000000 && j<=3;i++){ if (! (i in ids)) { - printf "acl%d=%d;", j, i; + printf "acl%d=%d;", j, i; j++ } - } + } }'` } @@ -101,7 +101,7 @@ _getfacl_filter_id() _acl_ls() { _ls_l -n $* | awk '{ print $1, $3, $4, $NF }' | _acl_filter_id -} +} # create an ACL with n ACEs in it # @@ -128,7 +128,7 @@ _filter_aces() BEGIN { FS=":" while ( getline 0 ) { - idlist[$1] = $3 + idlist[$1] = $3 } } /^user/ { if ($2 in idlist) sub($2, idlist[$2]); print; next} @@ -180,17 +180,17 @@ _require_attrs() { local args local nsp - + if [ $# -eq 0 ]; then args="user" else args="$*" fi - + [ -n "$ATTR_PROG" ] || _notrun "attr command not found" [ -n "$GETFATTR_PROG" ] || _notrun "getfattr command not found" [ -n "$SETFATTR_PROG" ] || _notrun "setfattr command not found" - + for nsp in $args; do # # Test if chacl is able to write an attribute on the target @@ -204,14 +204,14 @@ _require_attrs() touch $TEST_DIR/syscalltest $SETFATTR_PROG -n "$nsp.xfstests" -v "attr" $TEST_DIR/syscalltest > $TEST_DIR/syscalltest.out 2>&1 cat $TEST_DIR/syscalltest.out >> $seqres.full - + if grep -q 'Function not implemented' $TEST_DIR/syscalltest.out; then _notrun "kernel does not support attrs" fi if grep -q 'Operation not supported' $TEST_DIR/syscalltest.out; then _notrun "attr namespace $nsp not supported by this filesystem type: $FSTYP" fi - + rm -f $TEST_DIR/syscalltest.out done } From patchwork Mon Jun 14 06:28:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ritesh Harjani X-Patchwork-Id: 1491543 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=O7RRK2dx; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4G3M3V2QqWz9sf8 for ; Mon, 14 Jun 2021 16:28:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232519AbhFNGaz (ORCPT ); Mon, 14 Jun 2021 02:30:55 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:17954 "EHLO mx0b-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232516AbhFNGaw (ORCPT ); Mon, 14 Jun 2021 02:30:52 -0400 Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15E63YB0179176; Mon, 14 Jun 2021 02:28:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=x6NbGgHgj1ossGyOem7RBPDReF0JPijJ2u+vwpE04U8=; b=O7RRK2dxh7JA3+gPYOYFKp6zAUfPVVixGnwMS96iV6Dc3OyjzEMI37zH3WAefGhhXW56 s8+ev43hthWJNTRazFDjQOlJGRzC+ok7Y/h8hJ9Qw7zw7Htmg7qrfWKMLnwhCTJpnsm0 K9xewsLlWBJ1wGDuZgGiEOCWiR4bOsaGm3OhhTG72Lz8hfc3VKwXbt8OgG4nNotB2Ac4 IaekDZSOlZeqXwaOcRElxdBijdJ536G92KraUI3VC03WInXAuxOfz3SBlehxmHpFqE+H zBH7KuYlyVbZe7vsEbA1fKf3HiSAbCq1irtjKAbyy5OY4Ep/ZL7IBUhQNDeXtRJpJElw pg== Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 395yxg2gfm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 02:28:49 -0400 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 15E6OGlZ019526; Mon, 14 Jun 2021 06:28:48 GMT Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by ppma03ams.nl.ibm.com with ESMTP id 394mj8rr66-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 14 Jun 2021 06:28:47 +0000 Received: from d06av24.portsmouth.uk.ibm.com (mk.ibm.com [9.149.105.60]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 15E6SjJD33489218 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 14 Jun 2021 06:28:45 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2A05042047; Mon, 14 Jun 2021 06:28:45 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CBD2A4203F; Mon, 14 Jun 2021 06:28:44 +0000 (GMT) Received: from localhost (unknown [9.85.68.28]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 14 Jun 2021 06:28:44 +0000 (GMT) From: Ritesh Harjani To: fstests@vger.kernel.org Cc: linux-ext4@vger.kernel.org, Ritesh Harjani Subject: [PATCH 9/9] common/attr: Reduce MAX_ATTRS to leave some overhead for 64K blocksize Date: Mon, 14 Jun 2021 11:58:13 +0530 Message-Id: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 2lmcz6TvJeQX6-bz6pl5rn7s_Ab7uN8T X-Proofpoint-GUID: 2lmcz6TvJeQX6-bz6pl5rn7s_Ab7uN8T X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761 definitions=2021-06-13_11:2021-06-11,2021-06-13 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 adultscore=0 suspectscore=0 bulkscore=0 phishscore=0 spamscore=0 priorityscore=1501 impostorscore=0 mlxscore=0 mlxlogscore=817 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106140045 Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Test generic/020 fails for ext4 with 64K blocksize. So increase some overhead value to reduce the MAX_ATTRS so that it can accomodate for 64K blocksize. Signed-off-by: Ritesh Harjani --- common/attr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/attr b/common/attr index d3902346..e8661d80 100644 --- a/common/attr +++ b/common/attr @@ -260,7 +260,7 @@ xfs|udf|pvfs2|9p|ceph|nfs) # Assume max ~1 block of attrs BLOCK_SIZE=`_get_block_size $TEST_DIR` # user.attribute_XXX="value.XXX" is about 32 bytes; leave some overhead - let MAX_ATTRS=$BLOCK_SIZE/40 + let MAX_ATTRS=$BLOCK_SIZE/48 esac export MAX_ATTRS