From patchwork Mon Feb 5 22:19:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546321 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78EEE4BAB5 for ; Mon, 5 Feb 2024 22:20:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171629; cv=fail; b=lzydvXguUeC0M8PnafGUmDYMTJ5abTDBsfBvYzkknp5S9/lz/bTa2iMeRhT9ArGxW98Py5mmfN9NctP6020Q6987tKbOXtKxCEU9fA/rU0yqN6kkBqTSmfWzzLevUHzufjWIgnmoOpetwhPKiHp3A5EAleTF8eiV4a+aWwBxUaE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171629; c=relaxed/simple; bh=i+1JGwJaKHqdSpsJNQ6q5hCvxCJ7PtgDkodPTImMvSw=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=P1Fc+t5SVpuhE1hFjayHB8kJkkAxq5e7xgHGkbnNOZN7XSia1IJmY2tBGmvW+tIlIWTY6KJYh8EzrHUPPNgXrDLEiAyxDzMyKLNsupKgAbSAKCN8V2bk2l6KblPGG0vbsDWjsJ8PS7AFf8pXfcGHeT0tIi9beS+MKUVzwsKKZiY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=K5t1uYcc; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=VypijyJc; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="K5t1uYcc"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="VypijyJc" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LDxLe016031 for ; Mon, 5 Feb 2024 22:20:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=f7Bu3MvX9LhBVIkRjUNtHCxnPNOa/OTWO7jZnSkwAuU=; b=K5t1uYccezr3koQTA3PmWBOXPpvHC51NFmFRlFDJ9BC94fBfKmQh543Bd1nmfae53z2Z r5ilPyc6xiNKTbSKIa7C/V8e/EAJR4f6OE11Dw/PvP64vLwxDbk48WjsPMlLT4HDo5BA x5BqeRlLl8XnFpkvN+EM30ODn5eWLolJbleGVUtGMmKXvrCtqrfme+z5E3lqNRN0jLmB Dll7FktR3au5Rn2LZxDm/MBrPTRqVc5yRjzHVRpapTaB16ED8VxKnG0TukNKo3WGTUu9 x1Bd3PY5TOsatNvRj+eIgK9zMbHzLExfo9vjZfxPFnDA83EPiZmw5MYXp4pmnyhSot0m BQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1c93wb3m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:26 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415LBaFR007074 for ; Mon, 5 Feb 2024 22:20:25 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx6k59j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IVvFBCWEGJPzla/Jyc+YvXq1g6P0SBjIytmon3DWGRzZ1FgTJjggWjjeSVg1WNfn1+Sp0Z8ImaJtmI0nRmcsLWYNEQUlr0wQGzZwvGxHFNw/+qgTuv+jcG2P+u3IG4/RdjdZCdtbPwFa4KEe4Nvwlr0N0/81Bb4Vtt7TPxmn1ZtTL47FEDzNQ7BpuQSkerxXyogTNchLG6r8ysftNsQWSzFmU6d2xKX1i5vulzhfk8ikSm2K5sBOnB4L8S1VD59UB0Es38UpFlPkLBVqz2t7Xk35oXjsswyQxg45oi/XD44QCTTzzKuycqu2kyv6r181+v0XamuFeuvmS9Wt2f6UXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=f7Bu3MvX9LhBVIkRjUNtHCxnPNOa/OTWO7jZnSkwAuU=; b=oNlk7EzOohOHR8JXpaP6aDaTAMKJ9i2YAASRhvM0tkoR0en1IX1GlNForXvRattOoDZwL9Au3WLKbG2cTXM5TJpbnAXcPV62OKtXeJqmy8pKDkzoeXClzJjdf2xhQZtWl8qwRAymz7NpSbDnhEih4k6k6ig+H01PrNTh0RcpKLe5J3uPm1ah3COw0vbsUPnhgN5nAGBk9GWtDUkFQsmMIIVt7P73l3vtAXerbuispEuf8n059xoOhJ44jLbKhZk/zxt8CTV97aDkoBYdGVPnT1jc4f1T3xHpuD1Yn42AaokpIz5KNh/JBC8Yrdyopa3x/uLoEQjbcpph9KHRFfclRQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=f7Bu3MvX9LhBVIkRjUNtHCxnPNOa/OTWO7jZnSkwAuU=; b=VypijyJc5B5O6fQhQZgjpUCcHyPA+pdP4Lbhskh6+meriokI7/p3kUmWHWB14Mx1om50ttQYyHZHeK88MVmqLnYpiS8y5pzLTfj5Le0U7LCslkuk4++1a21ltcTPabCA5L9neZI1YBl8UmNTQRz7n7euH9v59ZpgugCjOfli+4Q= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by PH7PR10MB6402.namprd10.prod.outlook.com (2603:10b6:510:1ac::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:18 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:17 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 01/21] MAINTAINERS: add Catherine as xfs maintainer for 6.6.y Date: Mon, 5 Feb 2024 14:19:51 -0800 Message-Id: <20240205222011.95476-2-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: SJ0PR05CA0103.namprd05.prod.outlook.com (2603:10b6:a03:334::18) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|PH7PR10MB6402:EE_ X-MS-Office365-Filtering-Correlation-Id: f27eaea7-95fc-404c-07fe-08dc2698a1bc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8nmZn3srHWMy3szYjlDK1LI5izlLvV/dEjZ4cdLdzBItIoGOna6f83ftzah2isU0kVNWE6xFSRoIupmMHFW6Q0zcHa3PyRHNnw/Fx3C2RShzbpy/PBo4Jhzake48Vysb2CPFS0Q7dSHF85fnPsfos5GK7JeuNmM0z3i9AzvMxTlezBtNFOVQ02ar7h+rWcHtzQA0QISwxJFv2hJX8SaALjGWV5Yj7A/fJglXpKbpP4Btj0IIB6D08iwsZ0/39TzI/NeXumMkz0wS7aJSi3Kcv/1kqkV1hpqHNUWrsmHJhvmgYB7yp6QMEtQATC7Zxpxi2ntzzT1rcnHWWawX127Q/D09brqm+QK4WDTg4stiRlAB48ewFDAkHE/saWG0+UDgyOIYgc/6i0Spl3x7MzPMDaZoB5UMgdncRBrHW46WYTVEWgdSvPvoOICMR70mnHF2JxB7K+Ol+opcW3RoxGO5xmVHSMSWloPdadUvqs/v5LWVctdq1vHBJ+CZyQhjBZ/aIfY3bHHkwY9N3Hrzu6CtMM1bZLH9Jgri8TUNN1zoANf7VFzEX7g4mhIpflGVey0K X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(376002)(136003)(39860400002)(396003)(366004)(230922051799003)(1800799012)(64100799003)(186009)(451199024)(41300700001)(6666004)(316002)(36756003)(8676002)(8936002)(6486002)(66476007)(66946007)(6916009)(66556008)(44832011)(5660300002)(2906002)(38100700002)(6512007)(86362001)(2616005)(4744005)(478600001)(6506007)(83380400001)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Dkgh1229RvWg7UhWyY4j/YZ2bT47gEgC9egGoYAZQCh+EJDxxEPOE+JHzFLNxmq1DkODWMdPWi3cS63/t3jMrRo7k4dpeNdJ0Ae9xp4Mr5FOt5JQ8BpjUmktRi4Ta/sOpG/7bm3v9jXKee9sE0kHhJMMKNH1pzPgE4kZTxdevL60osG6wmaAj/ioBL1WOfIc2FH73cciqvzo3YfPzvwdTbMGTByFUwJmaHNgUbgz3PqFVA1DS4xgo2js0dJnfYDCn3t9115OD2z1by6zwFnCV75qsIHU7kGR6HL/zJiESANhb9zSdkaRZG+54WofcIzZl3U60I+hamOr+O6cZk6jYLqrXmxY2WTLsbkvx+hP6P5/RQCivxot/WD5ZugCf/fTfcmx+GcVMPUnIc0kQ1mT3L/YQ6yNfpHZckVDzMXhxDkt2nS0y0+7kFEs+IxCtgWweIaxIJIWdiJS6nYCfZITzG34aStojKQKGvIJaEmQsD2p+jWZIpKOrnL1FLw0DrnKImk4EX9KazDx0cV4VYcMHOSM9s/BU7UrbjRk7SW1xk2GbA4Dm2M27M5qcIvfTMBzixPFnmzMvX42Pu0xp6IcA7XMQngIQgE5YWcjFzq1ltxyxNjBVyerNBqARIhr8V81rwYs75CNlFpGRABSRf2SQoA+DWdI82sT3BWzIURPfNXw3/tZUivd6qjRTQ/AEZFyeyn3D+rF45mv57q4nfJ/4LNUqSzRfBG2QNK7iGeTPlTj7Gxu3+mVSLV2ilkzqRJGpCClNYtsob3EYIeW7HqgPHpwQquNWH0FNnQ+5G5Q4Fp0ctSB7EFbKa4T+95PGxZ9mKoSVkHDOuKDndmeNSEaN4df+7tPtkwyex8QKtDJEpaWXsHQIoEvxmzjxPupe8TNTvS6gOCKbQ1pPnylVo2hsq8yaMvK9KSguweKmJV00jeGtQxu6hVHOgduupThXd6Aqb0aNNC10XZ3iV1mjk7ZXb1aU6h+mQf3WgFyNMUm08O3JAPvIAViX0UkWXKMHXy9UrmyRrAxbZpAAyVWZ97Rw3FbezdZyyUoJmVmb0aXdVyJVbObP7xwMPPwOwMOLP9SyFBp57JKtTi7RXOPTyOHklqWGFACPmxPYvPQJlmqo04F9RgKvw4yvXhA6xpUS8Hqg9KKt0FdqIWmkq8uQNJ9p93xDBXFjF7yd/s2deo24vFebBxYxtWCqlfBLsQVfoNw/DbPrzLhXQDO/nnqSDs9VjP0X1olYxlYSBvroEiqM3Q//X+djvSzfT58327HvDZnw2j8c3pzfeLTTi5rg4DiF0+CF/jgMtcr6Qkbf8VX6LmREMGo6IBZa4zgDctyNDydjgZ2CpViVPp0OPPFpox8hwicoBMvoFQJTgRseKRUoWrzaERwQZSSZyjCRe5a208VHfYGW1LeXxtUCx6Yz9nqmAPE9oeY1YUjhoxWa2ClCL37GmIbKm8LeJr5m0HqJj9L2amMbtsTWmx/Dj1B/cE2iGHSGZiBsuKTy30VHAVdMQkzzWeqctPjzT80S59ojqkBX5/rNT6fSXM0Y2MLE4XF2ZNRKQAOtRhQCj8SGImHsQ/sDSB5y8g5n4H6mtmL4233tc5rxNz714UDzT75m+7Ca7DdoYIZcDzoPQWizfztCIaDGPh2Cr3B1kFO0F2nIeZXssmwOey2GlD1aXKGsgSf5g== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: +9el9dJ8S+wTlK7W6uSQsTYPQe/c2GO/+cJOY74sdxyk0h7fOMM7GcBqrVTChd0eZIgndg9/I1aM0TodT+tvDpCx79HmnaeVzyLt8ADtocE4A23HsgQQMQry/lY4qc8RvOeY/roJnxfxs2htBXb/JE3CUVMF1KHGhXNiAgkVr2YSDiDxyGR7yAlHeiukKRrKpMQus5FzXaKmfdKRyRlJdYMMNuUXEafmh8iTLtk11KBiiPZxzY2O0BLHh2b6c5KC976ds+v9hM1MrAJZ2vOrsCFM8us47wtTszB/zpt1zBNZbTmlbYhW5agnRK7CQ1gLiJqPCfDd7GaM3Hs+CP1aRkGQtoZWj7H7Rw1+Nq4Ju5ST5SV6PQ0CPtCsuHxUaedk8H4RpjPTp+M0nepQKVSEepJD4rGdvVBgdpgvF7jpWXdo/bqpk0aMWXK9Y0Dh+tD+dLhGOi5Fv6zhCLVBKNISeRBoSIF9MPS++8g52nzJKxsg3mtQ6MS7UZ8cyADpiWBBhM85sXwF6qiJuODTQrUqvqwpL+YYO2M2j6/83Asb0LQofNYhdF9pfM1I5VTXRcAcWEN3J17Toa4b2It4T3RKvfG7/uPNFK1A2SfOAHXZB7E= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f27eaea7-95fc-404c-07fe-08dc2698a1bc X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:17.2503 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 39HblOGXchx3xLtmII2BFwQmmAcwCAcDfA7zbqB4X4qOVshpROW1lDG2yBhD+mfcb9UeD/wgUpqVjFN8qH2UZd2dzgUXggFGSGwxg0wZxmE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6402 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 adultscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-ORIG-GUID: DehMsdfpgZmFGRseNtsUbge140rFFQ2L X-Proofpoint-GUID: DehMsdfpgZmFGRseNtsUbge140rFFQ2L This is an attempt to direct the bots and humans that are testing LTS 6.6.y towards the maintainer of xfs in the 6.6.y tree. Signed-off-by: Catherine Hoang --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index dd5de540ec0b..40312bb550f0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -23630,6 +23630,7 @@ F: include/xen/arm/swiotlb-xen.h F: include/xen/swiotlb-xen.h XFS FILESYSTEM +M: Catherine Hoang M: Chandan Babu R R: Darrick J. Wong L: linux-xfs@vger.kernel.org From patchwork Mon Feb 5 22:19:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546322 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B65B94C3AA for ; Mon, 5 Feb 2024 22:20:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171629; cv=fail; b=L1DPKBfZsLijDts2d8Usr/san9ihLTtl4wN8JN6bl24LPU6ZiRNShBwWAmw7QKoriAg2SpDj3VEIftsR10d69UpijpIISTZ/OKaqmEFDJ6Edf/dpOIUv96evRwD9iQ90dVNoWxp8To4hYrvxGKvz1NlO3Ej7sUyXZqFl01DDKC0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171629; c=relaxed/simple; bh=VvzN4yu1fmQ0VYqSjtKVezznRw0LavjhUkFiu0aYWsM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=gZyq0UpLmklVMsOpuaOQMOI0Wkie2/YMfF4DUOQnQWws66Oup7qoTh+HOg5XgdA4JM1dpn9UDBzXjjXeZv3/P2PW7Xn5gFjWjmLrvabnNoM1+FbVZGjpd3OBOdCeZg7JHo5Lc3JOzU4DqxmhdUMsuWH+uM4pjt5knpcmNe6MtY0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=NfamavOb; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=WR1VJn2g; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="NfamavOb"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="WR1VJn2g" Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LEBhC017450 for ; Mon, 5 Feb 2024 22:20:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=BlYNkxjGWSfbfZQ+XxFjmVB/mlx/td51hSe1ITYbYsk=; b=NfamavObzozLFfbGAPlUz+QynpFk/ZN2/kA3LFPDVsaX66YJobvi1qqZpicvMxD/D22y BWUblrvlKkSEzTtU9dprvmTmhBZDw4fnG+dLbGg46LkiVRWRX8P3PKiviqkg+UAVeW+F t4KMFOjvyXGyGYquREDTCkZ+f6BKY1KFb00Im+4xao2+NgMktG6bN3Jm7Qw16C6pnLXN UrNYdN+UtIF+ZFT52UzdW1NDzb5E+iKV6PUTqOEZCr8jG00Ehrhay1Fi3LaHxz1zdg7C 6hY7w1/r2VwmaNPFjCbILcbZnsWsyy2YBCrGBJZJfqzGGVGBEPdW4iCpWswzTfvlttsM xg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1d3ud830-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:26 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415LBaFS007074 for ; Mon, 5 Feb 2024 22:20:25 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx6k59j-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dx54Eo0bQ4ISl1PCJJYQHa3RlOMiyaGpl3++7v6N0WRj3JyJrxOt39pjshAWnmiF48R3QPdjEa6zowgNvO/el2xxFImRijKyzmKvAvjifOclyNVXT6tZjBEah+M7tQrrBE9x2IHNsQ0z9qjM0O8KDSHXq+oS54CK0ezAcpT9dwh0qD+nIldFebb7ueXVBgjjSu+0gDKN4ySWsydCANgdlbwbfDEVo/2bEj8OxWgimfC1jAfV4yxPwhpj7F+6VqzPMqvFOBZYlyYIGpb7GDqS0txBrdbPkNwWmsN4ibSR/x/3Lwl4ovwgemLzbuDdnlywD0AkNvZkR9q1dKUmn38GAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BlYNkxjGWSfbfZQ+XxFjmVB/mlx/td51hSe1ITYbYsk=; b=CjMuFXWrg8u+qgN12k+GY1otjHd6JgmQBUTnQdKXS7bzhPXgdunupme1HnVyna7LO71Mj+xctijoB2au9/tFAyIfnJvS9+JxNCFlIVGVBpEgIY1mBo2LZZN8cNJsQKOCXRDN2yMS7R4htpL4XEOYpSzRs5Scgjvvy+a0UR4pGRmrxv3ehEwPs4by+hiUJzkEER0HeP3wqJ1xPXGSQBM+sCJAifsrXXUrPDEuHlLTAclhguTV9iDudd+64FTAIrE6/qfaGhfRF7ukYxdky6bmuwPiLDeOnew1DoXfuJGdG+1oApSzUhG+VBKhUqTVhb6SAaKML/b+CJigOouTI0XDhg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BlYNkxjGWSfbfZQ+XxFjmVB/mlx/td51hSe1ITYbYsk=; b=WR1VJn2glOOEwYLzG4JsJZkqpW/og4A/DZRPn7FwXheqTEjOQtAqTUd/4dzPa91JXHYVDjF/O0X6Ido5IFJ6BmBQExxbhRpAN4aIM5pVp24x4ELRLHXR9JbOkWGwCdOvGINnxaGmoMVPI1he67XyAAkddnMkCTKaVuwvk8L68hc= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by PH7PR10MB6402.namprd10.prod.outlook.com (2603:10b6:510:1ac::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:19 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:19 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 02/21] xfs: bump max fsgeom struct version Date: Mon, 5 Feb 2024 14:19:52 -0800 Message-Id: <20240205222011.95476-3-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: BYAPR11CA0046.namprd11.prod.outlook.com (2603:10b6:a03:80::23) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|PH7PR10MB6402:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f1aeac0-c2c1-4210-0dd4-08dc2698a343 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dMA+CL9XXFd7rcfTmITWaBECi1YBaN1MBjMnn5oguUYPO/btP3fqOjZUirOKRGNv2JSXuNvzwgqrcRstDTZoHKFOMilKrR319YoxWWzxupsmHJtw0IrpBUxwQSKC7W+6Ifd9A/xp14GkBKiNkDyM3w+gaJeXztzBJi0GP21cO0VOsn9Pqkls6YOmjYGRTWIa2o7skJfVTcSTH47rUcHqSDUPa1WbBlBq4/EL35RfRehZVygyrZpHnwzj5oT5PE14h9utalcCrNf+8uLLov4qIoqGPL0eVC7/wom4IJreM2684GVcB09QeE5Ye/X1cAtD/sjSumQEZaxQgA8OwG9l0asZup6QB38sQsM1ASs18cPH21I5Q9B20a2dTlV09DvP2sRv49pvfNWPmfyQYtauyuBWmrCeF0VsgbqCSoQphRXVGu0Tk/va9w6n8IZoAHKgPVrxUK4Q2TGwIpw0PYj5SDzbkj5PXEiIyj0+7ku3Am5wOmcqLpptDKgBLELBsrx4afwCSdej5QatenBjvO96ZmGRpxHa/y4FJ7EV/80MH28s1snuXDJhx7zh9UpNmujq X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(376002)(136003)(39860400002)(396003)(366004)(230922051799003)(1800799012)(64100799003)(186009)(451199024)(41300700001)(6666004)(316002)(36756003)(8676002)(8936002)(6486002)(66476007)(66946007)(6916009)(66556008)(44832011)(5660300002)(2906002)(38100700002)(6512007)(86362001)(2616005)(478600001)(6506007)(83380400001)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Cz3KNz3fsCX/D8TGqRw2FbsqmfMe/WXRM8Y/Mncd4SBDCXQu58MDeU9sh5uqbpqqyfVuR3ZTQzU8MkOZ6KYia4AU45w1VkqZd2jKpHAcf0zAhejGpyt0twkx0Exov2hbE9tTVpo7OOyau/+RQ5zN5KkXGCeDXur/rFuKgftS+zWaWEc5tn9cpPbxCyZLhnvdKus8xsms/I/4dj8ONBOaIOjMkOgUw00Z6dXuwu21lEWy1QDZ8qw7XXQdaC755zIB4ZbIXvqwXdbzcul1DttEbBsbLguJgZZCVpy1atzc94aoKbDSsMQsqNhJTyixqTIY8LKrFeY7RAIMWENFPJY56/JlUcUDSq/3Fx44KqtU55+CaTwu0DUvTYt98txCVfQk+sexVcTEOOW1h2W0uoFD0wTUD30KfxHW38RmzjDD2DrKaCgCmo5qwcQexmyt0/7jg3JCXfVF7bTe9iQWwYfYv6Uo0M/LyQGRN+E9TrTM16VO7O0AGnKlWQSaDl1bgFK8HgI0lr9Jo6uTEO9zlh5I3of7PBcbY/owfOuFfapLq5vidHkxuYGhdqpruMwxCWPmj7oz377RmkxzrSsSqWEAr3ZT7DeZltC6g8u8Jo1CUP4/KqBKcVLwy21h1M3ZNJu3J8P0eehpKFMql7eoA8psZAIavAlb/RqT1mKKgpFrzJq3PZ4RKC4qLnbXEV+N90i7/i0nB7e6hePAu8Z0j/iKQs7osTCWnKowo0o315M/EjA0IzQKBBfUiNNSaJG16r7BwG9xfsezY7xxKNlqWipL3EDbB2A7FR50AcITnH/y7PR2c/IBLotij8qk8R0H86R1I5OQugD169Dt1HGpBC9Ng8FPzSwONVbf2vAg4BvvEC3iiE+JM4zwA+2NSosEdg4UjmL3q4fNm5c9P+OhhFREmaa4mc/otxsuHkh0iVN5U3h1zLcJa3vZI1Pq/YndYMsUqQJwTaVy7cLcijifn4TwLBPrMmo8F9fYeG0bISIPxDYpdUny/BPeNDdKrImI0A4OEnjKA1MYm4OggNIEvHuDWDbPhtALMFgzoPwAxIfeZNW2fEr8GqTx9QwD05PZPFwY3fY7blqYiDB7WG20DL5TFN12n1pxgmFIPjULU3N5Yw3YnxBdhs1bLBrw/+zEk+/DuzeH6YF5K9TtFWj+++MRnGVidcA0HE++cSE2N4ifEgYKFAX2qgv7PDSnN6m6S1qIBfx2G1riI3qli6LLtc7HCxvv3774cbGMGacW1b2M/Smbwg4f52dahhg6CnnqcXCnbe7YpZQGDLAPsJIXdnX0OsMXTVyQW1+Uq/KKHfoQt9uvsW88R/cVG4Rn4DxO/vhWpwQJ8uJI6IaZFZpMsSyoKwg+eecle+yMXecfNb6hRVgeSf7CHrTjOuHaGn7wbxNnf/fUr0UV68Y96NnBuFXPmi4fjTC9eNznFWrbcmRSY+mbGHuy7ST9yN2hnEh5sQLghA0Xo9m0m5R8VghvapE1s8WQ2XeDKbTGn+IeXEBldNag3iZ63pHD3uuBwK9LDHmahapj2xp9z0erzq/RrmKRNvKwWAOsru93Rcm+II4NkU+F+3prJEqfnp+t3I9imo/8GozSOy4ydFVXr8A6UIBXF80hTPBAFLygloWWYQ44+uYtMXheSsy2HCgfNIvqsex1DdBGFLjCDl8rOoMnhX3yyQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: AUQpvwn4l5V7DBEMCxjCrZF88IoB2cIRQt7K+khCkYvdD4AKiaH4KnSVgkQxYUS7rh2df5Ir4xulxNplVT/PQ21ZCxjfzfp+VFERaoJ9cthrBLEy/A0KryCpibGuCRkwjcjWWTfP3ihvxHlj0xL0IBfv7KBVKT55tvtmEuykrzl0IiABwsJf12f1yBH78Ntdr13ro5C4okWetI4A5pCz+FMOIYrvULtO6w7LCLksxjmk3Ea6qre5sdDLZHM5Yh/J14I8Pf2nq0im+86x/LDBm2HSXJDRHSqO1+BWsGwx+Y3ruH+G5Vp290h8mRRK/thPRmuqVd08HQVVTiwjC/dShUWBCmP/XNeXBHecjNBniIdZzU6niNPnscn2R2uuj6sT94Cu5kBy8ZwQO+dPIQFmbTCzFSzf+yixbd/OLP+e99/bU5BH4HB8le5nzORqqQKvEra4jzfsJ5BDT4kZbmBUvMKFSpgYEA0oc32PxsrK0Lzrhki490MQk9+o+HE28eXoWTm1/4xDyks0gFQ1MNFUoH9lqeWdhT4HmYdfo3YRPXTFS1G5vId30toSgoh6vynbwX6UGROiLmVM6eQU4snwKT0BJXaGvPYAfeRGzboahTY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f1aeac0-c2c1-4210-0dd4-08dc2698a343 X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:19.6594 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: TLO1+v8UQ0N3qd6WRvwGfKgaKKAW6qb36HvITOo2txBFbF1/1cza/vfL8K9A395qSqnhTi7tsmHMP1qCNualbQxF63/bBt6Tuv25S8/wnCA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6402 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 adultscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-ORIG-GUID: aU4Espj6QUqJbCcyxfVj7C5_0iSbVhw4 X-Proofpoint-GUID: aU4Espj6QUqJbCcyxfVj7C5_0iSbVhw4 From: "Darrick J. Wong" commit 9488062805943c2d63350d3ef9e4dc093799789a upstream. The latest version of the fs geometry structure is v5. Bump this constant so that xfs_db and mkfs calls to libxfs_fs_geometry will fill out all the fields. IOWs, this commit is a no-op for the kernel, but will be useful for userspace reporting in later changes. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Catherine Hoang --- fs/xfs/libxfs/xfs_sb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/libxfs/xfs_sb.h b/fs/xfs/libxfs/xfs_sb.h index a5e14740ec9a..19134b23c10b 100644 --- a/fs/xfs/libxfs/xfs_sb.h +++ b/fs/xfs/libxfs/xfs_sb.h @@ -25,7 +25,7 @@ extern uint64_t xfs_sb_version_to_features(struct xfs_sb *sbp); extern int xfs_update_secondary_sbs(struct xfs_mount *mp); -#define XFS_FS_GEOM_MAX_STRUCT_VER (4) +#define XFS_FS_GEOM_MAX_STRUCT_VER (5) extern void xfs_fs_geometry(struct xfs_mount *mp, struct xfs_fsop_geom *geo, int struct_version); extern int xfs_sb_read_secondary(struct xfs_mount *mp, From patchwork Mon Feb 5 22:19:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546323 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 41AD64B5A7 for ; Mon, 5 Feb 2024 22:20:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171630; cv=fail; b=SObD0wutk5wQwLadM5YmEhf4mL09VH3APUxVb8gV9KMo5VNsE3+kPIpdtYWcLcwYJZaOm5Q1FyevnPt9Qu2mRwl9l9AfVEjYcUgdAl3YGmndAmCXAIZJN/4o311qMKo35PEefOKoJJhJX660v65ngbrDU2wzS6Lr92iw4n5sZn4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171630; c=relaxed/simple; bh=eG8awgkBXJqira4uL1/ZlPFLa/Fs7ncDGlTeGM5stEI=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=cyjQVp2SwKi13T87A2SNQ2n+vgPahdA6PjrzT/hwA3FjQnQFOh07TjY0Ra5sMD+M6ATFdwpI5HQzq84NdURqi2SpEXDrqEbOzlJdRTkVqubtiVzSflCd/ru3C02uIuiZdrQa67mBvbHQobXgWrFU6b9U4nl8zRXV/ZFesCb1REs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=cl1F2j8/; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=mgyA0E9H; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="cl1F2j8/"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="mgyA0E9H" Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LDt2G017352 for ; Mon, 5 Feb 2024 22:20:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=WtMU5f9cz3oVb9hB8U3CqlFrG1In6pQNeER+/0nkoMM=; b=cl1F2j8//FGbWhMm9QcUqMa6NPbchqXcvN71NI0dSSIBJuBfNYushOQrb1PJJTRwWvcB dhX6uXaaY67bjc9XevPrkCq3VQI896NPmcTiI7CvE8fNTYkPb3IshpaSGo4iK//jYKi6 SxRe5i22VkvoCO+g8rk5N0KBEAuifDkzT5iBsq48zvbeGXVm8w3g/tJ+DB2t/fJZR0kH yHmQABSchUwxbgi5AOb8hCMBQtACqUF5eR12Tujai1ao9GO2yL4TBUjpbaASKaYFgLoS CZn2QGugtZB1ZeWqNxfoUpO+qWmOZC/ufKgTVAC91MHagfUvqi0ct6wCOPzuSe+tMs06 Lg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1dhdda6a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:26 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415LBaFT007074 for ; Mon, 5 Feb 2024 22:20:26 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx6k59j-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IymHI2zAyBaoudiBrLDGROakRC6qdW82Qc8DbWaG/MhTTpWN+RE/ERLX9bIcw1TVPMG8sav0XvDj7ESRTIMhx2cU2sPlJRY6IkawEZCNkkx1FryzwORYxZhTFb2OroOhnxcLqLKgcnCRdQzeX2Vnjy4t4aVjGlf0STUjTs0r3nTaZbmD5pIgtnWLycd3UwG1e8t8C3pb09Y9UXjyFLkgqSjl4xJScY5YQXqs8azz4nQI28cnJSZnKOhYcJcU6uL1TLTs3jzXb6sESKpM2/vWdeg5Ye/+jIuZUl7MqiYH5//tCb/zNdgqEqFlFzye5JYFoRUB9Dq3stvYiuC82Oj1YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WtMU5f9cz3oVb9hB8U3CqlFrG1In6pQNeER+/0nkoMM=; b=NwFoMh/49SjDmJtd4h0CwAK8G5DrdtwHWXk6QMePJ6a1ii/lIzKqeWw5ToBkX55qwUE+7vY1eh6hGb9Sy0Y5+z2PbKiMC3Q+meEDrCpY8l/f7bcZH0sNn2F6eznylrdXQDsT4Q7CaDufd62/YDK9HexlsKc558QCaZqdS8nPYd0i7VXhfMvZet3aKEZb2cJL/LLHQGTHk9IRN/JdefeQCYrD83H431Ssq9tUN8SVoWWsy5nT18YeoDRmcfSwn02nwLal99BcxY6uvvGydv/2e4AChOo2+kpgGySsNdAY4CD/7R8ASMvnAk+e4MqW7Xinwozo1yX1dqyOy9h8E8vbbg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WtMU5f9cz3oVb9hB8U3CqlFrG1In6pQNeER+/0nkoMM=; b=mgyA0E9HQWdecyvJah54Crv5jrgwBxhPCawyDsFox3Ze9Id/H+NUmY2UABjFEr7ZkONMqudKhEmTtR0fEd3rJdfWdNM7oDYuWMK+bOTirLaPCT8ZT9gChTGQ54lywZL3TErcQtPeBXLnPyrhn6odwKB2A+JDZV4Wz0S/m6TLEzE= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by PH7PR10MB6402.namprd10.prod.outlook.com (2603:10b6:510:1ac::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:23 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:21 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 03/21] xfs: hoist freeing of rt data fork extent mappings Date: Mon, 5 Feb 2024 14:19:53 -0800 Message-Id: <20240205222011.95476-4-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: SJ0PR13CA0174.namprd13.prod.outlook.com (2603:10b6:a03:2c7::29) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|PH7PR10MB6402:EE_ X-MS-Office365-Filtering-Correlation-Id: 67ea96ea-1bc2-440a-253d-08dc2698a47d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qWqx2dO1iR0iKL505N2K1+fzyfzlQJs4WbsiI1cPc1r0YqglWPZZQAJRYrqdIRxcfRJ2RPASZozFc/EgRQkFjdp3u8wuS/6yWTcdsb0P176BhrFU8fDtQjMk84FIIdudrCcaQ9zKh80V3ABtTrRPMuIHyJk3laW6UU2E9fkBAWliS3idn3sJM9kY3G6DQ7BSfd14XeUmwUD0VF+51ycvNentPuyYQcMsP4CAEjFA8E6hkgAZA17KnYpyvlIdByFbGg/DYIbvxZWUmdYs+PHOz5XRr8p9tcx9jSHXmFSDwXQX5mNjAW/UkRdqtCaEchR+PMzXJQ7IvOJj8pMlwEd+WrvuzLzdpdT77ozNFoJBjmnztiLoWrnh096IXe43C9VKgpEgvzj+NIt71fF1MJlcoXyfgBJ9R2YwXMqBpp+oeQ/cZyoEITKfI3vwd/jDPk5o0vhET7fqji6ZRNVG0YB2kNW7EEVoItFtR2pegEsmRx4sI3G+KNNZghOjnKvEKhbSyXr6JUHsenUbn15FqUch4W8ATsg25nQWGIEqI0w+TQzm50FMXPy1ggS6pJQJU6PJ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(376002)(136003)(39860400002)(396003)(366004)(230922051799003)(1800799012)(64100799003)(186009)(451199024)(41300700001)(6666004)(316002)(36756003)(8676002)(8936002)(6486002)(66476007)(66946007)(6916009)(66556008)(44832011)(5660300002)(2906002)(38100700002)(6512007)(86362001)(2616005)(478600001)(6506007)(83380400001)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cAdd9sw1K8bJiXekCH4n+ajK43impFu+e0v1xmg2dCjOMgxKIurk6Um1q/Zyucl5BiFjEA1svMMyXuMXB2b6gLNWaAaXTJSU2OYdkKeHz4Ls9MC9yw2hC400REy7dmu6Cg++GQqmTWw/J+GPbP4CrZ4OShwO9LuAMyDRcuiDnFfo2HKi4cnYEsWjxxoAmUUkE2/P/9HYM1MvrkBYsouIQ1yttNPQ8UN7BDhj+DDqWOi2ID5HpgDNxk/WU0YLtljw/TJA+PdL3fkq8j/qjL3QRjpM9XhUDciIWj5qlxa1hr0xMkd7HqHmy5b0Oog8RVYWaEzfzAqOIsgxooftN/fEWMdTccdBiy4ZZRRvb7LXU+197CL3cj0sWNGLXPdXl3vymxTSlKe1IzPasLkRtxHBQPMxDWdOb+x2P1KZmPS5nYsGrWG/ETQA3V09uU6gCgm8o851HIPgdKCsg0LRxHMhlOptBAbQFW1e4v5ihLEXTmMjutr4q7ik+mZePv2tScMd1WPj2ochdGHTOfbYfrrw/nE8/FraGPAyKIgD/qSMHOiq11LGPoG/2CA2p6IMBuTZfLj7Jemj/csMnMwsAGNwy2KDCj3RgkFNE7XNS7ZRxMrpgaW6lvpq4mZu2Hw7kvJ5PWT4YnuKjhR7HIfOoRbp/d9tFbysVbBaJ5znoLh5IWJPLz9e9dvyPSJMrFHOX+AKzKwmt/sq5X5d4OZPAlK09W6GQXN2++7+X/XLnAIfjrNxBDfnYrelbf0NhxhF8lZHUFT7PRNZ4S9TI+A+4d/u+NXNjhGyFfnX9NmXJDUrrjvz5vj5V3nXsXxE0fidco9hX7rXhNg2eq5foxZYoXUDBo5zB5xjvXFNBBUr2LwzKzMpry4t7d2TB0yHqaR7fHpv/qPyKiv4c6TlcxMqr2ci3SSIGNYPJVbyrDfEvE5G0PAd46t458zFQ8LHREGSJtbqzzWbq/RuEfGeSnQA18nQV49hYmNagl4QqCMVQGrBsCqdVdxOpsd7ULWLlIRCRAsfmNxMYl3pU92TKCKzE7k5wzFV1SjSK/PKBFPN7XS4tYVhZYKcLdIKDpZN8e5khhGU0Hgj6YMrPHzfxjSc8oJl1hUsLcMy9fs1JXgQII3q/jEx7vG1XQ5HrTNS98bspQlCWRlYV3luVM9fzXv6GfR2GLCzlRlPvHbkumizRuNOYs+jniL3OfL/HfjzjcaK5APaoQWaGbnk9dG/i1lF7d19FSv+paVdrwLkCSWm/AX/TOG1a7bslFaAXBjmnkP6XZDeHcGXqxYEvp1+f28fl4MuiiTBYkQtMvmLdO9SoMhGg24Wm1dmZdYwCsQY4mn373CevqDPd9BMTxw2rgq9pBTIfrsVPXMKXBhO6NwvmVKb+BRwUEhq9Hq1KbVkr6JMPijTe8Sm5NsEB1rLuLrW13UgZwvG6YLxlqu1Ev3Z/9DrB8GkvKs6sYBsnfL/DzeCyolVsahszK9XNEzEB3qNttx0q151Su+P/dxwLsNDc2UYEkJEsXq2lvpgQIYyOhMQLSgP2iu6z75pr2c9g4KDgeHlCcZKO9Y7tqIpxz3n5o7VgA0hW5aJ47DSYnlAr1oXWrL87FcbdTo6IQHTH3xQK/2Zb4RNkLOr/eiMinWndSemXiZ1ILXxvh4ZWXU4mJMFs9f5wzkMDoZWSe7fo3lwo4SSVw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: CCYKjumWOMW14QwOhthSgTQRNflytGtNzMMKxqZh5iLrnWYO8CSMhul5zWEfSGc35KCc5JORwwtAnQ2v1UoLzlx1HXJmKhQtOiISJEg8nUd9Qo2GGZgAH7zNu1ZECa0LeXvSducRAN52gE7NgdZNkKaaJfp6xAyXvoLSkSxGosX+PMW8D7rQ+/NVKm/uj+Z73Ax2Swdl2ovVnk2PopzYTDX6LjLERoevGxxY20jvJ8g8uBU4GCvjK+gs3yUtVYlsFPh1CA/wf8vVT5cw127tT47I9o2rSG1d+FlE9N87ou/Zh2PF0m1eEGSwTV9kKLjj2AuM35t5R3QBsMtIkl/WpZa2HTT9hzefBzK2qXfnglolYPTbj11ts4xdX9K0xLMfyMazBOd7qU7WsHDLcsD5H0xp/XCcp82IK9XVefF/SdxgtbcMvfRU7raji2cIjQ7bXkfHkHNUrQ7CeY8QizNzTdxj35CPpcJmqL86ZlJ7zPzUmptp1LPrkNsYWsJmS0oWEI9FjNhtZfOksAXP8vsG4/VD0icDyp7YZ6wgZIqjyxjBbxQuQEGGgziypPRP6sbhQosGe+gvDzKs37tL9BypOJ7l45w7QIQbVXvo8sOZo5o= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67ea96ea-1bc2-440a-253d-08dc2698a47d X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:21.8080 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xBsctnAMU46+D3uu/Vbu2HE4VvL+Gxf5ib8vJEVXkUXBwNdhOUdFrf3NOCsB4JtBY9nvJUyLHb4mo2rmk/I8f7rHjhG4hOxkm++1339Bjdw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6402 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 adultscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-GUID: 9IggEyOyKxBAAMJgNtvbopCI7aSFQlO2 X-Proofpoint-ORIG-GUID: 9IggEyOyKxBAAMJgNtvbopCI7aSFQlO2 From: "Darrick J. Wong" commit 6c664484337b37fa0cf6e958f4019623e30d40f7 upstream. Currently, xfs_bmap_del_extent_real contains a bunch of code to convert the physical extent of a data fork mapping for a realtime file into rt extents and pass that to the rt extent freeing function. Since the details of this aren't needed when CONFIG_XFS_REALTIME=n, move it to xfs_rtbitmap.c to reduce code size when realtime isn't enabled. This will (one day) enable realtime EFIs to reuse the same unit-converting call with less code duplication. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Catherine Hoang --- fs/xfs/libxfs/xfs_bmap.c | 19 +++---------------- fs/xfs/libxfs/xfs_rtbitmap.c | 33 +++++++++++++++++++++++++++++++++ fs/xfs/xfs_rtalloc.h | 5 +++++ 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 30c931b38853..26bfa34b4bbf 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -5057,33 +5057,20 @@ xfs_bmap_del_extent_real( flags = XFS_ILOG_CORE; if (whichfork == XFS_DATA_FORK && XFS_IS_REALTIME_INODE(ip)) { - xfs_filblks_t len; - xfs_extlen_t mod; - - len = div_u64_rem(del->br_blockcount, mp->m_sb.sb_rextsize, - &mod); - ASSERT(mod == 0); - if (!(bflags & XFS_BMAPI_REMAP)) { - xfs_fsblock_t bno; - - bno = div_u64_rem(del->br_startblock, - mp->m_sb.sb_rextsize, &mod); - ASSERT(mod == 0); - - error = xfs_rtfree_extent(tp, bno, (xfs_extlen_t)len); + error = xfs_rtfree_blocks(tp, del->br_startblock, + del->br_blockcount); if (error) goto done; } do_fx = 0; - nblks = len * mp->m_sb.sb_rextsize; qfield = XFS_TRANS_DQ_RTBCOUNT; } else { do_fx = 1; - nblks = del->br_blockcount; qfield = XFS_TRANS_DQ_BCOUNT; } + nblks = del->br_blockcount; del_endblock = del->br_startblock + del->br_blockcount; if (cur) { diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c index fa180ab66b73..655108a4cd05 100644 --- a/fs/xfs/libxfs/xfs_rtbitmap.c +++ b/fs/xfs/libxfs/xfs_rtbitmap.c @@ -1005,6 +1005,39 @@ xfs_rtfree_extent( return 0; } +/* + * Free some blocks in the realtime subvolume. rtbno and rtlen are in units of + * rt blocks, not rt extents; must be aligned to the rt extent size; and rtlen + * cannot exceed XFS_MAX_BMBT_EXTLEN. + */ +int +xfs_rtfree_blocks( + struct xfs_trans *tp, + xfs_fsblock_t rtbno, + xfs_filblks_t rtlen) +{ + struct xfs_mount *mp = tp->t_mountp; + xfs_rtblock_t bno; + xfs_filblks_t len; + xfs_extlen_t mod; + + ASSERT(rtlen <= XFS_MAX_BMBT_EXTLEN); + + len = div_u64_rem(rtlen, mp->m_sb.sb_rextsize, &mod); + if (mod) { + ASSERT(mod == 0); + return -EIO; + } + + bno = div_u64_rem(rtbno, mp->m_sb.sb_rextsize, &mod); + if (mod) { + ASSERT(mod == 0); + return -EIO; + } + + return xfs_rtfree_extent(tp, bno, len); +} + /* Find all the free records within a given range. */ int xfs_rtalloc_query_range( diff --git a/fs/xfs/xfs_rtalloc.h b/fs/xfs/xfs_rtalloc.h index 62c7ad79cbb6..3b2f1b499a11 100644 --- a/fs/xfs/xfs_rtalloc.h +++ b/fs/xfs/xfs_rtalloc.h @@ -58,6 +58,10 @@ xfs_rtfree_extent( xfs_rtblock_t bno, /* starting block number to free */ xfs_extlen_t len); /* length of extent freed */ +/* Same as above, but in units of rt blocks. */ +int xfs_rtfree_blocks(struct xfs_trans *tp, xfs_fsblock_t rtbno, + xfs_filblks_t rtlen); + /* * Initialize realtime fields in the mount structure. */ @@ -139,6 +143,7 @@ int xfs_rtalloc_reinit_frextents(struct xfs_mount *mp); #else # define xfs_rtallocate_extent(t,b,min,max,l,f,p,rb) (ENOSYS) # define xfs_rtfree_extent(t,b,l) (ENOSYS) +# define xfs_rtfree_blocks(t,rb,rl) (ENOSYS) # define xfs_rtpick_extent(m,t,l,rb) (ENOSYS) # define xfs_growfs_rt(mp,in) (ENOSYS) # define xfs_rtalloc_query_range(t,l,h,f,p) (ENOSYS) From patchwork Mon Feb 5 22:19:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546324 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BDB394BA93 for ; Mon, 5 Feb 2024 22:20:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171630; cv=fail; b=OhGqH4WjTioZ321838eoiz8sQ42/rpe0kf3QK6SlmTF98cgyv/m4nnFNmdr9gjUnJjwvSg86L5bQ5aCmyGcTyGx328cYV/YeSmNz+i1KcbCcc/Xq7H+GZsGTyye4P+swqdeFxfm/GfV73QADicqDb5/qGZbbZvkUULyvH882naM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171630; c=relaxed/simple; bh=lRpjgFQMQWbjh6ZkGtiVxygUvsSeURvFKoxMTZrCUvw=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=m2AhKEQKYPtwAzmzCHNDQgokNUMm4AitRarLnnULtM5gqnV7wYrhxBN7UKIlSnKUY4DFeAgDJjoWtyDxAVUKDil12UvJxx6HtjCy7kZA8JQj15MRyDaq42WG6fZ6mZy9MriWE3OyE0RXjlvr4UPr4dL9hnQ5bsEXe6Y/Y0mriRQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=m234xSh7; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=WNJkQJf9; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="m234xSh7"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="WNJkQJf9" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LDxbr016015 for ; Mon, 5 Feb 2024 22:20:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=vA8fwPw/gtnmEWpERlcWOfQ2TjQ36X+WkUwZvqYm/j4=; b=m234xSh7UJqGbsCWGjUcqH0HKU9FAhRovGDdxi8OVN6WQpLlk7L/x1UjbKCE6eSwiCIw CokLljXIclKqjRpFeyIijlH1R5N/E0AlLRtloylwu4+EBzfLDiBU/epZwBilzML9DfuT dhOaxXPylKHOWAHNRonswRVwl/cWDtTAMyLVIOIid3vEnPS6IUH8Wic1gwlmVv6qgBQQ K4km7POTma3sVYihObQOCk/wIXPqSkmILhxDJbNwAf8CAextEpJxzJ3MAEXlyNeNq64Q qTKh1aIUZeY/PQN8axi/jMEIZM2jveCq30qilQcVa5Xmueab391nqM8iMLoEWv4uWmhY fQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1c93wb3p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:27 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415LBaFU007074 for ; Mon, 5 Feb 2024 22:20:26 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx6k59j-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C63EoNaJ4umeewZjSlC+YPutsEDWql48p6xzJGdicNymOHHAjSKyHLxIiwVwbKkgwy5Ir7VNNpqEOdgekDGdhMN649kKohmgY7R6Ig4TA7dYtAMxSAu0Tapgn79hSghe0WmQZOc3DlCYQX3/tdthS9MN6BWz7D14Vl/G3lHNqVUYX4A7g1+TZ4N7xiFNOLhKN4S3GNXfaEvB3nuIyqDZlF7pucMfdP4WUnyK+ImClQcQZk7UTbRU862x2KsWi2a+g8edf8XixQtxJjZKNepAf22pHUegkbJFwO4pzzo62OD3V4+qYbeFC/zBlfBHPJc/BGRI6TGouY8uNLBVkEb/XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vA8fwPw/gtnmEWpERlcWOfQ2TjQ36X+WkUwZvqYm/j4=; b=AVqv1tDDhjyq/cVkj6189lVuVL9h5PG63cO/mpIGyieYftanx+PD+WAkhg14jRJ4CTmDC2R+jkQuxZBDHOhgOysMjF3+7J1csUGs2O1IyRAWgJCWEuipOwSwd6etFdDXvwke4Qb2EzwwFancfOASlYGDWPCrfKeW4ZCRl3po1G9jEzUfMvisF2nv71t8nPBR5ESeXvrMgl3rK/BcyBoEGmYM3nTo5YuWnGudACMvneSuTG4G/MgzBmXsXKlFyOTQxfOSDpiFt/oNU+TjRxcuh4TMtsqVRZBopirPoicncRbxkB9QHoN6p605kNuPTAhkxIcV3cPbLYnayXGL4ddRhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vA8fwPw/gtnmEWpERlcWOfQ2TjQ36X+WkUwZvqYm/j4=; b=WNJkQJf9zYiwyBSwVLTPUL/r/0wEnE+tXjt73CxW7b46E1DnzjnsJjEqdWHFejDEcOPllmPg4aZbMqLdqQ0pu4S+TTEWDLK69YKqnjUwqrRxnT8A5jesxqW7hGftj5Uj7STrce13nqo9b7e/nzxqEURAgweC8/CMOV2vwX9Ps4c= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by PH7PR10MB6402.namprd10.prod.outlook.com (2603:10b6:510:1ac::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:24 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:24 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 04/21] xfs: prevent rt growfs when quota is enabled Date: Mon, 5 Feb 2024 14:19:54 -0800 Message-Id: <20240205222011.95476-5-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: BY5PR03CA0009.namprd03.prod.outlook.com (2603:10b6:a03:1e0::19) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|PH7PR10MB6402:EE_ X-MS-Office365-Filtering-Correlation-Id: bbf56123-cc18-4064-380e-08dc2698a63b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RKaSe2n3ohBRQALxFNNfkGxvYkeDHtqFE84iekrsDsnOY2ux/X4/TlnLMhjXD2J/CXWERJ2KCa1+gzl8QmfhuviIMHefS2RB00I5dhEqakezTS1hlMlfBWIO93vvRz8xztIVfF4+6wkkPCMgJhrW7SKUWFmKLl2n18qyXsX9uWgrEUHk4heFAvQgoZWGpyz4UG+rZ9Ynh6evpv5zKDtmm4dA6gJAWnHfA2KEphNQuUVK/02uuVQoHY19P6c/s2SStQGJ1gFUnfGJwjCkFYz9DIzjQj7urHJHaKp/D/0jHjgAGo4sJHGBkQjN/DYWIEI2Of2GPqtzVYAUrm4xFyumoPOpTGQwuLxzpSRkV0UcmDNCHKCRgtvhpYq+xLgEmdcIOP6+207WBshAbeih1aqaxo29OKpeivqNx/uATZv66tg1BuOP81U4lEV/PUXze8r2S329MhLRCG+YMYl/Gaa7jkRrGUuuIGmUwP0bM6pDK1Z7HjoeYfrkKgagF+Ns6q7ZGAQUBDA7wnYGo3yB1aIC8XyAHe5eexnZrxwjwhsWuJCj2/3ZXWQOdW/D8QNs55F0 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(376002)(136003)(39860400002)(396003)(366004)(230922051799003)(1800799012)(64100799003)(186009)(451199024)(41300700001)(6666004)(316002)(36756003)(8676002)(8936002)(6486002)(66476007)(66946007)(6916009)(66556008)(15650500001)(44832011)(5660300002)(2906002)(38100700002)(6512007)(86362001)(2616005)(478600001)(6506007)(83380400001)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7xej2XS4jSflG53+5UoOueAbdygENKWIAu7TWqEaD+WGJ2QBZkr3gTAcy05c6WHhHYmCbKSsSf9FGVJCDmbXjC4pyHO/pJr3kNNto+gVkK5bTJa+xMb57gEc48RX4pHA+JlnXSJDh5/a2xR1ZagK/n/fwlRcJC4Jci2Ev9cUkTmk3lEsK36oGhixt3VZvuSU2SjzI/SP7tG3psJnCex3R6mWtNsabmO6jTJqw0ZSppwcsj0J3HQy7Lt7DMoDwOCkdi5Oivy31IesZsbiaWOSIw30XFPGDSatZuoj8H17EM7el1GerGspyX75WzFcteVWEC+KdE5PGwyeGq8X3uRKl7iqxeh0caHZNjdBAWPIdJFnTcxOm5b4Vg/tQIzr4uUk9dD0zcn2kMf2jg5a6c4JUxfpt3mVnuvSDcVq0HbdIdyGQT7nJXiyRBQCiJCKAx/tcAPThXC8/Md7Dr6+ZM8Fsu8hgrvDpojj6pH0oCa/3WZflAqPeL2tX+0geN4F9YfsaGaEXb5bj3AlCRE3mM62wNRFga/cfmZdqAGj5+IC00LjlIA1ZBDKy3xazu7BvDqHCmCiMEX8FYBJTU/ZrqOFAyNa7B80tNP1n3se0cCpb6NNw9EO8AzlB4pQeXEOkkKeONMGB/XZgucvLJzQJbnAmEmD3gSD4Z6YJg4Fn6PmOWjX5/Un7/J4Ojw55xf4mLFFXUxUJD/3fFIzpNCTTA73stG0z0gMbORTC5nu4h4ISczZce4ETrjkgyx7RFBHwiXgUuVICIv5SPQx3TFIW+3lMm3F7btIfK5F98NH/Ke7o2EYKodea6VYog9FW0O6Jnrmk5gFIf/kDq65dyskZ1B5UQ+9+vLvbtndH9y7ULxBiQq757Nr1DgXMg8AvCynj7Oq7am6TAEFunJgZmUNgKjpnj5JO5eUyvxw5bO6r3q2FEmc2g247kXCJDC7ygddkiIzuLVCK6aUJ53SSrbOt6GGKvgKa5nH8yWnI9LjkuRCLMURT45+qOnkzmyTUOmWJ4+iE2erke3ARktwP5KvxBlJBvk6M+OIzJtDLij3QsF/L4o0Wwz4VT61JgcCov1N5eO6E5W5p0zqxPYpx5tL4XPz3YMzdugX9sIo3zUwnAMyCuF2UoQHZvshsGXLXbTpBL0WJdO6HhDPAeEEWqVg6tIZ6WOQLp8YI1h/Z3SF6Z+JG51fPnSa5akh9+sEcn5xz4tIwWR4NLYuC1CbErR/gwCjuhmFmLODKl7IMjQ6EA7xNC9KcFRMN4xbYrU8jPtdsKf7OikZvUm4YBi8Lew8edncPKkg/SEuJZ77RBE+AT7j77RmEIgwlscEgYLTr0cAONaDYYBT947cZbZz8fXZCmOS+VyD/HRiZYULk3x57hr5G0ebBJriRahHsvIdcq1t7x4ariv8zhY6itWxbAZAAHk1D6mvFe3NAsmcqO+oS/tGoRCDqWSzLjtlt4Ha5DZ9Opp1sOiIvyet30ZrXKKKPPr+nDYUdPu6DoKg1K4LjHJyBzRnq9NfY4FL7SS+oXwAGzVuaIU4v6olrwYydk8H4+1fdwUT61nOGYw/Ckvv+4RFmB9lP0kkiGw2LGGoT7EkggrU1n4Tw5Wd6g2UsGT1gzeTtqL7Fjn8JgJF1LJjhztj6v4mFIBxKmpIEIQILjOwryyd0d+llJKGuI6fy7Z2z9rBqg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: odvbfxGMjr3qyw6X6+OyByZlC9YWUjJFYTcX8kVzc9aCBQ93+gM/Sox+kdboRPqdEU6nxZJX/RUVD9P971j/2CJJgDV9GD6URpjob7AP1OdMf7Be9qc4uP3PEb3Ja4AYsOEu6vtCqqZ6mzIewUDWIxe/6hKpTgV0ns+v2SrGJr2jyeH64j2fQAtPGtx1eQaG/zfplkrx49j/ykyH1ZoVoqXK/sc6Q9u8nnbZafQWEhXWEsswxTby0Hl+nYiln4ssBy/ntetKp0JT1UzGQOH0t8ChRfe37xQPxhra++hinuBR/sJ+no9/prwBvgRz2JrJkAKIHfdC6aTC8NYcNNrAW4++JeiMkZk9viRfSWgL0fBlSKaGHPv4J2hGRGk4gEJB9cc+j7NpT2qzV0Z/8whU2eAF2vveBpsBm2CZvBsg2GmnuYv6qRlT2hFlWpG/URJtpXrbV95vPUGaeu0wWUDzdY4qD39fJ2tnXR7/xm1bzk+at38Hc8L/WLosZ9/rEF6NQlC5vHllFm6pWJ1sNbAj6g2aycOycRP1KbcaGGvdd0KJgIrtnq2TckYFuPQnWZ45bLx8cAkW/CLmQoWzn0BS2C6YseymtZHDX5Wy7Xlzexw= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: bbf56123-cc18-4064-380e-08dc2698a63b X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:24.7717 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8amKm6GdE6/eBqFSx6xrugGJlK1EvZF4F53ZOJHTF65G92UOqf/WeX1bSQjuEH12Yjzuhy1caVJNYQFypKbBnZmFSuNRKqWBU4MaFjnjNOw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6402 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 adultscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-ORIG-GUID: CqirqhXyTKjovczGVaUShDi7GblgjTI3 X-Proofpoint-GUID: CqirqhXyTKjovczGVaUShDi7GblgjTI3 From: "Darrick J. Wong" commit b73494fa9a304ab95b59f07845e8d7d36e4d23e0 upstream. Quotas aren't (yet) supported with realtime, so we shouldn't allow userspace to set up a realtime section when quotas are enabled, even if they attached one via mount options. IOWS, you shouldn't be able to do: # mkfs.xfs -f /dev/sda # mount /dev/sda /mnt -o rtdev=/dev/sdb,usrquota # xfs_growfs -r /mnt Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Catherine Hoang --- fs/xfs/xfs_rtalloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index 16534e9873f6..31fd65b3aaa9 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c @@ -954,7 +954,7 @@ xfs_growfs_rt( return -EINVAL; /* Unsupported realtime features. */ - if (xfs_has_rmapbt(mp) || xfs_has_reflink(mp)) + if (xfs_has_rmapbt(mp) || xfs_has_reflink(mp) || xfs_has_quota(mp)) return -EOPNOTSUPP; nrblocks = in->newblocks; From patchwork Mon Feb 5 22:19:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546325 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3CA24B5A7 for ; Mon, 5 Feb 2024 22:20:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171635; cv=fail; b=K7Q+GNE8SljNmEe4rkO9YlBs+9nLPCuvSHypHb/NUQPYwYG+aV56FjWQzeOqFJRv2OjUJnGtC5nYqj2KM2stxshHGSKEg22p4jyU8CGj/ZthchSxn2LjxWM3WMiIoJeiGxuw9YJwgRdbpj8Y9Tu4EpPE6lHD1RyDXShBs8fgDz8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171635; c=relaxed/simple; bh=mEraLLdjAqgQt8UqpWEOY7nP6XS/EykgEkL/tLOGET4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=c/xU6Rbq62n+ddqoCSK8L/JiPzM0QzdBZkC+bG60IcoHOCBD4uCGujJmEKGClW+KHzIAoNC6TNn1ItaMkegjF98caKAiWtt5dl0kUk+mMBT69Ny+KlpYMac7zH73FQLlUV+NdhN3kyNz5+fZ6cx/1mOXZeDMQuIN5D8hgYl2xto= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=KrVQGi1m; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=Ds1HwP5G; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="KrVQGi1m"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="Ds1HwP5G" Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LDt3w017346 for ; Mon, 5 Feb 2024 22:20:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=bYI+mZNChQBgr/ucopMGIvCAUQzi4CBOh2pHbbZN/vw=; b=KrVQGi1m7lfyPA9/mNKw6Qxmw9GyhCO8JzldqkO5/vabCGjw+cf3t6YvcTWjtAJoe9f0 KCX+MsQ9YwecfawEwYgaW27unTpGDtt3lbDEfU2Ut8a0jWq4Ez9NximPZVCtYPFoTjLt UfLEdUHP+GuAiSpdHS0MKX+jLJwBGWaDcWrER2Iu7jIP1ZRFjMPcCYDk50OXajPCcQKC 2QHUN//0Lfi/QMmLBSxfv8gVaKl5MFoIYfd2T28x4fEMZSvxTcWtC0BdzicRzA/rb9G7 shvYe1cvvf3WDkCpcq8WFkJjxA32le/CInsZaEJEq0dA1rKDfXs+BHWbNySkYCgJQQ2q qA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1dhdda6d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:32 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415KnjNo038427 for ; Mon, 5 Feb 2024 22:20:31 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam04lp2040.outbound.protection.outlook.com [104.47.73.40]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx6e5es-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NgPPI/pllwZXwIvGPGaWUQjOPkifK9tF6cxU5bU1VBTVjmjkPWW3UsUI608e6bj/TqeaqLH7jALNkQxezdgolsaGRkwWZ21qC8+ASeWm3cfqhm6AylEPcZrmo+1ZM3Lsjb3l7imbwNHUiB8/u+f6A/pGHO/AAU+WuDqMMbwV/XQQLG/fMMMSUc+GFPGsjXvrNFZ+5PUQ/t6std2HRpzmX2yFXyN45OwMJ36w2zN80vOxM4vapZ7gBY3f/IPzYfNHAuVan0jChJZClzt+l6ryHg+yDKxcZ2jb2BxRakD2nRl7VlR7SCHM8f+cUW0phXNBcIH9MRa2OnKhsJoMs5Z34g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bYI+mZNChQBgr/ucopMGIvCAUQzi4CBOh2pHbbZN/vw=; b=VPEAgFgoreHjjBPlFdEcZqcamL66hguYZ4HHmY5k2B0CjX2l3dzolodHcglMWOmgbAUl42CsfElfoWOwPUEcnVr2U6SvSSFFcL3rseIgIKIoCfv2lutG3oW2oxeaWc/1bfglhdWgUsircugdgBynoX4FgJj+3bJtq+c0BpEBOD5yp/VYEyQnneIA7+J1xPr9xgu9S35I/d2gSEpljuW5g0ip+Nbw7A0HwepoaVX8pSrVPyDmv+bRMdqhUgNUgRBZnnYSx4xobbfKRREzNX5hzUz+EDljNF5G0LsQjRTtNOnbRzJH0oiUPaRnGZxQS7wZkfPGLquNnf+zajLtJF1zTg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bYI+mZNChQBgr/ucopMGIvCAUQzi4CBOh2pHbbZN/vw=; b=Ds1HwP5GbBzbwGv5S6qBuFYBeEr1ieaYdeNiQEu9MBnvbEf9fIAIgT3FzctxqbL2cjnoxSVajMK6m915Wfp0Mq1CVpQ0QZ3Zmq6eJotOfNzKqJcsuvmFYeOBMkb99hXCbNoxpG7yK8apGFLO5p7QCVbQ63590mToc6gmRWYgYF8= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by PH7PR10MB6402.namprd10.prod.outlook.com (2603:10b6:510:1ac::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:26 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:26 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 05/21] xfs: rt stubs should return negative errnos when rt disabled Date: Mon, 5 Feb 2024 14:19:55 -0800 Message-Id: <20240205222011.95476-6-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: BYAPR01CA0066.prod.exchangelabs.com (2603:10b6:a03:94::43) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|PH7PR10MB6402:EE_ X-MS-Office365-Filtering-Correlation-Id: 52657ea9-8cf7-4445-6024-08dc2698a784 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kgfFoLOpPn33s8HyG6qITIOAm8XnlcKRR5nX0XVIfoAB8iwjTUnrCLR4oAsdTqDTiOAcVR7YLylqnLBDx3udmZzhygudziYZhG0FJslvikg4J00h5imry4aItN/VZja2oKciIP9IIg8YsShT+f3lYPPNkaFL5NXI/XssEkHSMWVdhXWCw+Lqj5j38IRXAJa8y12xTxgUIq9iW8pGh1uKYpb2hEOTkjVP72YndR5JU3xMWo/64NMaUjBiUWolYG14ugV0Teb5brCHo9UiwQCdtil67LURfUgWNSqJEyxKrFkVeyS1ejJL+zmoIK7YcmEo0m6Fh4o8pj8JBC29IXeVV4b9oGKPVTrxBxKeC5YIanJqiHrr08Mn3yrwtPsAah7oFCIwbaHBQJ+Gkvu1cKx5V4ClZOnOuG0fP5zvwFGn0PtfThk+UV4hUhoKmZS+LDiRYLapfxAJUyDuZ8QRn3M8ri5XXnHOZMRjSTYkrQkC4I6j/oK9jOsoeaZmhhaHBkOntlCCSH+mvg9Wxvx4BVLrlZG4evb5k8cWcIJvW/w4uo+70Bo5lt1bzgddguKTuza1 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(376002)(136003)(39860400002)(396003)(366004)(230922051799003)(1800799012)(64100799003)(186009)(451199024)(41300700001)(6666004)(316002)(36756003)(8676002)(8936002)(6486002)(66476007)(66946007)(6916009)(66556008)(44832011)(5660300002)(2906002)(38100700002)(6512007)(86362001)(2616005)(478600001)(6506007)(83380400001)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HvFZ6rKj2BHHS6jcydZdrBIRIMEaOnkU0uUmpVLd373ex1Q5wc6Hf4KJsh5nlyH83jIUE1tZZADkMMMJEQw7ITBBg5CXtwD0lwbFpehqaWDDIBpG1EmNhs5oXb9G8230uc7FSfaBqtZwFYumJITnn7tPpcIX4Ay1f1MfBbxyeEIYSb+ooGD/aSaG0iIGP6hRVIin5To5pQWjKHvbQRUMMgdu2Hf1/yW5IO3A7x22qpVilUcB2qpIgthe3KHXfrqoISZEFYQaM3IbGRMI0w18rHlVopdlbHS9safWNy9sGMtCBdK1xKYaBOUZObV2/Dw0+Ee7P0deg6hHk9f76tFn81yjOd6R960B6jtCmvDjfsuXiO28DJtZAVOWi2rI5Xt+ZZL2mkc0qx8/+mbvQp1A7zEkAZXybcUrtIYw9fVtQLRWjbOceVLNhlaOLXPyq887RqyWtF1Hm5akLsUOLTFP5BR1SaL89JIbRt+Xwz60o8b4hIAPAQfD5vh3cOo8HV1TUzzI4zaFVsmoQAozF2m8Qwm25TxoHdCi/RvDTyIQWoZeTVd0BX5NEJmMLl4dsNTF2XRLx8KdhfQVFC08yqTVZGvxLSzUHwaz+GBETEw+rCC1EENJsWlhoxzxL+WnM7MOYEMNfeSIM/F62vD1Zv2jyTss3pbIBCXLgEvkmYJlf9ihd5IcRPWE2RE1cAQKAN2uU/i4XYDFItkU38ktrC9KaZHOVcZwRbEt+tkMRRbsBuU1va/JSqYCAqNsbmXo4k+ihRrpwU8TEq9E3rrXk9k5qYoK71NkVUZCF14ejAvxIdwBv46DPp9m62maa1Lj5L3XUk87+K2hR6NxNmh6F2SUmwMHlATJjk1IE7O09WeOBMycihVqcNSlraPq4Sr2hj9ThFNqWO+mUvsp3MWDYSrLQdEKf7N9nUWxH4mj5qpbF8OsAaDqfA1cSVnw6NAuRchCI/2gYkJ5crsyxt1FEFSqocF+8SFNsBM2yvCwG7daSk/1FoAroMdLJR6EZiUphPwM+uDVeg0p7v3sd0RulHGk0o7e9UmpDZNumCR4hs+585VMEi7H0xC89UKPjuiSvCic6zi9D5YUS8BzmZTzVdiWEvhQOuddM+i6c9EMcodXoOUhfDbJ/CQ/ZYjNLk6fo7erUnESmAT0bTQquqFdX68y4uFA/vWi+9eBV0aiDDBp743q5v2XFXwF8LP32c5mgYYUsLHTo3d9NW+LGAdwvQTh/QCyDAmC/lZsLnGTWzgrs7iiBMZvgDVS45wSVAqClghaA7Tqd+xvtGpzMbpdQ6B2ZoqunX54RPdbuGiyZLORiJlGrLol7OyEldosfLukfNhgSVemkSnwCNadAX9SkZtxzXqcyW+4ywW4xZtcZvdlTiMcxSFlk5wntiQ/+JI0GCkqyNZTYiOcnfWxRovRoY4k19XZgfI0aOO6m8g2Nw/N0G2j0Iie+bgC96Sb0Wbv8GrFnWnGFw7HII1X40hZ0Cs49JyPbPA/U8sbf2P3c1BbnwpZN/5kQUFO+Z9OyZFEherYrN0hCIu55dakIZMSYcvMypuMrjPPxMIPFEVf0ErPt8eHsEQFucukOXzmv5MicIb0BiQ1Ja1AfelgbHVq5aS/Jpg7hh9pL1CXN96Il7ZBqnIUvUsUimtzSAt8YlNM1TiGbec+djvfanOgnpMa8QC7qg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Xd6XT/XGX6T4IE7gqbtJ/N/4cX70ZO+xvgBhdMs+mDMmV9U8SkQwMJOtYKmzLPdSiCXL+4fMwLhsc+QZIuIdGTevhX4v3iWGVzy6/vyjzMZQEQITVEW/do0/qY3GyageSNVYOi0pIa/tHdqUOP+/gkOGp2t7ddylhvFXzFX8+KJ57XKnkQ8cS9MZR7ChP8QsPVklaGsHufYjhAd5Cj/1pUafX0PGzD3jeElpOJDJJL8ZKTy1vgU2+jlKXkXTiw6cbTJiwxSHg5jBKA7WKQsOImXQkUW8o3doZabJB3EEHA7SxHo2m20cZYdIbwqbUaJcqI3T74y/+ZzBlN/203yq9pyTqD/KSfnyqZv44EalNTmaUH0wlBuDb2WF14xmnWSuNZvEs+Q3V8MuoZmBFQhX+dp44rCOmUQGUyb3hGK0JPo+6bYBuUNj/A9Jx9Dq0ejdDuX5vaGwnXmlJxc5jvwMCRLnf+1rcVBVidlZWnMjhIcuf39ruFB07GgeRNJ9sIpUkQbQ3VEGwog4lp645wJTzbzXkrzcoKzEVZxZVXa8smPxBpAsGd8jH7rPuehykhhXhkOHUyFM9gKtDk0oXtc4/iaGEH4Nf5K1ZCxXgzTddbI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52657ea9-8cf7-4445-6024-08dc2698a784 X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:26.8806 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3SEBxNmypGrKDqTTrDLX3aJ2kMT3QNXb7XUvRYRjuhGYJU/0M+RC8FClDv65ih8CiwiCH+Ar/WQeUhsOp0P2iLXqYVGuzN6Ui6Vt3kvNS+o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6402 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 mlxlogscore=999 phishscore=0 spamscore=0 mlxscore=0 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-GUID: eFKUn-9LHBCFAlnfiNKenUPF9GLw17id X-Proofpoint-ORIG-GUID: eFKUn-9LHBCFAlnfiNKenUPF9GLw17id From: "Darrick J. Wong" commit c2988eb5cff75c02bc57e02c323154aa08f55b78 upstream. When realtime support is not compiled into the kernel, these functions should return negative errnos, not positive errnos. While we're at it, fix a broken macro declaration. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Catherine Hoang --- fs/xfs/xfs_rtalloc.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/fs/xfs/xfs_rtalloc.h b/fs/xfs/xfs_rtalloc.h index 3b2f1b499a11..65c284e9d33e 100644 --- a/fs/xfs/xfs_rtalloc.h +++ b/fs/xfs/xfs_rtalloc.h @@ -141,17 +141,17 @@ int xfs_rtalloc_extent_is_free(struct xfs_mount *mp, struct xfs_trans *tp, bool *is_free); int xfs_rtalloc_reinit_frextents(struct xfs_mount *mp); #else -# define xfs_rtallocate_extent(t,b,min,max,l,f,p,rb) (ENOSYS) -# define xfs_rtfree_extent(t,b,l) (ENOSYS) -# define xfs_rtfree_blocks(t,rb,rl) (ENOSYS) -# define xfs_rtpick_extent(m,t,l,rb) (ENOSYS) -# define xfs_growfs_rt(mp,in) (ENOSYS) -# define xfs_rtalloc_query_range(t,l,h,f,p) (ENOSYS) -# define xfs_rtalloc_query_all(m,t,f,p) (ENOSYS) -# define xfs_rtbuf_get(m,t,b,i,p) (ENOSYS) -# define xfs_verify_rtbno(m, r) (false) -# define xfs_rtalloc_extent_is_free(m,t,s,l,i) (ENOSYS) -# define xfs_rtalloc_reinit_frextents(m) (0) +# define xfs_rtallocate_extent(t,b,min,max,l,f,p,rb) (-ENOSYS) +# define xfs_rtfree_extent(t,b,l) (-ENOSYS) +# define xfs_rtfree_blocks(t,rb,rl) (-ENOSYS) +# define xfs_rtpick_extent(m,t,l,rb) (-ENOSYS) +# define xfs_growfs_rt(mp,in) (-ENOSYS) +# define xfs_rtalloc_query_range(m,t,l,h,f,p) (-ENOSYS) +# define xfs_rtalloc_query_all(m,t,f,p) (-ENOSYS) +# define xfs_rtbuf_get(m,t,b,i,p) (-ENOSYS) +# define xfs_verify_rtbno(m, r) (false) +# define xfs_rtalloc_extent_is_free(m,t,s,l,i) (-ENOSYS) +# define xfs_rtalloc_reinit_frextents(m) (0) static inline int /* error */ xfs_rtmount_init( xfs_mount_t *mp) /* file system mount structure */ @@ -162,7 +162,7 @@ xfs_rtmount_init( xfs_warn(mp, "Not built with CONFIG_XFS_RT"); return -ENOSYS; } -# define xfs_rtmount_inodes(m) (((mp)->m_sb.sb_rblocks == 0)? 0 : (ENOSYS)) +# define xfs_rtmount_inodes(m) (((mp)->m_sb.sb_rblocks == 0)? 0 : (-ENOSYS)) # define xfs_rtunmount_inodes(m) #endif /* CONFIG_XFS_RT */ From patchwork Mon Feb 5 22:19:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546326 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 201544C628 for ; Mon, 5 Feb 2024 22:20:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171635; cv=fail; b=UyQmw6GCBvK0kOxrNJ1Bv27dCb5sExXsK65Vq3MhQzbsw9WGubrEice1IQxu5peUrceNiWoUtR4uZBQ2SAy1iX68KskqIfhbDDs7s8iXktWJQy/q2jnlIn5i3X8Mhe37zYz4qOpTM5P5jPC3lhBpiDtQfzYLoIO93Gd3g4A9XG8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171635; c=relaxed/simple; bh=6NU8jXfF3y1dMdGjBwDfsEPQOv2g8hDn3+JdauLKzoM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=iVoDnZxylqQtDlNMTsCW0Tg4gaxMij3c7kwexwC8haAwwEyLLfwFPYDJQ6LmwbA/r3T73Z90NBM3R2ucqAcNbmh2jepxsmazRZsUB/GXm2IpUxWTyAhTPEg0O1VY8Gq8t+ZXU8TPZUQAyazWvmtrF1UohfZfwfoMoKofKqmNdGM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=lR17x0nN; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=Lfo64D5J; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="lR17x0nN"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="Lfo64D5J" Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LE3VM004487 for ; Mon, 5 Feb 2024 22:20:33 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=F+IEb7c+21Wxpkhnb4dFre/qwU36rFvNI+SL7WfsXpo=; b=lR17x0nNoSLayDKnth34lzfQCkQfVbQd4W7TZxOsSyAOafaudBNprZWfq18W4b6oFsp9 hsXl9CZBIOPBNt7g4zHkWsDD3a1xwo+37lGr/+94+HyLhzNw1xpIDdTFPKJPgA0Llu1t Vh29VPzBN0EMaP9hDNWgXOkS6I35qMDi8/k2vZVHucWtb8cxesy7bmXYLVxsZUYWoLJq vG97J0eTlJg7L5+SGYq7RCu7dO1D5w7fZ+pLXyCkCi6kmOhC8aBd6az+ru+73zhaQhWg wBjUn+oIsF+CMaQEexRCe74B49zYbartomzC7JMd90pe/ckaxWuR4er0Z31obMKyaEG3 Kw== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1bwen7kn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:32 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415KnjNq038427 for ; Mon, 5 Feb 2024 22:20:32 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam04lp2040.outbound.protection.outlook.com [104.47.73.40]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx6e5es-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V+L1tZyvoXOpWIr38MsXuVOa+61MLgtmpUfU71DyVYsm/j9B0ITfGoisM3qrOALrP5XOBrSn+vnREpqxghuET9votQ0jUlbzfU4piZsM82AW+yxEKpZkJF0Q/yGOQBSZ14wbbO9yFZyO2F0qZasJQ2fkm6URhDmUWtjnblfyXwNiEQW9zggwmeWn/cxUfNULhaSLyx7oFiatg/IxoOSRQVtXB5qxGdtRVpJUP1ymG2B6feBNb5434nAaClfepkkcg/aF3ElODDlAp6bhgwNnM6YxwTItK4vXGpcJUqeRflzQImTUukZcTDNalqzypILrbaGZYgYsw1xeJEDQ46HvsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=F+IEb7c+21Wxpkhnb4dFre/qwU36rFvNI+SL7WfsXpo=; b=F8wad8YIJ45JhWK/dFpKJF9X/XVtTqPXtCpD6tdn6PakQn6CBR/ECRIPPuJFHR6+FLUhPmq9e7lIp3gI/BbmOgt+icYCd1e/9+jU9kW6hpHYWc6J0oj1W581wAHQhcD42aihCSQ7ITUnnm3uQXUCcjslaX2LRFqb+/mOVHqec7aC2sNRJr2ZZsQaAm9/w3OBHS3hwfh4abL+je8MkTlgRfg3KqOFwvv31ZtUMvpB+5I1LAupiG/AaDep/EnyEfv7gPn4qUPpt0L45t1uRoh4bzeqUd3thAKsj9AFiJVppqgStviwgaQelNsPX4Dd3d7Ce64TQcgJX7s/bSMUBaaIjw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=F+IEb7c+21Wxpkhnb4dFre/qwU36rFvNI+SL7WfsXpo=; b=Lfo64D5JHUiyHHBgwJCF1DV99lxD7gqJjNnzJOG0+g9J72wa66/AD2Tmc39t30gxTJ0knzZoKvOIrsddo6bWTIw7mJE9/EIT4I5W97Ole6O+yelFxMckDZWYhYkCKjYYKphhdDr6/YlvOomu0kPP0i5HXHO2EJA6vouVi6+X+qE= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by PH7PR10MB6402.namprd10.prod.outlook.com (2603:10b6:510:1ac::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:29 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:29 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 06/21] xfs: fix units conversion error in xfs_bmap_del_extent_delay Date: Mon, 5 Feb 2024 14:19:56 -0800 Message-Id: <20240205222011.95476-7-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: BYAPR05CA0009.namprd05.prod.outlook.com (2603:10b6:a03:c0::22) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|PH7PR10MB6402:EE_ X-MS-Office365-Filtering-Correlation-Id: e315cef9-b48c-4193-a72a-08dc2698a8f0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gvAtb3A+aGexYBCuXX27I64NJgdmgykwqtRRkWgZjrSFa+jSLq8A8qwNKO9En7ffErGmVpJwCEi9JYQdjLlAcd6lXWp5v12biyL+dvVf/S9njad2f+CvqBqSyVvRcZENr5de1lQIlYRKi+igqDDqoDSMMBJgdKpMEyQXqcSbxmjTdLlMuL8TpX5/zQHJb43xKHVAbZ1Uo4f92tJwiePd0UZdhF8SuN2QIFtffbfMybbsTuhNfR/JXNbeqkl74Wd/EKSQWhk6OSWnJSqVmEaeEnEkJJtHbFoeQVOVHODbADcfygAoEeL4zypCLY7sVShFiHsAzLK9ltWYJsUnnN0HjEeke7HPV/o56p7xTLYXm/RQc5mf+NUtfcriikCeYUrV0f9TxPpQ/QSA6DbkTRRtDr9SXbZYYywr7T42D9EqRDeB23YsfUAPg9GMV81NcIYfEUoFdAWenQPBvghGRRkUCQeLejHGz0rmOa1N+/oKOFh7rv/LEruYbaTtKK5hMPoOXViwoB1Ty/wtdjBpvhyrhiSFT2v79JLb6J+3XRv3Y8w81Tzr8bnBbL69EHCflkB2 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(376002)(136003)(39860400002)(396003)(366004)(230922051799003)(1800799012)(64100799003)(186009)(451199024)(41300700001)(6666004)(316002)(36756003)(8676002)(8936002)(6486002)(66476007)(66946007)(6916009)(66556008)(44832011)(5660300002)(2906002)(38100700002)(6512007)(86362001)(2616005)(478600001)(6506007)(83380400001)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZU/4IRv1cGEj5HxTJPVpScWu5yRRT3ekpFQBFa80B9Q4rq1zUS0CD4v5tiTuKe3LdddGLa7CjkOtUm4woHFNIRybeCczEJad0me+Im4d6ZmLWmOGUkzGnR/JSdCF8HVpcFiSPojGzLdW3xxZ8OuF2DwcHWfyZ1ixhkDctX7+K1N/fz6ouZvaEnN3smz37UlQ7u6fynCk6LABc5gpLs7Qopof9gMueuOhOk90kXKHWM8nL1IY5aYHXlU/ADkBdqB3z5DPr6NdwgC1Wl3tIxvE8lZls6MK9ar9MCh+EmWDlxYw29CfMugxH/h8LWZqcidpLCBtp+ijI3rAWcQn+fV/HMLjKc1Epp1Dca8kfP636iqc3pAXpg/3Xc7GxhcztpqkLWVRnjKi+j/2/qG88tIkRDaVDycxW7tuGtAw0rMpKsxOU6Zdi/Ubkp/xpP2NL34lvRDKGqVVBTm1aFz3fB0yHQnFuUxCtfzjLeEZ9pCwLUfl/ubiual64ZgqVgER12VMToU3AMZ8AR3ke6QgyquNmUE384VoWImGgQMnV9egtoToy6TFHPS7JDmVOdfmffFtwr4zDdcnfwhw4eJnCSAa5Xr5C9LCWG62VX3Qq9qAUCzJhkQL+MNVE8VUV/ncg59CnRqJJWoHev62NhsXAtua0+L1mJ2Jn/MuSCGXInIpZLFsXsdRB5GqkMheqXpg/BIHiic/+I3HJRzauXj6ooUIPDQfXt+7kPG1neoHI/8/FkrXhvaecyg8ZLuWELVwotH2dRKNHr8kW+RsNpiOFaDKYn7rUDaGS4XZTkLJQVVn0U81UyUYPomxx4j5PunJpKrQ+sx+FZQbcI3w5+MyY+6Zfa7ZNf9S8nwvJlm/YU4J+itJMkRiclYO42FgBqB1Xz2Q0bRz7BSh3w79nijmJ/XxmCd10qRAko8tMCa6YT7Vxg1hscXPUYfq6nwY/3g0ydw7jtq7dFzrkTlXMhNAjqp0YpeLdcqv9oW6BMqSnnhnAnwpYedm2zrl2BG9leE4Bap307P5AXqxOUe5hnFD9QYOODTnH7MXD4D0rpN+7/0MFY5jPzWdXuGMlJV40Vwxtrv/RWIkJNbBb1hduRP1dzQFs7lNK6p3ECD+QTvgaCZIMAmf8EcatMN428kCDyBm2bWidzrv4VjbjeClM+T08Ig9vdhVPx3qS9N5w6RZKQKzqInUacpOj0FsXffbwM3bHmrET1MePIzuHeo8M0lMabheXYFLSYxINgKpsYQZ4Bhbq3LfTBbYOgSaqiShRdKmAyzPcHoLlOgRwQ9TyxlzZJwU1fT9x6HDXz0xRh3Vmf6xC0nEqpEWJ7HaCTI1qQDJnpSZ0ce3zMXNAV5nO7zHushR0n119yTh6urg47RamW6s7VOJG08EhzfInjzyNjvRKX47yJGeHySoAbgj4zdCMcn5EzYQxiGmQU7zhnUx8LHahNtDHhGqvngOSzC6/OIb6sFrU7H8TgUfb+E42g4o3t7gs3udgc67YRD8JjqQzg7e5x8Izgv0Bnv1GxX2yDRKMglYznAIJfRGKcTz9qwvbG4b9DUWajqvDUQQjNeuLXhDVGFTAYhe3sSQg4IXtrFlfapuJ9U60UVzRXl/fpQBci6m2stJoyRK9jxBCgY+MM0kOMip6vY8wxMPfX2xksKmZumPxHZVk04hvLHwwqno1TCNdg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: MSqXY8YGvVhANHphXsGs4Zs3ojm6Bb08y/CxqqXqgWw5VxftBAZkAdbyYhH7JbFHlMMvn8YKGSSv9Hx5Kylsb/jo8TncqwttThzopEdx2A0w84kLqZ7JyVSTeYIR1mpzcqqBlZso3NG8kOJ7suExf1v82Goh4NkfNtQ5szS12M2kgEXRVKrLNAbNsadxzGGFWkfO+s9wolDP7RNZ81guIoznPY5eERO3Bkaforh2dch5c3DQ5qXaigplh1Z5ne7eJnEE67cDYpXH5mhJN4ltEeoRUTQrKmFtvnJGuCK55YAXiRINWQRlcBPLWah8ExIeAAaVfIK4kFCt963ZubPRXYLycTGlXw8STWNKrdbC5F2i6Euadr8/Iv2bsczA+ftZOVgzuddZvsjcfR4KlN8hqNA4yqSLel0qJhm7JjkmBhabUwbic8LqYNJAFcG3FliCyp9oQ9z49jzVPrDkGMYoZ9N2ntnnyKhxgx4FI9D37T1dj8hQ/wDB0r8mq+Nobq/ljdzIy04Hnb8QMqLUwAA6BNezHwibN7diOjS9/Zm0wL/ICga8IkfHXQL6araLnKA+ZOYyMfFbhpdcIBXz6TY1HcXW1q6iNu6z9OS0yFfuVUI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e315cef9-b48c-4193-a72a-08dc2698a8f0 X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:29.2135 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xynYVMHonbjFL65t2jBYX4AoR0QRWOsZFucbZqAd7cdcnu5Aw3Oy7JNz4xuMHLKs77O/omiG1FoeFbLXE7gy7rIzYC7Oav9CHGb/BLhdh3U= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6402 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 mlxlogscore=999 phishscore=0 spamscore=0 mlxscore=0 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-ORIG-GUID: 7OwLKqmSaP9_kk-j5fsLXWPjJucVPyT7 X-Proofpoint-GUID: 7OwLKqmSaP9_kk-j5fsLXWPjJucVPyT7 From: "Darrick J. Wong" commit ddd98076d5c075c8a6c49d9e6e8ee12844137f23 upstream. The unit conversions in this function do not make sense. First we convert a block count to bytes, then divide that bytes value by rextsize, which is in blocks, to get an rt extent count. You can't divide bytes by blocks to get a (possibly multiblock) extent value. Fortunately nobody uses delalloc on the rt volume so this hasn't mattered. Fixes: fa5c836ca8eb5 ("xfs: refactor xfs_bunmapi_cow") Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Catherine Hoang --- fs/xfs/libxfs/xfs_bmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 26bfa34b4bbf..617cc7e78e38 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -4827,7 +4827,7 @@ xfs_bmap_del_extent_delay( ASSERT(got_endoff >= del_endoff); if (isrt) { - uint64_t rtexts = XFS_FSB_TO_B(mp, del->br_blockcount); + uint64_t rtexts = del->br_blockcount; do_div(rtexts, mp->m_sb.sb_rextsize); xfs_mod_frextents(mp, rtexts); From patchwork Mon Feb 5 22:19:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546327 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E11364D107 for ; Mon, 5 Feb 2024 22:20:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171637; cv=fail; b=W8CuTJhw/IFgX0xm2M446FaCBrgQEb52TsYmaG4QCgU1PZQmLAl1mVUUMYRZQS+pLWbvLux3/g7SSJjtF1zlj1/R6RIMZnSKv5ZInIGetNQ1yus3BS1+BkXdtRyz8zhOYbQCa3Yx6Pf8kTpyntoJF0H4uWSmlxglvIfYmRlb4J0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171637; c=relaxed/simple; bh=/Vf32951WbjLwk0YzCK67Kzyt+8nZouy4yut0yKV2Ko=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=nd34b09uWvfHjUFFSaYKo8zXo5HQiKGBWXOlFhGZEi2rLYm3VkNOnFxGcqSzF3kk0x48Mc4cS0oyQE0o7kU29r1M+sIkdpdq7/+eI2a8zO+n2U6ofJDKxRwxBDIxERnFKtThirToz2ze9Jr9+sSWmTFwLtfNI9cPa15mgbBuzog= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=nla+UeO8; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=lGBTZM+H; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="nla+UeO8"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="lGBTZM+H" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LG4cf020819 for ; Mon, 5 Feb 2024 22:20:35 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=Zy+scyhp7l+kFH1EaJfPS+TuHkOU/JmszeYszauM/R8=; b=nla+UeO8rIgm+qTL8qa763/fM260Ur5PVfnnxBBDA2hupOGvbyxKJkIBe9SZBPBVIJzw GmLDxz1tWZXNMp0wvim28jEYultdhehHZV5q5+aMEDxSv8zv2QWRab9JbeZ6TMh3tK8f 0grLAb51T4Iy4jeGwXs+iIMqV6Zy3mG43xgcQD4ki6R4zujl0xPv4ZOsdeAGRhFxGf7Q J72hT0urnShQVbT6x4hdl59ZhOKeknQoVOznxoHwnA4z/xfZP2AvmCFM9gScON3UV++5 T8EjeDzvEPoSmnTJCr3KrfecHLeqwnXO1qXbg8LOn8B+je9NOaPCZ8OAQpYJtY8WJ5Yr MA== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1dcbd5au-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:34 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415LgFwm038677 for ; Mon, 5 Feb 2024 22:20:33 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam04lp2041.outbound.protection.outlook.com [104.47.73.41]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx66vk6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f2uQvnDrEbj2mvuOxwp3j7kR5ws7uBwhrNGHZG3KFRhb0g4v0CYKBScXNeKLpyd26jEqpsbsUdbXjbggvzYK/1RHLYXOQISsSy9mzBUmgAvMkPq56q/nhundD4wihqJoC9GqObPEOnq6z6bOARBCyay/NVVItI2HmA4+aP5ADbiKCcM83s1BjWXvuraofzd4CbowPkZA1Wo7L6Wnzmjms4yjCc7DhIatqDiJxNMKZSDaJ0+xzGj7asizYTGrThU3WzkvOPJ3ya+K2lZh0WZkkNY/557FPjVzIYY+4Fg90IQ4PZC1tMZR1tegqO0qx7q/m8Vb4rTpHhtr2UQzZI1DZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Zy+scyhp7l+kFH1EaJfPS+TuHkOU/JmszeYszauM/R8=; b=IEmYMwRtb2p/JZEqJhsdY1yy9f8Os0IN5TGS0dQyXF1v+bnVPb27TTJzwsH0bxKDVI0N92N+jrFOxTgj7fbkxBobqbFmK0rizyl2OinchOGLCspBpz+mlj3BsxhiTDyWJLJtjfLxt48eE2AdyrRcJlYyJ24uQ3bIVl8FNTtHehm58JeF6dy8ivwLfsPKBjpye4qzTeXb7GjlzSXP9IB94j16kzKLJ8n4vGnoJPFr06fM7HrCZFhCbDfGwLH8kK0XcX/87QYyyOAy1uwU9E93XBMmWHGZ25hUjyAU88quzKZZMSt8VrAFRlQAfEVT06znkoQAJcZEgSIZP2vwQWRmnQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Zy+scyhp7l+kFH1EaJfPS+TuHkOU/JmszeYszauM/R8=; b=lGBTZM+HinTUt6L3LsWb9VjGSH7CQPuwP5cr/qh5M+TGLxzYlUy4GMO/p5Bp7bfgX7YUBNxa2/rZ9aYeYik3ZSp3bZtPyerCXG0iv5Tn+GQLnH+o9vbk1slII+9WV6IPrXuAggESS6KBQ7Px8+19BmwmLmzWk7Q53nosEg1fjow= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by PH7PR10MB6402.namprd10.prod.outlook.com (2603:10b6:510:1ac::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:31 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:31 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 07/21] xfs: make sure maxlen is still congruent with prod when rounding down Date: Mon, 5 Feb 2024 14:19:57 -0800 Message-Id: <20240205222011.95476-8-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: SJ0PR03CA0296.namprd03.prod.outlook.com (2603:10b6:a03:39e::31) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|PH7PR10MB6402:EE_ X-MS-Office365-Filtering-Correlation-Id: 02f17b40-0c40-4623-3ae1-08dc2698aa3e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0aykj20z/3JPD7RfSF4nFR2kc6pDcz2Ni3rgKGZA1GI2TfG0NZN7lg6D0FU1IFXFnz14VI9nbpPQ51vHBPPrTDTWzoRi8fMTUQZCOZaGu/qeVV8M+SAoQ5/xlcpI8WjVqN0Ei0hE5HGPcY9VoBZpfN0+tAvNlx9zFsQ4KGIHVGPbsQq6vyhu3pQXZvDaMRBq9gtz4J+09gpOq79dFowRV2h2rRZiTXkUoPONunQI5FXH8RZy6Evn+8z+Ra5oX1v/rsovbDlawSEYSbr523JSVSo/kwiXsO74DH+Bjaj51voGgeBx3niJ9vngJlSGTzVWO/CFchlZQ5rXoDlvNHaKDMBzfqwgVexkXDJaKVjk5zAAoMbm4BwIskwWS71rgCJsNOziUtrTUj8Y1tZQJ79uocaPNXG9Me8SZFUIUda9HzB6RdpX7zkYLxfh7hoIYZV+4uF5rorM/UUkrCmn9jlmS9B+IZ2smFd8XSELkSnSxPLxENkXTtNlL3w+m7QOTi6hoxQvzgLPDj+IowC4lDsSdQHg9CAoB15iMJl3c18cRtYQBgEXFakqrK2im0fIvtO2 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(376002)(136003)(39860400002)(396003)(366004)(230922051799003)(1800799012)(64100799003)(186009)(451199024)(41300700001)(6666004)(316002)(36756003)(8676002)(8936002)(6486002)(66476007)(66946007)(6916009)(66556008)(44832011)(5660300002)(2906002)(38100700002)(6512007)(86362001)(2616005)(478600001)(6506007)(83380400001)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3SW6mhwwlc8e1Y87Qp1NUBT8H2qLNaihnZOYmbjqPyEZ5xfO+uhzAT3JZrWsVg6al5t+MRGeV+zyOg5Jz3Un2amjFCo2ie/EQWAQZI3scaQ3mnk0LHDYFo5OpKgG9pPBJ+x11SYtDpdy1sHmuqrdkWH7DVbUnp/M69rCHz5LlwB3NVPhMHdRj+vS1SVM5IjNbYuAlAp1S8Thh8YMFm/W/LPDDxNhe2qCDONZdcytTtZaoEs9/WIWvWY5mDdiKuxf2qsApoDZN3PpCdP5cl7RpjI4s09NX+fhxZC/OTtAyduaWqkP5zemsXx7hWTBU5d2w/q16UTj/N32x7w7i7yRcSecqiu8v2ImTRmRfcKzb3isZE7zGEXuP1lhUMHqkxURYPkDAd+8oY6KW0qFjxdodY/aHMCAn7h/BVDdrQoVeA+zSR746OoBKmcJODi+cw1YRK6L4NS7GgS0s2o2W7WduQyKmaqVIydm7FtneNluYfWjA/kFWLlbsDBuJDxkJJ15oqWnd4ELJrnbr2QYSu6TjHuvBSAqnuBFq6/fgRBshw1HAk94VPdFN4l/N+ED7nTXwiBLU7RrOH+3/RuLJlGnW63zs/Zyyz4D1HN8XTGsLdSk3s4Ubpp9nVijuFYQ9k7K/ck5aD7zDYtfSFO41wq6rilv/uMKH+IDQDraB7Pu79vnKXEtCfh5aFO3LfBtdUP5HZI5ec+dPptcuaFgGTvZ3BcAOTsXnuuWDI30kqPsycE4iB2zpmG5tboIeqnPAjSukkbKEj0sDDHSW93bOnmy9ACbQQTVFOtFM8EKe+WlVcAtGpg/T7sF5UY/mrjFKPKfVs/p3DXnuuG/USah6ogwDE0vYipfW9MtawLW1P7VwHSAc6c6Zlh8UW/4EiCcNKi0bv9k7yqH9wg66yHQgeP8Fex/4k+/lUiA/W14qY37lsh4XA1HsUqUZ1OJkxiXQ0CMdr4oMOhB92+Fvlrg8HnR5wl/TLN2hxP+0DmKIg/ynNsm7o8pyPFBJ6ny+8OvnGsLxU7JAFrxM/W586or+RkfpGosAXyLuRA7jBSJU37wXl0wK1kWyU5jtk333MzFj/KXSoL/R+mcIssRY6y4jcYykUIiEEZcSM0hcYrT1dLHVCE6Fy6tQ7JA29DNIVjI/F/NGIwO/rJuqD4cxJfBhed0npdCsdSKEmy8+IfymWDciYy2H4k3EF1PRIkWvVIGXazmLuxKR/VY2UDcOSF1ZEmleeZNV9r7N+7HLy7+OoFrH9h09gHVLF1iq8nYrIoWl9HHV0bjALS+V1Qy9NXTM5b7h0/E8XyZFmMlvA3U2D5YG4FNjzGZ+TNziVCz7skcBhImOI1uEyqOdN9tG7LF3EpoOrfIRWq1AgcGbrrjlMgaMN8kHd64C2WR8nbZXlYh4qxouMMY+I9D0iwoMH/wKpXD8xFJ6mxT2x4QcTlgk9YCaZ/fQI2CHtYgclnX8Ou4j3uu9Aw9z+5MXWem1w1KP2afyfCV3UCWvotdELd56aGtx39Q7UKBmDqrDiNEdnaW4vFSbPw2riirgJeQm8W19YMBPKaDzk0EyRytDGfvG+c9bY6vbSuEe5tT4sVf36YxKDpUNEHi7j59Y20MdCMmG7YlcSCvMeiVepShzbeeIKPvXXUU7otINtDzQU6RMp2eGU9U5NKQyAmSE2bggwa9efjnnw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: z4TVixACEcjcIxcyN3p9Fahi2ftSU8/iXSeXk8VbJ9KCSKPAJ/bNEMA7jd4g0rexNJC+wkWS/icsXQDnhK3wQLTG0QUAAofjhdLAwqySmTibCKeChRBvKzzwk6Vv/4qU+tI1ICjsYhWzkygQPOyFAbbRZdWazq+GSZZSTjOsEPxocgVqKOfJMqglmjnBHhfMWiCf0qubR0Bg7n4iVJ3LLiEapK9piDQjE1K7Wb/7Aev4d8SveJpg/Z3sXJ9MwaSUxMZ7Go4GA3XBBxM48echkcn0R3STCWEWJ3RK/GZXcNAJOaB4H3qZatvGGXIygfXNujyjWh4oYVZusVlun51wcHMdJuOUfyr/0zHc4xxaQ7z9vQYTlsTnH5eLuajmRviAAdRhlsZ+7Io3IS7Fv42EevjCmMETjAhoQ3U9/IIw7hxrZi8ytVbzDkoPVckLSNlzrl1JNku2QX0Cbgfoz44bf9LRZyA7xWNud8IdbGUhIeSE+a1uFUzUoOGlX5yF/6TV8UDpuXNyyEnU4WIQaCmq8VZlRQ6EpOSkO6t4qW20kJNx8jYPQBiuVHo5+4rZyozjjoJpF66kNXKrQakxkOrF9XTlXE6MPJ3GBFnbGDlUjys= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02f17b40-0c40-4623-3ae1-08dc2698aa3e X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:31.4087 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HOJ9/moHU1yCKLmABPLZ0iMAxnMdTOXXlEjk9sayLs2lxJroYppz9g3QIU6kaX5QielFOx7XJWx1p1uNoidpXzyKpA6YhDg+nX7z4+DuxlI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6402 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 spamscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 phishscore=0 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-GUID: tSbTowiMSP2r03m2hAWLBznwlTHcgXzp X-Proofpoint-ORIG-GUID: tSbTowiMSP2r03m2hAWLBznwlTHcgXzp From: "Darrick J. Wong" commit f6a2dae2a1f52ea23f649c02615d073beba4cc35 upstream. In commit 2a6ca4baed62, we tried to fix an overflow problem in the realtime allocator that was caused by an overly large maxlen value causing xfs_rtcheck_range to run off the end of the realtime bitmap. Unfortunately, there is a subtle bug here -- maxlen (and minlen) both have to be aligned with @prod, but @prod can be larger than 1 if the user has set an extent size hint on the file, and that extent size hint is larger than the realtime extent size. If the rt free space extents are not aligned to this file's extszhint because other files without extent size hints allocated space (or the number of rt extents is similarly not aligned), then it's possible that maxlen after clamping to sb_rextents will no longer be aligned to prod. The allocation will succeed just fine, but we still trip the assertion. Fix the problem by reducing maxlen by any misalignment with prod. While we're at it, split the assertions into two so that we can tell which value had the bad alignment. Fixes: 2a6ca4baed62 ("xfs: make sure the rt allocator doesn't run off the end") Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Catherine Hoang --- fs/xfs/xfs_rtalloc.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c index 31fd65b3aaa9..0e4e2df08aed 100644 --- a/fs/xfs/xfs_rtalloc.c +++ b/fs/xfs/xfs_rtalloc.c @@ -211,6 +211,23 @@ xfs_rtallocate_range( return error; } +/* + * Make sure we don't run off the end of the rt volume. Be careful that + * adjusting maxlen downwards doesn't cause us to fail the alignment checks. + */ +static inline xfs_extlen_t +xfs_rtallocate_clamp_len( + struct xfs_mount *mp, + xfs_rtblock_t startrtx, + xfs_extlen_t rtxlen, + xfs_extlen_t prod) +{ + xfs_extlen_t ret; + + ret = min(mp->m_sb.sb_rextents, startrtx + rtxlen) - startrtx; + return rounddown(ret, prod); +} + /* * Attempt to allocate an extent minlen<=len<=maxlen starting from * bitmap block bbno. If we don't get maxlen then use prod to trim @@ -248,7 +265,7 @@ xfs_rtallocate_extent_block( i <= end; i++) { /* Make sure we don't scan off the end of the rt volume. */ - maxlen = min(mp->m_sb.sb_rextents, i + maxlen) - i; + maxlen = xfs_rtallocate_clamp_len(mp, i, maxlen, prod); /* * See if there's a free extent of maxlen starting at i. @@ -355,7 +372,8 @@ xfs_rtallocate_extent_exact( int isfree; /* extent is free */ xfs_rtblock_t next; /* next block to try (dummy) */ - ASSERT(minlen % prod == 0 && maxlen % prod == 0); + ASSERT(minlen % prod == 0); + ASSERT(maxlen % prod == 0); /* * Check if the range in question (for maxlen) is free. */ @@ -438,7 +456,9 @@ xfs_rtallocate_extent_near( xfs_rtblock_t n; /* next block to try */ xfs_rtblock_t r; /* result block */ - ASSERT(minlen % prod == 0 && maxlen % prod == 0); + ASSERT(minlen % prod == 0); + ASSERT(maxlen % prod == 0); + /* * If the block number given is off the end, silently set it to * the last block. @@ -447,7 +467,7 @@ xfs_rtallocate_extent_near( bno = mp->m_sb.sb_rextents - 1; /* Make sure we don't run off the end of the rt volume. */ - maxlen = min(mp->m_sb.sb_rextents, bno + maxlen) - bno; + maxlen = xfs_rtallocate_clamp_len(mp, bno, maxlen, prod); if (maxlen < minlen) { *rtblock = NULLRTBLOCK; return 0; @@ -638,7 +658,8 @@ xfs_rtallocate_extent_size( xfs_rtblock_t r; /* result block number */ xfs_suminfo_t sum; /* summary information for extents */ - ASSERT(minlen % prod == 0 && maxlen % prod == 0); + ASSERT(minlen % prod == 0); + ASSERT(maxlen % prod == 0); ASSERT(maxlen != 0); /* From patchwork Mon Feb 5 22:19:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546328 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CAD9A4C3AA for ; Mon, 5 Feb 2024 22:20:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171639; cv=fail; b=aEObSWkq39zu0jDPKV3J+YC3yToE66CCK4MdUfUDP+X8nXYQTQZLayTDryn/19bweYQzDNRGLLKHlTZuiExQKAdi3n393zQRiJ4UpqSGG3Y12i21aypmInU50ErHyHrafpkdUvTCmqy8rH3v6Wdx4XirOmiQsWWHPKSKTFuN70w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171639; c=relaxed/simple; bh=eewdmrWtAg5TmPJgfEXbBidlK+HhDAzwFomIK7rVKtY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=bGEYT5nhS6yiC0LHBsbsYop/Q3FBhVOYvtdJfIb8OmjWaqZ184cc2N7Xwazr17BGT7UKindW8XEuGpkOJNgsF4Aua/3Y9DRgfgV4gYTkJy/gwXXNtHY5rZCQM4oi3tPpLBIxiGssUiwFou1FYcLNFd22cdHEEWmOjncXxi+LmY8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=JDSMQNX/; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=lSg3bYqW; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="JDSMQNX/"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="lSg3bYqW" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LG403020835 for ; Mon, 5 Feb 2024 22:20:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=uv9qbbhytKoXIro/SeVixN45gQ8NSEid7dbusNjE0lA=; b=JDSMQNX/gUfkJvkj9PYYAnsekEhwguph3Z9M1lATqI02aC8mv1RtSmt2R0GeWwn4ife5 SYYHclIXZGGTTfpuxKmipa0/WbR+vtmn+1DtXXHNLseAoDaYt58X/BtceoHDrG9bPZPV AINOSWHJG2XvxZq6oAr8YuOFrs7xv8m+biwL59YhxjlXLCbZOpMVrryz2Qftw9A6BdIE 4NNewQOt7u6YMla+JNoFEObPRMG3G1sfxAz1fqhjKDLu6zsa/EReDs5T2rQFnJyPGhlj OpPQ4nwFnljQgGv8v8oB7X3bEUECCzAg0JBJqNQmqQxnAALyQHkbu94gH3k2+m03OCv9 bw== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1dcbd5aw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:36 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415MKPwH038466 for ; Mon, 5 Feb 2024 22:20:35 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2168.outbound.protection.outlook.com [104.47.55.168]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx66vn0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LIAjrGAubE9nl1Ps/5CJc6RW4QagdWcwy+OR/fjvj2OsqYyboL/h8ai/RmULfMbgLsrcTnphOR/Px3k9o6kZ9sWHRbpIf0zBKSHN3qwXjQObM7xZq1GvrxGeaxqe1+jw68ms4UIluVqN5sFh7QcJcSPsoKH4X89gNnQAiUus00guzogkZ3YGnVd4t2iRe9+Wl7cxV3jfj9SYm8ks8er3lSjE3rfryPG0++7uT1EUQ6dFI2r7QIqOhzqL0P+kYydOGTdojXo+UV/6fqHJJYEtqQN73iP3XRDwUTKmNK0ms2k+gZAYKMiW71HBcnlw9azd+SQ/8zICyWuxkSSKy4iljw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uv9qbbhytKoXIro/SeVixN45gQ8NSEid7dbusNjE0lA=; b=lgiYk77C9+Ar8USFr83gj9mMZa/Ri2vPef0MUBxAYlzZ7a2a9WpEb6afDPov0ijdtBE9OaLHiAENlPVEeBG98dkHqOGBW7ObHqeZpntI57LSX87Mm5AUOOTP54M+jp3aE1GUq8bpAXJeghiwQ+qADJK1ecJbrlL64FokqW4rpyECzIAy2TBNi2L4K4Kg5t0l40rMIzyl362yy/ppXjIR8b+EuhT9ETRPvNXUYez7w6TifO5Gu17GojUrh0WDPOSNbNWTvO2BzTANn03+4BeSLs9TgPFLSSmp4u8qmqDgH8JvdQJmSFCX0IPavm26Gj1kGrvtwodDs6eKUnZHoP0tCA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uv9qbbhytKoXIro/SeVixN45gQ8NSEid7dbusNjE0lA=; b=lSg3bYqWIJdSA5vZsdE6VgHbD4ysO4YOm5uRIRdnJxO67AfaV9zm16YgDKxd02aATJk55YCTt34DgTRxYJZMKHcPvWnh/z9GI3hdZrZmmDRsoFsw1QEMCyzhSTON+Bsfj3iqw4NrgJTKDROf1VTTxe6/h1oCJS4C7Vzmhhzgroc= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by BY5PR10MB4164.namprd10.prod.outlook.com (2603:10b6:a03:210::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:33 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:33 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 08/21] xfs: introduce protection for drop nlink Date: Mon, 5 Feb 2024 14:19:58 -0800 Message-Id: <20240205222011.95476-9-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: SJ0PR13CA0225.namprd13.prod.outlook.com (2603:10b6:a03:2c1::20) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|BY5PR10MB4164:EE_ X-MS-Office365-Filtering-Correlation-Id: 59cd1a8b-27d7-4d8c-26d7-08dc2698ab95 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nPmNn6ukhAsMCi3EOuZWOs8Hk/knLwvNcoJBvwMDwzN8v0y+03N4CSoY7wmkgEKcusljcDQxdZ7cWTBeK1Id00EmVQhqff0TheQoOzef3HHXUR0cHzqbfsHn+PLNcyaZG6DEX7EOGRD0h+Lq1ZQe8Jd7F8Sphp8LemLDE/o40HaBAzumKYZWsMLvG66QNhvs54nYCwSNSze8owNzqQqlG4KXHdZybttMoz9qOQxiduOCnGZlPmzBp6HNmfFYlMMkM7eG0salYRx/BCnI4k86+J+kT/ySlIFqjBky8LGj92F08qtAm/HZFW/I3L1pc/+8qUd3wljHHGKKqOUfhS2H5EmlbTmDOnjdnlg8Cxuh/hEP/Hdo5ItTJxzt/gWun0AWnWkAjex+ZgKHJ5Gv3cMFOy1eH+1TsB7oWWdD6+97fKgwUn2qRzXCWVy+QKkIR2YHtor8U6Z6ocB8Pl8+HHKrkkkXvl0HKYSor9Cb69c2q7bZH0FQf4bmjwVBmK/14PzU+OsQ3ssqaoRKkil1GcsqS5oae7us6+cYX7uUXSCR/Nix7QzyQUfiEe9JCjNPupgj X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(346002)(396003)(39860400002)(376002)(230922051799003)(186009)(451199024)(1800799012)(64100799003)(41300700001)(316002)(66556008)(66946007)(6916009)(66476007)(86362001)(6506007)(36756003)(6666004)(478600001)(6486002)(44832011)(8676002)(83380400001)(38100700002)(8936002)(1076003)(2616005)(6512007)(2906002)(5660300002)(4744005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +OoD6JfYaUiavbucv20lv2+o6wkirXFKhEztF5NCS6qsnYjTB8z6wcvx4Zb+ClvtLz23bDswcNx5DDg52PMScibOM+UUyeFqe5TmOsJUjVz/grm7xjcjjWvmtDQxhDJ5iHXG8uI8Z+JuW9hbJOT+rm2dDU3gsHJT3XveMJBaLYksWSCwF59enFMjxfL52NMOPRNs9QTAJIX/8VS3zhyqnaRwTD8i5+vjtRCH0X+u2uUDaODVh3ZTGXZkmgs3yyKWE6eQostZJMR/GG3MDdoiWrC3jppMsDNQTvP/ncWMq87SWm9mi/H8bpW+oA0VZ58pBiuDyLyOSqz44rkLxjypu258J/Qi5AOyZnxsvx5dfEWdoh0vZqT4uBk3Od+1XWWnh5OT5TH9xuAFYBH2HwOLvOSgnqqhHXZTg28xI5QXbzFeCeZ9ilL6yQwXG1sLzy0LQRnV21chUL+pgbgz1QkrymYc75kZQaQhPWaFtT33xp1FiFnDKWjQH/45vwqchqxCa7Sg0yTex6L4rM2TKMOj7IdK0Q/KUle7GLrg4uTKbwsa/6yUNwjgv2l0mV7fvzsGJ9EAnsX4GRpNYUwZ+KzFWS322T49OTfDhqXvIKX7195mMpPsFm4eXb3DXHNk/QiB/ARkS+aeKRb57o2Yfw1cxRgITm/6ZF4Ttuia0WvG3ZC58z1hnUvwruG5nCaYIJcJLJ6Lf4eOvVWmmSYx8ciPWBRDkz5EkdUfPqhnX0LBtHGTsRDo3gLxwmqdNTpgD5tLLLjgrVwbx4o7pHklGTarlXJQxLcDfmRV6Im+HijyBvsqOtv/zNn2Qr64azGmpGBs8crJZt6mUnddc9wyi4p7SDSCXDMpwFETYHaFkHtVFWirCon1Hz9XDU45A0kKaAv02hmGVFDx35vGUWXnT+UvgTFJ/BJMNG5Hdz8xYNMESu6nRFaGQ1dkm5Gem7+avaiFcSQjqnF19gue/oFdi670W1rbgz79KGKywbqjlvIWOPkypTBKvxcpNp7h1bRFg8ZLfUFykdUcVEPry/Jg2VoS78x/AtRXMjJh5jLenZ1lxMWRiGIW1Fk/hmuG2ueJxDMEz7h4c4pDqbWYJmw33NaCDpSFHohRu5VmkMtwwyLGuJcHS/71gnqRKtYBx7I21Ie4gbFK98aSnHl4JnwjZzTqxowGTj04wDKMKEiyHfFYNw9KHnLorST30dt1lhCoTr8PzqXuEcNKB36s0AGdT9KhWggRbUR4WtL8785JdGAiMp7QHJ3MjtaBb3XxsyzO69FiLPKU+yJNscgFR13tR1ex4KmYsWrUJuTQQmdrkPS9NXrvNXT4WO+o5hDbOvYM0FeJbErYWMFICjuymbRJbjDpcvBePw1yidj6ba6Jouf7y3Xn0kUhgblepOKBkebR4mLQf5Bh12lzEfUIDiAXxyZpQCQuZwx2Crjk8b5PPxwOdJeNbsyZdZ/y6xjRnp4UkK6mULcSEZp8EluXAG2VbgKwMVdNGQ6+69AgMCaiLBvgWvE/sY8XcWTe8hG2Rz1BilELsQO1rZ9cokMsLN5fqJexpj+Bk18AeRXYbDlj9rwgifDv0cj6lwQjYJ+9Yuu2K3oeqDIv/8lhLXX6/z01GXNpbTUjJ5FfmmXAj1AZkPm0BNElRNBzrdYbsWDW1BWZbI4ieARu3no5GaPrvrgR3EZRxA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: cFQBHvVRn5LOxSUozgtB68oCk5hTbEbFxQ47o3dMudZbOE0VxeOBvKFMzIQ00SS321vDCIsnGL8jZOra0KM75uy8awX5b2td6xLcP6DVdsOAYPpBIllC+ObU/lDmTVGJwysvQHAvpH9c1/nruiebquvtalQXpTmelMQ363s8tb/pDjIXafjTq7ZA+duNKCWtW27Kz30E2SShrX328mNSVYjaP9oFUp98yr3MpRMLROg20Xt+pF4VXhlKOnNSrWJh2Z9jCRvwYjP7oA2blaw2JYQT3+HxKkjgh77wYCO7Hl8E6EIRRuCqQZBplRE6qwPcFC5pSk3hI/3nz3Tg2A5XnAXTe3sKglz8lBbA1y+qoZyOAE7RjtKFIwy7PLaCay2fb4kE/iWLqhySjbFnBtEuT2c7IvSxj/4+UFLsR7ItDohcwQBu9FPYD7s8KR9jlTNFNgOAmgYzJpHKzhAjydliNw/BN+sHrp6J7Vta2HEGmV0d77bXbnaWQZ8alDOy/gxXV/uKsxkh7iVGtLaPpvTcCFfqTSVHd8lNufd/KSbcObfEbcC3m1Dtq3WdhUmnmaYVRe3X5n1JmoK3woo0BHmv6GOmOJipngMJMkCbPxhhNz0= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59cd1a8b-27d7-4d8c-26d7-08dc2698ab95 X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:33.6285 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: bXWMQTVu7zLPPg0CeGkfMb9l5VdBc5mb8S2cg2/CbRviFKRGcK8bVzpYz0VU/gQL5Kbewg1Ooq3Azs5fyh2E3h3c/IQck2ndeqw0Z34AKNo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4164 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 spamscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 phishscore=0 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-GUID: _ddJY7PrJItZgyCw4_1I_DFa146zTX0G X-Proofpoint-ORIG-GUID: _ddJY7PrJItZgyCw4_1I_DFa146zTX0G From: Cheng Lin commit 2b99e410b28f5a75ae417e6389e767c7745d6fce upstream. When abnormal drop_nlink are detected on the inode, return error, to avoid corruption propagation. Signed-off-by: Cheng Lin Reviewed-by: "Darrick J. Wong" Signed-off-by: Chandan Babu R Signed-off-by: Catherine Hoang --- fs/xfs/xfs_inode.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 4d55f58d99b7..fb85c5c81745 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -918,6 +918,13 @@ xfs_droplink( xfs_trans_t *tp, xfs_inode_t *ip) { + if (VFS_I(ip)->i_nlink == 0) { + xfs_alert(ip->i_mount, + "%s: Attempt to drop inode (%llu) with nlink zero.", + __func__, ip->i_ino); + return -EFSCORRUPTED; + } + xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG); drop_nlink(VFS_I(ip)); From patchwork Mon Feb 5 22:19:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546329 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D81524D117 for ; Mon, 5 Feb 2024 22:20:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171643; cv=fail; b=Uc7Hkw8mFQ7LK8TwYyrGlCj86wz7AvQ/aqTNUSk3SGqKYc3U/Bzsn7m0CH6j9kCs+ZTarkBBvPdOs2tH9/FtS2JJP+iyX4lmq1nW5jznu8nAJWAy0Xug2iZjch+llEuUY4C3o4sMelMOxoieXdSpyCLX1Aj0mJlMnR+pIsgvKuc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171643; c=relaxed/simple; bh=9jdLXbKPGvpjeGaLcBjPtQQ8gALOgO68AiaPajhH/JE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=Gu2ZEpikzgaj7SVtgA0XOf2BXzf4fX/mkBXDQP8Na8KryOb5jNWCpw+M3haANRPj1MFPjlgyTzcXAjgk8kawwpY52IpL9wP4wXS+5XXGxHZBllOVF1IkvyIAnoyIVbQAlJYAl9/Xq+Fey390HHFM56QiF0wA+mYGrEBUYKCIGsw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=EAEAx47w; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=GcehDpYX; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="EAEAx47w"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="GcehDpYX" Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LECpt017481 for ; Mon, 5 Feb 2024 22:20:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=dH6ITgYzGSAXRWxmWl+up8WZ2wFyu3w11rbk+rKMkdE=; b=EAEAx47wXanO2XGUWuhVUHH6O7wHRbQoVMc4wpfSmy7NOxiq6DUk5xONgzK+IfmNlgxf WXy15sZ9b20EoFOiTjuY2CTYt40o1QRdFtvkJYxN3PPvY0JumvFKkTrgLra4Xgw1mhi0 DzkZp7aZ5GetvfrKMHQg3mxTSdjRwX3/S+Qmj8ZLf83dgwFXfHIt2/vNcjOVZh7YLuY2 I+/VBRBi27TXn8Hjl163pf3r4pCmOHIsaftXmePeCWDJbwW+KL2dcSv0A1jEwv8lSxKt pfj/gjRoYz3nFuf3Xfr2cJwEoGZXUvrbJA9HQe1s9AsTXmIayrEMveo6rLpU/VnEzMvb jg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1d3ud83b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:40 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415L6U3P007043 for ; Mon, 5 Feb 2024 22:20:39 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx6k5pd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iHnyDfvNVobVF/2/8YE33FOVK+/QaTt6n5VQbzTtPpv4B2yutLyFfslVAxR4ilFpz9VGqqrAgCQVq7mqla7e7B3u/zee2I6fPMjKKXV1Z6F3OJpfVaVutqz+mlntoN27EImZecyiEEizSt9wERRH6b1O7FtgOQLjyJW3nImP3rVS9nASiK+mnX5mT0bezQq14NGiX71fS3T2q+0if1we5+1nChHTe/bxrv3147uvC+zYp1USu2nbC2ajGKZExBj6QQn1XNJ6Jgh4SeReQws7JozX+1IF1TWIDIqIwZFILgH12a8qImjp9btMA3FgdRHrEnxWTcQzb2AsEbGEo765CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=dH6ITgYzGSAXRWxmWl+up8WZ2wFyu3w11rbk+rKMkdE=; b=OpAX27Me8vnKR+tg+2Y63djopo+Km23wt4psR49Xz1wvGGc258stiwENSlt0GPHRvXLBD8iUovn/GMal/DeyYXyo51wYd6OupQO42ewU6rLM8+JgRMAO4S12kvvrCpULHz+LiA+bXQNTGY6z4XbLpxNyjdZBbR6VEGibEI7uJiABE8lRMw2CG6fwetYYzC8zg/aiiLYCLpJjIcR8gB0cM0bojdlEBCPajM1Ou/9E6wnFGv5m+GSJqYrRRVGk1NRxTNQyvsdJDzTuBesZPeh7elwakeAnYOmEUNHuRYNda3ffKddEe9Lq42L7lWjcIrJlLpENm+tjicQu6+ybNnqJfw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dH6ITgYzGSAXRWxmWl+up8WZ2wFyu3w11rbk+rKMkdE=; b=GcehDpYXHhNELzwrN+jrKvKv4hjbDpqs1715sWUbH+DYevvGrhualgXjSG7qcPTDXPuAP/dONkL0nkCQVpVq5/vWr28b05yfX1VXS/ulsbb9+1nsBYcZKOUeXeNR/5SM93dksih4JRR+vxzHI+s7tKQMUCt6ZBffCl8GBIX0Rxs= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by BY5PR10MB4164.namprd10.prod.outlook.com (2603:10b6:a03:210::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:35 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:35 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 09/21] xfs: handle nimaps=0 from xfs_bmapi_write in xfs_alloc_file_space Date: Mon, 5 Feb 2024 14:19:59 -0800 Message-Id: <20240205222011.95476-10-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: BY5PR17CA0045.namprd17.prod.outlook.com (2603:10b6:a03:167::22) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|BY5PR10MB4164:EE_ X-MS-Office365-Filtering-Correlation-Id: 936c3825-932f-40f2-8e32-08dc2698ace5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IjAq/FB94cSxsoPlwpRAIJhDBtJRmhJHtrRuI3fEkn9Xjzp4GuquvCNM3Qkbz4ulRhYOPKNkBQyHuLmK0o41/+1XHmd+0xlucxUVeqSRfYbOPl0PawNL0jpGAcsar8DklkeupOKMGZ9VHgNRvWpD+SgdxZyN6/8HIrtSiNM66xF1QP91uPADmJ0iZ9Bm5IDqRbgDE3VPtPva8FDwbg5X1Wi8EN9HWj5SpAeL+Hwok9fHU7TJmX9xQvYKwcwMGD3RAotzf/kdBze7wz36fhKZFKfnRVtvrZdAx45VfVM7CMzhAKIMy8xkLvP9u5EsoU13Pq4DsamoszxV+YJKKIHpx2td9xR0O5+gZ3y3Cezq5Vqs8QlovvpRyri1HmrUaTtfvpyWztuoWrGeoBgRdOYuxk8W5ux8t5rvgpt0b8GAreaTS6oJ/0aLVZy0szLMk7tcYRahQS52N8sVTf907TUngcgTfzLJVhuAdqn+oo5zrtJkHjyeW0/i4PYjfBdmeVzo5//usCdrywa2bX3HO1A6A9xNeuvYbsPRP8ROmmeIvKR0EwG26LS7I026BbZg1dmD X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(346002)(396003)(39860400002)(376002)(230922051799003)(186009)(451199024)(1800799012)(64100799003)(41300700001)(316002)(66556008)(66946007)(6916009)(66476007)(86362001)(6506007)(36756003)(6666004)(478600001)(6486002)(44832011)(8676002)(83380400001)(38100700002)(8936002)(1076003)(2616005)(6512007)(2906002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Zo+/MR30ED6E0AIHWzK+r1In3ZnREgDAXlL7BWSc/rdBlab8SbAa4lCPiKrBTsNFpxCQVtL8+yV0UPcWzSO1y2kkFoLZK6jZn4ThPPpReXciTQHIOh+Xvj/oGkOSUx3dGVkx50V4kjCbNh/6MVT3zDBKVV8kAq+gbU7n1cSzAsHXiz0yB433K3ObbfIxXQNvFg2zZQlLZUATH3vH5Kel4GwQxHhbGzA1avxMeMnbV2vX2Yvgo10qdCTPhKpY6qJMSL0rNsZHrERhMf+9EgjjGjM8yAK4pPExMRjkQo2l98zNJki8w9pg3ptHUsLs50Ga7dMr3fPEpI1A+okDiWPhxMCv542E7wKTr0Qp+SppqXRpqObsOk5VirzCrRXuJJfZlzg3zj68SLud+qOKAfwTVhtkQsOPKEkIOu41mG7RT3Jdmnq94urg0Y+bhMs2R8F3RxprW413sOW8/G1IzbQ1mAgP/S+kvRWckRQx5iY3xSYW+dG6YXAoNTGKqAjRr7P9JVZAIbqmeTd2odBRRd1n5LuLwFmJp/9JYL2+gEsVnc3tzBRTLRuULtqDEghseOr3yld6JshrXAnRSVkFtzhK4qc3D3fOLslCEatiMg/y+46JYbU9TQZuSiaPThOeUbOR2AWFZ51tQs14ZMRTVRKsBNdZbEjfupuZdz5WJ99ptqLFdfprRQOZ2FL6Hy6Ez1lg4xUT+Kvvvi0gFFmMAjzRMt3lO9o5oUPh2rWBvaLfNrt/mZicaTclIWP/qP+iVRir3f2Sn6ROny+kP8NaNpiHyx1A6gRlQO6v0TyaKZ4p8ohCAmNf9kG++XgKoeSN1xpmyEONndT/sXGu9lExG1tCpoWxgcV7spQEL1oOQd5kPjc7mFOs7x38gu2Z4Vz5gE4zxSWALgRjAJjPh3KxIhpJyIZQEduRZrzu+usuqUY1IWEMZWLttROMBIkRjXWvPI7vrEh6/XLRDccMFQKwOYlN1+yZW9uigTUiANZJGLjhAwicoL/0XNhlErvH7BFJTiHZ13fUIfwX3GrvFbG8f1N7JrzhWQCEk6cyCnybipofqeVFA8i/M4ie4wU43BBAMxQw4QLLEnnsvX0yMZzDvuNjOt8W6vK3qYfg5NC0KNyHa9YEraOMxN7AbE/FoPwXnCWhF+Qq4tmyftRhzGCHKzjzxV/rRxDYRvLAzBrQCB649tMUx360qXgNRhc51O1JoL8Urt3LC/XfoAkAlvCdOyQoGvEjO1G+B9ehpIOSRfjJq+Ckh3JqysoOQe1TyFrTL2DB1DO0G1JkjGu30FXF4h7D68ly0HjjDUwDuhLEtA+olKTY04/HCsgjC3Fo7Y0rS1UAuJALi/8e77f9YtrlajKCBl4Efl7LkRwKNOoZiI9i3xczhCithqST6OnV2KYhBhHuQmTzGrdPLbTlZtIOhZr4ypNvPNK+Caa8PgN2uBLgnmirEMpad3f8zaj3B87Cq77TiFZAMNulFiYn5iFWIQir3UdwNzXhRA5ntBJGmZMBcy/S2ActAqP3xQD0eim5pwLz5htA8v/wynH6X1Ur5OeYpCza0swSLR4u2E/sh2Y1dg1JSZn/xlKugLWRRFgMHUgl370fWj69n+0NCBSYGVIZX92iOuMZln7OqKP0GcNH6qYUKe7H0b60TBNGkqIeLPIakYjwLnK1+YbvOpjk4d5Crg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: f9ehO/40utZumldcpNGYaf829WDO9GBEXvENcoGz6l94Uza2HsjRCJ+BW1oImf0E9moyNCyVVuohC0qhxWBhWtchM+tGEizHv0juBkaRH+5Yb0+HW2wOA0l/lToR4/51enVNbHrBSpnkgyWbjkihW6btrtbb5YtkqKqCk18E991i0d17rAsUQOQ1Fb8XPFQE9Lv5JJfwzR/51PsAV431tNk6tXK7kXveCJP61WRBh67zHpHV8liclhTBa6/ZccGgXQ6/ffvmeWwuK4tbG/GTiGFmzZGS6u30Z5SOeCsnWYwMmgS8jMDoD0NlfZiJg6SkaVeKTiRw/ACG3vA2W76v0T9hOfTVjTYoq3gyZJTmnT9wyTBkvt+utECaQbjUIniIYFbwQUb3G08Psobe/lB5OoQUHsF9qv3bmQNMhFx5zJXvJ53dM/rNwvn83uQpnwH2Tq3RkJSczGmRVltFr/tavC+4ZdE8ziopz4GuCSE/x73CoQB9uLRp5g9M//zKRCpOMhsJfgQ22mQhoPzWUrlXkr7kxTptg26lrs8Go/uPP9/RGNWHlEZIywYyaMhXs7XS6KJTbLesS8FjeZcuUilp4VToBlYhTL+Efxf4lAspk1Q= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 936c3825-932f-40f2-8e32-08dc2698ace5 X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:35.8224 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VNcDoFhsAo98VMYqs+N2Wd3GIlrpVmQo51XcqGXerAb4P6z41mUUR/O78J9lrZxnbiVv7VFrS7e2AOOsz/MNgQzvYgP7v3Eo3O8S2ZzohWc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4164 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 adultscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-ORIG-GUID: 4mmtMdgUmxfi8jfIrwQVIAo2Svrgf9N5 X-Proofpoint-GUID: 4mmtMdgUmxfi8jfIrwQVIAo2Svrgf9N5 From: Christoph Hellwig commit 35dc55b9e80cb9ec4bcb969302000b002b2ed850 upstream. If xfs_bmapi_write finds a delalloc extent at the requested range, it tries to convert the entire delalloc extent to a real allocation. But if the allocator cannot find a single free extent large enough to cover the start block of the requested range, xfs_bmapi_write will return 0 but leave *nimaps set to 0. In that case we simply need to keep looping with the same startoffset_fsb so that one of the following allocations will eventually reach the requested range. Note that this could affect any caller of xfs_bmapi_write that covers an existing delayed allocation. As far as I can tell we do not have any other such caller, though - the regular writeback path uses xfs_bmapi_convert_delalloc to convert delayed allocations to real ones, and direct I/O invalidates the page cache first. Signed-off-by: Christoph Hellwig Reviewed-by: "Darrick J. Wong" Signed-off-by: Chandan Babu R Signed-off-by: Catherine Hoang --- fs/xfs/xfs_bmap_util.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index fcefab687285..ad4aba5002c1 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -780,12 +780,10 @@ xfs_alloc_file_space( { xfs_mount_t *mp = ip->i_mount; xfs_off_t count; - xfs_filblks_t allocated_fsb; xfs_filblks_t allocatesize_fsb; xfs_extlen_t extsz, temp; xfs_fileoff_t startoffset_fsb; xfs_fileoff_t endoffset_fsb; - int nimaps; int rt; xfs_trans_t *tp; xfs_bmbt_irec_t imaps[1], *imapp; @@ -808,7 +806,6 @@ xfs_alloc_file_space( count = len; imapp = &imaps[0]; - nimaps = 1; startoffset_fsb = XFS_B_TO_FSBT(mp, offset); endoffset_fsb = XFS_B_TO_FSB(mp, offset + count); allocatesize_fsb = endoffset_fsb - startoffset_fsb; @@ -819,6 +816,7 @@ xfs_alloc_file_space( while (allocatesize_fsb && !error) { xfs_fileoff_t s, e; unsigned int dblocks, rblocks, resblks; + int nimaps = 1; /* * Determine space reservations for data/realtime. @@ -884,15 +882,19 @@ xfs_alloc_file_space( if (error) break; - allocated_fsb = imapp->br_blockcount; - - if (nimaps == 0) { - error = -ENOSPC; - break; + /* + * If the allocator cannot find a single free extent large + * enough to cover the start block of the requested range, + * xfs_bmapi_write will return 0 but leave *nimaps set to 0. + * + * In that case we simply need to keep looping with the same + * startoffset_fsb so that one of the following allocations + * will eventually reach the requested range. + */ + if (nimaps) { + startoffset_fsb += imapp->br_blockcount; + allocatesize_fsb -= imapp->br_blockcount; } - - startoffset_fsb += allocated_fsb; - allocatesize_fsb -= allocated_fsb; } return error; From patchwork Mon Feb 5 22:20:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546331 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F0BA4C3AA for ; Mon, 5 Feb 2024 22:20:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171646; cv=fail; b=H+ZsQkp/B3uKLpiwaDtpSaqbsEYOY2A5YGisFeyUmgrvLdb+oIfyxe7HYrIyE12c69tnkZG+jUapFdsEGSeOTX1s4Nhzne3Xlt9H9DcXVwPTw+Sq0PevhuJOWvRYCmupCLh7ES7M9oPk16kVK/dqf474ohvnzOjUIu4wIiCOE+w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171646; c=relaxed/simple; bh=1EXSZ4iU3I8pgM4bkKizf5fGqqe4QT7Of0bIhF3Y3W8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=i3j5VYcJpSVU11Kk0xFs/xD+FSS253R41bhWlvvLd62F7bfxznzSxM67jDfW91bvHSm8EKEKplNzkpN7KFcRgy2Omsd6uWipcYo+duUINwbZP55d3QfL3Bu7u1xMSIIK7bjQbzwBae2WqUgtD53tVobVwqyzwq2/FfkMaRycgfQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=CowNkBf9; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=LO5Hq0VP; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="CowNkBf9"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="LO5Hq0VP" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LFkJi024970 for ; Mon, 5 Feb 2024 22:20:42 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=P9KaY+5IMBkxdj2U2wEtdky3D0IGhPhNPnyjLehqSQ4=; b=CowNkBf9uADy077JTR84r0rJG0qM4I1V1EZSR1RDUkZXEmWS14WcvpaiwLN+6dPbc80G QVl8OyLPzEaFEbDktvm76OJtUG6LBm8/f/D2qTmGoLX+KmDvwXNcI623TSq9fAuNNhsC 8PBMD0GYOl1YieN6Hmp1z/lpJP4w2dvgxkRYhV54YtGruwoB7PxDFxVBx3YWKlRC1sZ1 NkNloeMR8aMBtiNeMQ8psvnUncYEFrV5Nm7v/AFwI9fMiAdqej2D/+213/K43FO3TNEc okGn+524vcGW9e3X3G7mWvVhErt6LyfLBH6dcvVB5Kx26oo5W9r0DmshQGIIJVDTyuku DA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1c32nabj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:42 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415Laq8r036819 for ; Mon, 5 Feb 2024 22:20:40 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx6e1d1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ll5yt5fQ5VhVCLa28D2EN3g/PhKgpP/fmfMXV1VLEvlWP3RwfzkebqIIsWJBVbQGDCW4HXJCjUNi5S3LTcS5sAZkzL66i+jGTVGCZjdynnWkao/X8Wq/c66G8+Lye4fjT4QrstgXM7zdh8vrSoiP0kME7RJkk5fxtLbKg3L9qyaeSlJDkFMEC6Y7jtLOvM2w8RRcjhP/kxYyxMbPbNcQSnd9/Nqn3qTfx2j91AWI+4guZopi8m+l2gpwKI/K8NKtUsznLFbu9MLO4dOMefeS7iI5GQlfxxGlr6HZ1ylxO/CQdDAirKPHQMSkjQFp6rHaqasIO2Mg8TAEd1X4KajcHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=P9KaY+5IMBkxdj2U2wEtdky3D0IGhPhNPnyjLehqSQ4=; b=B1rnxImxtMFgLkX59y6008RsEBAKF8R+Py36ovTWoaqhNFBBmvOH3XwCNHoLe+rAwA5LRS778pFkpZwpQQhRPGuHQVzcwJcAZYU3uBxtRRiIOD9r7lxZiybuE9obCu6DEB6dEOWQyXGRYeoTprGz5cqqmsC9PMvKBzSm+ZHR/oMQIBfwgga88yKjrlc9fvdHE08ei1go6KEfOkKP6nGhu+kThfidYUyBBjfCVpxFedfdaHLkbaZDZmcAqDdXCmmlZUVrXnLuT1Bneq43xGrZRNiYtGMbeHt1imxip26+SCa9XHcgRgdH/ES8hunc8JgvA+xlaOqQ32wPmHQuSPCWdA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=P9KaY+5IMBkxdj2U2wEtdky3D0IGhPhNPnyjLehqSQ4=; b=LO5Hq0VP91jF9wKebkCutoExR00UZkgunkXqSbzypcC9jlaZNaYz9LKpoKitGkFoxpH57WtYu3K0kTVrMRF5Cdg/zPjlHJldXqvliPFIJekZVeqYaaLo5u6LqRpLXt/biOqGL2YGiAqsmmH5abGyb0PgN54sYn3XQsorit3HiHk= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by PH7PR10MB6402.namprd10.prod.outlook.com (2603:10b6:510:1ac::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:38 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:38 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 10/21] xfs: allow read IO and FICLONE to run concurrently Date: Mon, 5 Feb 2024 14:20:00 -0800 Message-Id: <20240205222011.95476-11-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: SJ0PR03CA0041.namprd03.prod.outlook.com (2603:10b6:a03:33e::16) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|PH7PR10MB6402:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c4bac3b-3606-4a09-b267-08dc2698ae28 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xBGzEE+Om1odOvG1FsoagsCO/hwdg4VbvmmYJuEMiiu/6Di2qvfz2PnQIddod//tfpGPMjEl5819On8YpeNM2LnPFG0zbeFrkhk9nnkw8GMes0Gmgucm2V2VMvhTwxFAzkjxG8dDKt8QNkSQXk8zV0V1WXIzM2dKKSkRiCal2ZOFwoRKPQMyGbM0pS0tfRmtJACvjdEs+kYj+E3RwBCSPoeyRHuCyOtD52J5qUlK8QePHqWs/hTqjLJPBCxMcKPALcK5ezejbk/M+mK+LQL+Y/WUqqE2tSVTu4Li3327qZhQy/rTYE5ArR8un+hCFYnWjTTo481M7reGsXRu+SlAutakPnD7VURsvnTSACeybwjpm7ua+ALjl5BznH3itReIogo3qoMEIwEnBP4wLCsFN00NEGBQyNfIt44W2022S33ncKiPwhgzppGXtsa6GiTxW5ZziTIWwDut5YKyrc2xuVYaPUBBT8MapW7qa2XqXot3nKHn4D7O1l4QslgOVjVBHNHQ8I4ymsLz7N1Vv0iIMTv4fl1ACwlV3II8p6Q/e+0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(376002)(136003)(39860400002)(396003)(366004)(230922051799003)(1800799012)(64100799003)(186009)(451199024)(41300700001)(6666004)(316002)(36756003)(8676002)(8936002)(966005)(6486002)(66476007)(66946007)(6916009)(66556008)(44832011)(5660300002)(2906002)(38100700002)(6512007)(86362001)(2616005)(478600001)(6506007)(83380400001)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: czer69t5h8jyT0L0Ga8DSbbZPIdeyHVdf4Cl7IeU4yIOw80z0aoRM+hRVOSzLYRQLuUDKvzYmyjx+MNAisgsnaiXU+T8tLEEFlWf5Q41LzGR8s3b/+8gsQZOcHfGe67+f4nCtZKOHynruyCljiUTmCz3DdYgxJXhNRGazwI7n5u3TykdCrae0TD7P/x9jKlNssQacIGZCXA7ZlP7MYAzS6/2r8s90zmVFPaP6NIjImJ5rx02vlMsrCuRvcYKWvuLI+M2m8bhl9IDBvIwwJ+GB9HotuiSr8U7GLDXu51zOev4+hbcqDfsiYcs3SfTHYGBqFFSFbcu7zIpubFgO3Wr/uEXy5hjXv3du4F/Q6+Jwa45vATKaTh79WZhWMENjQSHXt2AP6PklH9SNvWMYhV7/fdq+SWlKSeOut8Hc5qK9LRRId/wbIe1wsfuaNYxel449I1/dV0EqrMddLbkNp2PkXVBN1cP/j6Flpd3gL+WwpxYiXjLTFYwo4Q3bvfQwEKSFV7ZT4vUbLUjpwlQb0R9+9g3bt6JCfupfQ/0mZt91EubGDGh8Gxo6aFkTD+uBH7QH5kRGThvaBn8bk8ddgOF55VyAAU7SG/3bv3YdwsFGgfzReFaBgIcDucQEDkPbyZW/r/J0t7HIVKqTtfYM3T1Ejwyxtldq+83y47x3JL7HrlKapA/wz/Y9HTIMGfoIxr7SQM7UwZNkQZqQ9dG9h2Qi+ruPJMySRWAHEyfv46AIqI52xLazVTamArSpBAqSp8brMmbJH4mWZuc7N0OGUGweebUM/FwplCa9VFX+XHw6CpDH+Bz0sgPDbGvRutz5SBBh9Fj3bauGBOb0s6ZUIITWb89r0wY3IvlJO3upWObzHxHGgQ1fLagQWULPNA7V5wZCfYrK70obIEtRGejjAvKh5MJMvw4hfq/gZeEJE2mbpYQDc3SwPtEmNHkyA6JkNMSgREtfhSb/Y1/T+8heRRDiojP/HA5NPMOA8pmtGLj1fW8UyUxYhR92xxAVJFW9tA+U8p7AVbL6J7cojRM8Qpy/yhM/gyv6uB8OZEWxM3X8RHpZUfbfZ8xPDagPh4J8FQV0fR64q7V188XodKXlBpEkLP+hABMuni1Aa0yJW4YaA2uB7TTkdmbQQrYvH8yK81/htmqk3VAxf/HOrwP1n5qZS4qb/htOU2JcrJnRz8+sogxQyMp78UscIV2au3ajSoOM1/CyPcgmOB90ThosCghtSCR/l27Gfn5Q1luR8sSf+oy+mTt2GAHNTa7w7zJ+131R1oUmhxyKA1cspbP2zc/rG2+P/moV77cEqYhdBaMPLglPcxuWC+jrqBJ7fFRqm/gYlNGN/AX2ntePeApuTYOvApmi2+Us8XR7mhSGBuIff3+vUVOP/DpF5ydhKxaHRExN4DHjZ9XhowiJfFqW9nvnO1cpn8dwZ8WpreH2GZp0CqtVK7s9gOAaQKq3Aq2Fi3oEALMOblSVXZkf+a0qSSKnKCCc+b7+gULxvLfoqtrzVSqSKjRZLLui0Zd9+2sxX5B5iRi8URoX4oKv54rtnPMC8SUihcQ7GhBnIynRVk4cPCkswKX2Eb5TONEnmN3TNjYuyZpadCnHEuNpUHIHHV4CmMdYqjXbNw2/11sAIA6JTgD80B38LpM5fBOoEXDHEaI2fFpXTI8kDfv+cCz53DnvQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: B1HI8KF0vZZLdEd+kcwgqJEr5Z2Fd+ehnk7OfIJ/dHxNGdTd05yE6m3o15lwHUrkIvvhuVYZS/8sAADU7n3IsgEn6R+Y2vtklc2FR0bKcrtAS9OhUxe+cNTFYzxpw+zEPseP9wvutyMS/yhQZlB0N+Q0jg+w+orJhKHIKut2pxw7ZrLVa+vb3gTSPP7844P7TADvjAODNiQeES80w0+G9G0FaUSUgQaauVXSYBtTvHem8CkvMAyXO43CpG/haSkXvt4tA/AJGijguZHUluCf5NEaR42LFdIxlRSenKZqtX080vL7eVNx6f2zDZLMVUYtyBfN2RxO1xiU6IDlvqqWpjcQNKmTB8zPmB43u27DtqvmxgK2jdUOPERgLijfdB8WS8z30HqrhLM58mcFbup9KLjq3tBlGTDwYGiBqDemRFiXOBsjuiNxRHqUWC+RJPx24vdRoB0FGN+VV1OvmPrMHgrYeBTaJAYQbhquJ5VsvGPzPfaaWfRGg/ImS39AfN1tFr0nFothfh862llvnaAqXuLfjuCS9xtG1gzWfRcFeXs1fjvUj0/Hv1CkcCa48836zSNrYZ+JKREMllM88iYhCxvhWa4lHUCOKvuSgBHXLYk= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c4bac3b-3606-4a09-b267-08dc2698ae28 X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:38.0262 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: WxSOY9IAysf66OhwcAKmCFJm/DpdlD28sT6XOax6AVYNpUtzXqK0Xr0/DR73aTApCZuN2k2vHg2zNLK7tCIIq9eXHqbm+QLEZcg7kxtvN2c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR10MB6402 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 spamscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-GUID: FQ4cAg_9cMJixQtPxuzqj1EUlFBg0wbj X-Proofpoint-ORIG-GUID: FQ4cAg_9cMJixQtPxuzqj1EUlFBg0wbj commit 14a537983b228cb050ceca3a5b743d01315dc4aa upstream. One of our VM cluster management products needs to snapshot KVM image files so that they can be restored in case of failure. Snapshotting is done by redirecting VM disk writes to a sidecar file and using reflink on the disk image, specifically the FICLONE ioctl as used by "cp --reflink". Reflink locks the source and destination files while it operates, which means that reads from the main vm disk image are blocked, causing the vm to stall. When an image file is heavily fragmented, the copy process could take several minutes. Some of the vm image files have 50-100 million extent records, and duplicating that much metadata locks the file for 30 minutes or more. Having activities suspended for such a long time in a cluster node could result in node eviction. Clone operations and read IO do not change any data in the source file, so they should be able to run concurrently. Demote the exclusive locks taken by FICLONE to shared locks to allow reads while cloning. While a clone is in progress, writes will take the IOLOCK_EXCL, so they block until the clone completes. Link: https://lore.kernel.org/linux-xfs/8911B94D-DD29-4D6E-B5BC-32EAF1866245@oracle.com/ Signed-off-by: Catherine Hoang Reviewed-by: "Darrick J. Wong" Reviewed-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Chandan Babu R --- fs/xfs/xfs_file.c | 63 +++++++++++++++++++++++++++++++++++--------- fs/xfs/xfs_inode.c | 17 ++++++++++++ fs/xfs/xfs_inode.h | 9 +++++++ fs/xfs/xfs_reflink.c | 4 +++ 4 files changed, 80 insertions(+), 13 deletions(-) diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 203700278ddb..e33e5e13b95f 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -214,6 +214,43 @@ xfs_ilock_iocb( return 0; } +static int +xfs_ilock_iocb_for_write( + struct kiocb *iocb, + unsigned int *lock_mode) +{ + ssize_t ret; + struct xfs_inode *ip = XFS_I(file_inode(iocb->ki_filp)); + + ret = xfs_ilock_iocb(iocb, *lock_mode); + if (ret) + return ret; + + if (*lock_mode == XFS_IOLOCK_EXCL) + return 0; + if (!xfs_iflags_test(ip, XFS_IREMAPPING)) + return 0; + + xfs_iunlock(ip, *lock_mode); + *lock_mode = XFS_IOLOCK_EXCL; + return xfs_ilock_iocb(iocb, *lock_mode); +} + +static unsigned int +xfs_ilock_for_write_fault( + struct xfs_inode *ip) +{ + /* get a shared lock if no remapping in progress */ + xfs_ilock(ip, XFS_MMAPLOCK_SHARED); + if (!xfs_iflags_test(ip, XFS_IREMAPPING)) + return XFS_MMAPLOCK_SHARED; + + /* wait for remapping to complete */ + xfs_iunlock(ip, XFS_MMAPLOCK_SHARED); + xfs_ilock(ip, XFS_MMAPLOCK_EXCL); + return XFS_MMAPLOCK_EXCL; +} + STATIC ssize_t xfs_file_dio_read( struct kiocb *iocb, @@ -551,7 +588,7 @@ xfs_file_dio_write_aligned( unsigned int iolock = XFS_IOLOCK_SHARED; ssize_t ret; - ret = xfs_ilock_iocb(iocb, iolock); + ret = xfs_ilock_iocb_for_write(iocb, &iolock); if (ret) return ret; ret = xfs_file_write_checks(iocb, from, &iolock); @@ -618,7 +655,7 @@ xfs_file_dio_write_unaligned( flags = IOMAP_DIO_FORCE_WAIT; } - ret = xfs_ilock_iocb(iocb, iolock); + ret = xfs_ilock_iocb_for_write(iocb, &iolock); if (ret) return ret; @@ -1180,7 +1217,7 @@ xfs_file_remap_range( if (xfs_file_sync_writes(file_in) || xfs_file_sync_writes(file_out)) xfs_log_force_inode(dest); out_unlock: - xfs_iunlock2_io_mmap(src, dest); + xfs_iunlock2_remapping(src, dest); if (ret) trace_xfs_reflink_remap_range_error(dest, ret, _RET_IP_); return remapped > 0 ? remapped : ret; @@ -1328,6 +1365,7 @@ __xfs_filemap_fault( struct inode *inode = file_inode(vmf->vma->vm_file); struct xfs_inode *ip = XFS_I(inode); vm_fault_t ret; + unsigned int lock_mode = 0; trace_xfs_filemap_fault(ip, order, write_fault); @@ -1336,25 +1374,24 @@ __xfs_filemap_fault( file_update_time(vmf->vma->vm_file); } + if (IS_DAX(inode) || write_fault) + lock_mode = xfs_ilock_for_write_fault(XFS_I(inode)); + if (IS_DAX(inode)) { pfn_t pfn; - xfs_ilock(XFS_I(inode), XFS_MMAPLOCK_SHARED); ret = xfs_dax_fault(vmf, order, write_fault, &pfn); if (ret & VM_FAULT_NEEDDSYNC) ret = dax_finish_sync_fault(vmf, order, pfn); - xfs_iunlock(XFS_I(inode), XFS_MMAPLOCK_SHARED); + } else if (write_fault) { + ret = iomap_page_mkwrite(vmf, &xfs_page_mkwrite_iomap_ops); } else { - if (write_fault) { - xfs_ilock(XFS_I(inode), XFS_MMAPLOCK_SHARED); - ret = iomap_page_mkwrite(vmf, - &xfs_page_mkwrite_iomap_ops); - xfs_iunlock(XFS_I(inode), XFS_MMAPLOCK_SHARED); - } else { - ret = filemap_fault(vmf); - } + ret = filemap_fault(vmf); } + if (lock_mode) + xfs_iunlock(XFS_I(inode), lock_mode); + if (write_fault) sb_end_pagefault(inode->i_sb); return ret; diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index fb85c5c81745..f9d29acd72b9 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -3628,6 +3628,23 @@ xfs_iunlock2_io_mmap( inode_unlock(VFS_I(ip1)); } +/* Drop the MMAPLOCK and the IOLOCK after a remap completes. */ +void +xfs_iunlock2_remapping( + struct xfs_inode *ip1, + struct xfs_inode *ip2) +{ + xfs_iflags_clear(ip1, XFS_IREMAPPING); + + if (ip1 != ip2) + xfs_iunlock(ip1, XFS_MMAPLOCK_SHARED); + xfs_iunlock(ip2, XFS_MMAPLOCK_EXCL); + + if (ip1 != ip2) + inode_unlock_shared(VFS_I(ip1)); + inode_unlock(VFS_I(ip2)); +} + /* * Reload the incore inode list for this inode. Caller should ensure that * the link count cannot change, either by taking ILOCK_SHARED or otherwise diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index 0c5bdb91152e..3dc47937da5d 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -347,6 +347,14 @@ static inline bool xfs_inode_has_large_extent_counts(struct xfs_inode *ip) /* Quotacheck is running but inode has not been added to quota counts. */ #define XFS_IQUOTAUNCHECKED (1 << 14) +/* + * Remap in progress. Callers that wish to update file data while + * holding a shared IOLOCK or MMAPLOCK must drop the lock and retake + * the lock in exclusive mode. Relocking the file will block until + * IREMAPPING is cleared. + */ +#define XFS_IREMAPPING (1U << 15) + /* All inode state flags related to inode reclaim. */ #define XFS_ALL_IRECLAIM_FLAGS (XFS_IRECLAIMABLE | \ XFS_IRECLAIM | \ @@ -595,6 +603,7 @@ void xfs_end_io(struct work_struct *work); int xfs_ilock2_io_mmap(struct xfs_inode *ip1, struct xfs_inode *ip2); void xfs_iunlock2_io_mmap(struct xfs_inode *ip1, struct xfs_inode *ip2); +void xfs_iunlock2_remapping(struct xfs_inode *ip1, struct xfs_inode *ip2); static inline bool xfs_inode_unlinked_incomplete( diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index eb9102453aff..658edee8381d 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c @@ -1540,6 +1540,10 @@ xfs_reflink_remap_prep( if (ret) goto out_unlock; + xfs_iflags_set(src, XFS_IREMAPPING); + if (inode_in != inode_out) + xfs_ilock_demote(src, XFS_IOLOCK_EXCL | XFS_MMAPLOCK_EXCL); + return 0; out_unlock: xfs_iunlock2_io_mmap(src, dest); From patchwork Mon Feb 5 22:20:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546330 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CA4364D117 for ; Mon, 5 Feb 2024 22:20:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171646; cv=fail; b=OnxUR0jzw7X8VX/1vJ2s2Autr6nlDaVpqffexM2XzX4UhVVUgL9mixCddhzMiAfcFBPuLjaH85T+9LqN3kwOGsW3Ely9dOfQPxfmGFNf2dYB/TotxvO7rHapNGurwkwLDjoYptthtrEbqf+/PAhEtEjbatfA0QYG0gleFR3+wSI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171646; c=relaxed/simple; bh=ptQUU1riNYeaZ6ra63JPwMP6vbPi8VoDd9PokttUThs=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=AlTRE1qbsNgDh1MLZuggAfvcJmWMfOFS6ftb7vRYV2OQk7hwi64tzeos8anvKGXOg6ii+nYc587lD1J9bAES2rHJWCtKNSvREaPHdTXWdzNfc20WxbDPgsm1yrdNimfgYTVY4R3Tb1yX1LlIMUOM6H7LDWiWIBXslGvGuZWbiCA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=jFWF0TMz; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=b4prWRZS; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="jFWF0TMz"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="b4prWRZS" Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LDx4F017389 for ; Mon, 5 Feb 2024 22:20:44 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=Rpp41uyfpYqkyVkZRwrxUVLNdfIlk2H6xU10UsUHj90=; b=jFWF0TMzk1s2E9rSAVcjihDysAWiK5sWbieFyUATbNbNuynm2GH5YQRbFq773GXqNB8t TIYTj2H5o3z6Yge7VQ7i/VUfrkYQCw3MRg4tHzK2H1xc6QLaZ24z68sIHEiY+Ldyu6EJ CBbXjp8nIxKXPOqqQxFiaa4FNMV6lq34R2KkuoSSMwE1iBliqZZHZFznVoVbYkXb3I2v gzKTXnfXXFNAM8g7kPkD4oUDg3MMk4HwLPpnbrE/exD+MtcebqkWi/guQ5kzFR86c2bA ckZ9YdcNHmH7Crm+WShIIWQJsT8nYkXIdzYmjhSF9gzyzpwk87rMZgong46KnbDZuJRm 6Q== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1dhdda6q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:43 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415LbwVG007131 for ; Mon, 5 Feb 2024 22:20:42 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2168.outbound.protection.outlook.com [104.47.55.168]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx6k5rr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ej8qT4AzlCYfk3okZmMUP50YqOWvUnlJ4Ppk9cpVYF0GOMZa6pPpGoRYbBmc+jBQzRMBjhVpk0KPsptr9C8Soni5c7HI55DRPv7suTgh8SGMRKA7S4hsDIYaEto8+/X+x+r7/iNYcFp1NJJWffk9TKvMZqsecWefy3uXzI5YXes7RKppFsXj4eORvoOvwYE9M+EsqpxrZ8EoTcFM7CXvsRsSIqP9eriY32/3eoLhlfmWRd5VsvaPc/CvACTL10HZfvg/Irk0GYBRQccW6IU90V9bTebPxaVDQtljoM+GwwxahNQO6MCnxoLAGi8MrVjUZbvDsdkXy/5jHsKyOUsy4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Rpp41uyfpYqkyVkZRwrxUVLNdfIlk2H6xU10UsUHj90=; b=RNzLh3QXlABSYkWMO6F5erMAGNEn+Fns30rcz3RuMh9qvLB+2ZkUiWhqAopKMNQWwb8s4G1ejVU+DO9RQXBMtlVx0a5/0r08GD2GZC1KwWCvQhajeAzqwa6oT1gn8r3gqA9eeytfsy06+UP1YGPvjmuq3tKPp32MwpVgUcw1fIZhM7/wZgxISXWmsJXQdEL+vqmR7ULbQIbLHMzL7imudCkNkFnTajLRo5saGf7haUFGP3dvSj1Mhzm7G8/ERg0U1aq3zg5zlXFYncfLuFjp0DgZE+447Qb2R4cgLyp//qPptkqe2EUNSWrc4IPBVRwFUt9qdhaBtY0uAH13WAJIKg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Rpp41uyfpYqkyVkZRwrxUVLNdfIlk2H6xU10UsUHj90=; b=b4prWRZS9y2MAUU9aU/cl0wUCTTzmhqAqOo3pTJr1K4nMP3XduZeZ5rgRdicjNVygmwUN3A/xSDqccvZm09fhEeU/MCnYx819AWxIBP80fKMe7qzgQ0NmkIJ9wKBWrmPfz3ZX5+jsEtKdvbkgIXIsqje23LsMYW4btFLjsnPFhg= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by BY5PR10MB4164.namprd10.prod.outlook.com (2603:10b6:a03:210::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:40 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:40 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 11/21] xfs: factor out xfs_defer_pending_abort Date: Mon, 5 Feb 2024 14:20:01 -0800 Message-Id: <20240205222011.95476-12-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: SJ0P220CA0030.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:41b::6) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|BY5PR10MB4164:EE_ X-MS-Office365-Filtering-Correlation-Id: 370f3c86-1470-40b3-9d43-08dc2698af84 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SnFNb0JcJWQGyA4nDGv1pa8rgXq4M5FkvETwQD2EdY0eE03xYYsQuHE86sqfhtjGDNy1b4WxLfBjnzP/UHkO8b7mdSFI3mNCzdylISGT+NL4O7LsCFomxTfh4txXGF0/T1ne3I4/UzHHcDvhOGpJ3HykeDd72YstmI3ek490VOo4+R3LR10g/EsCkV1s9e7/seRxXhgkq5LPUZ/afnH03uPpMctgIqfs9JPCbLx6LX/DFhVm/9OvyrQItUmM3JHDbfeXqUAGvutsMX0lvWkrU1Hrc5usKQvUgJ3rSM+tQdcSri5lVcOu8/7cmgIXB8w14cU5iTOgM3vdFt0wPBWJUr3nRWE2eXyBqaykGs8NIgU+CoNVEjpRY7nBYQ1hBlLpcToKxVdoztLvbFO8QsSWoecFBrf73vftLty6BR7Mfc1XitQNpVNHmSTFxKiVCb07stbLjXp+zjkYOBQRPeJR/KQi4RQSoh6VioRfjKENIU3JPF3rsgxuq7B0KqIdqGKRDhhY+Bf3hIYW7Ruav0CK0OeHTdpmEtKT86cXAtbz8lci9B4QQLtTUeG6tKqHCIWz X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(346002)(396003)(39860400002)(376002)(230922051799003)(186009)(451199024)(1800799012)(64100799003)(41300700001)(316002)(66556008)(66946007)(6916009)(66476007)(86362001)(6506007)(36756003)(6666004)(478600001)(6486002)(44832011)(8676002)(83380400001)(38100700002)(8936002)(1076003)(2616005)(6512007)(2906002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: M0W2bnjpbfDfEioUbr+8nKGdTdZDmyYfKputOO9JYOl3dJbSePAUUXNaGi75niCh2W/rhhdIjJTiALCvE2ahnEtr5UoGRw82F6h1F7Y+4hyJcdRtJ6S+1Ccx9kefe+PuGBz+jNevlDrWadNomKCsEgYvuZ28B1JGYO5Saary1nxV4CVKL4eoSXV1LkiGeSlxmxBXs8ijM+uFO0SHPZVC3FKVP7ceJWwoIKn6KhXAbe26YdcqUvqA7o5gURsWlogEAB/Hn3Gpads8NK7pgJV6bXQp/sZbf79rKDldUXyasCy2OvaEnhxgKuZQhGE7Q1y0bwkv96qiStVoSrURErTEXXvhBdUHYZCVTgt47zbnB5EmXJ0qKQn2xBOVCR7fvI79K5tYJ7lGJTwU07hvfHb602CwCGIe/2cwMwDfiOD9RouDgEpZ/agTrBDF6whUpP2e46ln96EVBzyEuV/HuX0naFBNiXFQZyuEjGZ7dS7UaGKfvgBGBjFN8jJTkfH2EuMymfAXoYivJ2VPXnCHXeQmqxOJjNepH+6BvEhEGExPVzMzjceZoC0tUGvKY/fHJcqR7VvsNcubJalL/4E6DuTDqtJDkeA9VdeQ4bkKYCAKF8DYX6CC+7pnD2m6l1vBH5nGnUmviXmY421rbf7CytsZwtxAG1bLOVxw5gr5garmslbIjXsH0W3QFKDT3ehTs3qdqZ+u6WkSBSHqtxfKXHRmeJilfnYerxndwnZFXh96Zh6jVpJv7ETvMo+G3RQXJ8YaTOlFxJPw4S5KAqOyT/H64ZL8x7KucIpUk7t3j6NIq93PtdVKwcr5NBiSyj96E6VCJgcRPtDS24HH7PN2KiJ7hybPZbHJ1giqp2Zb45X8HMb5dopuLw1N7wdiLsT84yxtGej3JzMVYOhz3pq41UPLq7p0rR4K3ffpjPUcrqjsdK06OB/fqBvUYAX4wRelv34UVM3sZCg3uOw5uF4FJPTV+y0u355wCAwNe8r/EsUy6u1lzfElG233xua1L2jT/Ols1hM/wv2QrKJbAbpGh8PXzOJYL8d4RZqEx6JnAenJIAu0fQMx0NevpCLVGXOrW5GzFxP61pXe5sbj9nhOSx3o7jArrkB2jsj99cUrxRXu3IxJhE4ldT/o6nunD9kCBgXGpv6P9tyFIR2sG1gJ09ht4kOLDXp1LhEVQTplZEWYKkHrHT6e9Kc2G2faJrwyFOBwVQyjGd2hT6bQfXIddRSod49B0jvqkG100RXqlLpPT/N3f54iHKHFNKCItTZGj5AazYq80bpEcJ5N9kWXE1bBYlWIhOIyaLQ+VZrJWfmaq2Z+4c+jTZbXdZTHRCghRhgp13+MKyCPTgq/J0m+k8IMMRqKgL+ClY2kfimZo10TleeqGDT8YHTB4LTGknOO0B8W/zf/8RXnnryq/3IrQkFE5neKllNpZYT0V3rfnzqAKg/F7doZKbhKKq/HzQrUizHQ+tRVkWvDffzIm6TZpjvpvbEjo3CdyxXnHuUe9PNRC6yipY/9eo2VP3+CKza96/KCOdgXb8wJvAnMC8aFIKySxHFrJvWKr1m68uNkdLA2NoiO2bvNHcNrvbvqnX3/WRk6DjiTxkRJdz1FDNkkHN0bWEpICjtTEG9J4MKz9QuHjzUgga6OcaOuhI4qyM4MdhS2LzCdeUeBc7Gfu3srGZ2sJg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: BOGu7mHfW1bx5PZ95L6C/72uea5BEGJyyE0Ne1R56Llksqp5LggAmkIYh3geQme8N1xn5Rj2m78DXnrKIxbTmByo6jZhfA33CmD7dD2sOd5woyqI3d9g9FpZvkROpPoYTFYR4DLbgimfbrVndlnauyqBts8hAnocFZJd4Mwighs3POlscJ3c+2i6W0CzUPwuMqm0Zw6AChBAVvy08ntD6SDreMj4HQyFo3JJpjXc1uCGBKz2IokIWrLt+1qdHSLqt9CepvyyUGeGMBrO+s2MbUmvgf5H3bkAr3OKo45W+9U6STfG01qmT8mDZXSo9OUaabz/rqvE05j8qLaMnsPWNHRyEBp2mtg3p6yzXOQ2Rh9JrOIqbfYJtF5Q8YkqJxC6D1xMAxuMR0g6Tz8Yp7C04IgIfjAXNv81Kh10dAWxBkzplB5MKQDZwXxHc/vEaywag3nkXRaYqbkzJMqhOspfuASovN+Mg8Gm/EjeVf2Z+IHvGe4fkWcA5UcvWfdSqRe0iox4EvYw6Dg6wwHvgq14GxdAAR3g9CzhEYknpBF8VrTalAmeHB9o2zMFZAr/+3ZGvRFlYHuKWVFRWpvnX0X1Xw34Yrr/HC4hkOoqke8zfDg= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 370f3c86-1470-40b3-9d43-08dc2698af84 X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:40.3043 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 04p8kgFLfak2tK7a4Y+atuxvVhimblbHyY2+rG3pCoz9fDrBzta9tYW/V5TtZMxIF5b4pbg6rFMfINmtz8SrcFw8+bdadv4K521OhC+NW3w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4164 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 adultscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-GUID: n1Q472M6lcayAsI0WT2XZyLUK8WTnhfh X-Proofpoint-ORIG-GUID: n1Q472M6lcayAsI0WT2XZyLUK8WTnhfh From: Long Li commit 2a5db859c6825b5d50377dda9c3cc729c20cad43 upstream. Factor out xfs_defer_pending_abort() from xfs_defer_trans_abort(), which not use transaction parameter, so it can be used after the transaction life cycle. Signed-off-by: Long Li Reviewed-by: Darrick J. Wong Signed-off-by: Chandan Babu R Signed-off-by: Catherine Hoang --- fs/xfs/libxfs/xfs_defer.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c index bcfb6a4203cd..88388e12f8e7 100644 --- a/fs/xfs/libxfs/xfs_defer.c +++ b/fs/xfs/libxfs/xfs_defer.c @@ -245,21 +245,18 @@ xfs_defer_create_intents( return ret; } -/* Abort all the intents that were committed. */ STATIC void -xfs_defer_trans_abort( - struct xfs_trans *tp, - struct list_head *dop_pending) +xfs_defer_pending_abort( + struct xfs_mount *mp, + struct list_head *dop_list) { struct xfs_defer_pending *dfp; const struct xfs_defer_op_type *ops; - trace_xfs_defer_trans_abort(tp, _RET_IP_); - /* Abort intent items that don't have a done item. */ - list_for_each_entry(dfp, dop_pending, dfp_list) { + list_for_each_entry(dfp, dop_list, dfp_list) { ops = defer_op_types[dfp->dfp_type]; - trace_xfs_defer_pending_abort(tp->t_mountp, dfp); + trace_xfs_defer_pending_abort(mp, dfp); if (dfp->dfp_intent && !dfp->dfp_done) { ops->abort_intent(dfp->dfp_intent); dfp->dfp_intent = NULL; @@ -267,6 +264,16 @@ xfs_defer_trans_abort( } } +/* Abort all the intents that were committed. */ +STATIC void +xfs_defer_trans_abort( + struct xfs_trans *tp, + struct list_head *dop_pending) +{ + trace_xfs_defer_trans_abort(tp, _RET_IP_); + xfs_defer_pending_abort(tp->t_mountp, dop_pending); +} + /* * Capture resources that the caller said not to release ("held") when the * transaction commits. Caller is responsible for zero-initializing @dres. From patchwork Mon Feb 5 22:20:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546332 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4EBF4D9E4 for ; Mon, 5 Feb 2024 22:20:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171648; cv=fail; b=u9/oXw0CAPnDlwt4R5nh7dr4s3yfxEz1AXXdCuW/++P4peBrOUE3sEnG44MV6KZabsF+4eu5e4i3H9L2qcJwj70kozB395ymhTn0spSrXPRNDXPA1aFaxyZ334mQTQEjpHmJUBuslQDWiGcEYoHt2zuzOvNqeeACRsgvp7gMcNA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171648; c=relaxed/simple; bh=FfGCslGG52T4ySOOOLSL19+i5snGO4w1YfMvs7VtihU=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=LP0lZkKN24Mv/TG/tYQ8u98IIuMJH91MK97LJ3fRssvlt2HGiSWNCLNH80xgpuP3zuN5R9pTHC8fm+uuqag04P4zjn1lEdeAdI2oTUp6LlU0UDnrt+q/c8D+BDQlXSHDQpFmtQ3X76zecuSbBDKObJh6aGxqI9+lz2ObqSSa5ww= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=KgOXkZbW; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=fcM2zd9y; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="KgOXkZbW"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="fcM2zd9y" Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LFncb018432 for ; Mon, 5 Feb 2024 22:20:46 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=SpuJ2ko1Ml0rNMMvgSg/q5UB5W9Vmf/u4ej6IV6Vq8s=; b=KgOXkZbWcIKoW7LrhYSRVHXseum82ZiST1MG0x6R9b5me4U4/LKnuixL/Aw4dTfCLH3g DPsgZ9D5U2ynkKfDNvSuVsZzPYKj68JeNeV8nJhnfPPnD0X6iRoX6LvKE5N/usyYhQgz LcY7gpNrDTdqNmcrMtmQnYYyhOrLEw7uP94WX7JhKwDXoveg32fs42hpbcF6lczebnDZ kozrTGDKsnW5KoftAK5C26iGGlOw//QZYUjQb6yNxsTzW8OtV2KS8n7Y7XpiH2OH9nDY +74Ed9z6neJlzn7P5Q0+KJ+m9Z0pCSzL8myrrPpTQTkCLL/h15Ouigtq6RRm8sBMoDMp pA== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1cdcw9nu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:46 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415LeVfL038353 for ; Mon, 5 Feb 2024 22:20:44 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx66vwa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A968rvUorhCj8MxJY6YIH2pxEod/U1jmzbfjPq2zi7dasIqzJ52BJsBqVBu7mtXDLImga4fD+z3hiKKaSteEeDxp0e1Vzukv6XnxJXIYNGfLDOIrNcDsmjgT6x0iOesletIgrQzjvBr+S7tJvJQyW7OFrd4Ifam4r6pj03DJd/L7bjIEy9vT3BCosh7HDZ1oHWZ+o8DYTpPx6xGPjD/tb45DF1cZ+rqUedNFwSPeRiJo5Bbmq1KZALUX5jxTYpTK82c4u9ZfxZj1BalV0Nr7L60pxZWoDd7AmZzRIyBhmdh8PSnBgXIYkxdoDwkWFKm+d1RN3P2lVcu4IdN8SdT94g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SpuJ2ko1Ml0rNMMvgSg/q5UB5W9Vmf/u4ej6IV6Vq8s=; b=a7UPITWv1BoD0dj5a8PbXMeYINnK2KOfRv8jLw2ZgubnJLTs2ZyFTCiukJ4HUhxqOboa4z4rl/wHZRBxBfUKZEJDix8JFEziBDW4I7pr8gWY2MyMvfxivQrNfBZ+IqmZDnFvl6rPhLFmSp4Os3KpNh1EuxWQnnOwgd2MzPqiJAZcNqTVk6946fO/0Lu3raZa2kL8/dO/okFeTgW38UJKe/q74oZQE9vs0+xschkxMVCX+WSZoydaOHcdcrBRajBJVZTPbVcUyPrh26ARblClQdRRlJhRjI991ZUr83zDv005lLr3ctqt7bWWtZDrV85Wt04rUvIGOHoUN7KL9rmnfA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SpuJ2ko1Ml0rNMMvgSg/q5UB5W9Vmf/u4ej6IV6Vq8s=; b=fcM2zd9y9LpP4wN3/B+uhInZjSeoyCc81DHkmHPEQqwW6QAMBqhD3wkwiotJIpcWpJdHpcNBGdrIjlExXfl/NbYTUaP89SYMctzyTqgd+KgBL4bujFl+0VHoHZSOM8gzJr/8dnaTpfWmljPCJKpJEiDKUKJ3nQ5FBino53kyF5Y= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by BY5PR10MB4164.namprd10.prod.outlook.com (2603:10b6:a03:210::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:42 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:42 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 12/21] xfs: abort intent items when recovery intents fail Date: Mon, 5 Feb 2024 14:20:02 -0800 Message-Id: <20240205222011.95476-13-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: BY5PR17CA0023.namprd17.prod.outlook.com (2603:10b6:a03:1b8::36) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|BY5PR10MB4164:EE_ X-MS-Office365-Filtering-Correlation-Id: 8a447e2b-1576-439a-6350-08dc2698b0cb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EWF/kDVjnfxycizgQXhAq90FtafHYzWrpYLfzg5SKB6Iginl4Aaz+V9Fi4pBR5SyXCYdmA5dReHjPdtg2TDaCIcJhFBkGeF6AZFLvRlbJXp0f/2ErQEOzbt2CEk+b3hygKZbrZHuXUZ8cRwqX/EhezE+AW4lftBNZr2juoohcdt+2/gch435xNjR/AoEkakw1u/Q/HhfkVLW3pVkQiGXyBZJB2XiBcXsDYPPPCzEtQt+h25aYXn5SCAt0mGpp5rhOgy/JcyR8GT6jP42Kcb8AD0C98iMO+TqXsvK9UUxnjbwDgPjOOaJ22VY9ipecVmhJgXU+66UXKeQp9fEUe3dv7O/NeEb6RxpGVIPzRsOxhdB4MkE3E53qZt/UiseOtI2NCyKlqMwC4JvszXESzIjAVqHP4TjifTgxh3xl0czfdx6TdcTDaC/hiR5vXWbWPlys0RiiMsoH1Us9OM/NotCUlE6ZdkDOdDCMWIBvsg1Hr9zFUYPh4/dDTo6vnDEv9y3tl3iBzAZ81uDyYX4uXyLVA23WeK3NoEz+/YIbauSSUpMDm+8otLFycUgUs9rXbPk X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(346002)(396003)(39860400002)(376002)(230922051799003)(186009)(451199024)(1800799012)(64100799003)(41300700001)(316002)(66556008)(66946007)(6916009)(66476007)(86362001)(6506007)(36756003)(6666004)(478600001)(6486002)(44832011)(8676002)(83380400001)(38100700002)(8936002)(1076003)(2616005)(6512007)(2906002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DO53dFbCcg7die58zhs8dAR3Kp/xCkUyhbRmevNP+2usiSm/No6lZ0FnWj8QrZU9AuzjDg3+atzJRsJ/3H39gZLcmyAv51jWwyAU3/BH3/5kjRDAPqb6jjfyw1GJ1H4CMUlvkYvc3E54XAHbOGwIqLuWmELGbujEFDSZs3445yc0UEqQGogJ+lwQdTkc5lCBG/L6cTqAaqx6P6jWFgTfFS5iCCTyo9Bscx/bkECVC2GAWVc8SRohJLIbCZE1zr3ExUCvHhzOTlYNcwq0ulcNycli8zbr+/8cf7pPoOPvmutFCHVsdHka/e+nF8pC02EZ4a3bbj8TI0fy3xG/aakJ1JBLIpM9nQl7WFMBc86b7tAyRSZwyaJQtKURCBd7P0jfviWeGe1nVRXJjOQGa9WoQEPfBjYKjDXbtx9O74rm6do15AGzuW+FDtQ/QKvW6dkNt6081lXdQoK9gB0FMuJmaS8exGpfUCLQ/6f1asXHHcf6ZEx83OD/JVGf6XnSgG90oRO8Q2rW2DofIkwwZg8+3bB23TCv0zEnxzsRkXErZ3lrtuFClDCOZNvv8V5xIMaDiuKG8tXndgIiUikThWbUL/hToXbls49NFOK7HB1byUdSEdcQyBU3N7BHNZqHbt1gSBzxoQNl3SA2ZMFwmV4Bylhl57jhgl0ZPYNjSn5t3lQPyTocpt5poAr7QvnZrLxh+PVb/GG+DsQvQUsysK7lsn+ODRHxOo2javMA6PqiwOPI3XrNHAGm4TOhCs0UoBgAzf/+9ty/MGjO+8WjaLeEKsNaC6gj94jbMuidT4VeMrk2NqMo+Wi3eAzSA0v54vTVt0wj25rCRIVNPwer2kRBK///LolG/r7T2lcY0ME1zW59VZzC3bYqQKnsLQjUpCodQYxHk6HOQ+Ud/Msvu21EMIY3evTqUqGkQeG7BH3uOpao1FB7AhvITeNVKjU9lx1x0d09isAvTwVlRrbo6UEfkrVnQJoJMkjU96oPbuo3tYcFuJVy8hjVXDwe+ZA1NAv2+qKaT8PcZZ9ROoMmm7w/4CpRubAYiGZQdbYdzV16iydGpfUNlPhrImZunZwZw1x+QD4zsAcTlFby52icdWFhKJOOSXWe7UzrGhvVEmJFry/sAXJqG8WtbL1nfdV4pRJlbpwekYkjbz8a9w9zYLXR2fzRbdHUdpEaOsSYRUq3AjQBCdjshhU8JrlpfS6w94hjXLG77vF6Ng99+/YiRgN3zrKFPdz4ADjLS8+JtGYT/A2F/YebKSmyYWeWOo2Pm7nozpcqjEtDsEs4fj/2s0hJ5Af7Spd8oRFUzrYXzELMqqupmfb2O0ZKNcTxG9q8Q6Z+ReylXntUBF6IHEGJze0DlTJBZ63YuzSYXFXnEpoknYO/EjI/ohrpnKweMO5FSPu2WYkginrdNdtjJ16dYQGPtpKYy8x0/LKw1PW5XYxjSzXHMUjqJn59hADFuyunWz/025q9sauKc0flMMLHnUjQSG68ARxiYJGrvUoKUl8Tqmh9S4hMnvGtc09uf/LPM1I2LgRbhV3ymgcL4p/sKsZ22QgSgLZS3Tf4qwR/gkphrwhPohr0guq58eTqrqIwKlKbh9f0T8+Pzn2zfOs2f4P4o3jz42XP+pPujTmricZXd23bADSPdvJExmrkW14jh5/sVPnzHXFQCNhXZYRFPOkqKQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 25vP6S4VOnqcfriN8hVC5OJ9k3tVfAlXyDmFnX+EDKlnd3RKBgYkiDk7sKczOFsNLM6Ok9jUn4r1yv8dVsByHylSehBvHpE70OmrlMr6gPqSwQeem3Ao2Q1Vo54J94yNNSkNUQ/C4uHk8nMsucYC5fCDAxtt6ItNqMDhTck1jQ1+QF3YnnrXBS9zFjMz+CZ+REz274aMTBlGQGPcritYsyLXBM96stGsVFGj1KMrZZky54KUUP4nyZuy8R18bq6gc+IGg1vco43x+xVloPWGJ2B4kC3yY8wTalZDnNgkv0RWNjT5IW31KaFdZVTLUfKBoiTC1aOUKeT4oVs1Y7831VrYduaiybET1/48t9t8qw8yFxhwaD3E1tOEQyWOdgcqfsZ5WLD0fX5/rwb/XwUEP/kEAVPLDCGv+0749Y3b1woe28fXPLnfn62VNZaG0uVzU9L64UKiUKRrJTVTrQ4VnPoNRLPvIC6h1Q5tcyjwnV52+qde/EZWU50+w3StpkLLGubQBKl5lOE6vL2hLt6TUKx0M3bO+xO0asHwoXBX9xyXkd2yzNHWZ52WJIicF+wsgvQ0H2EbXJNb0JY4Cpou6oqq1GK9VkvevTBzXm7QhOo= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a447e2b-1576-439a-6350-08dc2698b0cb X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:42.4144 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HsKztVwJQjJLa7ajhpJt+6UnR9u0LammmH/OTpT+q5wAHB9Zieb7b8KqB5tPNdRRFHjVxe6bfniNeFU+wTajLuMAJmNzQLtvVxPxKlLLAJQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4164 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 spamscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 phishscore=0 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-GUID: t0019I_i1QwDcSq590v9icryyZtJreGg X-Proofpoint-ORIG-GUID: t0019I_i1QwDcSq590v9icryyZtJreGg From: Long Li commit f8f9d952e42dd49ae534f61f2fa7ca0876cb9848 upstream. When recovering intents, we capture newly created intent items as part of committing recovered intent items. If intent recovery fails at a later point, we forget to remove those newly created intent items from the AIL and hang: [root@localhost ~]# cat /proc/539/stack [<0>] xfs_ail_push_all_sync+0x174/0x230 [<0>] xfs_unmount_flush_inodes+0x8d/0xd0 [<0>] xfs_mountfs+0x15f7/0x1e70 [<0>] xfs_fs_fill_super+0x10ec/0x1b20 [<0>] get_tree_bdev+0x3c8/0x730 [<0>] vfs_get_tree+0x89/0x2c0 [<0>] path_mount+0xecf/0x1800 [<0>] do_mount+0xf3/0x110 [<0>] __x64_sys_mount+0x154/0x1f0 [<0>] do_syscall_64+0x39/0x80 [<0>] entry_SYSCALL_64_after_hwframe+0x63/0xcd When newly created intent items fail to commit via transaction, intent recovery hasn't created done items for these newly created intent items, so the capture structure is the sole owner of the captured intent items. We must release them explicitly or else they leak: unreferenced object 0xffff888016719108 (size 432): comm "mount", pid 529, jiffies 4294706839 (age 144.463s) hex dump (first 32 bytes): 08 91 71 16 80 88 ff ff 08 91 71 16 80 88 ff ff ..q.......q..... 18 91 71 16 80 88 ff ff 18 91 71 16 80 88 ff ff ..q.......q..... backtrace: [] xfs_efi_init+0x18f/0x1d0 [] xfs_extent_free_create_intent+0x50/0x150 [] xfs_defer_create_intents+0x16a/0x340 [] xfs_defer_ops_capture_and_commit+0x8e/0xad0 [] xfs_cui_item_recover+0x819/0x980 [] xlog_recover_process_intents+0x246/0xb70 [] xlog_recover_finish+0x8a/0x9a0 [] xfs_log_mount_finish+0x2bb/0x4a0 [] xfs_mountfs+0x14bf/0x1e70 [] xfs_fs_fill_super+0x10d0/0x1b20 [] get_tree_bdev+0x3d2/0x6d0 [] vfs_get_tree+0x89/0x2c0 [] path_mount+0xecf/0x1800 [] do_mount+0xf3/0x110 [] __x64_sys_mount+0x154/0x1f0 [] do_syscall_64+0x39/0x80 Fix the problem above by abort intent items that don't have a done item when recovery intents fail. Fixes: e6fff81e4870 ("xfs: proper replay of deferred ops queued during log recovery") Signed-off-by: Long Li Reviewed-by: Darrick J. Wong Signed-off-by: Chandan Babu R Signed-off-by: Catherine Hoang --- fs/xfs/libxfs/xfs_defer.c | 5 +++-- fs/xfs/libxfs/xfs_defer.h | 2 +- fs/xfs/xfs_log_recover.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c index 88388e12f8e7..f71679ce23b9 100644 --- a/fs/xfs/libxfs/xfs_defer.c +++ b/fs/xfs/libxfs/xfs_defer.c @@ -763,12 +763,13 @@ xfs_defer_ops_capture( /* Release all resources that we used to capture deferred ops. */ void -xfs_defer_ops_capture_free( +xfs_defer_ops_capture_abort( struct xfs_mount *mp, struct xfs_defer_capture *dfc) { unsigned short i; + xfs_defer_pending_abort(mp, &dfc->dfc_dfops); xfs_defer_cancel_list(mp, &dfc->dfc_dfops); for (i = 0; i < dfc->dfc_held.dr_bufs; i++) @@ -809,7 +810,7 @@ xfs_defer_ops_capture_and_commit( /* Commit the transaction and add the capture structure to the list. */ error = xfs_trans_commit(tp); if (error) { - xfs_defer_ops_capture_free(mp, dfc); + xfs_defer_ops_capture_abort(mp, dfc); return error; } diff --git a/fs/xfs/libxfs/xfs_defer.h b/fs/xfs/libxfs/xfs_defer.h index 114a3a4930a3..8788ad5f6a73 100644 --- a/fs/xfs/libxfs/xfs_defer.h +++ b/fs/xfs/libxfs/xfs_defer.h @@ -121,7 +121,7 @@ int xfs_defer_ops_capture_and_commit(struct xfs_trans *tp, struct list_head *capture_list); void xfs_defer_ops_continue(struct xfs_defer_capture *d, struct xfs_trans *tp, struct xfs_defer_resources *dres); -void xfs_defer_ops_capture_free(struct xfs_mount *mp, +void xfs_defer_ops_capture_abort(struct xfs_mount *mp, struct xfs_defer_capture *d); void xfs_defer_resources_rele(struct xfs_defer_resources *dres); diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 13b94d2e605b..a1e18b24971a 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -2511,7 +2511,7 @@ xlog_abort_defer_ops( list_for_each_entry_safe(dfc, next, capture_list, dfc_list) { list_del_init(&dfc->dfc_list); - xfs_defer_ops_capture_free(mp, dfc); + xfs_defer_ops_capture_abort(mp, dfc); } } From patchwork Mon Feb 5 22:20:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546333 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 63D414D9E4 for ; Mon, 5 Feb 2024 22:20:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171651; cv=fail; b=Q/knsCobyL3HIFu2Dbu+LqjXrJM5yh1z+uYrNU+mwwXc3nu3r5nXZ6O2QQWmJBE8edJqtceR3JaendkRUhuTmgMbtYEJxEjKyA5T6t7v+QmDi8+UmeDGKce3+V7mWPN1ZyYT+nO9PWI6WJL6ico9Eaw5nlVgNvJsyklMptE8l7w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171651; c=relaxed/simple; bh=QGNaP4SUinhs+aAR8gx7RywonLkJKijV3dp3+AJOmhg=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=QfvLF0zhmYwaing4v0YWtHsRNHGHNoEpW1ynDx0ScShWq2Pqofet0RYEJJ4wIo8OydzOLsgacAGWSSINAne7Yq6FyU3nbu1QemAWAnqWcCO7IFiZyWz3x6MUPpX7Kt2P3g+fFm4hNlTlAVuUInD3+W6Lj0NDlYCN6MMo7gY7G30= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=MCe9b8V+; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=MXNEJpRF; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="MCe9b8V+"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="MXNEJpRF" Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LE3Vw004468 for ; Mon, 5 Feb 2024 22:20:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=3C7l7KSxJHeafQcIe+0S/PSdCveKAoPeYuysjY9HKYI=; b=MCe9b8V+iZw1R3CQcIFPpy2Jgtz8jN24wCmC7QV2mMNNJENuWDPW87ymVhWUeS2wVdtN dQRZLO+6NnnBgwh5DNPXE/F2fvN/PrQxpvUG1CByndkDwAHf9oqH6LO+J/Ogb8OszXab lKCqks2dP++UTshBWcHDiT1sfJ8ttvbsXSppq+lFar4bCMhDLpBfWtpk1/oYVsgmuXif OSnEe00uKG3gNXzegD/I8H2zAxGyESn3bM3W+OMi7Ricj21UKPP1BKqG+caupSEj/UYi +9QgH70D6wu/Zq5MhLffkWI7Wwzj4dqNh+IyXpbpU7BNrTHWkU206q8hFOHZo8iSakgE Lw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1bwen7m1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:48 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415LFZYU007100 for ; Mon, 5 Feb 2024 22:20:47 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2168.outbound.protection.outlook.com [104.47.55.168]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx6k5uk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jvEVNkaT4BZ6DB0ed2+mRla/dzv2uQ2lUnTQKo4QvUxPeHD7MlF2yj1ZuHlWxRxXByYF7fhnVlPl340hHyOJnfzluu4AeoBt7fe6tubiAisKc3VkomdunVTXiAoYpNC8LrfXtzWw4bfgW33iM5/qIVMiUot76qws2yjdGag7lZECwe+EpXpLgfRt9o6dmKWSDXJriTwdMsym6hJbJDMgt2lexfzO/f9guYkLhY3URIi3tWgLrdARudm1MbT7289k9fi/nj5n3r3ePUAY3m7ixOPW39fPm7KHwcDBQg6nkPBUkl8/I1w0OCS2Qe/7Pl9ZlPhxyEHiO9MPXMLkYDWnlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3C7l7KSxJHeafQcIe+0S/PSdCveKAoPeYuysjY9HKYI=; b=USDTn+tq6RgJ65ODGJcq4yVrBKCVp9T4LUv0ERJiJQjM5dLYaXciGgT5dEME0yNYf3UsmSeq5+Id2IEkNhNPaWIUc54u+JuZVKTuzhu4Qxj8fI8RZMcoHOCO9TfLvmkj8AUiROWLgpPbRCNg/oQ4GeLprZZHqurYZ7I2j/obB16J2GJChBVxBoXhJLYsV4fYmImt/ObB/q8Vc8B0lF1iNMA3/sephunzTie/I4tsEKjLtSQ3Uh0Qlb0sP1xqXY158h2pwiyMdDMcYWLawo/9zBFvEjWsBU9LaOwgqPdgWRzx3EjXL7xaYbDtc82VhCBmXQYaqdwxH4fy5zvgj65HHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3C7l7KSxJHeafQcIe+0S/PSdCveKAoPeYuysjY9HKYI=; b=MXNEJpRFfbFYKjKQ7eZVgmH2oFWqv7bdUBJxWnfZFNFNwFDzTzSenU+FDU3IMe1mTlbqeId9o65mihiDnDGzYEHWDGwCzRnrAT5vtbhWkcWdqxzeCiMWxHXWvcS2qT/ScS/R8HXWcZ6MFZtf7SHkfd6/g7lI+sxfKtP3LKofS0k= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by BY5PR10MB4164.namprd10.prod.outlook.com (2603:10b6:a03:210::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:44 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:44 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 13/21] xfs: only remap the written blocks in xfs_reflink_end_cow_extent Date: Mon, 5 Feb 2024 14:20:03 -0800 Message-Id: <20240205222011.95476-14-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: SJ0PR13CA0041.namprd13.prod.outlook.com (2603:10b6:a03:2c2::16) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|BY5PR10MB4164:EE_ X-MS-Office365-Filtering-Correlation-Id: d84688dc-30a2-4307-3902-08dc2698b21e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: K19CCthZ+dhiP3TkqtR4dDz9Fjr6yYk1HLyVVucKmUvkb5Y30ndqaLnMQRHxsLk7G2nh6x3KfakTyAz7oU0TcP2aoG14BfVhNM8qovJNJPvmage7txj7ksTOTGqhN6AVuIIyxK5nCW8+d/FALyfntVDEWqg9AIB2mMkhk2wGWAYMQjTLQdpUNA04NYzJSj50VQPiR2SBC/YmYPqhy/89hu51T81Vu95bUF+mv/Sb4PkoxdT1O/7CtraAuKr5wrm/NiVrMSfVVqJcliziY2BdGk0s/qdkTW0zdGyOcGCSvAZblApl76F3O631xZsgDv0HG9c3MDTOIHXPQGBne10DpJjaWMGq6TKqTj2BIJNz4/kLygW+kGq89Nw+a7zdpftOV5nwyRKz729kmCfOH9HMUbB4AGh/U61hXYoq4lOcHoUt5EVze2CCmVugay5nBsJ9lDlPlM9P7/Tf5bpoWKofXav4/oUGFXaBFyBkGVVdxQBUBPL5ncDRo7O1op/mruzxqkqvN2JvMydvunqac78NqauMduvpPbvCXZwqx4JBG2Q464YZSrtDzCNFsqlOyXa9 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(346002)(396003)(39860400002)(376002)(230922051799003)(186009)(451199024)(1800799012)(64100799003)(41300700001)(316002)(66556008)(66946007)(6916009)(66476007)(86362001)(6506007)(36756003)(6666004)(478600001)(6486002)(44832011)(8676002)(83380400001)(38100700002)(8936002)(1076003)(2616005)(6512007)(2906002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LLhX7q/cO5Kny2jv/37NbS1qelDYCZmJtL+A9Yp0/1qk4NhMNVqWJwd+mve1qWAuFVuP8QGYps2IRdPfUJYbdwYTsVEXWEXrCPoCGvUq4BtbOzY2Gpv7os0uEAjT3fyw+FgOOKLeIPKor989ttDw2ent2aK32v3A2NvI8nrJOt4TKiLn9R4tRwR0CXg5TzhiXOCTZ03acASDfyaRKir4zm12vZCL0DbQRdGFRWg0UHivpBdBSI/W9v4eS4RkzlF0WIqL+CVYj7UCjr5+iY18rbYv1ZNMA+oL5FwLR4/SOwq2cje8GgWPQhAiANkFGmN9gpTCZSdJkd0KDsGfVIFXjFhuIaiPyBDgnpn3aSd7lZLKUjXYHRrWtcnhuRhctuGwveTkiK5pQIIFLvAqf8qESjSmusNPE01Sdxn79KK7ArWX0BRfhz9MOHyhBa95MSKtqY/0UUXlhN40c2EPOPCwcrJF931kJu4BQjaujdH2qN1DT4+OGtAphS9qrGVCjesISXi9f8FMarhhZi3wSQcmA9gqY98+3HwjEiw4srnbfgM6j31qY4DPuMaNRv1TEgYExBT4NTbVAZR592oyWV8y+HJXsbonrzuXssmFzDABynrr53x9S/pJmKCsLYzlT3N2uMthebMyDSZFmu9Fog57iPwgNFWmY5VRpPfvmUo3YlopBP4z6ZNve5FdJNrLDWcv0SMiErI3B6xPGqIC+fbrlbQ+fBcYDbnE5ruzpY6KxcwTTu5tJTB0gbdas6gt+KQRHVKwc7SkTCA1IVCglqlxC/oKBRsO9MUixb+y0iPEYNLabOtKkPg8/V5Q0/BrRCLMuGQnmOW26YAnk/wsjvZ2JtELVwTOeYEy8dF1upn1FrgUazXQUXwDHTMQmzdb16TB0t2fBvNUOd9yCH11jxmhMFej7FGPmBIXH7O320HvjPweH833syT8bjStViFX5gW7rx6qX3povguErJ9Mx7zu+7ovxbKXYCrY1qjlCN/CjZh92ER/PKQCfBP3QUsG5/b0AIVG9BuBGUtdYDpJHzfQCdF+wYD6hx/x4LvXqY55bRMlCdApgwiLkKDn+4eioVgdthw5y4lz+cWoQ2AmEnilSW1P04EdDpU5Hy9Emw/vQjque1nczZi6zdUS4fZ2Golo2Chqqz2dNwqm6dyKuHGv0Udeolbj79Y92seNONYVM2iPMEvfPNsdH3X3atoa4KhH8EkCYws8TrDyBluGt/5uRmCqDdxz2/fgA4cJp16RpGp3eXkXrpwlElhODYCXoieINh5s2G+AO5SqYAXx3BxGx1gAMLZH5nVzUri7YgwnATAea1El7zTH1Oel7U4Cf3t08Fy/rsV0xtPEA5OYi1j/ADf5SH0r5FMogriDwpbx9kevUKSkFoYKLnddIOOyC5EL0qDeenmESXNq7wlKjxGitYg5+6Vq/ycOGKLxKVzsBSMkOmrbRSMmVw+YJLnDpaIZJ9zcimwsDMvSF3mYiu7fSzoUAMU362jwFvjCqqWIqN23rQBo6araEX2zNmklcHmoJGMovQ1kI6wWIV/TwYM63VULRyWpxZUeHTekV6kRIJVrgo/wvoMnjUjsD/6xSpjV4IZ3CDaPhdfx0uAQioh2SPcCTmKgZzK3qlO7SrJ2hgDZB0KzMCDkjpB2/u08DJpv6tsPIQJXVdn5JZ2y3ddQlw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: QgIdkaD9m7MIafRCo3JaPO9vBZw34h3xxO35XjUjliAHVjslqBHJPSg6vaz6S9vZ5+0JSVdC+B7BNStVs5smuqYYU+iSNRIKgDy+IHudFodTKy2eKhUjwKftJ59+5fDZLbon6nt7faO3gO4v0m3Z6IWS8LNrW5XMCt6umYewbkgsoeD6XlT4TLbf6fpn/JcMzzPAX2VCNXmtBhp395YPgxVT1m8ObByuIFDohp7rp/62Lh9Lxj/0p4lKtmqtXOObSdt1BGnbcRV6JinApu1X32KqLhzjzAryqwB4RUzjhPnZe4cPle6B0Fbhlsjez54uTgnmY9rBJYmsRMYzrxuBxN/0YN/txh9WFLZqW+SHUaL9tFBAu4s54htlB7Rdh8wKAcDT2K7K+toVb7KF5rfnKDGH6Z+CN2pRdORaJ+uGiGvaX/eeySYUgahBwxcDZGEu1O+w70yilJJtWWXnuaHh4q9eEcsKCM/28dUyEHRuB0XujqaLaktuZ4za/DPRPJiv71t6iFNJhzsmsBDZpu6v3qgBFsOZQJr5o+B5nBsKRvUXxuBgLtlleQQJgSyA/1x4CLzmTCHCNlF/y3ysoBw4QEUKMYGYXfQKHCgjnPY6Q44= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: d84688dc-30a2-4307-3902-08dc2698b21e X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:44.6400 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: P5kRbxFbs59eIjfdds2JGr+XeG0uUbWQAZPmxwDCabvOwSVzQ4rHePU/htZN0LBHlXL7hS8cmK7dD6dTTTBYQPGwKNXUNPgVG7g+7EY5Gtg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4164 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 adultscore=0 malwarescore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-ORIG-GUID: YDMBOvagmcFvJkIQPxFM-1-gwbZ_vZrK X-Proofpoint-GUID: YDMBOvagmcFvJkIQPxFM-1-gwbZ_vZrK From: Christoph Hellwig commit 55f669f34184ecb25b8353f29c7f6f1ae5b313d1 upstream. xfs_reflink_end_cow_extent looks up the COW extent and the data fork extent at offset_fsb, and then proceeds to remap the common subset between the two. It does however not limit the remapped extent to the passed in [*offset_fsbm end_fsb] range and thus potentially remaps more blocks than the one handled by the current I/O completion. This means that with sufficiently large data and COW extents we could be remapping COW fork mappings that have not been written to, leading to a stale data exposure on a powerfail event. We use to have a xfs_trim_range to make the remap fit the I/O completion range, but that got (apparently accidentally) removed in commit df2fd88f8ac7 ("xfs: rewrite xfs_reflink_end_cow to use intents"). Note that I've only found this by code inspection, and a test case would probably require very specific delay and error injection. Fixes: df2fd88f8ac7 ("xfs: rewrite xfs_reflink_end_cow to use intents") Signed-off-by: Christoph Hellwig Reviewed-by: "Darrick J. Wong" Signed-off-by: Chandan Babu R Signed-off-by: Catherine Hoang --- fs/xfs/xfs_reflink.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index 658edee8381d..e5b62dc28466 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c @@ -784,6 +784,7 @@ xfs_reflink_end_cow_extent( } } del = got; + xfs_trim_extent(&del, *offset_fsb, end_fsb - *offset_fsb); /* Grab the corresponding mapping in the data fork. */ nmaps = 1; From patchwork Mon Feb 5 22:20:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546334 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 82E884D5A7 for ; Mon, 5 Feb 2024 22:20:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171655; cv=fail; b=kLjkd6k2Znh6Y82yhGTQh94hKaqthX7ZzRAuCNjokJNqVwroD9xh/KWPnMrYAA3EltUjn53MRgKybwy3b2sJQ1X+Bc29aUICgVjIJgTEE25Ql8B0QSekcYrNU93w8PLaJSP0720lehpkcxFUc2cCkiNYTjj3HuuiXJuaDQCxKMc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171655; c=relaxed/simple; bh=tM2ISFO5xvWCfC2gB2gXxiLxNsWZ3FOS97s2Egjje54=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=nZF4P9sZ2C1+f6ZxVF3mpU9buq9UzikHpYDipSAK7Kj/DH/ye113wRTJ1DhITfUW716UWLBH7N4y3mWW3Fbi3sIoy6Eghje2XGmccoZ2+AM7bxuNs5cC1L8elix5NgEdqiR0sVM3qh4cd8GnTtxGusJ5JCZ+fRGH/19UE18k/Ss= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=YXId3Yfc; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=qdNHMZrw; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="YXId3Yfc"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="qdNHMZrw" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LFkAX025006 for ; Mon, 5 Feb 2024 22:20:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=6a/Vx+pcL13GNO3xhPo/HMGejI0TDJBNgPqeA/+05WI=; b=YXId3YfcFCWr1gNpQ7dvD3myMd+RzRiDAHiGUC/EBRtfG+k7rvoy2EymLOUMPkYvuip6 g8btLyxJg7DZ78hfq53yzU74QOmKSqOSTz13fLGmNzpk6RpnzkcdwG9FV0SU7MRFHJZ0 C3NseWik32pQVZIREkQCaPAn8sNfDwu+69OTLkwP1pTi4Fjw0Ut7HDPl/w2tNXfVMjNe ScCFNfcWLMBZ3ISFbNWSM26u5b60eHEgyXtRcbzAGHSkKD+G0mhX9GQnynqoLVw+BqsH S+aaUhiWhNTPhnA2g0qrxlZzGzHafBR1n75e7Gyt0W1dkG53V7Mg1EQ5Qm1NIX0xwh+r 3Q== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1c32nabu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:50 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415KeLwE019865 for ; Mon, 5 Feb 2024 22:20:49 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bxcpjfn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RIYddOx5BVMUDWjqGoB0iCkh/6gal9m85H9l3kB1lRKrzBLCr8hJdJs0uN8Ee6P3dNYkuo+u8XbHNhW8kjqp7gRdo9pMUPwC8yAs96+NhDDbUcIvmldzy97Lu5IpEBwGNT7bMwGY9zCZsr5zabjlnGN6/PozWyDid3evvksIe9Eu+AK/GCstsmORaa20NuLilzAY8myq1AKjMfnbarxDLVF1fH0zFz4cTawkPnwmWX8AUp+7V2sca5VlIj6i+SUEkGU9z+q+N/PxQnzISAIgMm/KtLV6FpO/E9Pn3Kcf1iefQJoJJMjZYpSHIM9HOO/rXCHyKV8etZL9AKDQRG5JlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6a/Vx+pcL13GNO3xhPo/HMGejI0TDJBNgPqeA/+05WI=; b=aohiz2QO60b0aqHeIq7FkwcVTcVc6caWOWPe2yHc2qyTISErcnuIgpJNjuUZMvWNBFcfQzbxKXDph2bu0Xf+NiMr1PAx+6D1/hY0RWmMPs1/MpisIoybAyQNj4zviA40e1f3LfTKmtmj+2KZcIyBKo0yIF9pi8eYIcHFyLQv505u1aYz/Ee1+abOJ/GlOgmCgSMlWPAk6D5dz17EU+tXOj3QXMZgVGizdK6k/O9Y/ukfMeWGeHZg5yGalmdMrv9liN3vw4jyY3I4eP8Ekv8a9eSibmUfdI3j23jugcQHDWu0TBij/0kh6ZWrbgZz+kjHOeFPL6OTltsx8Hoa0PDkaw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6a/Vx+pcL13GNO3xhPo/HMGejI0TDJBNgPqeA/+05WI=; b=qdNHMZrwajGzsCJUd7TgTpLv8neIhNmFzhwYDm6RfJd4KxIsgTQKWJ754Jvdav4/vy0WShiGSqztgzpzoZKCg+hNSDrwgG2SsCUHxyLtVREOKwK63QfCI2zlhdjxqiWNbslyK8T25fJ2+0wgvhmDyC3T8oxqy3u+0s6PsoZt65A= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by BY5PR10MB4164.namprd10.prod.outlook.com (2603:10b6:a03:210::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:46 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:46 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 14/21] xfs: up(ic_sema) if flushing data device fails Date: Mon, 5 Feb 2024 14:20:04 -0800 Message-Id: <20240205222011.95476-15-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: BY3PR04CA0007.namprd04.prod.outlook.com (2603:10b6:a03:217::12) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|BY5PR10MB4164:EE_ X-MS-Office365-Filtering-Correlation-Id: 68e83d20-bdeb-4a4c-6211-08dc2698b365 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xynSGBxBqoq5Mr3pCUjpgxW0G2a3nwRaDcmp/VwgVDy8ctwuIdmxOE8dky1U+0sQGjrc43IP5iyiN2w57F8fuleEz09RhPz0AGktfrnyDFtpzEJfB4JI7SQtwD92hN+vugVejSUm39QiXsfaTV/ruVpkvxWCnGEtb46wOvFIKY05iUaqI+n9GAgvkrzXu+/dpczRQ5nVOY4BQvaryG6cojRMc/qRR02tI89QpktggC15SaUQ50j15aXkhOb3yq3zFbOGqIB4ECcqibHKzZgmIfdpIUb3Lbna21RY8407hlFiWmadJnsbgyPrg08+G4/2ajvulGou8KstNTH5kGeo8BzW5GoEzwP/QM2FUZNpOJK+6gcxfRZ0xzS0cwIpfd8frYsta6nS54/FwVAyNGa5xH5eOxQlJj3YDJb4qhaO4ohkpm8u4DDrKGOZK3ltTSmW5jmnKXS4pvMfTo7+OOi1ptK4Of6Gd9QIdBVLCVKZU0MTrWfsPyKdIlJviwB9lvDH3odmds+LucuKutSyzMm7VJiRh0bffCHjx4vav5ToZt32esG6m9WsBdgUERvs4LfF X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(346002)(396003)(39860400002)(376002)(230273577357003)(230922051799003)(186009)(451199024)(1800799012)(64100799003)(41300700001)(316002)(66556008)(66946007)(6916009)(66476007)(86362001)(6506007)(36756003)(6666004)(478600001)(6486002)(44832011)(8676002)(83380400001)(38100700002)(8936002)(1076003)(2616005)(6512007)(2906002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SuYsNLCqu9qpUkekQGazgMZqubKtu6flhczRtgl7lV747zFZpuBChV+gtmO6vBRtZrLMWzG0RyypxihBQNq5frhRrjhShASM78OSVT3Wag7BJCJVYaKnU3IVg5u1QafBix46Qe3HTWAJ43N6dZhwPnerqceDFQqG1+NOHAZYa9xi54hq4We4b+o5+Eu3i3fsgdpn9cJLSjdhAf1UaMEoedo/f6zm1QjgISRBVWaPmXP1kiD4EIPsFHS9e8JMlwDVFeqxBhAzCJiT3u+YOnbq9xR/DRc78T44RNhIz8ieAySEyoTQTY9jC7539HuG7IH9y8rmHiAl48ImClFsoBWyIky5ILSneiONu6wnjrdKzvgCQf2u8pprDK64e7nx9tOyZu07cLCaa54QlFerVbqh8Z66K4dgsJKPzXXDEjdcNmHrYE2O7MRdCldL/2awgvOuz2Tlo+CPG0Djaob2+dWtJT1Ga0MOOygEBRG4H8lzgsInqZHtoiU1KJLxKYcUeKKZ+gOb1TH3d42Zsq7UMojX+jziKr2xhyGh3EqD+qwoig0JL3wl0z3VhoEfbl8I/BS3kqNyY5mNGlJjAp2FCaRmjgAeeHaNeuRwhjr6qBLCKAwIg/ujksN34vI7oiNjk3Lfj9yUhvPVovazrADOmzIMQm3qc0awkQ+VNxSADcJ+yKqMWEAD2/C7DnBGFPpe/rwFQ3nIPkmKxXme4bE4zztTnURA3bT1DV3sncYnbLFUaLc4xi69JkiIdc0k+J84RD2N0joTG6pxeLADH43ljHde9jPeiI9a5dRhskgi+FPb4G6GMIuQZS8fV7ii3mzRTD4b/8xOL1Dckr4rYnQdgho5VADa6Hzyi5W5mZ3mpMYvRUhwILv5femxiXugwKm8nQocXkSAbJfXVVNClN/NPVTiDA+VQ6lNpncPPMiZZL77Pv3dMnYj8ld6Mbgr8Hsa0dA7ltjn/3Sm+Jnr9nrvqRneTqckFolEu4JLPu0TNY1dAbEOmGIS8NjXfGRDMkYIXNSzYuJesSY91Fr4/67shc3QiMVus60UuMntfTqbZkT8zI3VhY0DeBz5eh468dHJTCTXjkPpe168GAFntgRwqK4W1iIA9KgDfMS/LvEv8ijAOFIS8DkyBQ6fh58c234pHXYPvNn8w4rxxJBUPPCNPjUbCxbTlTtQeDVmrxiz7uAuFp/uBzmvBZw34eif7/yhFqSPxqKeJywPWIso2BJsufhT7W2pvbhMqimSvQLf4NIgxTpeVn0fRqZcZQPNmt2dXDwTsJRaWx7tzuC0eA+g1g+6hLPO1p34P0ItttNsH5fuIjz6Jmn0EaCBxbKhDIVM1XLuBe0aaBT2DcNqZZkSaCBZEoXQLoyqQxMOUCs+ykhLtGOCn5lCHSXa6gdN/JZKCRbpvKFc/49pZ1sz6BtxdySVQDhrj+zN2Fz7XX9lWJfFSRR3wKtNG6vuM0dfJO/O+QyXB+SkSttLQbdqbFSFe3RCxcDd9rKdvOo3mxaYCscOF5ig52g4laXBtjc4S3EvvHXFqvA3xl2MxixOGEq2RhrlOnEYOIkRRTg44ndR45m3Cvfs/XxXKNycPq2yvygi7WEBMKfEf8uCsjQdPqkMhPUHHTz9lufz/gK7Jxs5goQh2PDj0z2wbgDEKM2n7aEBsCBaX8Ws2Y8mPffVe+d98iT/Pw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: rwJ30B291TfytivhZw9QJTB1hVwJDVg0Z0L+5InG8K7iyuK8vetpq/HVTbEFCWSkaa8qHGvpPD53eyqydyaU3qHu5Vw+BdJ/Vk7doahKyGbYfKYw9TpLXexD4t8KsJ+1HdkhqM/MKeJ9DuT7+zc+7i8S/Jf4ZrbsZPoAUomehGLNUp8jV/gV1EwYlw8AV0/M5ghGp3wdDWRaVOde8YD5ADq1u2cq9k8hZ1Z8N40TENz4VzLOLKUdCLWKfZA5cltX2nH81jZgc1WTvuETcxWmijWwsPYUAMRu36AIW+OxAbs/0oG1zhDrD7aM/ucHFvEqB6be6Zw4/URwpFS3BQZ9PSy0mIT7wggjyxtux7mXzhga8beFkkiZqXvc99gr6CByLqQmnqxANy3pTRwCU9orYq+KKT6/+ufp+G4QQaVLc7KgIK97zfcuZvv4knY7exn0tCDrxEypjNdzqQdrwnHETkbe/oREmVoalVSs8PyKgo58Tir/j7UKqc4xyg1zT39uP2hCx5imh/a0iuFeej4uZFNnemUpfQxRZ+fxfP5JrVgyV1dN+wGbhj5Ir3ZviCwdtBIlIs57FqWb+W/dT+LHdMdudNW+nT2WSoaEU7ahHjU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 68e83d20-bdeb-4a4c-6211-08dc2698b365 X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:46.7680 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5dPBmi0qQtBxUgnKRO4i9q13GQ0zeFKcmqgLij8zX7RmnyHhiGsJvVdmYjw1FtkLUUz01o7o3ENFFU7UNalhgKwPN+arCQtFXcrF5osCzpg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4164 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0 mlxscore=0 adultscore=0 spamscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-GUID: Sx10WYNE3XS0UEPzhE9aGpe7nQvR620p X-Proofpoint-ORIG-GUID: Sx10WYNE3XS0UEPzhE9aGpe7nQvR620p From: Leah Rumancik commit 471de20303dda0b67981e06d59cc6c4a83fd2a3c upstream. We flush the data device cache before we issue external log IO. If the flush fails, we shut down the log immediately and return. However, the iclog->ic_sema is left in a decremented state so let's add an up(). Prior to this patch, xfs/438 would fail consistently when running with an external log device: sync -> xfs_log_force -> xlog_write_iclog -> down(&iclog->ic_sema) -> blkdev_issue_flush (fail causes us to intiate shutdown) -> xlog_force_shutdown -> return unmount -> xfs_log_umount -> xlog_wait_iclog_completion -> down(&iclog->ic_sema) --------> HANG There is a second early return / shutdown. Make sure the up() happens for it as well. Also make sure we cleanup the iclog state, xlog_state_done_syncing, before dropping the iclog lock. Fixes: b5d721eaae47 ("xfs: external logs need to flush data device") Fixes: 842a42d126b4 ("xfs: shutdown on failure to add page to log bio") Fixes: 7d839e325af2 ("xfs: check return codes when flushing block devices") Signed-off-by: Leah Rumancik Reviewed-by: "Darrick J. Wong" Signed-off-by: Chandan Babu R Signed-off-by: Catherine Hoang --- fs/xfs/xfs_log.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 51c100c86177..ee206facf0dc 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c @@ -1893,9 +1893,7 @@ xlog_write_iclog( * the buffer manually, the code needs to be kept in sync * with the I/O completion path. */ - xlog_state_done_syncing(iclog); - up(&iclog->ic_sema); - return; + goto sync; } /* @@ -1925,20 +1923,17 @@ xlog_write_iclog( * avoid shutdown re-entering this path and erroring out again. */ if (log->l_targ != log->l_mp->m_ddev_targp && - blkdev_issue_flush(log->l_mp->m_ddev_targp->bt_bdev)) { - xlog_force_shutdown(log, SHUTDOWN_LOG_IO_ERROR); - return; - } + blkdev_issue_flush(log->l_mp->m_ddev_targp->bt_bdev)) + goto shutdown; } if (iclog->ic_flags & XLOG_ICL_NEED_FUA) iclog->ic_bio.bi_opf |= REQ_FUA; iclog->ic_flags &= ~(XLOG_ICL_NEED_FLUSH | XLOG_ICL_NEED_FUA); - if (xlog_map_iclog_data(&iclog->ic_bio, iclog->ic_data, count)) { - xlog_force_shutdown(log, SHUTDOWN_LOG_IO_ERROR); - return; - } + if (xlog_map_iclog_data(&iclog->ic_bio, iclog->ic_data, count)) + goto shutdown; + if (is_vmalloc_addr(iclog->ic_data)) flush_kernel_vmap_range(iclog->ic_data, count); @@ -1959,6 +1954,12 @@ xlog_write_iclog( } submit_bio(&iclog->ic_bio); + return; +shutdown: + xlog_force_shutdown(log, SHUTDOWN_LOG_IO_ERROR); +sync: + xlog_state_done_syncing(iclog); + up(&iclog->ic_sema); } /* From patchwork Mon Feb 5 22:20:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546335 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3065A4DA02 for ; Mon, 5 Feb 2024 22:20:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171655; cv=fail; b=ES3gNWikCnAvn8evmBgiQN6cmE53m7HpMARYYoIs84MUSH1PHCbPy3BguKXoi/EcGxZbotkqgQzs9o81tUj/dDOrEUjSnGeF41gs7RqH2mdTRu7xp7mE+lqE9Essp8Ria4534mwPgLHLFyOJG6xqGV/Idgx3huT6wCsVNcB7I2g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171655; c=relaxed/simple; bh=aLjFHEdhfDp1snEEA6bJMvlFHVX2iUg1BibARViqJ0c=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=HSGkoRSs9iJ67KuAJtl2anLefWF5K1mhuBzUR6sevLmPml+FGowSfiISALA0OPkgYrb+kpXVh6VTCVj+hs4WWMtXa9GCpal3XaIsc7K9HfKpzrWTYvbyG+kaGT/cvpZyw2p4InGlt6Op33GEXmquybQHYvg0C6vsuWhzc0eMaBw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=CxYTKWm7; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=v4zxAAg1; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="CxYTKWm7"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="v4zxAAg1" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LFkeU024990 for ; Mon, 5 Feb 2024 22:20:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=0KKVZ1caTeQqLNoRwTQXdwZybi+h6QhSESfBwIlbIfw=; b=CxYTKWm7DuWCuQW+C/vB8ZpU8Tr01k9c5Kq0oh7ck5DAyXOGS9KhhwVbGvS0148UqyBU 2KpebKWpwhb1fJTsBfA2BxMEL9fDOGkh7wqt0Eag8sd1fzboPR5TFgjAVwPd/rDjFQ1x NU99svBlshfySlu3IF/nr+nYVBBy2irtOLtPxoCijuDTttTI4fjjSUSHQPuutvLtVL+I cte3UNcU19vK36cLk4//quAp+BSR8jMu5SPDlHH1p9AS80zeUwk7O1qZXaeXoWr7+Uwy MCOoDUg3SwfLR/3MYMaGRicKqEFcCxgrJxTBANr255RoKGRduaGnxZpG73VdseUsvttK 5w== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1c32naby-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:53 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415M6cc2036747 for ; Mon, 5 Feb 2024 22:20:51 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx6e1nc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mGpLYywcK8JLAjTT6mP4qM+sX1QgR++wg/nv9GEbbcQhQlMiww8WHSecu/JMpjC/n2KbX4ExHX8ZJcm8wgD0PCkP4F5IkQY9jbjyGGlXi2GiSELX9SrtVlPOlwPUm1P2vE4VsdgfUzemekQphglb0rrEoQL0pE4wg6NVbuqa7CjII7wXrgMx5e6t+ji5UxKzWJ00pVRGz6WIOAaO+w8R4fGGTLUo7qc4hPv5f2oWyp94VfQki72V8aVyQKFL7PmR6X1B+E04O7x4ufXKc6Ld8AfFKkHmm8EmOu8Z9VV2omRMz1TQ0o1jfJkHlZH23STsaUPtS8gEAQv4hx+KAvgjNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0KKVZ1caTeQqLNoRwTQXdwZybi+h6QhSESfBwIlbIfw=; b=iuoVvgvp9NmU6pyCt9+i52BKaPwBLVQe/DX5yVvj5jo+s8c8Aa2yK9mBJc3YnZBoOghKyfvJhqKH0YGL1WVxGncZlnt/4f2LpJQpxgYiCcgrePSiPZ3LIgKvDDMJdgrP9SxJoODemx5gTURapAs/5RdRepta41c1PbI3pRevB/6VpK0OsE7yPLdB19UCLYAtHBvdelX+KLjPFjSXmOYid7Z1Wt3uyAFyvRIoh3R+X7hj8JtgLLmzAh5gr34c/hF6+ZwNZikXvZqYYB1VXJFjEGbJza/lg2KA5E4qbRwoxh8vKOgRidhqnjRka1bLEFWuvF4TqSaLXXfUsvHWJi80Jg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0KKVZ1caTeQqLNoRwTQXdwZybi+h6QhSESfBwIlbIfw=; b=v4zxAAg1Kn/ajdkyXFPhhLBD3NOQ0fl2SULoGh9OA0zqKazq3dCpM/qFCu/1F9i0gGX1bouyrTU4DEDv/prVNpeTWJTaydDNEWdTtIEV0wz79UcBDMOWJ7Dj9DBxZMMuYs0v29rgqMl70S2xP3EKRSVdmlalTsIDB4zr9VDq8J4= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by BY5PR10MB4164.namprd10.prod.outlook.com (2603:10b6:a03:210::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:48 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:48 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 15/21] xfs: fix internal error from AGFL exhaustion Date: Mon, 5 Feb 2024 14:20:05 -0800 Message-Id: <20240205222011.95476-16-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: BYAPR05CA0076.namprd05.prod.outlook.com (2603:10b6:a03:e0::17) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|BY5PR10MB4164:EE_ X-MS-Office365-Filtering-Correlation-Id: 56efe0d4-3752-4d6f-5cc3-08dc2698b489 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LWYxxl3gcasthJm+ZwgJ6dyK6riYsu5H8rNlrqYsROuL+8EgQktvJpa3szpMIc0SLbXi7DZ8xOGujC0zkCrQamKJDryw7IG9Cu0uA6jqfv33uhRJvfrc6ZU1+a6hIfty59JK98N01P9zJ38iWi6ez0Ot6QRsvWSkrgVCfMr9OGX7HoK0Bdk5IZclrem+LV+OlFLNo0AoXmAtjuWVIgULqdBY4V3t81lw/WmyDT9nl9sZj1DdaWUz+8dM7Gy0+m+/BkjJaiBWElAOSFN2AjS3+ZelfO3OWUt/B3OlPdP/g4tomIqwhbl50ft3cXts3RBknpTF4MOe6T1pagEByTMH3zYpu3N1bBCHk0OlKFa8kpMOgbCca6/3qwF4wdbnzQA52dDyqwz1I/gNW+K0RncGCHRxt5WrfVpBV8tMba3ugaKk830k0WG/Ra9ELc4KE6vq0uNu+DAXvZaIULYNQi1fOKu9a03VltcD8Q06AUqrxKmcWcSeYyBrP6V0Xbxsy2TIyWqwRaNopHwQEXcTX+A+pCaodxWPr0FDGmV60akeMjVDS4fXdzGDjKW54zNsaO6Z X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(346002)(396003)(39860400002)(376002)(230922051799003)(186009)(451199024)(1800799012)(64100799003)(41300700001)(316002)(66556008)(66946007)(6916009)(66476007)(86362001)(6506007)(36756003)(6666004)(478600001)(6486002)(44832011)(8676002)(83380400001)(38100700002)(8936002)(1076003)(2616005)(6512007)(2906002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rCkm2D4WRyQ2QCvgPSAIMYKbiOmUgnYkhrW067i1yx4I2ZRsgY82Sj6rYTvRwiBfGD1aTsv29Utk+n8uE+fQqPmBsSLB5xYHtsSZ5mozcby6tn3heSwaYdsDPqxuHoX9mOaXO+SFWcUxVkdVlnxFWWgUHCW5Zrh3AU+WuEyir9Pr8w+RzVVB2tloDsPb3cA+jAz9PRdRQcSGZaB5beJ3eS1bdPpju7sc6Eu7brLdMTy5Fb60GMN0oACNVHuIdG5Dy1OFZCaDPXJaXdwtpijSlLWnLv8DcyQvfUwAXf8zDRS1qPfYzzLpxg/IlMZpKEkqQVcCUSVDFNUiD08SWiYJEtXCHzs/bnVqsTYXiPOFT/ylGZMqVj22Y3xV1fVKrY5UuVf04q2IN4UPQ8WcD2amy3b/KSzlYiA/+npy47pXTN7j7QHeoo/b9ObnxuXg4h/IbIfLkLJw7F8UuraOwGQXVqDWdcNdt+6IW+2xmYmUjX/C+WksdyZFrKuIrSAled1rO4b8x6WZEEB2MHerDWguJBtBdiEfDuZlWgl0UqmA+4XxGvy425PkHa3eoTfc9gm1OzuEnfV5kcXTlYocqwAVm28o8PjKhuMBumd68DM16h+R+5Jn4iD6QU4DFwpAR5QKrDIXyFowaxeQnvH73HvNQXengKHua5LCdNpgX5XBHXGueUNnEpibEwHpmUivqWCXOejdUx+/GhQzcjGzLip3M+5u8dwWqBntXyzDFAguPTW8cNHt/4XwRTV4OA3RBMOoSdvs3/c1QcOeNAt/YorPxLCknNh4zdQS0fArhJWQ/MVFXZMapq5Y7BJOPkZj4UBtJLSfxgJtwMXg/iihJUsU0Cdc13jTVG+4BRxJ6htlCEHEgVZkjLdjm+D1s5a/QyBJSneTQIvuada/A3PRdNGRFwGosdrn8KAZdffxKA2ZNf5Jsr62wS1FbRUC6A0Tc10WX4MPUXmQwzDVdT33bFF/JLfRHTpQeBDKSpCAqUPjZyjzRgU5a4uZbeNczkc8ncgvkUbANCCmouxcongBcf0N5qSaJX4yHf4wtQFKL+EFMPID5wZDysWrcnvnJeHV6WGuiJlXEO9EUknaX16MS71tzZl/Rzl1dkxKR17tdi40yVigMvu7zb+F4sbqaJFd0tqVhJTd+e2xo3vZtVIZZIT4X43zhhT+yx+oETvHV9BTDkg5CPm6yDDohFbIF2XwGBxcy535ZDLhrp6h+6XFsNd+DvYdqVn3VTETGu/i7AjZO2xWptkEh545E7xgHH+9OCDfb+4ZKnBRrL88V4pykgvpX0TUCZAsGko7TOBR2gDcv7dHArNGJhW4G0rOcrY2/CMHZyNGZL/IJxxkJr/T9A4iC/bNPLGhOEIg/RW8DMRwJ22uhME6LKXAoA9I7aNDePYjlD0mCpMfjwqGWe7iBOsP9mPxykjJkKsWdvi7rP0hntNVJAAO/M6wXvFWLoGizs+G1DcYJAoBXX0rzV46TacccodAZj/+7FbCNLWQCeLYc+KAv7yhZ7Sed8xLJrLi17C2IwsRAhWXOTvE0kIOlERZnQ/En6rdqtSOVyqcJdeLNntsriGtX85l2JSxRfFnczYCM4B9WhrPT6yWH8evd/85FYoTQ6z+uZkcfO79kD4mNx8LJ8WpSeTCapHbaRG8Th8Rh/K8OpcgY7aX8QfQuiS/vA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: eFDkcAMaX1ELWfniuU9dXDlGNxOFvF4PJVWd+LCXPhEdAwl1BNHQIC5M6i+XelKfUYbFOwej1s62psff9g5kvwXQ5EhZ91469lEJSkYzmK2Xetmh0vqcbVfeMic0a7+tZrgdo9pjnGPoJ3AF74wWKkow6O2P5nRIv0pVCE9FoHzgGCgc8XZa2AXDM/2YRWSouHFIo2bYoyOMzd/244qa3ZBDGRggwImGkZqB28CMsLJTT5eboU2g7/wf+zlQeaselzZmpUfYpF5fC/uG81Uubpe9st9mq69acT8vtFZk5MDSSHCzchXb4n2gSiY3nQgYR5NnLkX+l+PiNtHJ1UhknZJb/1eIDFjuH/nm0PWUN/qOAGw/uKTSUuZLxNwiMJ2fF+yvrVCY9Ha+AG3m+GBdVn9ZGQFKKiybrAuQyZluUYOC5+wis4uGBoL+4RplVYMy7QRY9j92BVs1Ox4+Y3zvVf9N1omzjVVjFHZiTFBQE0vOM2R2eQGXUxJFXYL0K9Ink9KvuDAPoAwBudrLbPpO2FNd6b8LF93g1Ewz4yjsDp11NSO++jt3+O5/wDbejuuZpWZ3nKaphxZI1/lWcllBzJlfL/m8WYZHh/lg7MIl5XQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56efe0d4-3752-4d6f-5cc3-08dc2698b489 X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:48.7003 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: C2OfLc99MTyOLXE/5qbd9C2ZwKMxqBEIIl22mMz9OaZSUoMwxCBuIWO2WnlXHpR0NHzrbA6lG+mFPfO7PVu2BXzAbxThJBZdbsPQSRTsuUw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4164 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 spamscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-GUID: GnoG3Tpd8N1mx5_5DSJPSiX_utWo6ID3 X-Proofpoint-ORIG-GUID: GnoG3Tpd8N1mx5_5DSJPSiX_utWo6ID3 From: Omar Sandoval commit f63a5b3769ad7659da4c0420751d78958ab97675 upstream. We've been seeing XFS errors like the following: XFS: Internal error i != 1 at line 3526 of file fs/xfs/libxfs/xfs_btree.c. Caller xfs_btree_insert+0x1ec/0x280 ... Call Trace: xfs_corruption_error+0x94/0xa0 xfs_btree_insert+0x221/0x280 xfs_alloc_fixup_trees+0x104/0x3e0 xfs_alloc_ag_vextent_size+0x667/0x820 xfs_alloc_fix_freelist+0x5d9/0x750 xfs_free_extent_fix_freelist+0x65/0xa0 __xfs_free_extent+0x57/0x180 ... This is the XFS_IS_CORRUPT() check in xfs_btree_insert() when xfs_btree_insrec() fails. After converting this into a panic and dissecting the core dump, I found that xfs_btree_insrec() is failing because it's trying to split a leaf node in the cntbt when the AG free list is empty. In particular, it's failing to get a block from the AGFL _while trying to refill the AGFL_. If a single operation splits every level of the bnobt and the cntbt (and the rmapbt if it is enabled) at once, the free list will be empty. Then, when the next operation tries to refill the free list, it allocates space. If the allocation does not use a full extent, it will need to insert records for the remaining space in the bnobt and cntbt. And if those new records go in full leaves, the leaves (and potentially more nodes up to the old root) need to be split. Fix it by accounting for the additional splits that may be required to refill the free list in the calculation for the minimum free list size. P.S. As far as I can tell, this bug has existed for a long time -- maybe back to xfs-history commit afdf80ae7405 ("Add XFS_AG_MAXLEVELS macros ...") in April 1994! It requires a very unlucky sequence of events, and in fact we didn't hit it until a particular sparse mmap workload updated from 5.12 to 5.19. But this bug existed in 5.12, so it must've been exposed by some other change in allocation or writeback patterns. It's also much less likely to be hit with the rmapbt enabled, since that increases the minimum free list size and is unlikely to split at the same time as the bnobt and cntbt. Reviewed-by: "Darrick J. Wong" Reviewed-by: Dave Chinner Signed-off-by: Omar Sandoval Signed-off-by: Chandan Babu R Signed-off-by: Catherine Hoang --- fs/xfs/libxfs/xfs_alloc.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c index 3069194527dd..100ab5931b31 100644 --- a/fs/xfs/libxfs/xfs_alloc.c +++ b/fs/xfs/libxfs/xfs_alloc.c @@ -2275,16 +2275,37 @@ xfs_alloc_min_freelist( ASSERT(mp->m_alloc_maxlevels > 0); + /* + * For a btree shorter than the maximum height, the worst case is that + * every level gets split and a new level is added, then while inserting + * another entry to refill the AGFL, every level under the old root gets + * split again. This is: + * + * (full height split reservation) + (AGFL refill split height) + * = (current height + 1) + (current height - 1) + * = (new height) + (new height - 2) + * = 2 * new height - 2 + * + * For a btree of maximum height, the worst case is that every level + * under the root gets split, then while inserting another entry to + * refill the AGFL, every level under the root gets split again. This is + * also: + * + * 2 * (current height - 1) + * = 2 * (new height - 1) + * = 2 * new height - 2 + */ + /* space needed by-bno freespace btree */ min_free = min_t(unsigned int, levels[XFS_BTNUM_BNOi] + 1, - mp->m_alloc_maxlevels); + mp->m_alloc_maxlevels) * 2 - 2; /* space needed by-size freespace btree */ min_free += min_t(unsigned int, levels[XFS_BTNUM_CNTi] + 1, - mp->m_alloc_maxlevels); + mp->m_alloc_maxlevels) * 2 - 2; /* space needed reverse mapping used space btree */ if (xfs_has_rmapbt(mp)) min_free += min_t(unsigned int, levels[XFS_BTNUM_RMAPi] + 1, - mp->m_rmap_maxlevels); + mp->m_rmap_maxlevels) * 2 - 2; return min_free; } From patchwork Mon Feb 5 22:20:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546336 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AA2974E1A2 for ; Mon, 5 Feb 2024 22:20:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171656; cv=fail; b=nOSXQbYsGL+/YT+/7ShUJCplLguApt3Puy4tw4DROxNEhN4Y3tpbFnNZzgiJkRVU0sLIS+ndT58S/vVAIngCsZBqX3ZSKSXcukosk8TlwEV4zB3oaGqw3KpFZ3jKAnVy/riWOzyxgB4AnHGAyRYGSHIxGNqgC9Pa9KR6oW5aT2k= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171656; c=relaxed/simple; bh=yfz0oSKB2JIkPGiKR/CO9khBhcyXMWf4Wh+4Rkp3+8k=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=K7cuGGu1BYm10AZsYo8mEUKmji2ef8UDcYz5Q25fBGzZ0qUJNN8cOQz2eUt2KkQHcyTbApNd75CbZTThPVCHWupC+iUT7nwaZhivXAAA7jV9246kyM2kavL25+bB8+wYM60pVjS8bB/jdusVJF2pryuEy+eXbNdG+GrnHnERz7Q= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=TzJJUmB4; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=mOiXeO1o; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="TzJJUmB4"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="mOiXeO1o" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LG7Mp020854 for ; Mon, 5 Feb 2024 22:20:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-type : content-transfer-encoding : mime-version; s=corp-2023-11-20; bh=jlnX6uAbZdB/vZF7HYgMZrK0ZqIondb8E6yvQsbDz0g=; b=TzJJUmB4gG6Bp3xu8heyIu4OQSr7CvCcPAHKqpnnxwsbmh2xQKiZJYVxeFYc9Lp1yHBz cAmPg+CujdkWgRAjj/eOmAutEKdX7HesF6pXrXNXJt65oBK0DFgD6c1QUhNbkZZ6dyUp MCNLOql35iP6EhyNb1mXn4Ng/WMJkxuWkGVh00N3wgsGpsJRMJ9YIKCx3dBzZPIdeJUS axjqC4aOGdGifUxhy47vIDAhfSylF80jG4tkInB3eORtS6oxL7MB6lxfaQWahdpDfegU bXQFnzDeFMlKs2sEBGrJSzvaU1iCBWFT0wvtxQeLROJuWNGEKRvVDfS9CLmCJ4rpxVx0 kQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1dcbd5bd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:53 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415M6cc3036747 for ; Mon, 5 Feb 2024 22:20:52 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx6e1nc-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i2jKrNfegSRBCDCx9rfcwmzHo7TUvuFRM+G75th+MnUgkD1K59jr3yutQ9DbDN+zwNSJW03PjbjVBA+6qETdj351WmbOHU+kNf2FCJNN2sg2QpKogeHBHpEODMmwAs2dn4MtxB0AOF7ptSAUPKP+thGAe6A3NRc0v3X60Adu+m4c6gE3FuL7DhVO00S3LNtOfBV/tsNam0zTuOvTr3aLY4LJMFqMr4Hgc54KvkAe10PXdJMIe38k1+NOq3EFIweUJszRevvNZMwa3Z4SwI6+euOoouT8D42caDnx3paaUzFRtyv2iv03oDGDPHptatS+cH1Wy+lKhHDISkk/4pSzgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jlnX6uAbZdB/vZF7HYgMZrK0ZqIondb8E6yvQsbDz0g=; b=BziqbxQ329vR0CsdDuTn1iEvOPMWWvJy1L/jxFgo2GUYNLrOprVQBu/CHlIOHqwoCD2QiPK+TASDFRmisHLk1hxTkJZoRepsGmNpiy4pHzrc75yxkE0LXZvAbpvYPQPNl4tjIwTpCZQE2QyzcGwOIqNaI83L1FQTBlmbC2lj0a3DFXS52EXgdhSSD01W97OB9VC3S2h1jnNXshKgCU8ro662c6FTZbJO6mMbaDDnT3bd0rF8FdiUfPHNWbqDAt//q9MTaqgNhsMQw/oEo7Kttegynxn2ibNXMbkRH/Ubcx61WMNVxBEfQibkIcxCcA+iW8/zU6YjnCZYds6iK+Pimg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jlnX6uAbZdB/vZF7HYgMZrK0ZqIondb8E6yvQsbDz0g=; b=mOiXeO1oNr+Xt3NNqNBg2Tl5OFjrzDQP5lV3i+HqJrr6Rf7h21devmZ1FvfwA+jL5ji/cqoDSq5S8H7l0wwwhaUjVBL9rP+6MUQFASrLdVFHyK+RW8zgcU9rjEYHjypB+ICWvkRigQTqLAm1AGBig+uEg/scKskt9/hyJoQjgiQ= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by BY5PR10MB4164.namprd10.prod.outlook.com (2603:10b6:a03:210::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:50 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:50 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 16/21] xfs: fix again select in kconfig XFS_ONLINE_SCRUB_STATS Date: Mon, 5 Feb 2024 14:20:06 -0800 Message-Id: <20240205222011.95476-17-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: SJ0PR05CA0080.namprd05.prod.outlook.com (2603:10b6:a03:332::25) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|BY5PR10MB4164:EE_ X-MS-Office365-Filtering-Correlation-Id: 978b2068-4249-49df-d55c-08dc2698b5de X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oK8RRNY1qz64PzM9yJSoyapjNcKArR0Ik3OKFSWWPI2NSHM1XQ0G2eb3eHiuUhfu2yKVzQYlQueafdi2p6wFhhZj3g/DHzoYCaN1JotLLLxwSHh/vIbt70yV2dfAJpEwCOUuJCD6oSJ6DGFYh+uqg8Azlj4QLvcEJdtmwPmnvlw2TS0LcPVWgNTDC4DnD6TN5SeOQg1M1UYCkCVMT1W5jpkJhiKeBp/1QK9LTAiUjyhmsgTm4Vvqyn4Skzt4/Rmg9aRqAzYNyVyuRsEDqY2oglp/jIONAm/g3fjI1t5KMXKPFiJmjWc97f6n/KWnJNY5vcEfik2m67RBu3t3n67X2nW86Jo5854CRnCWbnFXL4fEDa4Okj4hmZG12e+F0emU2MvpbqLrjshCp6fkuBId6tGUArXw7moZ7IhVUNkRyTdBMmeVJ1jdQnORljqPASjUHwoFLlkKzeeeUUNvtUqPPE+4OoSkxgbusURAN2mTouPWq4hqzI1cDuq4qtnZPxLLGxXxxHW0RD0/dgSucggGE1mC+Ym5eVH0dyvZm2UyFbz+aOEPyvLzS5R9ZUgGQzJO X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(346002)(396003)(39860400002)(376002)(230922051799003)(186009)(451199024)(1800799012)(64100799003)(41300700001)(316002)(66556008)(66946007)(6916009)(66476007)(86362001)(6506007)(36756003)(6666004)(478600001)(6486002)(44832011)(8676002)(83380400001)(38100700002)(8936002)(1076003)(2616005)(6512007)(66574015)(2906002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?g57Zyk7oVCwUSdb9gjK0kwuhfq4R?= =?utf-8?q?wsB8l96MK3uYD//qp9NV4LmYaz73idlKXoV6qyQWz2fiu9KC1ZUskql2ftge28jos?= =?utf-8?q?FfWJzQhfroGWaBzNVwIot66yG7Eq/M9N5zxEfVw0wVRuYEvzaCJohhSdhRGKNBWiG?= =?utf-8?q?G/gdLF44VP7V9nrUG7t8NpTqgQUp7DGQh6M7QtlGktG3ew7KSprG1bbNcHLN5ZXe7?= =?utf-8?q?Nz80JjaWggy+N3y08WAqF8O28B2gzx6PGdcGHJEPChsmVErP0uQNXV+g0wJ9kl9mN?= =?utf-8?q?ROFUPRsv7mXGTeqkX/0l/gXQJpaK93wh5ZaECV7fN1OzSa3o+gZntYqqzMBYtx53O?= =?utf-8?q?VESFBzOI0hhzWADqBErNXR/W7GEIUvwrn3a1RAA70fqtq/4kePj4Klchq03ijJ1xo?= =?utf-8?q?KlIPUc+vw9jShiN3zjGw+Nb47Mmsxrcn1LHLXqz8JOb5xlMgtaP+gcdOQJ+D5Nuvi?= =?utf-8?q?9sSU7p2NgvIWN4MtH7xiC991mwbwwyIpBEsYRkCP/KEVT0+eUvvrqFug/p1vUkbaK?= =?utf-8?q?HeiaOHAy2nGEGgazFp1q4/OZ8ekBH7yTBbbwvf+wpxczFApA6q02skuOavOKiXiRo?= =?utf-8?q?yc+69fU74KEc7N1VctHPfNSLOpsfsrQlBAVkIOD3CPnDE4UzGUjJugxkIH9ZA3E3c?= =?utf-8?q?049oJlLdmKT0S8UYfClwPZJlfy7CmOO3eoYeNki4NZs0YiFFwCZyUMFhN5kWnqYJr?= =?utf-8?q?z5E+96zrUX9na146ZMBmmQI3X2rRD+AKSPvp1XtMkPW278T6PuLIB3hjK7Anwo6kh?= =?utf-8?q?nOYxa8J9lE3m3qVZ2GgUGtD9DgKKb/lNGP0sinF5FgNLXqhWN5zepCy4CxExtZZPp?= =?utf-8?q?z8PViadpYGgIO6ffTupJRiPnetqRk9tnJqQQfC+mzall+JJHCcz0VS3xFy/3M7+YC?= =?utf-8?q?E+33Dr7jbmecJAmtI3XFkomZN+yaH8s3I6THVoK9rd9an6E8/4ThJC+m6aCbHLKys?= =?utf-8?q?g7MGuzk/IFVmEScSClAUs/k6LilF/iLSN0iU2VFPgOXGlaAseiKDHWP88OZvunQJ2?= =?utf-8?q?SeViBzkxKa+AP/5n4OcNecimJYd+IWwPFQ6D/jbCjD0T+0bb79fpmrviiv0tJLtZx?= =?utf-8?q?VMQFOvDNicXvlRJO1X8E6QeHmb3qGdb1h1VOCUhPXapZnuiRVyyOnLyGSgMs6VzgF?= =?utf-8?q?RSPEtdNcoV3+ZTj+Ptqx6mX3vVeVJjdFmZm7P6s3ledbpg8ovrGZrndAYiALruW8J?= =?utf-8?q?T9oaYXi35EOfFtIGtUNLa5NuUDgzY00n/RQlnMrqMqiNh9UQJYlflQLZVQMBc4+0Q?= =?utf-8?q?3JH+vamNmNbmu37uLwUf79MOZ/zpKtFHzNTE1EmF6MicTMdi1ZE1xmQEiey2OXTo3?= =?utf-8?q?beAevG1os5yKuOG+PALYidojCsRtDS55oc5pnbAwSt03zGckxOfc2spVZ/mEjpDAb?= =?utf-8?q?Y4UKsadUzKoeDyFIR/xccGX91RBIUPV0AHRtpus/mf800khkZuayFQj7NGYfR0QK5?= =?utf-8?q?mgvNMTU+qugnrWYZx61sKjI5xxB5cMq7a2E7OOZ22j4OwVWQRFIZABWsrTj2VbMp7?= =?utf-8?q?EXS+63+a6YazXSq8yfLR/moiWHc7gpiaCW+YoAcXgfeliUl7Pk7UvxQcmdLmAREUR?= =?utf-8?q?plW4crTcBOfBwWHncAydLFlNBMN2GdbjQ=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: lxg0iieHK5LNk+XWwtva23OihQkR7Gr2qa9YOwJwGXznamcknEWtDgJi/YfRDIAuEBCKixobz6tOE/ZD4r/+jcc3QvifST6DyOJ5zCNERYPW2XJPSKQF6OzsaX0xgTxpUhDvU+S4eypbs+zY0sh0uJSZr6CKyWLBF7PIkxihtyuupu/ww9BRSEVG1q438k6/DKJ45IvfAzhmHN1EOMeZNRsjK9PeDvyzgcxJGmXTXBXyt+xu6GJ7sNb0oqcWEhH/jxTON0HTeh8m501GS6+V0f1QE2IsQCXOmFB19mndcYCLzgJUZhPLw+qKBE8rMngCHWdezjevNGP5FUzOOFAK8es96SgOUThwHqN8Of59g04ilTiF3BVjfC2MESFJ9ppWmDNf9dRpzeewTM7JBd3u9H9LAClbuqnQ3wYFbBTRu9C2GPVi1TdW1Q6XHhTasvrVurtOuww7X/ACVQFu/7Gv0TTbCjDsCmYWRgz+NVUXmxlIowP69hAFFdjtj7AYffAtZ3NxFMkqfA4nO8TxaMwiWShiPoKhyVUMVvruQhrDBo2YoWn8TEslYn28junvPbLF8ZnWC/jtjqanq5W6R5PGH3uV7MPD91dppYJprwN/hW4= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 978b2068-4249-49df-d55c-08dc2698b5de X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:50.8838 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VRyaIoMIlEE1AHPZLukcJMYRaHq+JCxnccKYvZzq4poQL1UUJRwWVK/gqiE3MrX/9SAT06VZpUxg6/eOITDHyAebmIImaHDKqo6ZMRTmaQE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4164 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 spamscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-GUID: raXbrOoFUhR7OHlqo8tgXd5KF0m3qwVd X-Proofpoint-ORIG-GUID: raXbrOoFUhR7OHlqo8tgXd5KF0m3qwVd From: Anthony Iliopoulos commit a2e4388adfa44684c7c428a5a5980efe0d75e13e upstream. Commit 57c0f4a8ea3a attempted to fix the select in the kconfig entry XFS_ONLINE_SCRUB_STATS by selecting XFS_DEBUG, but the original intention was to select DEBUG_FS, since the feature relies on debugfs to export the related scrub statistics. Fixes: 57c0f4a8ea3a ("xfs: fix select in config XFS_ONLINE_SCRUB_STATS") Reported-by: Holger Hoffstätte Signed-off-by: Anthony Iliopoulos Reviewed-by: Dave Chinner Reviewed-by: "Darrick J. Wong" Signed-off-by: Chandan Babu R Signed-off-by: Catherine Hoang --- fs/xfs/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/Kconfig b/fs/xfs/Kconfig index ed0bc8cbc703..567fb37274d3 100644 --- a/fs/xfs/Kconfig +++ b/fs/xfs/Kconfig @@ -147,7 +147,7 @@ config XFS_ONLINE_SCRUB_STATS bool "XFS online metadata check usage data collection" default y depends on XFS_ONLINE_SCRUB - select XFS_DEBUG + select DEBUG_FS help If you say Y here, the kernel will gather usage data about the online metadata check subsystem. This includes the number From patchwork Mon Feb 5 22:20:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546337 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 30F6F4EB21 for ; Mon, 5 Feb 2024 22:20:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171657; cv=fail; b=JOhKte0ksA+Dhx6FadVciSO9tVZ5qMsKL2ZB5PxGhULz6gI8clebDCRvc0BbzdRhz8Y1gQ3E27FoSsda08T4KIYVtGOgg5fmqLeuoHpO4vwzlQq3vEW7dTN1jIdyVZxclo3GPYCGgtt9lFQ6aBtNNCcM+nNQtAbKEeWJyVRLkSw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171657; c=relaxed/simple; bh=XOfbk8qGFuFL0GcUI5J89/40P/g1UrwlDY+n5vdHYIM=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=MO2+Tzlq0kKYI7fY6n4OgBzT1okfAVh0jlQ3GnQBnpr/sOrXyTXuHFIhlpRo7ZA33hSwFnnJhFjlj4cW4FoUpIVxu20cUfsS+axWxot7VWP/G1GYW6cNLPeOlXtNrHNU3gRV7KGV9bor8tDbfPxfHkX4ZK5djYWbDatutBZ0h58= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=f5oZq0E9; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=y4fyW9GW; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="f5oZq0E9"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="y4fyW9GW" Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LFwBY004733 for ; Mon, 5 Feb 2024 22:20:55 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=QyCIJIbHJ97JEBUXH58a1kTVRpj1f5cqYQJ+rTYfLME=; b=f5oZq0E9Mu6ZGFLT5XnkGg2BGuLfykdVfgSArJobPzcSvwOlgqg4wG5kvor9lPiq4UCZ ih15yKibOWOtfoG86s/4nGQO7md5h8WDegQfjmEFxbOLnpoG78YclS20vvl5kRM+ZhxH V8qVQwaLZYi5UbFlU+hsMXZpGhmVIYEfQDHJaXY4+U+RLLjgesX9R7AGu5DMOPhnb17A dptjPK7r4fZ56Cx3wj37WrMtgntFkjYe72xVWtyzkICgV0H4tEyRUJ3tbP2x+qKvSNgR 4ZhZStKwcGl9PjiZkGmTxYpmOiZeGTlEmbw7sFk7ZGGEzy4IebcMNThVtz4GtRyWZXew Cg== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1e1v56b6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:55 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415M07K4039488 for ; Mon, 5 Feb 2024 22:20:54 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx66849-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kssABPw3YYP78gQdQoGviiCD5qzOzzEkm9JxGHptGYxJk3hAl20iPmJUH7R30RJn9X0VT2o3pfewD0+QEl+lz+xSTVH3H6rSb13VYnos8WF3TOC9ZK8dLBjMaaW8pmiYzKZelLDA9/BrNT5asT9p2bYF2BOJrYleuItItV6Vdl4zvOyStcbYrd3+CHqM/DacNY0AvQ/oyH3nAMZz4/PSVsekFIe1qGK/sr0hvhAGGU0r9nvQ0iO4IhRWF/EBsLQyAW0dsPEojhq1xjvBKR/8xgrzL0LjPUX5EZWd8nA9+4TPw7Yn7xQ9V9RGxej2PGKvhvPrdztiRzS/AsYgKeiqpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QyCIJIbHJ97JEBUXH58a1kTVRpj1f5cqYQJ+rTYfLME=; b=Qbg8Tw9xXq7ZM0pNcuYjQg1EBRj6AwOkWZfpFrbmfWQia8kHWhGBxwsu6pqrONFaSIifYQA1yZ0rohoxuJH68v9UVVPZc5r6ronY531zQKGriKhO8scot+qkih2KmsJm9jXrgcbZJHq4XcDBPKh0dAfDgpdXel9XzNGdCKwsP4OyGfFxUCXlcewIlQ9NUG+gYoG27fSsLaaAs8C0ePLblT6UBuBug/f7HGFWSTA3hiwl8JCBo2P3StrD/4/3CmUvoDANX/aUL6vd0pxRoqjwEmG8LDK/ccROlrftXVM2rkrjLABnCm6XU3kapoB2+ukI5VBkL252QYQpo2AiVPtKsg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QyCIJIbHJ97JEBUXH58a1kTVRpj1f5cqYQJ+rTYfLME=; b=y4fyW9GWsSqQzeSC38PPq5IUpN2qCWvod6bQuU+HWThPcynuWf8rpwNY2H7Q3AgrDfRqRDF+19RtGHcEtW31BswQCYvQDKY9pYp4c9Hi8zKVYZSnoj7UeP+AZEsfnbaD1rosZpMFTBhsz5Ki+TYZtmgGJEzC4Fhff3fjCptilsM= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by BY5PR10MB4164.namprd10.prod.outlook.com (2603:10b6:a03:210::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:52 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:52 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 17/21] xfs: inode recovery does not validate the recovered inode Date: Mon, 5 Feb 2024 14:20:07 -0800 Message-Id: <20240205222011.95476-18-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: SJ0PR03CA0275.namprd03.prod.outlook.com (2603:10b6:a03:39e::10) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|BY5PR10MB4164:EE_ X-MS-Office365-Filtering-Correlation-Id: 43c52282-3041-48c7-9dbe-08dc2698b706 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Y2dUMh8AS3NkbWy2MvN0NJhc2iN0XlM2MDCmG12HDD9ouoXWwhJETRHqNP55aExcLLn2qosq+0VulD4ExjhkHIowh/fWePNQQhZdBuhGMofb4W3gXQVxkIJiA5Sw5K4ThwgRV5fX9t04olOEQJBhuP32F8+qAI2Zq1RXTHUMnPMFwJYgv9LF7lsotFEPI+MAa1eNSiT0f/F/z8ndfm7X1Z5l7BKMcWAfu34z+g2IEnP/G4yPJKVf2f4Byd1TbPjPducOIpW8PZkIkRw22z+WTM9ScK8T5V9E7gUkUy3FPqR/mfaCKu0TvFtYbU3S5dTYsq0uO55jTdn6AOLMUDr605KExc8o1PHWxG6qrQrq+DdMWme++xLkMm/6Xb8PEF//KOUk4dK+k8RGI61XcEX8doi0InBE8dkhwPW9VnzbV9wWWtWMs3ZuKtu9WmZ4LggyzjG9S5tzDZ3CS0+/PX5yoT0CvmkIP/rK7bALXGcAu2w5zfJNlSHFQ+unyB3Im4vMCgDdhIjoMIFbE96mrBtVqn8t2W/vqGrxRegW0ZFOxYsxOB/OrI4qdm9xoh+kuWRs X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(346002)(396003)(39860400002)(376002)(230922051799003)(186009)(451199024)(1800799012)(64100799003)(41300700001)(316002)(66556008)(66946007)(6916009)(66476007)(86362001)(6506007)(36756003)(6666004)(478600001)(6486002)(44832011)(8676002)(83380400001)(38100700002)(8936002)(1076003)(2616005)(6512007)(2906002)(15650500001)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: T4q2SBHqHpdFBjYrbrqzlRYmbew/aZdnvDzFUDuJDWv33M2p7fHvky/yPoWIKczBFX2halIYqvHZT+rwkssvoFdfxk6zTdcDkswPOuJNJhzFYIb2pydbptSXMKNz9fSyPYKOl65tGab26wWfMF5TUOynxkQDYzLpAsfdyLMMpaZHmjMkELNwHIynVMK1ergLh3GyZsKyF/OANNNqn/iAxeGgtZL6+G2ReWrYfnlL/buXQSjTnNg6umx8NqvGq6c8pF2da48n/TaAdfumByNqAVmFA5SrqFouHUIPsAWYVhkitao16p2ZHxfllVGBBWfgxwMB6DRDuQyKG25VGDwvCLf2girbm0sZOZyl0tNSH27+VJP0pPzbmgolxL3U1rYbriSMhElJN9XH+8tKCKeAW9tXHacESgVBsefa5mLVtQu+YG05ljT4nzO+elhNab3rhzSTdCc5vO/FETFUdnAmdRrVKSCM2ypxIuwBEGjqHbYORGEdZWg7Vpqr0/W40ZJrm5dkU3JCCvhXZEM/7Wq9AF3sAebRS54t23uNVupzgSTx8yY+qCQ/QvN/hgVlynEZ7igztEDZ5SgUgT/k4wrGJ+DhwpzaGAtW2yH0SSCtmPQkHvWrZQfDj84doXe3FO/wBHRPoBYXB6L92EwQOQ1ripS+i01F6qxyxVCo7wr69PHXytBJVJl/Ydsw3+rKbunxjicfTZjv0PH/ZCuf9tJ43uRXq360wXZiXf/RtkZrUuf00XTedNK3xdOCWVVUXaTOcSpk2AqoQaG2MpL8iPxJuHglOl1t2tXYCmFQBK6Uur+YAg2FTRr2JEzWcDbYIY1I602D1z2Mwo8zNukNB+fYkx/6M8jw89UVj6pYQ3Wl8v5kwxmkKAAYBvk8yD4UsNeSkpB3yDhafoBQySyb8GM5gy690CrYfBjcKKxdHdY4g0Mm0geLs4tk74Z7UoIXb+yrE8Qtwb0U3eksMy1LQHJPs/gC/DzqFqq5CxJSxpnY5YJc+T6DRmKGXOTuPO43O5HBFBxj/Z2TdLCLQlL/YeXnmVIkyyFRzp14skfYemdxa/UM8t5T98OwzNkgEKjGpbMhyUCnjYB9nx0GwdtVVbhBVWUfuRcXjjbaOscBQL5rUY0eZZrZ8WbOax2BhbCtmyb7G2PX/bsJp9lSumrYNx+VPNWIWHSKRXOYOXXk8XvbUASuxwsOMTXiEv6lexUdoBxouLg43p5yUIGGaiO0BGXNRocRMWgzembowpWOZzMT2PXAzXSew91/L4PlZR5Iyrs1P3oVU5ToQUQVVwV3NzjG4lwEy0kM9P98zLhc0xrWFPLAAsuUkyLG5jD0RgIc05hV8oDqnAuwW/WpFjC1claoXzGMgSvL4Xvq8wTFa47HaiPLeyB7OiV2/XCHhopfsOQRcCHpddKKVmJ9SAWiE8UuuRaxtfftLD+pHERDCYGqiNi11OvvS9/ATNRZ/iTv6RqgOYtfs5nQHQMHTGYcCcgr0K9K0CNioiKLFephYoRXn+Dsv2CgXia8n4icBUD8CZ+BVoZ71ombEcOLcS9UrOTIrnPf8gD4QdsN85PXCRXJaVg211W5JP8T6s2l8IhnJ2WYAhyJNxggebjk8nwPx7SVoJ90aoW5k/1+4ePsdQlGloJrFN3sbWLgN0wo52QXlkxItGRBMsrYH11F+ysC413VjQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: rmK6QRVq6w05xGkGikJrFAGigprvT4xXmWlHIN1we6WagCH1U6T/wqIPWX5eYRXKF8RlZFp+Ax+SuiHrUDAAQpPPymXE8HQLCvyQtFHMGJgKVl5aesa4ILfJXQ0nPa6okMpM7SoH8//hkvh/nYya0J498zSz4ANDmGmkDNCNK6TKi0qC5izkZ+IaXTL+TF+XmICdMHOCC/tfiZjSVnwbZqgHm5KzOR/LfujxNcfSVoz5VwlqvSonXr93RmQshKYjzr46z0R4f9F7LlC9Fuz7zDrvgPKL0l4+T0Jbj2FMMihQVEP9SkT+m3xKq5BoAS9OiCpS8wmhFNCQjy5vBQBP8IuNaW6lt39edbrseQ9DlqygahSEmpgyJForM/3Lvwn9tRS+/TA/IQui6hilGfXmWXlZ59wg2MBvxDEC5XkH100EacBCHt3HIT3IFfpWbDx8hRoOjKjGNd0UO/EqyCdTOezk6RO8bJpxdYHZSpZrt8vI7bzbFFDxdBBGbbnO5co59pHkUbHB4kn6u4g7eFs8aAdlVjflxKVDaMN4o9HzwaB7dlwVljCMIEVisG0zf5qx7ZrqSLcIxfljq3E4g+0Ur8OLKNxVUzG1GbcktgV3IAk= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 43c52282-3041-48c7-9dbe-08dc2698b706 X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:52.9053 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: l3w+tsinzQCBzAu9KYXh160fa7wrKoptMYHkruM69aAPGwDwB2jN1WuWQ3/QMUPTRgT7SXzV06RXVKO73L9c5D6MdIUBKjNYV43BFJ1iP1U= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4164 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 bulkscore=0 phishscore=0 spamscore=0 adultscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-GUID: nbXM5YurKalRHzaU8qoHOWV86vEUoR6q X-Proofpoint-ORIG-GUID: nbXM5YurKalRHzaU8qoHOWV86vEUoR6q From: Dave Chinner commit 038ca189c0d2c1570b4d922f25b524007c85cf94 upstream. Discovered when trying to track down a weird recovery corruption issue that wasn't detected at recovery time. The specific corruption was a zero extent count field when big extent counts are in use, and it turns out the dinode verifier doesn't detect that specific corruption case, either. So fix it too. Signed-off-by: Dave Chinner Reviewed-by: "Darrick J. Wong" Signed-off-by: Chandan Babu R Signed-off-by: Catherine Hoang --- fs/xfs/libxfs/xfs_inode_buf.c | 3 +++ fs/xfs/xfs_inode_item_recover.c | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c index a35781577cad..0f970a0b3382 100644 --- a/fs/xfs/libxfs/xfs_inode_buf.c +++ b/fs/xfs/libxfs/xfs_inode_buf.c @@ -508,6 +508,9 @@ xfs_dinode_verify( if (mode && nextents + naextents > nblocks) return __this_address; + if (nextents + naextents == 0 && nblocks != 0) + return __this_address; + if (S_ISDIR(mode) && nextents > mp->m_dir_geo->max_extents) return __this_address; diff --git a/fs/xfs/xfs_inode_item_recover.c b/fs/xfs/xfs_inode_item_recover.c index e6609067ef26..144198a6b270 100644 --- a/fs/xfs/xfs_inode_item_recover.c +++ b/fs/xfs/xfs_inode_item_recover.c @@ -286,6 +286,7 @@ xlog_recover_inode_commit_pass2( struct xfs_log_dinode *ldip; uint isize; int need_free = 0; + xfs_failaddr_t fa; if (item->ri_buf[0].i_len == sizeof(struct xfs_inode_log_format)) { in_f = item->ri_buf[0].i_addr; @@ -530,8 +531,19 @@ xlog_recover_inode_commit_pass2( (dip->di_mode != 0)) error = xfs_recover_inode_owner_change(mp, dip, in_f, buffer_list); - /* re-generate the checksum. */ + /* re-generate the checksum and validate the recovered inode. */ xfs_dinode_calc_crc(log->l_mp, dip); + fa = xfs_dinode_verify(log->l_mp, in_f->ilf_ino, dip); + if (fa) { + XFS_CORRUPTION_ERROR( + "Bad dinode after recovery", + XFS_ERRLEVEL_LOW, mp, dip, sizeof(*dip)); + xfs_alert(mp, + "Metadata corruption detected at %pS, inode 0x%llx", + fa, in_f->ilf_ino); + error = -EFSCORRUPTED; + goto out_release; + } ASSERT(bp->b_mount == mp); bp->b_flags |= _XBF_LOGRECOVERY; From patchwork Mon Feb 5 22:20:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546338 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0DF104F216 for ; Mon, 5 Feb 2024 22:20:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171660; cv=fail; b=KN7DC4OG8NEc+qIwxDjUmvoFQsVP+qg6UbWq8kMJrUWyUidXWIdpRk5i8TLf2LyDu0tzLIKVkdqisf8/PygiW+DKcSshPYFhgt4haOnOb8xVG2QuCt25PoHBkAFlDW/bysbPtqhfyQ3/hFWeU/1BkrPZSGDqy5waGE43GD7aAxY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171660; c=relaxed/simple; bh=qCuP2zIkark+CiJ9njMGUDWYFilwRgp3lPsInxk1Rk8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=QF2L4WjAQoYtY8vYT4FWBH+vPtmCsxtCXpMp9bb0Tn9ZhEbH9K4Fj1pCcqxLQsxku1776dfS39bS+6qJE5aEBtQSfu53a3SseZCqP6I+VeqhYBWySxhg4mvDxf2qqyXJNAOs9xVC2wq0caVY7qmwybx1jWbjlED02UzKwnGqomo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=IdQgmZ0s; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=Qrvx688O; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="IdQgmZ0s"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="Qrvx688O" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LFkj7024987 for ; Mon, 5 Feb 2024 22:20:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=DunNBBwLHa8gbOz2awBRm1eDp6Y8GG+bO0mwHzIrvfE=; b=IdQgmZ0sBLPWKsIrKmGOxSsUXNfnk7FtWowGM5HhsvKbAqI01lnmzBqtdLfAx9jddGUH 8CCbFCCQdaW7FXV5KNV8TE6W3CmGi1Z8CJwg9KBQWC/TLM09YOEXVfrd8GWWLOk24YXk hx7WATYp/hItOVLJ2Mz3Si13nLVkOQ/cocpz5CMPIr2fFPaZGn6P+OkN7I+iaZoHAVw8 6z0xzfqeMJOHUIG7/JLS24H9Rmo7Wc43DjOUp7GPN0Zz1wn31pQfyx780SUyChtKxaLl hoDSLNbueHckTWIwR+FjsJlfFchKmJ0eCSmbfYD2uUqen4lbV9tp68Lt8SB2fEpfzBz1 zA== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1c32nac9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:58 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415LDrSt019741 for ; Mon, 5 Feb 2024 22:20:56 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2168.outbound.protection.outlook.com [104.47.55.168]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bxcpjmp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:20:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m8UNAv1cLIr2Hkd/+GaZ1xNH3tF2Hd9dpRKRrt1KRzAbyqtQyVthRVE8Hq9mAgrEaB7Vaa+2Iz16xj3QxPcmFMBokd9Vg563FmFQyK0J5OOgOOpMwVCAyODO+CSv4v4/0KBswyFyVJQ5c4GUsYFr5qSji7q2HgvaMHpFMbAMKEwnACLlCDL9HEhX86pu1K1JE11Hz0lNBydDBMLLm+t0NDFM356dLFhS89ugCNmvhOaU79lM/27YyYJvKR8Lu9J7O1o8H2r8lPWUxh/pP3CRL9RMcwWwjPgTPrqxxookOgn08IqpUI/f8cGxXAqHGL0uiD8Tdg03+nIEubNdweHPaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DunNBBwLHa8gbOz2awBRm1eDp6Y8GG+bO0mwHzIrvfE=; b=hqhm7EAGZnMEv9vNtoY/ccDDttRmNX8dOhOZxi2dgPKztbMXNpBgXrx19IJEqY/XU+j470SvdADL72bkvPU6Oz6gkWM13pGpZSeKcvl/ccMAztPH6VQMp1+H5dIBWvDf/JNz3DHy00vTv9F+bNq4hQg4vQsj7xYlx2bLA+EyslEVvawC3UvqkFAD7rjiTPFXFMdnJYqQxrD50L1t8pwyXvFnphWdYZUC0g0CwhlfnOcVDY28IS869O2bfFVka2FQUe6k5CcqgfH/xWXuWZ3GB/mwCu9KHH6WLtVyewkGeY6vkaGnDep3f8e4+PZZPGZw4IBXvIV7zyxQDK3iIJQdTQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DunNBBwLHa8gbOz2awBRm1eDp6Y8GG+bO0mwHzIrvfE=; b=Qrvx688OmoYKofZTYh7tNalkZC7yUeCInnWIAMuNCLRF/XUH///AO66MIUyLHQ17EljmyU1UXWVdQHYSLb8HZhE6ftmUelaobx3Ixdw+wSyZ6Q2rrGAKzC6JOl2W44JKnWhvK2Ft6+s8k4ulizrweRQwfn/QtgfBCxX9x6mxqgs= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by BY5PR10MB4164.namprd10.prod.outlook.com (2603:10b6:a03:210::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:54 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:54 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 18/21] xfs: clean up dqblk extraction Date: Mon, 5 Feb 2024 14:20:08 -0800 Message-Id: <20240205222011.95476-19-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: SJ0PR03CA0298.namprd03.prod.outlook.com (2603:10b6:a03:39e::33) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|BY5PR10MB4164:EE_ X-MS-Office365-Filtering-Correlation-Id: c76b2257-ac00-41ca-d127-08dc2698b83a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zRDk33uFRMy2WMw2HrD+ujk1VTw9knUcS/6AaEb7SSLJ/hNA1jaAsc+z55kHN+e4Gnxe4xOghQex3pBddwHXkdqSteiAMfr7COeUx++D6un/rl4SLCvFxzmjOXuq3svTrE/bN82dxmiFenLfXnNAecfQveDsjY1GmxLWILID7+M+Q2omlltqMukEVppCkXNzDz6DOWIjax+PsA4wOu99mxH9PZY8sC7exGe/6nkFQUb6GqEjbRZAq1UBsw0gdt0ly6eOHyLgfg3ghn8yd+17eMhH3ojw3/HBSn5nxRKjd5dP+GDlS5GutRSSTKO/NzcMq32D7Urz+s6ffVfVsY4jhmCc3W1Xi4x/NOBqHbHUS+RaMdzZEUOPX1zx6i0lDZ4012I1dXaWIpQ9vbzfWVji8GvEJtcLS3X0HDw2bJTR/ySS2OfmlSjLF47EgAsgINvO4roE3Ppj3BIxTcLVMe8NXQd3WNpH1iDtWOYKtIoIiHxUL9W9p3dEjGNB3FbKQCaoy/XjBiqhaGjwYHouhVfaL16ezDfw/zowuKqsu1fx+Q2qiyvddVMQoIpcBXOYJDqD X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(346002)(396003)(39860400002)(376002)(230922051799003)(186009)(451199024)(1800799012)(64100799003)(41300700001)(316002)(66556008)(66946007)(6916009)(66476007)(86362001)(6506007)(36756003)(6666004)(478600001)(6486002)(44832011)(8676002)(83380400001)(38100700002)(8936002)(1076003)(2616005)(6512007)(2906002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fGBRxa08OcjijI/gedtvvKB+z/DUjneUkI1+nCV1jQxMqCn9vl6YKwU2/Yk3hEzDMZavm0VXbyFxUAxyeJ3BmmXKzunSHrzVFJt9V5MGsGa36AGuaGsAsz8/b5rS9rc6+4kJJDmEZlb3/nDFRtbQP4mk7RopEuebkTkkyYpaYUiMm32dtrJ5yGdZJjkGCuA1jHCh2pekks6QcSOl7eWisAHmJv7xU1JATv/qz6u1VxKsQMIaThNtm8RZwJ4DvkXiBaxfOf3YwW0DdiT+hZD4vM3odMs1CII0Bp3i/jW1dZoroYKQGQdoZD35fBwEZdqC1csly06VuBloBzBvjgHoTtLJxhAWFQrPk9Lczm6QrDjo4tdWQ8DnSyf6XKfFyOP8HYlci7OiRj2cDMEQ40gsAQTxZk9h0wPG1Koirv5uF40ARUXwBxeL+KbUMkXx9VR9oWMyZxVMMYATD0R/mhkOup2oQygdvbVAbE72EmneuqvUnPUQI0W42cNHPJsnfP3DIM/8y+WWqZ3NlWenW/egdFtP1cBFsBejLrD5goDolVCg/kjeobFX7PL8d0NWP9PYXT9O5O9t1dlzXUHhewWtKiYwN9vYmVuppP0ya9+/PDJSTWiqmfxNxNcimfIiK8rTy3McHTnptSqlyNrAM5bt6sTi+0lMZ6GHEn9lCgYBVBHZ/S1qIHO36cGJY0nbHrjEGzYTkmtAGYakLX795VyAfFdw7swcrf2oxkmLRtSg9ZVshTAeDukVJUuW4GJ4Mva9wH7N/kQjmVtcYvMKt1n//Jy0zQAS44YrAPEbDbI8SlABSLD9VNwtmVCkPaONlRcPJw1RcWnNHN/IhKFo4j3K8zgMi+mieg1/6mFPZYNcg1SLSxC0njAmKeJi2x8TY0AXW5L+anz7fhiogpHSjcqWaqhB5NfSCWTl7YvYUQj3RFGMhhj2eilHCdRrJckH1ocnWd/dw0LqPHiylhYCpzTM1fnq90cdndIGaWESfx/zXQdQuDF41eZhlnAX6xcjl0UjIdHLi2rT/WFtT9kneHp01WV3qvJ60ud0oy9QV+iB+JV/Gb8XMmf3QRl+BqvI7gQ3WK1apLIpnWiLsjsthuByrwnmlzsbhtUx4j4PLwmZUc66gdD3t6nckc40Rvox3kwjBcs/WGtStqh/eZsFO3ngJrXo6ryaCM/SzUiLv0o6C0Ej2HhoeAqjdz7g5HOFGOxDtF3u23Jlz9ke7V7cO/31gnN+7vuObgi+iUgotNEqVue3omHdNrhwfyl/YfO0su9Bg3BeiG4QVrJ9aihTe1JEhKSb2bBeAmm/0GM0HvSs4JjrntB29Ub7q7+ujfwQwr9HIHHXm+kKgXpEG0Dg2jYjxXpNhIpG/V9cF05pxdA+KG+nsb0SFrPSXPrbqwFxJSonF9WVNcUK3x9M08adOeDFEDxUac8zZmkmIzmjJGYj2hYwswc0Rhw6a0bCtMuGmUWpUuj53gv5I5RwRm+0env5QVK7XgnVis+9rjn4evOZElNyEgiXmmY7TfEnUcZ4W51Q4rTEsZo3KcZ5At4xlhnebCH1Z8qf/c2ZUon2LdyALODfhJWhYZheP813ExxvwhAB6ARvhhfKt731/dFl0giHTpawnYwpJNuDq/HHXkondMjbKAoJMBgu/rHof4KvFyEXxnvXuC7TVsP17I/w/ijTlA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: pthPNmnnniH+s3hh3MwQevATloZKrDY7BBew4kOpabmnYgLYs3+TwvdkC11tMzMupY0yP73UWXoowxGOglAguzb95GTKia7lKPxc7PKTRTwpv/ONS88d2yxZTq/thw6HVcHEreOdsOkwTzMDBSyOHtR+lEsAeelJ0Kzhv/z5Rg83muERI47S7EpIj9UsYcBB7DagiPOvnoqPl/b5kd+7l+RVD9siHeZV2w4HBOPN+P5D5Xi6UTPoCoXmCiuxdz/E2C99Tb7R6YEHkeYOYWlj8U6rTQciJ1xa38ZZhJyAprUQpmIvd3LUcWTPaLNYfq8NkwJS1UGHx+c8E0R1ufd/ipvKJN0dyj6Dl6C1dyQT8t4B+HyVsPKHM+AoAWX/UYEaxmWukmQLDuXwGAtF69a/zyNol4/F9gwek7dNRvqganXJ7T1w4sYjKRW8pS2o3WGLt6Oap2OAlhXoyWC3TLZog2gNJEWm5cI/fMFHdwhAbtTsV7BNIviMez+e4x0eFIFTrkiVxm8rBYLZ0msvomzSDzNC3D3osRvcPE93NSruS9QAHLU6hqezzjbm8M6NCVOL+YqLLKFGQMYy7SnTWLK8m6/rUO1+sICnW6IpPSaRl8w= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c76b2257-ac00-41ca-d127-08dc2698b83a X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:54.8950 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: fxI7e8vaSFUcwfuEciZ8vHruNwC+v0oaTW92DyU33HP4bkGABoh3pNMQ3vTjvKIsmsQ9ojXB7aEWjmG8lDGpsg7aVKW0BSLfH8ECLPrMQM8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4164 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0 mlxscore=0 adultscore=0 spamscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-GUID: h-4aumCaXefnnYcxzp8_O2E-cmtBS4rv X-Proofpoint-ORIG-GUID: h-4aumCaXefnnYcxzp8_O2E-cmtBS4rv From: "Darrick J. Wong" commit ed17f7da5f0c8b65b7b5f7c98beb0aadbc0546ee upstream. Since the introduction of xfs_dqblk in V5, xfs really ought to find the dqblk pointer from the dquot buffer, then compute the xfs_disk_dquot pointer from the dqblk pointer. Fix the open-coded xfs_buf_offset calls and do the type checking in the correct order. Note that this has made no practical difference since the start of the xfs_disk_dquot is coincident with the start of the xfs_dqblk. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Chandan Babu R Signed-off-by: Catherine Hoang --- fs/xfs/xfs_dquot.c | 5 +++-- fs/xfs/xfs_dquot_item_recover.c | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c index ac6ba646624d..a013b87ab8d5 100644 --- a/fs/xfs/xfs_dquot.c +++ b/fs/xfs/xfs_dquot.c @@ -562,7 +562,8 @@ xfs_dquot_from_disk( struct xfs_dquot *dqp, struct xfs_buf *bp) { - struct xfs_disk_dquot *ddqp = bp->b_addr + dqp->q_bufoffset; + struct xfs_dqblk *dqb = xfs_buf_offset(bp, dqp->q_bufoffset); + struct xfs_disk_dquot *ddqp = &dqb->dd_diskdq; /* * Ensure that we got the type and ID we were looking for. @@ -1250,7 +1251,7 @@ xfs_qm_dqflush( } /* Flush the incore dquot to the ondisk buffer. */ - dqblk = bp->b_addr + dqp->q_bufoffset; + dqblk = xfs_buf_offset(bp, dqp->q_bufoffset); xfs_dquot_to_disk(&dqblk->dd_diskdq, dqp); /* diff --git a/fs/xfs/xfs_dquot_item_recover.c b/fs/xfs/xfs_dquot_item_recover.c index 8966ba842395..db2cb5e4197b 100644 --- a/fs/xfs/xfs_dquot_item_recover.c +++ b/fs/xfs/xfs_dquot_item_recover.c @@ -65,6 +65,7 @@ xlog_recover_dquot_commit_pass2( { struct xfs_mount *mp = log->l_mp; struct xfs_buf *bp; + struct xfs_dqblk *dqb; struct xfs_disk_dquot *ddq, *recddq; struct xfs_dq_logformat *dq_f; xfs_failaddr_t fa; @@ -130,14 +131,14 @@ xlog_recover_dquot_commit_pass2( return error; ASSERT(bp); - ddq = xfs_buf_offset(bp, dq_f->qlf_boffset); + dqb = xfs_buf_offset(bp, dq_f->qlf_boffset); + ddq = &dqb->dd_diskdq; /* * If the dquot has an LSN in it, recover the dquot only if it's less * than the lsn of the transaction we are replaying. */ if (xfs_has_crc(mp)) { - struct xfs_dqblk *dqb = (struct xfs_dqblk *)ddq; xfs_lsn_t lsn = be64_to_cpu(dqb->dd_lsn); if (lsn && lsn != -1 && XFS_LSN_CMP(lsn, current_lsn) >= 0) { @@ -147,7 +148,7 @@ xlog_recover_dquot_commit_pass2( memcpy(ddq, recddq, item->ri_buf[1].i_len); if (xfs_has_crc(mp)) { - xfs_update_cksum((char *)ddq, sizeof(struct xfs_dqblk), + xfs_update_cksum((char *)dqb, sizeof(struct xfs_dqblk), XFS_DQUOT_CRC_OFF); } From patchwork Mon Feb 5 22:20:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546339 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 006474F202 for ; Mon, 5 Feb 2024 22:21:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171664; cv=fail; b=QbxS4FbNUpOjvI12pZrgt7WcQ8YPCawGVf0FhxBUBd9vb1UySf1ZbqgO1b/VdAaLI0a70pu2KacuIsjnCU6rhBe8XSAfrDrd+x7qgM/uBurZlK6E8CUP8XiYYRNL/WX/Q2PjK4n6gS5Y6PGeokfJHsilL3uYA1UHVl4oHdUwyrI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171664; c=relaxed/simple; bh=ykF7NpnQT46Jks4gfz8eLGiyCdlQem/AcbuOhppl/6w=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=ODgHOpCJJaJk24JVi8Cl5Y2TnRNLLULOwvm48cqFPxyj1OcwF9dQYb33daSC80bxQxNNZDOgsgk2NpYqFHt7SGDPy2Zjsu1UPM5Roqfs4W1o0X5gLE3wztJHNVVhwdll9YuVVaGr2J1t/EOmmbVnCPA+9pPNAA4Os3QZVVkacEE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=mKUpN7K0; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=nGbGoknK; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="mKUpN7K0"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="nGbGoknK" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LG7Mr020854 for ; Mon, 5 Feb 2024 22:21:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=LuMDbYYENfwkIa7wnMKemSJhWngTnAyZfWqQeSr9hFo=; b=mKUpN7K0dHwqQGgmuiSrbIQNf8vIYHYwYVS5C95ALt+5OVy9XuQpHdIlML4p/HABwksS T+eVlmmYrEuF/RYE3g3nRFbWF6dcDtbjWZh1iP6tE63JLvKnmMwzvCEJwhmXaTYZiV4M SsLDhge8FFvHK//RQSOXCWQ+ujfis/danzelWXxUQuOyx7jaMj64cQXjRDjr1q5gwhWq 2fPEUZzjI2xN+HSeh3mHSLY7UnrHuwrcTnS8PCnn+Jaea3gTaE5juk4MHRjT61qKL07a 3sCSjdrl/CFkNgsoYaZl7ao9YMUaqFv3cdTC6h97bgZnUMooOF18/P3DkHNuuWLnLbLI ow== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1dcbd5bx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:21:02 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415KW94X039512 for ; Mon, 5 Feb 2024 22:21:01 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx66890-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:21:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CjetKDmRZYPnBErSh6epZw28fwYPkMerfeENw8yZm/EZ+GgSTrtLKAs9jt3GbORQPfEAQ4+MIPPA5ppfO5wOqrSOvAoQ+t4VP0C+81mO5PWFbR/noDODMoivqSvtzglFU2hwtEpBwTGKTwrzusfsnzffRXkFdGVKGsSVrj7lQXLgPVE/tbyyrss648PietAOTarfisQqfufgw8Jp2CPasFfq2L0ggcvlBH6xCYLiEQEOdRNsZKWKPykygwjerFaP3xI0pRIuR0c9qzjJNCRotMdntRvjX/OOBboXlkQpw9iv+6W552BpEF2mCeHPErbnS3zyMyvzYmTi8M4ewBsN+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LuMDbYYENfwkIa7wnMKemSJhWngTnAyZfWqQeSr9hFo=; b=M7VV5LBfvvFf68yHWyyRzVwxUg5qPS3RMBE9OXI+kgidkmdqlqjiUUrJYvnz+OxCPXIoCfTChNms9FExutk4WgpA25hxWgcWY/4Mo2f4e92xfrdI5CqwNGvEBA+wQIW7viLNYyFGEPtItCT2k2l8WkDHQRuUj37KslMZHCzakQa0pdXz9jE/cHn886NjtbS4R4SuFDjZenRQ6Tp52vyGePB9i/Nj2kgKp5BhWARnjBF17nU9ytrkM4U51A+49vhb+3cJqlJt41vDyL6Upx3xDEkrdpsgaVNnyWWnUPP7BaV+aGobTgKcZaMOww9zZaAd7goNwACxmL1IJCVS8UQuEg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LuMDbYYENfwkIa7wnMKemSJhWngTnAyZfWqQeSr9hFo=; b=nGbGoknKNCPCe1fQolBa1JWu4qhP0SQreHsVQ8RjQ7Q5uP4SZuIAaHLiXoBJk+vvJ+wEUoXasFBM5OuW6902L0uUK0i+Lwr73nGgmS94nQKXBbMcu9m/0YebORsnv+HRFZ13Xv2emcJ0sy8JNCY2FwetQ3qhGOsdFLbGnVwZ6yE= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by BY5PR10MB4164.namprd10.prod.outlook.com (2603:10b6:a03:210::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:20:57 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:57 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 19/21] xfs: dquot recovery does not validate the recovered dquot Date: Mon, 5 Feb 2024 14:20:09 -0800 Message-Id: <20240205222011.95476-20-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: SJ0PR03CA0274.namprd03.prod.outlook.com (2603:10b6:a03:39e::9) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|BY5PR10MB4164:EE_ X-MS-Office365-Filtering-Correlation-Id: dbc8b671-ce9b-4e51-a03c-08dc2698b9a9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T6x99DFDEpCl7dbrei76YU27VtL5UPZkwucQe7d1DMfefffhuIU9t+6i7IVcR19LDWH10LIIm9cfh3worxkOkfLODtU883Qhzz1g7Q1DxFdR1yIrHLhgKh2pUOr4GwhOGCXMnTsGAvRTNmvxkiEZtIOWmmS2iSWm/0eNfiAt5vaiLt9EZktLN7q1EpRwAeSQUvFft61iatWIZ2nB+fieQM5GQjB+GHhLdoCBqRyu+h5d4TX51aivEmjcFgH/ssnD+BDqveT1sjeWKNSWBU/LmVNOAsORQNgErinxvYlvMcFP9Pc+Fms1ryqwtCV5k+frx4EQxxgj/oVJZIBEnn+LH1PE7BDjz0H/VA8xF5erYSAm6XexuztB41A+agX+7DkyN20nTMlRDBxNcZkb8o6SeiAhUz2I7ARSwnbeGpiDqWnLisdAqXF4zJLKmFvp8+/JJounGNUHQkYdFYrGNilCUeNVERNRAu0694mADvuWEq/j4Ezw1jJcJb4IY2MvXsMZIiDp3rq3pxUoZCc5i34TOx6ue3Xj/iqmaAEldL1M7YaP8UpFf00CucWRu+TBFQCS X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(346002)(396003)(39860400002)(376002)(230922051799003)(186009)(451199024)(1800799012)(64100799003)(41300700001)(316002)(66556008)(66946007)(6916009)(66476007)(86362001)(6506007)(36756003)(6666004)(478600001)(6486002)(44832011)(8676002)(83380400001)(38100700002)(8936002)(1076003)(2616005)(6512007)(2906002)(15650500001)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0Eu9R55YvHtvjpa6Mh9Aj//AVMzial58ufI218HsQ/LFr+wXG988/IyvPvY40OTwBwafhAI5n/QV4Qej8b0+jycUK8QWaXbS4t5+3j4u5B3NwYyK5ywt9Kjib8GYOMP+/9SiKhreauInYmLfaZuOKQpIh6UEvUAGRKlsIK1SaHKmQLV0jmHazxLqPx6gb+XT/uTqr7eejzBFkKVaMwiTBt67y+pc1LGJEckWYe2nt5AjV9/GbnVDl9HlqFMM8nK7Uixrp1qLvKxFsESgBQfIZSfENcaTOy/TYzMKbz9w0gR5QtSimZvI1W2ZvliTsvltW9u7DDq2+6QfN+I2gxViWsinZ9RgP2/rfIE7Xznr9LBVmNg7W5pitBozFiDMY8D1tLAwBmAXB0fqMc6/I/8nyEqEkFBAI4xErcoKmKc31ligu8x8pbxFZKt9xSNfzbJld6l1drJNal/+Rz5YJMz/HzzvG61Pq2it7DWl1ddBINaPVUzM2bWs7Ew6niDvbrMT9RGnA/sW8TkoDipJ302TmA3SIfYkNCqQIDNI10lBiDBCVgK8803imlvYGEcO4MMTWKyIpeKjzeEpS/H4epzGopzujdxCkMkmTbc5uwZeFavCv/uGydKEMHd4+7u/s/gfGjt+CPz+8N4P4l7Fwo6cVbqqIYLQ/uLcWV+3GB69nBkJUYD63XGqbcSiziSJ2c+PeabBoL1LctDROF3DIJuadM1ivJjQhfkHkN18bvl7+Xb03LKKK+1ltMGfDEe4Nl5Yl9PJhJCjpdl8j8My8s7mQO6i0X7F1T9t/XGDQZFyqZ1zXTmAgn61BQNDEGDz3n+r6oljDATKfaBdjB++gIF/7L8g2h/ScsoMFjIgYSsd/X08pgdBsUwR7GUk/7rmzDM1hFNdpgyrmzKqETdtITwpuH18U/MX00F3UPB9Qars+OrANL8SooT/92WHDXT7DQodyy2e8F+HaSrsua0qSvUBT0FIpS9QLha8OvXEnJMTdc1kN1XIWwPgQTCoQmViUI1GC4OBEHK0r7c6UDo2wg2imSEw6hjL6jBw+wRJGIgSKldZVpNjP3yLJh2mdqlWOpTERPwBf6ezCAlPsgatih9Bo/ZvVUrc+6iJY+eVVnhjICBSaI3b8U+TXPP44y83FRJkAGseLO8LTmHFivZK/CYI5ak1B2A1hleboXG4rLqSU0n+8N/GsujOwVYsC99UB/7MQ0QcfOv2j9/G9AghOD8hVzDPPXrgVuXmye180IjLix0FiBahPT2IhaUIEjx5CWPlg4aqPI/IC2Zu1h5F2KG8pi+OzTc+EvnaeO1k1RW0AnvPU9eBWGfVnf4Jd9NA2q6c4mIcoARlo6zjoFudMZooT55Cd6+Rw9V8B6oHaLKqLBQEmslPosWO66IvPvDsuCo3NklhDIpNoGU9/aSHUqdPpY2PB9syiw3fX5uKnSc3TUClEYHXTOd154CG6PjvRjili6ohOnGmS9WJsz800YPN4KgvwxOVRQ2g4X+hOy0SvJFomXjg1tMfslD4AN3x2UGFijgIp8EMCvnozTCuZaG+xpoyjv1Qt7dobhii3Ido7qiAwYgBAdtZ7BeW1fjXtKVyyre3Kv1BPPCC4Sd4xnnddet/EcqP8fx6m7kXs3tiwUGHM9abE4eqok9gm21dvH8ZIFn8BPD0EcS7JTxrHG5f3A== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: +EejGv4pkoCq4OLwZvskC5kHj6Jx5mY8lo8iwG2kmNlfGX6LF+WC0xyfjYvSg0XQGicQw5Fnrj094PGi4bY/ebws2eQLbQGXjFUKHdB/JR7foJp1LvtFZp8XFblmNBknZmviTVZ84Be8dFxzI3cHAvLi7eOseYTr44vcISOgUsldp7dSfi4K1JZsEJv1hd4OlKULlq+GZAMT76nlhinHwK7PPo+B2yzBiAM2Re3E+ihfK417Yv8/Q5mXu+oONOuycwWT/tzQvTBCUIja4Rwd0tY2meHm1D47x/lYAJ0U2XwIxNRoNp8pBGNFuI5MzBTPH3iBiH7RZaUWUXYlcwOG9zEO5vTdak272j6osHtA1lDjAb9RfH1BviQ5u+mcWMeK5kELRoSPDbydAxUXrfm7M0WXFBDPMmOO1oVOaKCvCaa3ttkg5KUkzS24Pn8AvJeZ2bCE+Smz91KxJ7ANXkPU1V1Smoj1qiTgiuiuWx7GGbmjbHYQ2jC3rUfyRuc//Yv8oK46+bKaS+guPbRsZFuxaC1AdkTaZKsCdCxyGhGTYi+f+6A+8ocPpPvxzfQzKsFA2YI8TGmL9WstgIZpmputYR8qtv6keQW46Xa9hdfZgU0= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: dbc8b671-ce9b-4e51-a03c-08dc2698b9a9 X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:57.3167 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: tdzKQ9wF+MorFjN+ftgpKi7d7bAeAUWcJCKB9HsokHOOAIBAT1H/M4f+DR0Oirr4Oq2nerPAkDm03bERBgWinymR2IFPXDNN2Dn1K2O7R0g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4164 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 bulkscore=0 phishscore=0 spamscore=0 adultscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-GUID: jKyjHqvylAWGHk3uxyFraPv28t2eIq0D X-Proofpoint-ORIG-GUID: jKyjHqvylAWGHk3uxyFraPv28t2eIq0D From: "Darrick J. Wong" commit 9c235dfc3d3f901fe22acb20f2ab37ff39f2ce02 upstream. When we're recovering ondisk quota records from the log, we need to validate the recovered buffer contents before writing them to disk. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Chandan Babu R Signed-off-by: Catherine Hoang --- fs/xfs/xfs_dquot_item_recover.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/fs/xfs/xfs_dquot_item_recover.c b/fs/xfs/xfs_dquot_item_recover.c index db2cb5e4197b..2c2720ce6923 100644 --- a/fs/xfs/xfs_dquot_item_recover.c +++ b/fs/xfs/xfs_dquot_item_recover.c @@ -19,6 +19,7 @@ #include "xfs_log.h" #include "xfs_log_priv.h" #include "xfs_log_recover.h" +#include "xfs_error.h" STATIC void xlog_recover_dquot_ra_pass2( @@ -152,6 +153,19 @@ xlog_recover_dquot_commit_pass2( XFS_DQUOT_CRC_OFF); } + /* Validate the recovered dquot. */ + fa = xfs_dqblk_verify(log->l_mp, dqb, dq_f->qlf_id); + if (fa) { + XFS_CORRUPTION_ERROR("Bad dquot after recovery", + XFS_ERRLEVEL_LOW, mp, dqb, + sizeof(struct xfs_dqblk)); + xfs_alert(mp, + "Metadata corruption detected at %pS, dquot 0x%x", + fa, dq_f->qlf_id); + error = -EFSCORRUPTED; + goto out_release; + } + ASSERT(dq_f->qlf_size == 2); ASSERT(bp->b_mount == mp); bp->b_flags |= _XBF_LOGRECOVERY; From patchwork Mon Feb 5 22:20:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546340 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1BFC64F218 for ; Mon, 5 Feb 2024 22:21:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171664; cv=fail; b=FQ8S4zTPwhlbo0X6YqwXeuRqwi8YcNt6gRb88HZzM3abJeREATNhNPme1K0W9CmXeDU7VTXzZLfHgCxPSb7mFpqn+IgmdOwUg5eGov4JI5yYT8QGR7wMKZmRVgehNNr/zjBC7EWNwqoaCriD9rSOxUwYOpfKkb2pzgnmc+zvuls= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171664; c=relaxed/simple; bh=8nJQ6Xfyu8kIESNGyxqX/d3QyLkc7TMEImcDNDV1sOE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=PAn3AzHpfVou1pJSFdnw4cl9WFotb9HPYPEj51cWxNEySSn31YaOI1oRgHlvhKv/7g5CXCV1JLA0LbXBsCYdPWvGiTTNgBaicTP7pcUbi7WadHGbs/761E4yH/NHfl1sCVYka/RJRklReEVozURgod/pwVJrFYHqrICl6yyrl6Y= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=dBJmVwfo; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=uA3jpHAf; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="dBJmVwfo"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="uA3jpHAf" Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LFnxR018452 for ; Mon, 5 Feb 2024 22:21:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=ZcVg6FhlIzOzz73xD+aGgcmYSbYZymJ/o348m+dO8uA=; b=dBJmVwfoBFYl6TcGpZb0mdinW8XR5BCu1yQ6IDlW15sXF+8brPDuQyisHzn/GFoB1mom gZF+CgHHHkB/deW7GGftjQRVNluOH7kJu0ldI72tgc/SOsDhyR9mMzlqR6uGJc3cN5Wr 2SPw5z1Z63nUyEO0W284CthXwDzvQVRafQtBe+TcrnLipFCNCXR31SlDrqU4pOW65wx6 JOMItGsqJjrH9omsvz6r4qo1sDJHq38alZOhZLwsiYkWH1DVBx2JRZHk6dunjFplCw6J bctpa5UXZSGW/IZgymw5aCZqrsGf3qYhZKcPu9/Zra1udzZ26ZhDza48BoJeWkyEcIqu dQ== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1cdcw9pu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:21:02 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415KW94Y039512 for ; Mon, 5 Feb 2024 22:21:01 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2100.outbound.protection.outlook.com [104.47.55.100]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx66890-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:21:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M3tkWM+9mahQW/RTQrrUfHEPt9hGPHBKE60mQZdCkxDuFe5ivylGRn3BvDF9jQw4xbLlhsjlqV6xUElV4flITXTQsHx4X7IsDazwCLfpr2vl9IFkCGY8XFbaPARM+cVSUYT9wmvGL7Zm2OVE268FX1iK2+OMUlvX1yCOz3nS2GfKLv2kJI/vp/vXVmEa81WoMDI1HvwFFD9Rv9bnyq58JVuLNKJwTey5IzvEh65LMWfL0HLxVWNIEBaIWy66JexUtX1gHLNVZYzJn1s23SxmAZ0iU5L+iU/paEM7vDV5ZabR5oJwSEPFIV3q4rymoztnt9Msj2Lkxnq6XWWOd0PA2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZcVg6FhlIzOzz73xD+aGgcmYSbYZymJ/o348m+dO8uA=; b=EWgn3yHin4As1IyNzVBF31BRv++uo4dWVYpSrgLgjXixpv0RS0W0InbHxcazgNMd96ZLH8EPeRcM/P1cT7cS9+Pq0V9Ufzuxxc/bD0sovKtoRE70/dhve4EIFNTKFy5/Whr/xJtLoX+gqlKv3yK7hgUvdSM3wMtqatCjl/Oq/1xMSPc27CQc8c5kt3r84CqwYEJH8jpnWhMUDg07SVvsnSJS6N6TuX5ohprVhJWM5J5+waE2/jb7tk2WH7/o3HhD5BEilx0TuDwSG7kAEVyg3/QF9afI5u6RbRLx3iX92F+sGBjGgfkMoKCFYrl5DoQHeQziYz5z8080pBl4wh0QYw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZcVg6FhlIzOzz73xD+aGgcmYSbYZymJ/o348m+dO8uA=; b=uA3jpHAfn/baAj/9GvjPemBbo9KIxW21RrgPR2nVBpijaGCiR00ICv8nrFfeWvBKVU/NA8ezakG6HECqpv2IDmLgpfs42fZE69j+agY1/D3n4HTbh0PnmpNFQEwV9HvOKD4pvwtGUpGpknBXYwadEPMYRcFvvlp3GisulheMAxU= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by BY5PR10MB4164.namprd10.prod.outlook.com (2603:10b6:a03:210::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:21:00 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:20:59 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 20/21] xfs: clean up FS_XFLAG_REALTIME handling in xfs_ioctl_setattr_xflags Date: Mon, 5 Feb 2024 14:20:10 -0800 Message-Id: <20240205222011.95476-21-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: SJ0PR03CA0278.namprd03.prod.outlook.com (2603:10b6:a03:39e::13) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|BY5PR10MB4164:EE_ X-MS-Office365-Filtering-Correlation-Id: baedd93a-8779-409f-aa04-08dc2698baf9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jOsEtXVWfKiIVVFyxspIx/+QC2zTtsnLH1y+yDnnn/r89RU4obOLz2OBzZraatDQMqd7QBkKnlHblVeo6j4JN2k21yJ3Trui2TyvAS6++lWKkPvhGgjU4cW0NzEw/GeIVzO9WNcAFEoH8652m54dugeSx9V7iSj0Fn2YkxCbL9QuljE61lzh96X6Ip4UFCkHB9WpEUZalktv8Uk6L+angj24ao3Fk7em3LYi55BHi9ibF4rSj9uwJm3gPXR2uFOFEMFLLXtLSpbzM/Tn7n7I800Btk0dAoohVwKWHdChLLBu6mfg/0VtRuBneE1j9+b+o3WxOkmQek5J9NShw6lNn/ruozJ70uBFFi9DZ6FXPntmk4eUo06FlFNDGA2I6DoDtGqeJoza56kk3g2Jalo/hiJLTz3YoT/axWrZvlFCiC1W91sMfFm8BxSuLwjvJDjl839H3BYYXPy4yt9kYU3PiOFP9x/UXHQ9tSv7kcAcqS2HrtKZ2zO0iUi58iWb2/QsGHzkbkHjwxrHOTcB1XDsiQ2h55+kTLjeE5p+klsgxL4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(346002)(396003)(39860400002)(376002)(230922051799003)(186009)(451199024)(1800799012)(64100799003)(41300700001)(316002)(66556008)(66946007)(6916009)(66476007)(86362001)(6506007)(36756003)(6666004)(478600001)(966005)(6486002)(44832011)(8676002)(83380400001)(38100700002)(8936002)(1076003)(2616005)(6512007)(2906002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IdjzWfm1a9OGF4Z1OqRkxVw4syPPuwYY8hSb8EC5uHNs0azWNtqCYJM/TxzkNsu/VAA/Uhhm7l7JsEidobRxEYJLQBZWlDqzw7BvlFUhFwQMHsSWxCi/vAxFVNMovkuK91Tf54rojktuTNxlrFGmL68c21E6aIYjqn4RF29mkMxz+2HmY8vuKmtgRGIWZOa7YrsqFy4ufS0PaDmL4KgNZIr0HG75TCWU6+uO/tAK+sAaGshBMHmNx9iNzzsmDvJAnOoPFhxIb5d1nV7ECZCN2huQzweiNFw9o7FGDc004vOVAZj9oqu9cQJGDXfJqvwJZaK7zt2vw/XFxukvJCWVmJDhW6YIBJKjNmDbvtBYxeGdvPIPkznH+BOgyBYVWt26oAyUig9lD2MpsujOL7hVdrh+AgSqzhRBJyj3rn1P6fIa/jbtZhl8uSBV6AuOjpt+qCsSJ8a+qo/o6YVSSytReVo9QKVwlETRGiJP0Rg0yBk4ClJR7gxVg98hivtfHc4tI+Mw5VqM0/5cIQSnObSZreU0eWXFhV0DN2KawdhAC7DPYkoI3+L1pOZ7wUK+W0HkjQMEfZUitIpQ/l1zNQvJpn4LFUIalwLdoU5LytMGlbjYIu5BFxWMpCJ7U+fxFJYk52tNwK7UezFRcxOn/RuNYMw7vtuOqwK6ZA5kDecmVjt0QZA5yqzI8tSiwrVktc2P+xruAUnmE0iwNErqgQire9LWg1o/zs0eQIj/e87OhcPZzcfKMFsIu4Q0PqromI/DRF9sPKUpKK2yooCSGfl6Gwmz/OMDgKKF9v1qLZcFSwzjbwQAni/elwKH+H3PmdqYFBZ0OUz31R3Dqdm46syySUQrE6w4JkPYUiv5J9C/qcLe18+iox8DFw5LzDNoqSbDQAoFAcybHSRZSYC6Agt+IXolYDFsEprga71OKIkuyUskUkWD5NgpwR3P4fmjLeAg99YZBQ0sAGTurB9NFivGUlgSXm1Jz/bZBpW0IPBhoHTqUZIo+sOaORVlcluHCBoIEsEUG1VXhIzUpBSIop/wvJ5ItEmKhsOk+sBYuIFzSFwQSus9tBmC9sgLofA7xPgWflnz9mZWB7gm5zLncYSiJii9vRF3hnYHLEK2aeqnMj2CvgXjpND4G6YG/dzqsYaKD4T3KKDG+7Cu3Ugc6Jso8RRh6jF3nW+Ampdv8c7op3NyX6yDC7k86q1V/MCHIWD47MB96Cnc5badAZAExOLKtsuOl0lf8YuoisDXuzXAjIRsdrfOlGsC8IEe9LCWDSceRbVICv8QJ7DKak51EmxlP2CQBfQCRhTbW36FNThl+WMTl2++qY9kuOjLuvk+44ytMD4BMPnH0elTQ0igsLrpe1VOjhRWZv0AeUUwlxpNQyljYO07mfGu2LmyGdPmZIjgijz2f6y9OnxqQP805K467sBTUAOhjE0U/mIw8YhIG4twqwtvML/fe9CLAvClt4B5GjCTGME/5oiFtYtNIX8cMgATtIWjZtiHOuGvfrpIPzkN14xbkftH6fNGhPHZI2SI5n/44OowrZFCL7Tw/ss6NnkePDgjhY31vYuHWeXM+FD2isKRnndnfqWImndr5itaLh3LCF5Cmj1PBsNyeZOsoU5ueBkzKUVmHYOrOeqshICg4bwDeRdhPRjxDcgaDrZXZdBIdpmeXT16dW1qTVybIw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 3vFi2EYGSyttKxUBK8+HhU1DIxwTy56WACd7dB1oYzQhVQfXdnDYPVUblcmuepWtWBXc6kvSwldLs0xPDJJHh6yT+m7zUF7T9XHEQJv19F+djZ5qZQdU6SgVv/HlgWKKGPxnSY+RBD87wn+S0yR0AcraeN/75YoigW/Aoalme2YdR8b8mVw93PcPCRQnEdCM7P+KxJJpJJgKvpVcfpgmFpTRgSN+MIX3JiwtnnDI+x76sYpDkRETDu0Gt3qO0ew86gbr5T/ordlJhdCI3ARmy+dZQJ3caL36oh6GYrSfptz/6Z9gF9AmTU6nMgVtylGk9LZZ/JRl83hvhtdfmVbWyjEsdMBCQ0gDG8f/eprg5KR5U5Q9NzuP1dXuXdtuVu7pAstDPsbk6vlKfoAHqIQ+YdC6NYDNeYOSuvmbnF+6WkMqnwlt+fdZUqqz0iHdU/f35IpZH1oZqhMFqGwwFmP0xuFykaPeopBAsJV+qUaKfy7faT7kHDT8W21ZGXPUg9I3RX3tmt9ROEBASk/uv5XzrDyIRpT/mdpdSbfO810wCOkT+0QKLC2CgpAa4vBFhOP5xwFnXPixhclTA8lidhPuSgWrmXRo+7ZqWf65x63bePQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: baedd93a-8779-409f-aa04-08dc2698baf9 X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:20:59.6299 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6i8nUBSz/Vd60ieQLZY7R/IzdXJv59Rhh7NEK7g3ywagmBXkVbkoJ8tbkD6pcjqBznCoiMXp50h6LqGLGD0EXOxdkAQKlh1BCqVK9OQ+Bp0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4164 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 bulkscore=0 phishscore=0 spamscore=0 adultscore=0 mlxlogscore=999 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-GUID: _CEzkrGxDivQLFj14MEY90jAzA9n0n9F X-Proofpoint-ORIG-GUID: _CEzkrGxDivQLFj14MEY90jAzA9n0n9F From: Christoph Hellwig commit c421df0b19430417a04f68919fc3d1943d20ac04 upstream. Introduce a local boolean variable if FS_XFLAG_REALTIME to make the checks for it more obvious, and de-densify a few of the conditionals using it to make them more readable while at it. Signed-off-by: Christoph Hellwig Link: https://lore.kernel.org/r/20231025141020.192413-4-hch@lst.de Reviewed-by: Darrick J. Wong Signed-off-by: Christian Brauner Signed-off-by: Catherine Hoang --- fs/xfs/xfs_ioctl.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 55bb01173cde..be69e7be713e 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -1120,23 +1120,25 @@ xfs_ioctl_setattr_xflags( struct fileattr *fa) { struct xfs_mount *mp = ip->i_mount; + bool rtflag = (fa->fsx_xflags & FS_XFLAG_REALTIME); uint64_t i_flags2; - /* Can't change realtime flag if any extents are allocated. */ - if ((ip->i_df.if_nextents || ip->i_delayed_blks) && - XFS_IS_REALTIME_INODE(ip) != (fa->fsx_xflags & FS_XFLAG_REALTIME)) - return -EINVAL; + if (rtflag != XFS_IS_REALTIME_INODE(ip)) { + /* Can't change realtime flag if any extents are allocated. */ + if (ip->i_df.if_nextents || ip->i_delayed_blks) + return -EINVAL; + } - /* If realtime flag is set then must have realtime device */ - if (fa->fsx_xflags & FS_XFLAG_REALTIME) { + if (rtflag) { + /* If realtime flag is set then must have realtime device */ if (mp->m_sb.sb_rblocks == 0 || mp->m_sb.sb_rextsize == 0 || (ip->i_extsize % mp->m_sb.sb_rextsize)) return -EINVAL; - } - /* Clear reflink if we are actually able to set the rt flag. */ - if ((fa->fsx_xflags & FS_XFLAG_REALTIME) && xfs_is_reflink_inode(ip)) - ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK; + /* Clear reflink if we are actually able to set the rt flag. */ + if (xfs_is_reflink_inode(ip)) + ip->i_diflags2 &= ~XFS_DIFLAG2_REFLINK; + } /* diflags2 only valid for v3 inodes. */ i_flags2 = xfs_flags2diflags2(ip, fa->fsx_xflags); From patchwork Mon Feb 5 22:20:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catherine Hoang X-Patchwork-Id: 13546341 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 974C34F5EF for ; Mon, 5 Feb 2024 22:21:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171667; cv=fail; b=NGSqf5jhJtJgWcSh/zhTeb1vlZwSmrdf2XUIyLzdrZfMCJYX7aKvzK3lHE4mqwqeYoU8PongdDOcu/XguzJzuQvTM2/cuo2VXVu96SDgw1A38TwszAKX85sig1vpw0qPwiEhWAPDzeaCx3Ub7IS9T1iWIIm0FHmVV+qLALL1cX0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707171667; c=relaxed/simple; bh=odIrb+HmPTRyFV5+wvPWcOq/omezCj1/ZMo28wLuUgY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=mgFt5VRLMD2yBPaGhyrzlLmPbF8WiWCMijJeQeJozqjrEJ/sn+J87DXNgKqciAjsxoyFcrxeEKcqdCh1H41O047TUoz/cI3Y3WQuSTd55XNLFtQBBuxHj3W8uHEEk5VXLqXF/TLnsUmr6KtPE7SvYd83DKnU4l87zIEOvnDGs3Y= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=WAAuL+G5; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=XZu1OPhY; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="WAAuL+G5"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="XZu1OPhY" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 415LFkAa025006 for ; Mon, 5 Feb 2024 22:21:05 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=iKFnNVI+opeXzHnKtzNXirHXYKNZUAr8FJmOJXYFdRw=; b=WAAuL+G5L+m8+V9t7zQuwANHZWHZJ+B6RNifQNzAF3AKpjxgtAdgWHTHPFeFO4o1GMW+ wujiUHSJmOgEd6/sQAtMJ2kynxW8rX4RE0VsUJTINUh2/PTvxoO0vzOq6fGkQuPGCD1a 10MTgwT5lh+JUL1P+ORjDzlg6XMR2yCY+GdH5UvBz9XQEjFMgMtluH75YEm3bjDZZwGF d2Ih88IaMCk6SmM++blmePs+5xhMgvf7DcCGIb+BJq0z+emEWuTwx9ZZdxznU2sy6Gtk 0JNhc1nCoMB8zWHV1mrddNjMO86skRvwAaXq71OBvJIfmHkSPaSQXYsEHoQVFqRX626b MQ== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3w1c32nacs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:21:05 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 415LV0FY036845 for ; Mon, 5 Feb 2024 22:21:03 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2169.outbound.protection.outlook.com [104.47.55.169]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3w1bx6e1vs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 05 Feb 2024 22:21:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k0bxUuKE479i5UuJeH5T1TaPkmK1SZ8KQOxO8WyFumtiaL+AFFbquFx31dUkEUoU4y1PiPdD4LpQigJRaLcRE1znoeOtX1dwcpSKHgV1ZJmISy+H+ELhTi0w2vdOangQrNqz7V3KmugZ+vZ2FRKXZolpIivgK3pAbrnR91BuCeCOmoyIzpFgnLbBunt+tRXZ8QSgtuFwldKhrLvnOeMhpMQ5iUWo9zPWDxeM488+c/ycRxDWnjk/rWk6gQELGZ7ahcsIlcdNIaWUJo2aOhOUHDZjPIVWb9j2GkgpZIlTTm1m+CDd7agPxvFZpPNwZe6OXCRyeAmKKyJm/0WglDwp3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iKFnNVI+opeXzHnKtzNXirHXYKNZUAr8FJmOJXYFdRw=; b=elYOCJp/Nb0RP6SSVyeTIta4HHNUEmwR7h0pcIVEAW8s7kBZNRDvUdJCks8cAsNvMtch4fOZVhxZh6pOSHGrFiWNZ/2z1udUWpj8/2HHUSzreWFhQniADun+f3mU96v9UKU0o/d/qR2YmfmkMWSQBpE+f0dlTnmU2TtoXHlUHcAGLOObbnnnTqFXry5+LmZe9UsnERf86RWI8TwZS9AHOhAHxM7GhQmJTC0IAp0BYpo2DVVDNyk2P5O0RhDE3RZujH6KP+JoOYqTCY55S3CiMFzCI7wQOc26rV7IQLjwriYeQwsutgpAIzYL0Hg1XsFTMXzkXSqNb9U647akKvrV7A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iKFnNVI+opeXzHnKtzNXirHXYKNZUAr8FJmOJXYFdRw=; b=XZu1OPhYEk/hiFt/E50zgvZO7oPUEkkz/RQMHeuGhiBepgnCeDYntM6Sbcmvf7+uEqHp1XPqzE4psuC1Xn8QoUsynk7RNXxE2cShgNgcwmq5r0aKQR3vxLsUfN36xV7I6sP9IozHYfqMkXobuQc0kfZf8hmXjAfQPOGgkTJTchI= Received: from BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) by BY5PR10MB4164.namprd10.prod.outlook.com (2603:10b6:a03:210::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Mon, 5 Feb 2024 22:21:01 +0000 Received: from BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f]) by BLAPR10MB5316.namprd10.prod.outlook.com ([fe80::5758:bb17:6bb2:ab4f%4]) with mapi id 15.20.7249.035; Mon, 5 Feb 2024 22:21:01 +0000 From: Catherine Hoang To: linux-xfs@vger.kernel.org Subject: [PATCH 6.6 CANDIDATE v2 21/21] xfs: respect the stable writes flag on the RT device Date: Mon, 5 Feb 2024 14:20:11 -0800 Message-Id: <20240205222011.95476-22-catherine.hoang@oracle.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240205222011.95476-1-catherine.hoang@oracle.com> References: <20240205222011.95476-1-catherine.hoang@oracle.com> X-ClientProxiedBy: BYAPR05CA0060.namprd05.prod.outlook.com (2603:10b6:a03:74::37) To BLAPR10MB5316.namprd10.prod.outlook.com (2603:10b6:208:326::6) Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BLAPR10MB5316:EE_|BY5PR10MB4164:EE_ X-MS-Office365-Filtering-Correlation-Id: 59d199de-3906-4e66-c15b-08dc2698bc4c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NVGrcSV3laj3P4xsfflM+nBwtQBTlvQ2GLq3axIa/1HwB1PtDElTfl2x3yCurXIjCmKlKJPhwlwgIU54I1znKI8t7oqEVcKW4JvQRLwMROYsbVRUsLpoyUCo5lRq6ADSvK/BqNKb4sqHBa3o4VZ/vcMn7Auz2CzwVgALWrnvR3nEMjT0/F1KrQUXqpOpH7vop3GliRuIooNwnNBXg8nB7RfOmXnNYs3AUfhYib9fSdBwKdGDl6+L9uIQZQrNh/EKMHnfZmK+SYh0VNsaqcxnSRrNvQutjUih73f1yA3JnMAKiYePDUSWNig9xzpFSbvA5K3v+yWoLacAL8a2s8TEiSkTcwAHnO/M3BUlzKxdLV+GCo+kdw5yUvwF4eQ6XrhfZpRPA3ym82yhF3tmjVAV4mstUKwRsunFBb8gnC/OVs7oGe8BbBJQ9ANZo4ThkZJgy5ls2GzO/yM8Dq6TCqkAZrQze+cijLf/EZr0mmzhkr0lXiKS7F+Rzg9m3DCYIaQaTa984aH75uaWHxzBKUEWto+eR9YsJquwbFUyeeD/Wu0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BLAPR10MB5316.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(366004)(136003)(346002)(396003)(39860400002)(376002)(230922051799003)(186009)(451199024)(1800799012)(64100799003)(41300700001)(316002)(66556008)(66946007)(6916009)(66476007)(86362001)(6506007)(36756003)(6666004)(478600001)(966005)(6486002)(44832011)(8676002)(83380400001)(38100700002)(8936002)(1076003)(2616005)(6512007)(2906002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MPd6J6D8O6A+sBuqpfwR+hza1l8itTMS/PMFgjR7oC3OeehWeAVTyuGoNzPG7ITPkWeZ+woSTpEDmZukeFtUeP9MS8Ck1v725GarnHI/VlU8ovpCtZTM2yM487E1uk0lx4Zk84/5MLm9EsRvOWVYZtGPqJVLzxWAB5oePouRlXkwJV8yz0SjvDjErxoX5fwO0YLXFGZiYyJgpjCYen68+YCBa/+YQbYLxY2x+4Lkyf6zD5dG5SGurvcHBMwh5ul5EM48tVAel1IhE+ZogaoSXc+mo4leSJ5EAOWZJNFwh2BN+WA7MSzCkTCbwQtgFQ3zJ+I0pm+ATw2qAQ6DmacHQ5Romns8gbMA3YcJY6Pcrt/lpYJmVmUDuBgR+ykZwN7TQyf9oQFgj9woEz7sBAyjO/V116RRQ7Wtnqlg1hC3LGd0ezgoCc3ywNOHHxgOW+3tmXJ1D/EaGAeqyKkIRfhsyhKNBjETVpdlD9LGyvsgi6kdjOdDPj0RDZCCGe/+cfqzTcSuHWxfJlkFwtTIlI6zFCBYyMctlrxLJPhX33aKF90UsHwMXkndmIrTeyr9ghnUdby0tHyVApRupctCWcLtaoHgdlFaBk1nCXc5uhDZG7udLhaUFV4uCNa+SRDbpaqKjbNoHaJ6BlgdZar9msKlKauKbx6fKB8ojCi6ELq78yVCkjVvaTAcgaA6lnJO3gEduajcybNkrtYSOBwpDrGvf7D76V+/Sv8MSliBftzooPKn4QNNo5bMGrGoD+MlF28NK6lW5RSFgJ3lKkW3BFeCFCfgKQNdQdVEXCq0Afab4p0K3Cw9caXM8C4rc70dpWBVAwlNjGF1xfl5KsrFnqtGywBShGyQ9jdc6Ju2sjE+IG1g+fLZLgZO6pgD5afkJuT50xWijsuKTT4QOVbRYXD3HKVzCtfp6MRpF2kYHDhqOaA0qNRWf5kxKk6J9LtIpCtzdOA3+t043ITlKl818xkYcbMOItHIJRjI1IH6kHK5dpbgmZHOz7cve3fPgV4vunhn27uJ2J4Kw0Z2SrYrRT7CEeQBvnb8H4EFhEanngCSoHqUfNdKxWfweGiZjdbNRl7caSLPknBVkGU9LfzUADogNidkGxLbrGfg0glbsyEwprXIPeq1SCxfgiLjsr4CGfb+ySs8rKfW5Mc1PV217RoSXCHSIw5KYPaRj0GvHAZ1rFq6Q2hSZYeXYVBHHbHdMYmlGNpi4zf0Pkm4tSkpvvvkjNmT9CvKWw6AublWHCvDuK9uKVSmpLIEmHO/WjhuktTfUEygfZhyn2MgzZ68hzYSJQ7DAO7fm35Oijtqgpzsoy+6Qi/trHKSu+utFsN++XV58qGs/3S3KQHd6gnvFst85ezby4Vfq7RvfzucsECH47WWCYze5JYHM8WVDbr7jYknQj/graBmTVrWaHm+fFsVINfFHbPtsQ6MQXisE+FpK/3KjJ6oiIbEz8qItDxGlyf6HzqqSUx5dC1mmi9wHwgEWPBOLWswZH+MbSNr2qmInKpziWKnhqEMTQ6mgZnES+lK6ROhbnDBUa/XLrjlfl6GxlCugrExuNGk6YAUF8zpVQ1NuPx6pBZHjf5d+LxOPFiQCvgk8X0vJbkNJYZO87lkBfVCPKljRuWg6sSmKxauL8GRYJbZSJMT2x+Yf8s4jP/0K3103ZiYZzxRurjSFPGWHA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: stXEwnnYyPIxXyMG4bLgmUbQPu+OQQHBZ84YbMeYOIEpe6O0x1HdGLwNDPOFsdW1z4QHktmKqsl9jua4m/kcQtDAflVqQgqwbbPydukJo0xCjL1VfRuAlynAf3PHkafXvxTSvNVhn4T/xqpW2OlorvLrufit0VpjQqpzu7V8qIRFG9oHI0FpYbIwJR8yFG/EutcIG9CReq0MijVU7pAeA2XbApL66W/zgON6oyqSho4na0vkmFse3rkAjt9U6fAetmT5J3hM176AmH+X/+wufVo2/tamYxOYfJZq893MMnozgdIZMSCRTlaFsxVL59CHXNSfaqli1tzxl6QC6VCEeI4FXGXeP5J1N8zI1y0NMymcX+hrbL+pRcrSzMzxVVG3iEPSBxcvwLze4aJY21gFsSNOPjQIGv0OHwHYQU1Rh4T1UwX1sBLkwLtgRj5IMY9pChxUIkU8dbJkXIq77X98ploC4v7b+5+tkEUvSaYpT6jaSdPxHnEtuFqyZ6LCqeAT/4C7mXtvPRzCJZ/VKxiKNTl7099Hjdi7Crm5i21YusHLktLF3/eYqmQ+Ibe/zZ3wFCJrMBtwKez74phAa4r41FlGU1LFBJi1GnBb820PGUI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 59d199de-3906-4e66-c15b-08dc2698bc4c X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5316.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 22:21:01.7636 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zHa2gFGEB7UxOIDg9WvVP16kWIsWTK5L4JKCL06SJHs/rQi0znlTAGpobGsrztp0OR4OGNHuGdCZ4aceQ/VMO8wDLKbGWXYiyEsLZ6EeMj4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4164 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-05_16,2024-01-31_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 spamscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402050168 X-Proofpoint-GUID: ytDtmOFsw9NYrnuT9RQWLAD4LSbf7Hj3 X-Proofpoint-ORIG-GUID: ytDtmOFsw9NYrnuT9RQWLAD4LSbf7Hj3 From: Christoph Hellwig commit 9c04138414c00ae61421f36ada002712c4bac94a upstream. Update the per-folio stable writes flag dependening on which device an inode resides on. Signed-off-by: Christoph Hellwig Link: https://lore.kernel.org/r/20231025141020.192413-5-hch@lst.de Reviewed-by: Darrick J. Wong Signed-off-by: Christian Brauner Signed-off-by: Catherine Hoang --- fs/xfs/xfs_inode.h | 8 ++++++++ fs/xfs/xfs_ioctl.c | 8 ++++++++ fs/xfs/xfs_iops.c | 7 +++++++ 3 files changed, 23 insertions(+) diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index 3dc47937da5d..3beb470f1892 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h @@ -569,6 +569,14 @@ extern void xfs_setup_inode(struct xfs_inode *ip); extern void xfs_setup_iops(struct xfs_inode *ip); extern void xfs_diflags_to_iflags(struct xfs_inode *ip, bool init); +static inline void xfs_update_stable_writes(struct xfs_inode *ip) +{ + if (bdev_stable_writes(xfs_inode_buftarg(ip)->bt_bdev)) + mapping_set_stable_writes(VFS_I(ip)->i_mapping); + else + mapping_clear_stable_writes(VFS_I(ip)->i_mapping); +} + /* * When setting up a newly allocated inode, we need to call * xfs_finish_inode_setup() once the inode is fully instantiated at diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index be69e7be713e..535f6d38cdb5 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -1149,6 +1149,14 @@ xfs_ioctl_setattr_xflags( ip->i_diflags2 = i_flags2; xfs_diflags_to_iflags(ip, false); + + /* + * Make the stable writes flag match that of the device the inode + * resides on when flipping the RT flag. + */ + if (rtflag != XFS_IS_REALTIME_INODE(ip) && S_ISREG(VFS_I(ip)->i_mode)) + xfs_update_stable_writes(ip); + xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG); xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); XFS_STATS_INC(mp, xs_ig_attrchg); diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index 2b3b05c28e9e..b8ec045708c3 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -1298,6 +1298,13 @@ xfs_setup_inode( gfp_mask = mapping_gfp_mask(inode->i_mapping); mapping_set_gfp_mask(inode->i_mapping, (gfp_mask & ~(__GFP_FS))); + /* + * For real-time inodes update the stable write flags to that of the RT + * device instead of the data device. + */ + if (S_ISREG(inode->i_mode) && XFS_IS_REALTIME_INODE(ip)) + xfs_update_stable_writes(ip); + /* * If there is no attribute fork no ACL can exist on this inode, * and it can't have any file capabilities attached to it either.