From patchwork Fri Mar 3 17:21:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 63819 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp307429wrd; Fri, 3 Mar 2023 01:21:05 -0800 (PST) X-Google-Smtp-Source: AK7set/jl5alAJiq/k7airg0BqvvVMXX5yuu1ySP07iBtt0Hlfn+fnAAP0l3Aq5ZeLn2XxIBYp7e X-Received: by 2002:a05:6a20:431e:b0:cc:9b29:f617 with SMTP id h30-20020a056a20431e00b000cc9b29f617mr2065462pzk.0.1677835265340; Fri, 03 Mar 2023 01:21:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677835265; cv=none; d=google.com; s=arc-20160816; b=mFHf7vdlIQZ8nu1hZg8TNSbTQsGRMgEvBH3T7IqSvnetAkFYLVn2vuG4VgTxIJom4o T5oV4iW06YNvNSg+gDNSWOt2drZWoNV2EHI2mU7j/byBO8A8eb5ZhBFQPXiF1cIByS2b Nxd40D3O26+J1D5LOkolrVSRPi+ZoXiBoh6Ajh2l4/M4BGVYiITqJjuR0N6hcOE+b93M 3VDl3gXUK77fvAQ5q/Nhzwp4G7G/PlxCGqXFmZWpwRbxcCESvcHCV7bUWoirUZtTWnem vVcb/ks/7dRTYGTvFuVEC8pWlYE35Gf79f0TBGGIpcw+KieaMUuOXkI2Z1KChxfE/kfC 9cpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=0cSBCCqH3DUMoPiEfavHLIiQ46NcSse9SRVqXKiHayw=; b=We8XQYXmygS0w67OpsBwX0grwyhr5Pc/hLLSi14+eBFhyLgtlUCeM7ZoDvA5wKG5YA gP2iJZs1/Zy+MewMtPzZJZ4lJJ+ML4mhim6Wf/HNO1+Ld1Qrq+diAHd0sgjiBWEHGUve hpH020y4IptbPk6tfqXsIUvufco7TUISbqkUasUMZsiNkGK67TsWDN4nkj85hIkkXG+b HU6+bXuzzv+obz1WQ2TiRfOZ4wfa2NWR3bZoq7CRJlygBxX0+orblbxy4HoYGIIk5LB1 f9oIez9HvdQSyUHsH2Eo/UKlOli3eIixygbpPYZGtuoECt+E+SlzwDzlOPL3O2JdmAJS r9Bg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w4-20020a656944000000b005030127c431si1494431pgq.808.2023.03.03.01.20.52; Fri, 03 Mar 2023 01:21:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230346AbjCCJUY (ORCPT + 99 others); Fri, 3 Mar 2023 04:20:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230000AbjCCJTx (ORCPT ); Fri, 3 Mar 2023 04:19:53 -0500 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5C8C23DA8; Fri, 3 Mar 2023 01:19:52 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4PSj9J3XCHz4f3nTZ; Fri, 3 Mar 2023 17:19:48 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnnbGyuwFkFpqfEg--.45687S8; Fri, 03 Mar 2023 17:19:50 +0800 (CST) From: Kemeng Shi To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com, ritesh.list@gmail.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v3 06/20] ext4: protect pa->pa_free in ext4_discard_allocated_blocks Date: Sat, 4 Mar 2023 01:21:06 +0800 Message-Id: <20230303172120.3800725-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230303172120.3800725-1-shikemeng@huaweicloud.com> References: <20230303172120.3800725-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDnnbGyuwFkFpqfEg--.45687S8 X-Coremail-Antispam: 1UD129KBjvdXoW7Gr1UGF18KFyfKw1fXF1rCrg_yoW3KrbE9a 48CF4xJFWrJw1fu3W8tay0qrs5KF4Fyr4UWFWrtw1fu3WrXF4fG3WDXr1rJr9rWa1jy343 C3s5uryUGF40gjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDkFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr 1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRiVbyDUU UUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759337790950381421?= X-GMAIL-MSGID: =?utf-8?q?1759337790950381421?= If ext4_mb_mark_diskspace_used fails in ext4_mb_new_blocks, we may discard pa already in list. Protect pa with pa_lock to avoid race. Signed-off-by: Kemeng Shi Reviewed-by: Ojaswin Mujoo --- fs/ext4/mballoc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index d6a27e47584a..56f35a25842c 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -4266,8 +4266,11 @@ static void ext4_discard_allocated_blocks(struct ext4_allocation_context *ac) ext4_mb_unload_buddy(&e4b); return; } - if (pa->pa_type == MB_INODE_PA) + if (pa->pa_type == MB_INODE_PA) { + spin_lock(&pa->pa_lock); pa->pa_free += ac->ac_b_ex.fe_len; + spin_unlock(&pa->pa_lock); + } } /*