Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3063889rwa; Mon, 22 Aug 2022 20:32:50 -0700 (PDT) X-Google-Smtp-Source: AA6agR5Cx73veafFm19qRDRAtXALnKo1iKTF0UfYNxjAAY2zvTPBPyBeEyq7++Q5ImgwzUkMjZJW X-Received: by 2002:a17:907:a059:b0:73d:62cf:cbc9 with SMTP id gz25-20020a170907a05900b0073d62cfcbc9mr9421393ejc.394.1661225570700; Mon, 22 Aug 2022 20:32:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661225570; cv=none; d=google.com; s=arc-20160816; b=ihu2+81GlYvujiqH7+HIUdA4iaLpaLe2trusf0pCEfNwaUcV6WuhGzswCMxP2IkS8/ k02fnLYAHtiFw3CyGG5krLkNE4E1p4zcW0KvergnhQHWd2rR4IErlhUNkaruY3RM68FZ UYBiTGjU1i/dI/ejhE5OC9BeLmvDDIsqoXHUn6yMUasHrnqm9guvZbesb5pMdXWB4nTI /AzIWb+EzkYe24X9BG59UiMgaULgFY1HA/BZV7a5ctk4CiCYS6UcVV6w4ssd5V7nighh KTqSVd5dx5SIFtLAecn0JuQwZmkJkS7FpOegCgVWo+hDdYS3JKh+LREyIdzlzl3Y0Pg9 rbRA== 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=+qc79B2BTc+cSDbQrxL+vXMqMVxtgZRkbCViFq3ka/8=; b=Br0BSmXhTZLA0E5D3z788vBQqz6K2RDv22et1F5SrlSbhu2ENVv8/Ic2CwTm8bEkje 4j6jJS0+tYDUzTJ+8sYsfnlzw/exL3xcqJqgO5PxBXS4o+l6OR+Re5U2PaUkR9DD2Kje +1EWrjqrOOCdA2jIS11ruo8yOwxi42kaX0fmhuhL2fP+c8O0ylepRvR137oV5OxPKyw/ pJWKvkbDANx6pG7Qltf7dgItvyBFpM9sFZcgpyrCvv3LFh9jeEx7J17S1E8pSJx3i8xY y4kC0JqL8wcAsU4pXEGhkoNSCm+iI5owafuT4M+sdcE9D6fkfIT/RaYwi1g/CoRC810H MvhQ== 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dr2-20020a170907720200b0072eece129bdsi10991311ejc.59.2022.08.22.20.32.25; Mon, 22 Aug 2022 20:32: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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240072AbiHWDYn (ORCPT + 99 others); Mon, 22 Aug 2022 23:24:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239405AbiHWDYX (ORCPT ); Mon, 22 Aug 2022 23:24:23 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0A6F52FEE for ; Mon, 22 Aug 2022 20:24:22 -0700 (PDT) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MBZGq6CvdzXf27; Tue, 23 Aug 2022 11:20:03 +0800 (CST) Received: from huawei.com (10.175.124.27) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 23 Aug 2022 11:24:20 +0800 From: Miaohe Lin To: , CC: , , Subject: [PATCH v2 3/6] mm, hwpoison: fix extra put_page() in soft_offline_page() Date: Tue, 23 Aug 2022 11:23:43 +0800 Message-ID: <20220823032346.4260-4-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20220823032346.4260-1-linmiaohe@huawei.com> References: <20220823032346.4260-1-linmiaohe@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 When hwpoison_filter() refuses to soft offline a page, the page refcnt incremented previously by MF_COUNT_INCREASED would have been consumed via get_hwpoison_page() if ret <= 0. So the put_ref_page() here will put the extra one. Remove it to fix the issue. Fixes: 9113eaf331bf ("mm/memory-failure.c: add hwpoison_filter for soft offline") Signed-off-by: Miaohe Lin Acked-by: Naoya Horiguchi --- mm/memory-failure.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index ecd42d717c6f..1d79e693f1b9 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -2575,8 +2575,6 @@ int soft_offline_page(unsigned long pfn, int flags) if (hwpoison_filter(page)) { if (ret > 0) put_page(page); - else - put_ref_page(ref_page); mutex_unlock(&mf_mutex); return -EOPNOTSUPP; -- 2.23.0