From patchwork Tue Aug 22 11:05:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingbo Xu X-Patchwork-Id: 136564 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b82d:0:b0:3f2:4152:657d with SMTP id z13csp3735642vqi; Tue, 22 Aug 2023 09:17:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGJnf+vXGgtaj+qwnHLsNlr4eAMnH6KG6twnm8yFpNW6nAB/XH8/W1mLej6o18af+LeS947 X-Received: by 2002:a17:902:eb45:b0:1bb:7a73:6b59 with SMTP id i5-20020a170902eb4500b001bb7a736b59mr8154263pli.32.1692721070340; Tue, 22 Aug 2023 09:17:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692721070; cv=none; d=google.com; s=arc-20160816; b=b+wSTEtSzdSAttaCa67+h1ARSwaXayKIqDFIRvog1JsEYNw7tT1EL8Cp2J/FrmvtNw 0bfAzl9CQG8E+QYR0kgsw8Q0bufCF5E1S7+Y/tWzWZIUGc91xL0QEMG+hAIspFOVjkVT Qv0tZlL+MoQiLm90WOoWJ7cNaREahn8eWhHxvh0Qlycg02kcFxGqEK8w9Lts7EfqVMH8 oIM6xq0UOqKywxB82QmL1OhD/s21bf49MXMbsdj5StSTT4tJH7RjQJT1ic5lFzADi1mN 7FmEDoWnlC+ONMH53jMPDWmAiWKRFyQJkh1z1a4UQCOZDKcLcsEggSI8DDpWPOHLjeAw wChw== 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 :message-id:date:subject:cc:to:from; bh=1PmNaBh6QPLbEayb8LGlmdRY4SQ/7cq7GgvOOHcn+JM=; fh=uQc8+Edocj1jwBmxzkHy27AP1UUURuKg6XPVq9xxavw=; b=hukOZOsR2+dGbktiJbd9MMlertUMaQDlPtWXS+mLWcN/172SBU9B4LOxJYDGGZHa1c 4k1DRp7Ofa7GKjwoS95Ufuzxk/KRt090egCmeDPxNJ8VpbepP05DvlATvWpcJczStuYA sfZ3wpEpJBMkU6Qw20Z3njgmTDIFRSte7/ZTgM6jv/HHqDU1nxGEaDgcROF5kCIO6HGR mW1pTmsGs2ziBfOcE1tsq0sW+QYgDTAdocp/9gjigH8BXpibXD7UoRe1mipueH4e6p6W QSjjzx57WMVVnTQOQDwnSy4tAzaCJ3IMOcCcKSS1zQPLaeL3NzgurRfKFELqo7YlV2zs Htyg== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p2-20020a170902f08200b001bb0fdbfdc1si8683081pla.199.2023.08.22.09.17.27; Tue, 22 Aug 2023 09:17:50 -0700 (PDT) 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234421AbjHVLFk (ORCPT + 99 others); Tue, 22 Aug 2023 07:05:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232234AbjHVLFi (ORCPT ); Tue, 22 Aug 2023 07:05:38 -0400 Received: from out30-100.freemail.mail.aliyun.com (out30-100.freemail.mail.aliyun.com [115.124.30.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C7B81BE for ; Tue, 22 Aug 2023 04:05:34 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R151e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=jefflexu@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0VqMKLwI_1692702330; Received: from localhost(mailfrom:jefflexu@linux.alibaba.com fp:SMTPD_---0VqMKLwI_1692702330) by smtp.aliyun-inc.com; Tue, 22 Aug 2023 19:05:31 +0800 From: Jingbo Xu To: hsiangkao@linux.alibaba.com, chao@kernel.org, linux-erofs@lists.ozlabs.org Cc: huyue2@coolpad.com, linux-kernel@vger.kernel.org Subject: [PATCH] erofs: release ztailpacking pclusters properly Date: Tue, 22 Aug 2023 19:05:30 +0800 Message-Id: <20230822110530.96831-1-jefflexu@linux.alibaba.com> X-Mailer: git-send-email 2.19.1.6.gb485710b MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL 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: INBOX X-GMAIL-THRID: 1774946689060961939 X-GMAIL-MSGID: 1774946689060961939 Currently ztailpacking pclusters are chained with FOLLOWED_NOINPLACE and not recorded into the managed_pslots XArray. After commit 7674a42f35ea ("erofs: use struct lockref to replace handcrafted approach"), ztailpacking pclusters won't be freed with erofs_workgroup_put() anymore, which will cause the following issue: BUG erofs_pcluster-1 (Tainted: G OE ): Objects remaining in erofs_pcluster-1 on __kmem_cache_shutdown() Use z_erofs_free_pcluster() directly to free ztailpacking pclusters. Fixes: 7674a42f35ea ("erofs: use struct lockref to replace handcrafted approach") Signed-off-by: Jingbo Xu Reviewed-by: Gao Xiang Reviewed-by: Chao Yu --- fs/erofs/zdata.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c index de4f12152b62..5419405cafb3 100644 --- a/fs/erofs/zdata.c +++ b/fs/erofs/zdata.c @@ -1410,7 +1410,10 @@ static void z_erofs_decompress_queue(const struct z_erofs_decompressqueue *io, owned = READ_ONCE(be.pcl->next); z_erofs_decompress_pcluster(&be, io->eio ? -EIO : 0); - erofs_workgroup_put(&be.pcl->obj); + if (z_erofs_is_inline_pcluster(be.pcl)) + z_erofs_free_pcluster(be.pcl); + else + erofs_workgroup_put(&be.pcl->obj); } }