From patchwork Fri Aug 13 12:12:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 497492 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24554C4338F for ; Fri, 13 Aug 2021 12:12:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0647C610F7 for ; Fri, 13 Aug 2021 12:12:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234931AbhHMMNQ (ORCPT ); Fri, 13 Aug 2021 08:13:16 -0400 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:13180 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240259AbhHMMNQ (ORCPT ); Fri, 13 Aug 2021 08:13:16 -0400 Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17DC7GME026291; Fri, 13 Aug 2021 12:12:46 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=zVuw70JfTlM4/80WwpBxg2UKnZkr4fSJ14RmTv0NR0s=; b=LD7VyS8uMdcobOzNsv7RHhYgbDOVoTKpJFzq+0uWkOrQQHUVHR6hW0sczQqyZpDQlCoD L0F+sKxOd7YR6KIyvMDhXx10YvO3cJvvL9XalNCzzG8paxoa9816kmoMnCAwmL4FGTdZ 9eKcClLgY83fxedNxG1ZNd7Q6anOkuYQQy0JE5FxWPLEFiHOeErfCZerQDWWNEB1S9HT 7/GlQLl18hnREAcgiBQze51lgxIw86R+o+WTr7Ig8q+e2hK0nY42FDHLccPjCICWqGKp 9IbqDhAMFATmxqgdUBbMpSQeOg8BTscoBD9ooQD5N6LA9y9YGN8BSh7qwOZVwGAZvCGN Tw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=zVuw70JfTlM4/80WwpBxg2UKnZkr4fSJ14RmTv0NR0s=; b=WTOGozE9GCmJl4ZA1YxmoaqtmhTFqLhG00HX0pNt400JLZmrZDCEf2cbtfVpdMCuMoYF K0kxss0eEsBY6A1OWZJuoW/JTrPifwChm4uuBx0IgyzeYcdrAoH9ICwC89YGPGJXb2D+ caSEzUXc6IbQfKMRlRvRS/vU1YzAzcQyTFVyLCpSaVfLWH/A24NEYMT+eJmTKvGTpBxb wz+sIqbSmKY664OUsSxpioUZRWMypYeXmSjI59DQRM1mBXNbj/FVBI73M6aYyt33/9Zh DwNO+UmjRt3TkZYqFsTz/4ZBQPWDpwO3xeCWhrHyq7fyxZks0HscG9tZYnckRykGWI5Z ng== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3adq9g84dk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Aug 2021 12:12:45 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 17DCAZX7038630; Fri, 13 Aug 2021 12:12:44 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2176.outbound.protection.outlook.com [104.47.59.176]) by aserp3020.oracle.com with ESMTP id 3accrdx85v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Aug 2021 12:12:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LlJPc2O7WUiPvaakpCKBV/p7ulpruPcm5LqsdKzn6fepvlUVJ35dur8vH3R2MEJzAxcLNqOQFAplrYoMcLj95pacQFlnvu6omiqaSUXLIWVkGHRU1zmfI9WxTQkTwkIpytXncFfCbtPicTFyV6zuUgVvrt//v2c3RgVaegdZKcBq2mq0FGexBqslcLwwQ0p4h/bNY2mOLUlBK69+wGApK5t/mHEN7IpKE6OASB+onWGL53oqlcTeL2Kfn8bP3wh0SXgo+9uuqTXPEkRdh9/FqPmAN0k8+VfNsd+kEYnPySu8rjZCpXdgRXtGmx23XxfBJ3mzg7H3YJt1hok99bEUgw== 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-SenderADCheck; bh=zVuw70JfTlM4/80WwpBxg2UKnZkr4fSJ14RmTv0NR0s=; b=DrRCrTgJYpMSLQoJUnTYy3gvDhfJhyI486lol0H38eopAACIeyx6cgJ6d0OtdIOzLYuujyXApo6JCsTN+HKIJ/pq7/5xYZpOPrCqEo0I3fSJ0kxXb8bNnXJ+BWWUFFTMArO1QS0ypqDqGkCjf9uxuv/xCuhuDvacD4UtbCw+dLpS8kDlnUMWCUFRHzw5gRUkfBKOKS4IY2syovf1losbJCfclU9XuSSxp95/Dmzdcw/UEZiLi7bcra9aPG6iP91hB/2gXAek2awgchWu8Z/BAld45b6muX2u2dc3GVBSsoIvIAdh3AxXAqozD0n4BLbZdydxVXG7NaJ4ySMVgc/zYw== 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=zVuw70JfTlM4/80WwpBxg2UKnZkr4fSJ14RmTv0NR0s=; b=AGDPlbvaXcUaP58fWVTSuYifPFD5A5nL3poOZUKnUIO8sIv+zMyyUqhhQheWWuQi0Wa1Jqz5mtg0F3WO0IS5n9FVuYiHvOdnK0m1/YOUxu+eyLTFwvhSCYDgaHg+Bo8HTycZuTyO5JduEYl92WeCgZzppkYzUbOo+rJ6NNAfIh4= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=oracle.com; Received: from MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) by MN2PR10MB3789.namprd10.prod.outlook.com (2603:10b6:208:181::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17; Fri, 13 Aug 2021 12:12:43 +0000 Received: from MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::b813:4805:31e:d36a]) by MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::b813:4805:31e:d36a%5]) with mapi id 15.20.4415.019; Fri, 13 Aug 2021 12:12:43 +0000 From: Anand Jain To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, fdmanana@suse.com, Qu Wenruo , Anand Jain Subject: [PATCH 1/3] btrfs: qgroup: don't commit transaction when we already hold the handle Date: Fri, 13 Aug 2021 20:12:23 +0800 Message-Id: <387bbbec5e040ec46f5d15b6a754b7a7af57b302.1628854236.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: X-ClientProxiedBy: SG2PR04CA0155.apcprd04.prod.outlook.com (2603:1096:4::17) To MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (39.109.186.25) by SG2PR04CA0155.apcprd04.prod.outlook.com (2603:1096:4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17 via Frontend Transport; Fri, 13 Aug 2021 12:12:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1380493a-8fd4-4d30-abb1-08d95e53a70e X-MS-TrafficTypeDiagnostic: MN2PR10MB3789: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1751; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W8S7mE47HEd/Luhu4UFMlFx4VCnR0rnAzQ7J7gt5734mb49ptPviUamB/217WOFggoxBQYE6RIjuV8yBtPUXR1a6lRT3TBQxPxmSCfwSvaq0emrwVjJES2bMbterMVkgMVnzyfJPOwqPQ5jysrdt2eI3D5Bb6R4KL0Kfk4WaFb/BlAH5UsS+Cwb9IeJeVh1bkpUJ8IcdPr801JU3D4wLg1l6qDBxzyleFuf7RTH8x7CRCw7w5wU8VlCbNMq01ICyZN4mAj8kR/31wldwni4sT9tsVeiIsGKGnEUsL+bkD50xlGV+C70YP5iYWlRljezFFzU7NYtWJBM5twsERkORJIwFof+Z9jzULvZmqYzQx5LUqsjqhwfAfSuMufu5O1QyWqjx05/fYjeRP3x/4E6/7n+kJRV19z0fXHvBhBQ3RzmsHcmQ35ojkG68xOmu/ObpWocZ65QiiKw8qLabbUhx/bH1YceCN9Ystd0Eb3j2RkxLMHz94zM3UfOm+O9u9oi1tEOUbNK2mNWsZ7OqFyFvLlwtDmFkHGCUOd+WegYAYzVOjJ9NpWDiZIqOiVyz6HbsXiJEV7of4ZAEj4I+aQm6HtR22zoQQm66EV3Yz3OJiTz2uDE46JsD8QD4U/0n0S/yUJ3/0u46L735HBw7TB1kh3Eq0yPm4i8kAHYw3IDw5RSZTEMFdgjhrfCvxHnI50hEDtC+vrce14eAtQw6ScWmi+UHyG61WMC1tQnsbgzMvdulOtlUNfvVGowh+tbqqLhhW//fMGZIDTnjjSGDJxweGNUrV5ZlFpU9SR8+0ezwcZ4= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR10MB4128.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(396003)(346002)(136003)(366004)(376002)(39860400002)(26005)(54906003)(44832011)(5660300002)(52116002)(966005)(107886003)(316002)(6506007)(83380400001)(36756003)(956004)(6666004)(8936002)(4326008)(2616005)(6512007)(38350700002)(38100700002)(86362001)(8676002)(66476007)(66556008)(66946007)(2906002)(6486002)(186003)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FLAjAjwVtn5yYKFy5UrRcu8EvkZQEcmZsaXiwZhBymOtKbt/u6WaBp68se/kU5c/0xTp3qJvQG3H0iD0GEEZEf/s2a+kaMyNGuflq0zCf7/+t4N85q50ZCrnHA232USCzTkmPTUAkIa/uiZ1R/ZqKpkoqBTIp236McJB525bZUG3W6tOUGwe0QAj1oWAfG0XKvURx2KrXcCFHgwTcIUVHMgbTzoxRbxndy0oBo1+IGTfW8hPP1zCnxwD4lsbgBqmZQRCN1XoOwNdQSRCD0ohs1PBeKuTRDQFMcnnzEwLxmoV0vPxHhR5E/aZkyV3u7IjADWRPSsOqaYXNU3C6TH7llVuaiBFA/4CcK1ga4CY9/0/9/IBQNdoBV9HUt+Xkm2GHzYe60jiHJfl71MPQ+Nkgs6xLqIVdPAzN4RTvgPtgOQca/Ukb4QDrROpw+6SenKVEN/eW8ZME1TJmRXDSgDAqeG2WpVB8UKbkdzpwhkjC/1Ff+0Z6t8o686V8lzVJ6bSO4ComEAqrm3ilwojI1Mnsgc5BJBCt54n+6o3xgqxSkDCkx9JipeHu2hQ0lI1Xe+jNKNstz3BYmPwYUkew8/ul2RetxyB+Xt2O4/o29wF0GelGfGqy2stqNeXJzqF/t4z6pn6DAoGU+jq8rSE2ekSrVv2XMV2dg8ASOcSQWmISoar23GG1/OEENxWUP1LKGP5kT17hOHShOusY8wWXzGq4erN0ZshdAGFSMOOSs63AEPReGf6WTkHQsfZybv2+zOCIhv54sIMegaCOpwHnRxbMVa/Qgi3LtiNU5jsoU6DKvW/YTTxHYJz5MOxxU+Z7M7RM0tPnbIWmEMCvB+HghTWWxAFRKDP7wsEHUZDgBYHDXG4Wxsnw/YMgNy8+KngE3mLV24XtQ2CjPrejMQSvJ/PuZlIN1D9Rd+iy/jo8ubIPqokCBQlvEcFJAhto6FTfRvm2V66TebsaGfPzVuOe2Rd5bJ/J6Fkvvy6+NaRO1y1IDnmASuAVNL7z9uEEuwnDGkLA+3GsnXtRjFAAiOIkkoZEOtEG7QQlgIiLq4+QhNnH1Z6U5UuT9A559+rm2wCzPxoESj+VujShBbegtIFqTSVdhggRmIsB7Urr3b35mVUy78dQshM8hbmirWPeXyhc1ndE7E+tlAYzJwiVZIusrztWUTl241wpnI7hzchHiVERCuBy7GT64GsVADr9XYQKVeyLYjXsDDJkJT+ZpIHXxhC6z04BjPtY9OBVPI9QmRv2LFptuL39yXzsuuubhLzOAvkkR/xb53uZtmHcjPEDUW05MC9eKCBIPf23aYN48N8p8IdtFGVC8FyAtjxVh9j29cw X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1380493a-8fd4-4d30-abb1-08d95e53a70e X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB4128.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2021 12:12:43.0536 (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: UwMF34leFLP3XLxxlXUfu1eD8KECvAM6R7wBtGUh3y+S7THiKsHIpcvNgTOIrODVqYy9wNUGRTDHnqDwznqvgw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3789 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10074 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxlogscore=999 malwarescore=0 adultscore=0 spamscore=0 bulkscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000 definitions=main-2108130074 X-Proofpoint-ORIG-GUID: jCejqUD1mbJoyY3P-EHZRNpS-SxGaOIq X-Proofpoint-GUID: jCejqUD1mbJoyY3P-EHZRNpS-SxGaOIq Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Qu Wenruo commit 6f23277a49e68f8a9355385c846939ad0b1261e7 upstream [BUG] When running the following script, btrfs will trigger an ASSERT(): #/bin/bash mkfs.btrfs -f $dev mount $dev $mnt xfs_io -f -c "pwrite 0 1G" $mnt/file sync btrfs quota enable $mnt btrfs quota rescan -w $mnt # Manually set the limit below current usage btrfs qgroup limit 512M $mnt $mnt # Crash happens touch $mnt/file The dmesg looks like this: assertion failed: refcount_read(&trans->use_count) == 1, in fs/btrfs/transaction.c:2022 ------------[ cut here ]------------ kernel BUG at fs/btrfs/ctree.h:3230! invalid opcode: 0000 [#1] SMP PTI RIP: 0010:assertfail.constprop.0+0x18/0x1a [btrfs] btrfs_commit_transaction.cold+0x11/0x5d [btrfs] try_flush_qgroup+0x67/0x100 [btrfs] __btrfs_qgroup_reserve_meta+0x3a/0x60 [btrfs] btrfs_delayed_update_inode+0xaa/0x350 [btrfs] btrfs_update_inode+0x9d/0x110 [btrfs] btrfs_dirty_inode+0x5d/0xd0 [btrfs] touch_atime+0xb5/0x100 iterate_dir+0xf1/0x1b0 __x64_sys_getdents64+0x78/0x110 do_syscall_64+0x33/0x80 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x7fb5afe588db [CAUSE] In try_flush_qgroup(), we assume we don't hold a transaction handle at all. This is true for data reservation and mostly true for metadata. Since data space reservation always happens before we start a transaction, and for most metadata operation we reserve space in start_transaction(). But there is an exception, btrfs_delayed_inode_reserve_metadata(). It holds a transaction handle, while still trying to reserve extra metadata space. When we hit EDQUOT inside btrfs_delayed_inode_reserve_metadata(), we will join current transaction and commit, while we still have transaction handle from qgroup code. [FIX] Let's check current->journal before we join the transaction. If current->journal is unset or BTRFS_SEND_TRANS_STUB, it means we are not holding a transaction, thus are able to join and then commit transaction. If current->journal is a valid transaction handle, we avoid committing transaction and just end it This is less effective than committing current transaction, as it won't free metadata reserved space, but we may still free some data space before new data writes. Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1178634 Fixes: c53e9653605d ("btrfs: qgroup: try to flush qgroup space when we get -EDQUOT") Reviewed-by: Filipe Manana Signed-off-by: Qu Wenruo Signed-off-by: David Sterba Signed-off-by: Anand Jain --- fs/btrfs/qgroup.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 2f119adbc808..78146501c665 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -3502,6 +3502,7 @@ static int try_flush_qgroup(struct btrfs_root *root) { struct btrfs_trans_handle *trans; int ret; + bool can_commit = true; /* * We don't want to run flush again and again, so if there is a running @@ -3513,6 +3514,20 @@ static int try_flush_qgroup(struct btrfs_root *root) return 0; } + /* + * If current process holds a transaction, we shouldn't flush, as we + * assume all space reservation happens before a transaction handle is + * held. + * + * But there are cases like btrfs_delayed_item_reserve_metadata() where + * we try to reserve space with one transction handle already held. + * In that case we can't commit transaction, but at least try to end it + * and hope the started data writes can free some space. + */ + if (current->journal_info && + current->journal_info != BTRFS_SEND_TRANS_STUB) + can_commit = false; + ret = btrfs_start_delalloc_snapshot(root); if (ret < 0) goto out; @@ -3524,7 +3539,10 @@ static int try_flush_qgroup(struct btrfs_root *root) goto out; } - ret = btrfs_commit_transaction(trans); + if (can_commit) + ret = btrfs_commit_transaction(trans); + else + ret = btrfs_end_transaction(trans); out: clear_bit(BTRFS_ROOT_QGROUP_FLUSHING, &root->state); wake_up(&root->qgroup_flush_wait); From patchwork Fri Aug 13 12:12:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 497078 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D8E7C4338F for ; Fri, 13 Aug 2021 12:12:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 73FC4610CF for ; Fri, 13 Aug 2021 12:12:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240297AbhHMMNU (ORCPT ); Fri, 13 Aug 2021 08:13:20 -0400 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:55730 "EHLO mx0b-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240259AbhHMMNS (ORCPT ); Fri, 13 Aug 2021 08:13:18 -0400 Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17DC7bTM015718; Fri, 13 Aug 2021 12:12:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=4npzuYd9vVl/RsNpNn83J0xXpFJRszeHjHcq32NexDY=; b=RtSA20rknKRSwvG4/i3YH71SfP2J9V9R1ZQfE4K8ToIDP8V9UbDeAz/TkEyIAe4ew+aR Mko34J/IdpjjByneyJGDzpsaZiv1yat/jTWHa3pmVrDUU8yuYhNX7GE/6NFbFY91Q49b RiNPZExODuMT31fENm4a6nJ7BhD10MJx9Xj62RPIqtjGGUy7p1/UTK6d8TuGC5IAEgbg Y9NdspjYJlXtUh/YMeiVmnLD1rKBMV2wCDp5W/JRB6bW+ho0uzjiePswp6FR+F8emkkN XJ4Uli0PB/rj4ryMtWBlODMI8QvElmwVLAZLKV/b0vnZ6jeipUBsOBSfr9zVXz1YSIvC Bg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=4npzuYd9vVl/RsNpNn83J0xXpFJRszeHjHcq32NexDY=; b=ckJOM/+hNMWAt9qvvCTFWuKJx+Fp1Jn97UWNd01yLicHBLsqkoMdwCEA3rJj0Vf7Ldg4 mqzMQwBg3FcdQCh4AuRxjzlR6F/BIG96Q8X0+2gvpvhVMUMxelsztqtHiHiq/kl2xGrV ffRGCSn1z1kKl57S68XZC0jy14W4U44bV0NLiaDjy+0v9YZsTqc6jKdZe3NuxbRU3ecI hPwrvqwTiLQMWri+7qSLg9tBxlvdZAVBrsxsiuuQOC//CJUXRFNH+X4B6A8qJWKc7Bhu e59aP4IJ0Lp6VOTTT/4amhrqoNnH0wryuZAv/g/wctBQ4660soht5hr3uvF5akXqRYKW vg== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3ad13vasvf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Aug 2021 12:12:48 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 17DCAZxd038678; Fri, 13 Aug 2021 12:12:47 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2176.outbound.protection.outlook.com [104.47.59.176]) by aserp3020.oracle.com with ESMTP id 3accrdx880-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Aug 2021 12:12:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SuFRl0apA5s4NVWabFvrBJrwkby2uZlQxddLT2uBDrJCRkLPMCHiTiYhNeP30kLt3oFp02W4s6OIRx5l2gn6V35hZOdklef9fU7KCFbaPs00yw24XtA3m9uV9M+zLdNox86U6tuubuuPOV2cbckSumx//auVZb5KluwxZg3VmFkoVz+I3nDizXTWQ731eDgs4K6yaxCd6or5Y6hpBr1DGfYxSsLbTX5TQdWqnjNwhjQmuBJ7Zg3NX+MHJE+do7FhAtLFBmmPo2QR2DmDoH63UKV/a+V05da4xwvda5wNfOiOTzUgssFSq9nx6W1sjKEvwKotiUURtp9VRNQaxbjM4g== 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-SenderADCheck; bh=4npzuYd9vVl/RsNpNn83J0xXpFJRszeHjHcq32NexDY=; b=TQCsgteEP4KoTZTetSJkB3UZXeZGXctBHpNHksAlZeFYO9k9O1VvyNeUNpGKlydNOWM188r7XmKVfDE7R1GI2mH9pM89/DLuKZjSyBNaZPHsCBeCuknw9h/3HQ2mMXMkU5UWDd9kyU2UsEMxECaDOS79MtzADxDyRvb6PFPDWc8PVvcoEmskFNpf1JZBfAnMlPLWFh9ThQjPKnPd8n8F43VqOAFw2gFso+4yWr39gVDUTQmX8B6WDnxC8GiHYthst/p/c7tOG1Wo14il2YkPGTfCQQrMa1hrOh+89bspwxrUbS1HF3IQ+rW+YwfS7WTPU0ht2YyNBrxHe0+/hbGD/Q== 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=4npzuYd9vVl/RsNpNn83J0xXpFJRszeHjHcq32NexDY=; b=ed276V+htzsb36DiX5rEi+5EoKNwbwOAaTdZ8FjwR/ViOq0CoOiorjYpomaH6UiLfs7r86weq3cR9N1PFn7RisaKtr1BtyIXoFsyH9zfAHLlvLhD2xyVpllZ1j9lg3wr5JpYmGJ+BLQLik+DlbidyLZKlvuXjMQG1jVeiY2R2uQ= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=oracle.com; Received: from MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) by MN2PR10MB3789.namprd10.prod.outlook.com (2603:10b6:208:181::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17; Fri, 13 Aug 2021 12:12:45 +0000 Received: from MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::b813:4805:31e:d36a]) by MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::b813:4805:31e:d36a%5]) with mapi id 15.20.4415.019; Fri, 13 Aug 2021 12:12:45 +0000 From: Anand Jain To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, fdmanana@suse.com, Nikolay Borisov , David Sterba , Anand Jain Subject: [PATCH 2/3] btrfs: export and rename qgroup_reserve_meta Date: Fri, 13 Aug 2021 20:12:24 +0800 Message-Id: <4cdae9f94a8feae8f848574c214016ae6a923078.1628854236.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: X-ClientProxiedBy: SG2PR04CA0155.apcprd04.prod.outlook.com (2603:1096:4::17) To MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (39.109.186.25) by SG2PR04CA0155.apcprd04.prod.outlook.com (2603:1096:4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17 via Frontend Transport; Fri, 13 Aug 2021 12:12:43 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d676bd4d-a1ef-4445-6aa5-08d95e53a8ad X-MS-TrafficTypeDiagnostic: MN2PR10MB3789: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:167; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Px84CRCR6TiXZJLbowXsQR56Fi2ETz+mfvXL8wYfeI+jRwT6GnFxivIU6DVOIIwo6qw1XqLrfyCtq9KTtXw9yFK8vjGeB034zaif/sR78a0qHLihaLjSF6wHMkfbi3cOILC2kDHKwfdWKeNFOSmh2WFiaJmtQEKh5Gwgzfv+Ub1UZTXGz8datYy8gS3lUXhKfHR9CXA8J1zw/zKgsMJ8Nud1KXx3BlyIxkreaM9USjgx0MTQ6iNRYLV3i9QGsrbG4SwkK8FaBR/sIgR5BUY9UlED4qjGxwnv144EBhxlLkRfuFa/qYlYZYygCcQYteuvHe2tKwUqa7IV6fiS5RkaMIiQuFujAseL1qGeG1deahlCrk8TWSnDGi3T+gagJnEUG2RzjuUqyWZQTIuVzlnjSUyW1mqvcBNDPjqhU26SYjqT6rEhYaYeAl5aVx8vFda8FLrgBGyF6gs90RkYLnRLvsY7u+1suffOK4v6gDpQQxiEAWAJxMoM8MPjqiQn2T3xGt2+2w6OGdrYklivupbFqnH9lviOseDv72K+LvcSVZb5lVFjot9KLXIRHX1YGaQ2Vfbh6vBXLyn7tM0p7wv4jTfSCWg5ZmxeAcfUNXCRihRxrWaXkaR3Ws/LbXF6KvZOxKJ8B+hDHz8DXS8X+oYefJKXZGaBj14B+P+iLmdb9bk1UzZ7yh38sBODk9WnDpxJm91khDLTcsSzXmVdt58XWw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR10MB4128.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(396003)(346002)(136003)(366004)(376002)(39860400002)(26005)(54906003)(44832011)(5660300002)(52116002)(107886003)(316002)(6506007)(83380400001)(36756003)(956004)(6666004)(8936002)(4326008)(2616005)(6512007)(38350700002)(38100700002)(86362001)(8676002)(66476007)(66556008)(66946007)(2906002)(6486002)(186003)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: agOdv8b7ZgeXhLqy4VbjgfV2ULr5xfoYYPPdBs8gfLgt1yHMcJ955Ts9P2uZc+hf2oPbID+CFfsaN1D2ZleusuiZQqX8Sd+8hXWYcDlDyBKmMdj4meslxOVPENRXSBhVsOpjC86Hbw16agrnVhEQutis8lX+Z3wU//3nAhnkD0nWEyFvU5FusC2Q7ACHXGRQQCnMXdpyNFt0qkRqaH2uL54zEPhTIhL85NLQ0lD6t55m2Ram/wEEsAjcGxNMSds7dMR8+7NVHrhEG/Dq9C+mHuRTAUDYAFoX64wUSfbq75uelAv/k5vq9CKQnQ9E1WXslduIKbkJ33C+ER1qeYrvYcLuhcvEj4+JDxslC4dCGLnFf7IaIF1W2/pyOEdiHYD7k4HYNsXdSAQDXY6ScxbueaRxbm+zZEQR1hgp4ElDDrDOnxGOvM8xPEd6sIyGEiA5/XSTgX19Vh0Omd5gZz5EXBVnKdi3nh6JCmidf8Lagv/M+s3RS7rJuJHL2xZFINh3nHid/ylF5L13DY34QSWX7FcLiOqObpfBgnoQXsHlhJUkMMs1WyEYqH/3bxa0tQ832x3dJFuF8lJuxpApjnX9QQKMLZSf292XPRVB/lJFG9aXe47dnFyspbnDdtxQnUUuuX3icnocb2s8LeE9kloHU5mOkS2x+T2wsTrpwxtXRTnKsB/d94nEhBphsO72f1CSb4HxK3ZCEM3tX8t+JAPTmh/Hm82HWjTO6+4/Ui2mB7/sMSiC8IynvqocD/5lP1LbKeUvqb46sCfK+cXBfpcnFjnJtKUbXJoSboHFX2TYrqsD8TvZnwMWr8ZSvX9NGrRufGFPEbX0HfR+OIq8QLk/Ld8u81oLKisih4XlVFVlyA9ptjx3/eEWxDJE9Te1RfTAWQaRwRQpP9NY4ZO+VHfJ8olGLawTPWvzOIvPZUgpjdeEwV39c27Pjn8JDHvRk6gWc6/eO8wF5X8SbjCUkDS93Vc9Kozm7tXhqfwfXtbIjhbZbJRcYPHOGjQsY0jxqcuuC/8P2qZoWYLMelTHNd6vo5m4P7dxI9AQu0kM2RfG42V0jn0q3Nn1FL49tGIqWdUi85lq88eDU68V9arCCogYDoT8J6TsZtfW3hU5FxQrnHqSLvpV0cZMsU9KpT5ZbF38uUwwnuMYT6JZGtOOH2VJxqkXLyJA/LkDiFUfKwte5RaH6mhyTiuewGS9b7vKxy/iooXZn+OI3OKhMxmdy7g+NYPsL5jZxUQyrwLdzqEntuye7kyGxTrxo2Ego/BGNnDIQ5rsMgWelkWrmX+0wLBUO+ClwXWHSTCEWf3A6X3WsWRfX5a+I683+9X4vNy9e+Vo X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: d676bd4d-a1ef-4445-6aa5-08d95e53a8ad X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB4128.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2021 12:12:45.7886 (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: pllsS1bsZO2Axk3gd8aZZI6RWE6JcHtipu/RUKKSNiZaa65kWBbb7PWdkMyLfztMtKmKPt2nlJkhCfRh0EGJNA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3789 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10074 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxlogscore=999 malwarescore=0 adultscore=0 spamscore=0 bulkscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000 definitions=main-2108130074 X-Proofpoint-ORIG-GUID: XLXJNsW3uLXyUlrZXrMjULYdKt3ODrcl X-Proofpoint-GUID: XLXJNsW3uLXyUlrZXrMjULYdKt3ODrcl Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nikolay Borisov commit 80e9baed722c853056e0c5374f51524593cb1031 upstream Signed-off-by: Nikolay Borisov Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Anand Jain Conflicts: fs/btrfs/qgroup.h --- fs/btrfs/qgroup.c | 8 ++++---- fs/btrfs/qgroup.h | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 78146501c665..a7344c7d3160 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -3800,8 +3800,8 @@ static int sub_root_meta_rsv(struct btrfs_root *root, int num_bytes, return num_bytes; } -static int qgroup_reserve_meta(struct btrfs_root *root, int num_bytes, - enum btrfs_qgroup_rsv_type type, bool enforce) +int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes, + enum btrfs_qgroup_rsv_type type, bool enforce) { struct btrfs_fs_info *fs_info = root->fs_info; int ret; @@ -3832,14 +3832,14 @@ int __btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes, { int ret; - ret = qgroup_reserve_meta(root, num_bytes, type, enforce); + ret = btrfs_qgroup_reserve_meta(root, num_bytes, type, enforce); if (ret <= 0 && ret != -EDQUOT) return ret; ret = try_flush_qgroup(root); if (ret < 0) return ret; - return qgroup_reserve_meta(root, num_bytes, type, enforce); + return btrfs_qgroup_reserve_meta(root, num_bytes, type, enforce); } void btrfs_qgroup_free_meta_all_pertrans(struct btrfs_root *root) diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h index d1f93585f217..0a2659685ad6 100644 --- a/fs/btrfs/qgroup.h +++ b/fs/btrfs/qgroup.h @@ -349,7 +349,8 @@ int btrfs_qgroup_reserve_data(struct btrfs_inode *inode, int btrfs_qgroup_release_data(struct inode *inode, u64 start, u64 len); int btrfs_qgroup_free_data(struct inode *inode, struct extent_changeset *reserved, u64 start, u64 len); - +int btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes, + enum btrfs_qgroup_rsv_type type, bool enforce); int __btrfs_qgroup_reserve_meta(struct btrfs_root *root, int num_bytes, enum btrfs_qgroup_rsv_type type, bool enforce); /* Reserve metadata space for pertrans and prealloc type */ From patchwork Fri Aug 13 12:12:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 497491 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MSGID_FROM_MTA_HEADER, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C549EC4338F for ; Fri, 13 Aug 2021 12:12:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AA64060F36 for ; Fri, 13 Aug 2021 12:12:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240354AbhHMMNZ (ORCPT ); Fri, 13 Aug 2021 08:13:25 -0400 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:24646 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240330AbhHMMNX (ORCPT ); Fri, 13 Aug 2021 08:13:23 -0400 Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 17DC6C8h020307; Fri, 13 Aug 2021 12:12:52 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=lvXMEPj2paTkuoqhJOSwBXNwDz5KZgoiTCyk1Wr1xLg=; b=wYVOTcE0SONJ89nPW+MYCf7TtujGOIhYzmZJsfOePfCZTKNjVjsXVaoIZVEYGxWB2WuS l0PP4hZ9U+FAJ61Dx0etZElizQFcTwrJ1p6BPiJLiZJ1622oSeRZivyZZBtzTiHrj7nf O7b626Du7cMCIms+btyhQfZsaNQlyJFKmt+fg83nJ1U5ROdb76L56XcqmwFwev2y7Ezk zE4yNYNPLyrR/fI1/mAoseOtuTdLgYNzj6QM9f0gThYxBCUBCPscKTPC5UFLKzhGxLPt zw/yj0LhMe5DamaC90NUc6A+jMWIZCI49fl+PoPK7eLiNj4UB1syBjkpAqq4/g/tNCY2 7Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=lvXMEPj2paTkuoqhJOSwBXNwDz5KZgoiTCyk1Wr1xLg=; b=N1RKhXRPAkTC+Cq3FtrZWFeMWaWhvKXjs8aFSKMTml8e8I6wltmqMur4WqTQMACBbgjv yGjyRItFKI1vajU54DjcZQIIJtAMdUeIpgBMj3O2vdYhwadCsyWlk3xHntiXCLkiwDyb SAeAoeTwe6n6rIxcNg0WrBJSIGVg9F+vnyP0w87FxHSpAn4Quwnp5ZWtEJoz4vASeV7G enjX3pVpMg1G64i7k0rGCrYfPCDPTJ8XneHn3Fsy0rHhcALfS58rBE8LmORu26I22fCV N1G3r3aXasQdZSWU1+CtTAwuMtuUZh+zj+LcxVQvNB2z6pSikBV+ZZHieTS71OgtdIVk bg== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by mx0b-00069f02.pphosted.com with ESMTP id 3ad2ajjpra-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Aug 2021 12:12:52 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 17DCAKjt066661; Fri, 13 Aug 2021 12:12:51 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2102.outbound.protection.outlook.com [104.47.58.102]) by userp3030.oracle.com with ESMTP id 3abjwagpqx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Aug 2021 12:12:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kUdoLyZbScFAYrx1do3N5PhseLu7g0TeU42Q5hqVcDzdV5qNqk40kprHrNS9tBDIQoKx42DiDw/Tx6WjXl6FmGHvapzDXfS6VzhXSQ9RseOAeM6f2ZE5JQC0Obc/AMjDxoOVQyneiHpYdvMzxzRQGF9IHePqXjmHAfJpLRcbF98UL2lSpsLt5E87y6D3Bdv1m6zrtp0hit3vbGL8sERPNwVLXXWf48oVU6HA7hglHT7pVOITt1A1YAlpqPLWCW+O911pf1tCFN81yEGvN9ZVdyvy4DaevWakkiU0OnJFx9uhC5LXfu3vebddWHTZWwtz+M8xno9eQYUciQTpWVyldw== 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-SenderADCheck; bh=lvXMEPj2paTkuoqhJOSwBXNwDz5KZgoiTCyk1Wr1xLg=; b=Hpjoj/CvSKWj76N0me404/a4MSHCGscEpEU8ch4ou5HzX7XePbnZb3x6h/6HhZIxMQ0HYnRhXpP2f0mje9HpFErUeHVCCgg4T+04pRuUnT8ss5SnzY5Mim8x6FGpd9pCAilK6eZmCT5vbypnC2Mi3x0Xz4kqOcBoduzL6uLz3Q7aVlDxyx2DWbJbfHZiYvv9EPkeZzF7xLh27Magt62S4+dTTbdcVFFXWJ1mJJv6XxsVrO2xUuZZyE4HQnWzHGThL8W5QGw0Od7ZDQKLe35aYrLt5SIFZ1ateKZMmIFsXs0E3zkLoSOWWod8U/jtRu0tk7cuzCQo3BiKjQT8jPhXUA== 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=lvXMEPj2paTkuoqhJOSwBXNwDz5KZgoiTCyk1Wr1xLg=; b=pUfAKUVtVGPsN+zWaFauPTw4qzlE74xmuA0nLRPgTwEj3qR0KRiXPmg6GUuWi/j/2lOVFuj1AQzOA0VpGk2qlGyhYG3beptx8OQt6Wr+fiaH174Pt/mTDYcoA3IJwRW+rJjrHJRlMaAhhTBmxPERwGtRReTTg92GNmn2gM4uvdM= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=oracle.com; Received: from MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) by MN2PR10MB3837.namprd10.prod.outlook.com (2603:10b6:208:183::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16; Fri, 13 Aug 2021 12:12:48 +0000 Received: from MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::b813:4805:31e:d36a]) by MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::b813:4805:31e:d36a%5]) with mapi id 15.20.4415.019; Fri, 13 Aug 2021 12:12:48 +0000 From: Anand Jain To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, fdmanana@suse.com, Nikolay Borisov , Qu Wenruo , Anand Jain Subject: [PATCH 3/3] btrfs: don't flush from btrfs_delayed_inode_reserve_metadata Date: Fri, 13 Aug 2021 20:12:25 +0800 Message-Id: <67b189dab7575f9edbc41caa4118ee68856a56a2.1628854236.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: X-ClientProxiedBy: SG2PR04CA0155.apcprd04.prod.outlook.com (2603:1096:4::17) To MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (39.109.186.25) by SG2PR04CA0155.apcprd04.prod.outlook.com (2603:1096:4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.17 via Frontend Transport; Fri, 13 Aug 2021 12:12:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fb33a27a-2d30-4e4a-e619-08d95e53aa5a X-MS-TrafficTypeDiagnostic: MN2PR10MB3837: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ceUe5a7VU+hURZ8jBo2U33+8n4eP0CeGAtmh6l1HfcondWg2yajAMRO1OlOK2OOZdqPTmsX7BmuKEkVeUvqPmb7WzMTDEM9PedeAjZia1pOrrvuAl+k0uRIbnQd3HW3T4QSCIs+IamCNOiHQxygmtTM8RJmH/5W4g5WGpStnF8UHVFYIQT2dGiBqoOszC84+RXvlk6DkO6Qte5+xFbRD0HQwXLXhLl/BZBOP03FjIrSm+aMqK9fcDofEVJ83nnFEXJn21Anh4G3OvVwpLBpcHATaB+wKPaJTNKGVSqrwm+7RqGuKsX9vvbfgx6uH2fRA0QnpdctJEV4O5buFdRPC23CV7IN6P+i0zQLJd21ja+iyXgvELSabHaF1PEoOVFDRwGfKjXJUL0p2m7FnueRRUNm/Tgt9AebY6iRmoOxQSNnXbm9g4IvIWQeibJ46IhEXlWpHHw083gxoyqgSo0ZfmyoHZqc5OBbWC+nq9nATdiLXB1CIHeeRlyWTH7isHAwbrVndP6fPx0dUY1h5Z2t9Q6uR9g5+6YToKQzsohiBjlP6mvedrk7JBIDfSmLXfCdrZY2/KsKA3vlseCSCNDImYuP8h1C6irOPth2z3PU9QAoQbID6tadUj661xMtBXvDtcN9rScbJ+U/9bxvVIm2MUfbfvO+d2lwYFBgSrIUqL17j6OCCAW8VT7xbdqGfTK7D5h/Mb/Z5Epmxb0LWvKdyOQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR10MB4128.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(376002)(396003)(346002)(136003)(366004)(39860400002)(54906003)(8936002)(478600001)(38100700002)(2616005)(956004)(38350700002)(107886003)(44832011)(52116002)(2906002)(316002)(5660300002)(8676002)(6666004)(26005)(6506007)(186003)(36756003)(83380400001)(66476007)(66556008)(6512007)(6486002)(66946007)(86362001)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rX3fPKdXU1EaJ6yGvau+JB2a+AkKCyiNB7kHxpV3kZI3Ze0DB4pUfQiYAnlDBIQTC7B3qROuHjIUQN9SSlGEZaCr1bVtte/WrSnzTzR9fz8yO8E0zsMeG13bjHylQrdCzSNhHUq+xw8CfJBbGMULWLAyXWotbJG5dk+K1nTPrcrbzJ4brZWsagC4RPlwvojIuyF4AzPv8SibSQulX8kWMKE9xKiUOA2QNcSHOZlRju8xB5ASOv4oRfWRZoGFEp+Q4xILATMz4lWMKxESp8dz0t0J5sWGhzYsPnvZWQ1ZQzsjglsxU3SBXwZBDs3ccD900V+hP2ToN142DmL22kHnifKr8GTystZTZ9aFGo3IyHY0H5AbO/Tj0AdSN7zY4zYxF0peJozUPDbh16cE0w35Vai2i9NTO+lHpF5N3BOqZ0gqJgDYob3qgLFNppBGddSoTtfT2W+J1S12+ZKPwarmpbFIV8HwopQmx9G+q7e5CHbgH2dGZskk3atNLQCDXMPHB+eDH+kgJ7wDXQNC9oLOFGjkzf0jHRDWgwW+XNTXED1Rddx8fnp01Zo4EG2MFgUuNJq9jX3QTF1+rYLwqJMwrLKjfIktAlY6P51xcWXHkiZL5KkJsbvz42WYJfVu8jW/ltdt5L/mHwotpiMQKN25vigj2xvc9B3gE6hc9KAvI5Hf8+z0sfJGKH4krNCyj8vfKqcZSdLLHP3/mOp0i5jUlP0u3+0YKo04JNHnxTkxZdHk5m4U/9a0AqfTrgRMAgiSL2H4bJd2oDHaEJKAjGD+9bQjEj8h88jYkLlShpvpytyu5dh1yRc4hTYSAiwvIOJvz0MQMTT5SXJOPucwGjjJ8wo/vf0NncXXoQou1m8QHFlVjzem/QL0WWNDzbUbbB+Py76ZCuxjYd4bKYvZEVbern/wZOU/FNi5cPJv4FfVgz0GY1H1kOjZP6W9mg+k5QRho5Izn+zfmsSHrVj1NsWfHXXymklAFuTkUUSS3+5a7a/vOLjlCnvMQKQxrRNKovbib+3rkqHyxv64m3Ysb5O8TTd9hqYAVWMfgJClRLPIc3h9RUHd2XMMat6B8LpJhib2pKaDIX2vvgNKexMqLLNqRaCv/+fLdrDS51uOdVyXcXwgZVCEyWsMYKDIAVn5jXKH2lxUsYtM+16dtAc55KkETDVYXRJZCl8pOkFkFT3+iGjX7XaoEUa+36Vf9ed7NNxydXnfL9m9diMNr4HoKq5QS4tXo0DS9sdcO0VkIdM2HpIiX0/UZI9Xy9050tBxexvPHW16oB4NgdrGMUdJircrVSdBPUO+V2pr+Sq/k/FGbvQts++WU77ZzTdV8PuR8TRB X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb33a27a-2d30-4e4a-e619-08d95e53aa5a X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB4128.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Aug 2021 12:12:48.6471 (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: kyNrSvfWa8hBuYzHZ+Q3nUobfgQP9RcjoX4aF6KAvhfEMlC5XMLp/QYskp5Cj5i8EdRg2Z3Ppw8PRJD6SO4HsQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3837 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10074 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 malwarescore=0 phishscore=0 bulkscore=0 suspectscore=0 mlxscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2107140000 definitions=main-2108130074 X-Proofpoint-ORIG-GUID: TrUWmagXoKfUdQdxMLk2uwUlaRrC0de0 X-Proofpoint-GUID: TrUWmagXoKfUdQdxMLk2uwUlaRrC0de0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nikolay Borisov commit 4d14c5cde5c268a2bc26addecf09489cb953ef64 upstream Calling btrfs_qgroup_reserve_meta_prealloc from btrfs_delayed_inode_reserve_metadata can result in flushing delalloc while holding a transaction and delayed node locks. This is deadlock prone. In the past multiple commits: * ae5e070eaca9 ("btrfs: qgroup: don't try to wait flushing if we're already holding a transaction") * 6f23277a49e6 ("btrfs: qgroup: don't commit transaction when we already hold the handle") Tried to solve various aspects of this but this was always a whack-a-mole game. Unfortunately those 2 fixes don't solve a deadlock scenario involving btrfs_delayed_node::mutex. Namely, one thread can call btrfs_dirty_inode as a result of reading a file and modifying its atime: PID: 6963 TASK: ffff8c7f3f94c000 CPU: 2 COMMAND: "test" #0 __schedule at ffffffffa529e07d #1 schedule at ffffffffa529e4ff #2 schedule_timeout at ffffffffa52a1bdd #3 wait_for_completion at ffffffffa529eeea <-- sleeps with delayed node mutex held #4 start_delalloc_inodes at ffffffffc0380db5 #5 btrfs_start_delalloc_snapshot at ffffffffc0393836 #6 try_flush_qgroup at ffffffffc03f04b2 #7 __btrfs_qgroup_reserve_meta at ffffffffc03f5bb6 <-- tries to reserve space and starts delalloc inodes. #8 btrfs_delayed_update_inode at ffffffffc03e31aa <-- acquires delayed node mutex #9 btrfs_update_inode at ffffffffc0385ba8 #10 btrfs_dirty_inode at ffffffffc038627b <-- TRANSACTIION OPENED #11 touch_atime at ffffffffa4cf0000 #12 generic_file_read_iter at ffffffffa4c1f123 #13 new_sync_read at ffffffffa4ccdc8a #14 vfs_read at ffffffffa4cd0849 #15 ksys_read at ffffffffa4cd0bd1 #16 do_syscall_64 at ffffffffa4a052eb #17 entry_SYSCALL_64_after_hwframe at ffffffffa540008c This will cause an asynchronous work to flush the delalloc inodes to happen which can try to acquire the same delayed_node mutex: PID: 455 TASK: ffff8c8085fa4000 CPU: 5 COMMAND: "kworker/u16:30" #0 __schedule at ffffffffa529e07d #1 schedule at ffffffffa529e4ff #2 schedule_preempt_disabled at ffffffffa529e80a #3 __mutex_lock at ffffffffa529fdcb <-- goes to sleep, never wakes up. #4 btrfs_delayed_update_inode at ffffffffc03e3143 <-- tries to acquire the mutex #5 btrfs_update_inode at ffffffffc0385ba8 <-- this is the same inode that pid 6963 is holding #6 cow_file_range_inline.constprop.78 at ffffffffc0386be7 #7 cow_file_range at ffffffffc03879c1 #8 btrfs_run_delalloc_range at ffffffffc038894c #9 writepage_delalloc at ffffffffc03a3c8f #10 __extent_writepage at ffffffffc03a4c01 #11 extent_write_cache_pages at ffffffffc03a500b #12 extent_writepages at ffffffffc03a6de2 #13 do_writepages at ffffffffa4c277eb #14 __filemap_fdatawrite_range at ffffffffa4c1e5bb #15 btrfs_run_delalloc_work at ffffffffc0380987 <-- starts running delayed nodes #16 normal_work_helper at ffffffffc03b706c #17 process_one_work at ffffffffa4aba4e4 #18 worker_thread at ffffffffa4aba6fd #19 kthread at ffffffffa4ac0a3d #20 ret_from_fork at ffffffffa54001ff To fully address those cases the complete fix is to never issue any flushing while holding the transaction or the delayed node lock. This patch achieves it by calling qgroup_reserve_meta directly which will either succeed without flushing or will fail and return -EDQUOT. In the latter case that return value is going to be propagated to btrfs_dirty_inode which will fallback to start a new transaction. That's fine as the majority of time we expect the inode will have BTRFS_DELAYED_NODE_INODE_DIRTY flag set which will result in directly copying the in-memory state. Fixes: c53e9653605d ("btrfs: qgroup: try to flush qgroup space when we get -EDQUOT") CC: stable@vger.kernel.org # 5.10+ Reviewed-by: Qu Wenruo Signed-off-by: Nikolay Borisov Signed-off-by: David Sterba Signed-off-by: Anand Jain Conflicts: fs/btrfs/inode.c --- fs/btrfs/delayed-inode.c | 3 ++- fs/btrfs/inode.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index 7dad8794ee38..e7f8cf1531bc 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -627,7 +627,8 @@ static int btrfs_delayed_inode_reserve_metadata( */ if (!src_rsv || (!trans->bytes_reserved && src_rsv->type != BTRFS_BLOCK_RSV_DELALLOC)) { - ret = btrfs_qgroup_reserve_meta_prealloc(root, num_bytes, true); + ret = btrfs_qgroup_reserve_meta(root, num_bytes, + BTRFS_QGROUP_RSV_META_PREALLOC, true); if (ret < 0) return ret; ret = btrfs_block_rsv_add(root, dst_rsv, num_bytes, diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 64dd702a5448..a38dcf6ae4f9 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -6375,7 +6375,7 @@ static int btrfs_dirty_inode(struct inode *inode) return PTR_ERR(trans); ret = btrfs_update_inode(trans, root, inode); - if (ret && ret == -ENOSPC) { + if (ret && (ret == -ENOSPC || ret == -EDQUOT)) { /* whoops, lets try again with the full transaction */ btrfs_end_transaction(trans); trans = btrfs_start_transaction(root, 1);