From patchwork Thu Mar 9 05:31:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao Xiang X-Patchwork-Id: 66600 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp111729wrd; Wed, 8 Mar 2023 21:42:31 -0800 (PST) X-Google-Smtp-Source: AK7set8bKLL/7X7zcP49sKOZNSNCWaxBMGuItqs2C3pKIHqPo9ioChNQ2GRTyRYCyyvICImbGJ9x X-Received: by 2002:a17:90a:1d1:b0:237:5834:294b with SMTP id 17-20020a17090a01d100b002375834294bmr22005571pjd.41.1678340551568; Wed, 08 Mar 2023 21:42:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678340551; cv=none; d=google.com; s=arc-20160816; b=PgvgXAluH0wRtPp+KINtRl7vNdj06Lw6cAgExjGY1difugJ2YdTGNNGJTC5SF4RAxc DIyYN0Gsk5V0OOJNQoS6t0PcNOmzAK8yZeWFqB+KIX/qCwNkBC0SOHyfc6crafcp3PlM u4193IMzs2q/7S+3BSezcsOjcP4PgMOxPF4ZAld++tCRKO8M7FOMZxvAvN9fPEbGnsGr z9Uu6YCku83MSPpF5DIIAlAjfSD1+U3a1eXV4uPYfK9zcyCzk0I2LBqY30KmvWopFxp6 tZ7tev1tNjNbtXj15L/38GWVc2y/TLDPUnHsiEl4rOGKkdH6BKnpnTFFPruSf8e3oahE XLbw== 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=mazjW0zn2TyhnL3a4RgL9EbjtW+hMMAf3TTOWY9eEEY=; b=DQT/A6WEQ3EOXBGUSkqZbWXVHJYaiXpyVt0GpmkCzcKJAECOEZ8k+4qOgKsmTna2B5 662qWyYSEMaaIJzQIhuxVuFsEiwTotKHCZlBsZHERTH/dWxiIGNGaNcXWaSAnIPICJn+ Wgfjy6TM1QMaNUcs9lXVGJRcvTDazN6Pp6dugu7HULMkaGR4Rf+QHoIhcIjXMWvx3fCc hvjpCdDvc/ZYH97ojx+iNrxziigUNKB7sRqCVATt5ka6t8mgo0SVnn2qBWfzH1rr93cX UQZRMxhI14KjQgdPAWDlEYC4LUp0Xfu6VRWg8oCDrkItbzs54mF65By+y9p7i1Fke87G 47WA== 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 199-20020a6301d0000000b004ff6eee715bsi16853835pgb.460.2023.03.08.21.42.19; Wed, 08 Mar 2023 21:42:31 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229914AbjCIFd6 (ORCPT + 99 others); Thu, 9 Mar 2023 00:33:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229798AbjCIFdM (ORCPT ); Thu, 9 Mar 2023 00:33:12 -0500 Received: from out30-110.freemail.mail.aliyun.com (out30-110.freemail.mail.aliyun.com [115.124.30.110]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 561B0DCA49 for ; Wed, 8 Mar 2023 21:31:56 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R181e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=hsiangkao@linux.alibaba.com;NM=1;PH=DS;RN=3;SR=0;TI=SMTPD_---0VdS7uEN_1678339908; Received: from e18g06460.et15sqa.tbsite.net(mailfrom:hsiangkao@linux.alibaba.com fp:SMTPD_---0VdS7uEN_1678339908) by smtp.aliyun-inc.com; Thu, 09 Mar 2023 13:31:54 +0800 From: Gao Xiang To: linux-erofs@lists.ozlabs.org Cc: LKML , Gao Xiang Subject: [PATCH 1/2] erofs: Revert "erofs: fix kvcalloc() misuse with __GFP_NOFAIL" Date: Thu, 9 Mar 2023 13:31:47 +0800 Message-Id: <20230309053148.9223-1-hsiangkao@linux.alibaba.com> X-Mailer: git-send-email 2.24.4 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_NONE,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759867621920910256?= X-GMAIL-MSGID: =?utf-8?q?1759867621920910256?= Let's revert commit 12724ba38992 ("erofs: fix kvcalloc() misuse with __GFP_NOFAIL") since kvmalloc() already supports __GFP_NOFAIL in commit a421ef303008 ("mm: allow !GFP_KERNEL allocations for kvmalloc"). So the original fix was wrong. Actually there was some issue as [1] discussed, so before that mm fix is landed, the warn could still happen but applying this commit first will cause less. [1] https://lore.kernel.org/r/20230305053035.1911-1-hsiangkao@linux.alibaba.com Fixes: 12724ba38992 ("erofs: fix kvcalloc() misuse with __GFP_NOFAIL") Signed-off-by: Gao Xiang Reviewed-by: Chao Yu --- fs/erofs/zdata.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c index 3247d2422bea..f1708c77a991 100644 --- a/fs/erofs/zdata.c +++ b/fs/erofs/zdata.c @@ -1312,12 +1312,12 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be, if (!be->decompressed_pages) be->decompressed_pages = - kcalloc(be->nr_pages, sizeof(struct page *), - GFP_KERNEL | __GFP_NOFAIL); + kvcalloc(be->nr_pages, sizeof(struct page *), + GFP_KERNEL | __GFP_NOFAIL); if (!be->compressed_pages) be->compressed_pages = - kcalloc(pclusterpages, sizeof(struct page *), - GFP_KERNEL | __GFP_NOFAIL); + kvcalloc(pclusterpages, sizeof(struct page *), + GFP_KERNEL | __GFP_NOFAIL); z_erofs_parse_out_bvecs(be); err2 = z_erofs_parse_in_bvecs(be, &overlapped); @@ -1365,7 +1365,7 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be, } if (be->compressed_pages < be->onstack_pages || be->compressed_pages >= be->onstack_pages + Z_EROFS_ONSTACK_PAGES) - kfree(be->compressed_pages); + kvfree(be->compressed_pages); z_erofs_fill_other_copies(be, err); for (i = 0; i < be->nr_pages; ++i) { @@ -1384,7 +1384,7 @@ static int z_erofs_decompress_pcluster(struct z_erofs_decompress_backend *be, } if (be->decompressed_pages != be->onstack_pages) - kfree(be->decompressed_pages); + kvfree(be->decompressed_pages); pcl->length = 0; pcl->partial = true; From patchwork Thu Mar 9 05:31:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao Xiang X-Patchwork-Id: 66599 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp111663wrd; Wed, 8 Mar 2023 21:42:20 -0800 (PST) X-Google-Smtp-Source: AK7set8VsR2BojtGeMPBnwrGY5Py83kr4LVj76v8nhUWKW53BDAvNcAKpC9MY4QaMOeVApRAajnR X-Received: by 2002:a17:902:8643:b0:19c:f80c:df90 with SMTP id y3-20020a170902864300b0019cf80cdf90mr19919274plt.45.1678340539724; Wed, 08 Mar 2023 21:42:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678340539; cv=none; d=google.com; s=arc-20160816; b=QDN9JjHOAuKITxHac5UiECd270F5xGHZJxvuNuthTLXtXD/Zn6xL1kLEFLsQ7wY1Sa IUctbmrrVk0D39HydUlJDVAaoe36fc+QONIBrx9UIBEYxjyLoLNK14ZGUNKbLzoK6ISY yCgZfZZWblZofhWdLAuhdFi5usSfEO0e3JIFgPZaWqq3Dqt7pwUdMGSJ1hK0yk9V6rOF y92Mavvg5iSrK7nyI37VblLanLQxI3yXmSbewa+x89NzhKSUzbGv01qHBPDFeDfbCWUH Cxya78z/JzOXaI2aMWdrg9sIs2Yy5cvoJEPMW5ihvqbK1RfgG6PG9jRS+KRDt3Yu4+BJ Y47w== 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=Tnu4XI+HOnQBYBwM147rUNVgSA62lZzvDWbpeES47cs=; b=ZjWV9sD+KiVhmThhl0otwSSQ7WiWYHGhlrvrg9e5QdypgXMC4kh0miBg2ly5fY3LDf tmFb0sAa9eWOlv0fI5ZYOF7JSIIL0ZQv/eYKcvInmlKuawwW5/qUVNlDplwnNbQ1C1m0 ZcCyKWD39IC6KfWx5ZSBjsUD3qd7D7EPHNYKbMJZoITuo90VmuuM/1mq15w1WVY2tOFH EZARjHpKbgbHgHM08aVsNtg18JzIkh4L1w1owhT8tQWAUZw05hBtD5Kjrhzet5DtMjjc 5K7i1w+nMwAMinqoOqqFXlOFO+sC1VyXPlCmhBTCHPJbEk57Iu0AB1mNjJIKJEQUSLb/ B3fQ== 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 jx7-20020a170903138700b001967f72c227si15503046plb.390.2023.03.08.21.42.06; Wed, 08 Mar 2023 21:42:19 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229939AbjCIFdw (ORCPT + 99 others); Thu, 9 Mar 2023 00:33:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229501AbjCIFdM (ORCPT ); Thu, 9 Mar 2023 00:33:12 -0500 Received: from out30-131.freemail.mail.aliyun.com (out30-131.freemail.mail.aliyun.com [115.124.30.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC77564237 for ; Wed, 8 Mar 2023 21:31:57 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R131e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045170;MF=hsiangkao@linux.alibaba.com;NM=1;PH=DS;RN=3;SR=0;TI=SMTPD_---0VdS7uHS_1678339914; Received: from e18g06460.et15sqa.tbsite.net(mailfrom:hsiangkao@linux.alibaba.com fp:SMTPD_---0VdS7uHS_1678339914) by smtp.aliyun-inc.com; Thu, 09 Mar 2023 13:31:55 +0800 From: Gao Xiang To: linux-erofs@lists.ozlabs.org Cc: LKML , Gao Xiang Subject: [PATCH 2/2] erofs: get rid of an useless DBG_BUGON Date: Thu, 9 Mar 2023 13:31:48 +0800 Message-Id: <20230309053148.9223-2-hsiangkao@linux.alibaba.com> X-Mailer: git-send-email 2.24.4 In-Reply-To: <20230309053148.9223-1-hsiangkao@linux.alibaba.com> References: <20230309053148.9223-1-hsiangkao@linux.alibaba.com> 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_NONE,RCVD_IN_MSPIKE_H2, 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759867609549312847?= X-GMAIL-MSGID: =?utf-8?q?1759867609549312847?= `err` could be -EINTR and it should not be the case. Actually such DBG_BUGON is useless. Signed-off-by: Gao Xiang Reviewed-by: Chao Yu --- fs/erofs/zmap.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/fs/erofs/zmap.c b/fs/erofs/zmap.c index 8bf6d30518b6..655da4d739cb 100644 --- a/fs/erofs/zmap.c +++ b/fs/erofs/zmap.c @@ -757,9 +757,6 @@ int z_erofs_map_blocks_iter(struct inode *inode, struct erofs_map_blocks *map, err = z_erofs_do_map_blocks(inode, map, flags); out: trace_z_erofs_map_blocks_iter_exit(inode, map, flags, err); - - /* aggressively BUG_ON iff CONFIG_EROFS_FS_DEBUG is on */ - DBG_BUGON(err < 0 && err != -ENOMEM); return err; }