Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp4153899rwe; Tue, 30 Aug 2022 05:40:21 -0700 (PDT) X-Google-Smtp-Source: AA6agR7w+SYcu9BY4uYTV2UgGDaSdeBKYcia2/VWRPENHTk8fMzuWlNevke1QcEVid4si1dLChDe X-Received: by 2002:a63:8941:0:b0:42a:4631:aa60 with SMTP id v62-20020a638941000000b0042a4631aa60mr15697852pgd.134.1661863220803; Tue, 30 Aug 2022 05:40:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661863220; cv=none; d=google.com; s=arc-20160816; b=RZ2NB1K11ptp4U/uRUZUKJaWFBiJ22g7FbJeTyFT+aH3xxsvpGZpm/sRmwN3JR3/DX fzAPdVZNcXsz50jNUIemQ8GpHdRZ/fib3fn/nhvZ8eVxcupmWvDixS1GUzzxU1NKZdKQ XPAUGfprsjzCy1/0N6yU90w2ihbouV9t5n+EOeLeJ8Wyohlr1IwM8kWK+b6ntCokxgJq UeestXmUQos+qS4H65U47sSO2y8iQwczihadtVIsrLdDWeTjZmKMy1DX2p5G+eRznkSr CIc170lZRuqNyVIe63SfiQeWloXb/c0O7iC+q4rwXCyFYpF57FNcN5ppsDGKe8M1Uahp /Q7A== 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=XhVydFNg7RC7PkO7/4fbPcXGn5p2pKzeftNQoVpGfcQ=; b=HplaMi/xoFsVvNiVIXxpfIH35Z090o4wwsx8ZGo0rEjvHPYqGn8A23yAJSKcaxJIIM c9TkoGjI5JCkAqfnWlkjSvQof1sipBg+Qzwc8WqqpiKgPgJgmCzjXT1Daffx4t2SSl5x pgdGXygYzW/+doy7zVjz7LD4rpenhgzK6J8eARzwqIUuA7Mb0rZ4Bk/y+s64n9ZXRpuu QP3b41QPyFbeteP0PTuXJ9V2yDvU19dsc5YoeiKwL924+MTm+L7Dj0H5irMuP2jt1j2N wrazTeIxQ5vuMkVt9WXNLUPo1tmkjbSPLVKFWHZClR3oz+RPESdpM7nZT0OLTP9RWUyv nffQ== 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 o2-20020a056a0015c200b0052f60f7e0a1si12284415pfu.5.2022.08.30.05.40.09; Tue, 30 Aug 2022 05:40:20 -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 S229714AbiH3Mgw (ORCPT + 99 others); Tue, 30 Aug 2022 08:36:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229792AbiH3Mgi (ORCPT ); Tue, 30 Aug 2022 08:36:38 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B378DAA0E for ; Tue, 30 Aug 2022 05:36:37 -0700 (PDT) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MH6Dx4Y3VznTjS; Tue, 30 Aug 2022 20:34:09 +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, 30 Aug 2022 20:36:34 +0800 From: Miaohe Lin To: , CC: , , Subject: [PATCH 3/6] mm, hwpoison: use num_poisoned_pages_sub() to decrease num_poisoned_pages Date: Tue, 30 Aug 2022 20:36:01 +0800 Message-ID: <20220830123604.25763-4-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20220830123604.25763-1-linmiaohe@huawei.com> References: <20220830123604.25763-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: dggems701-chm.china.huawei.com (10.3.19.178) 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 Use num_poisoned_pages_sub() to combine multiple atomic ops into one. Also num_poisoned_pages_dec() can be killed as there's no caller now. Signed-off-by: Miaohe Lin --- include/linux/swapops.h | 5 ----- mm/memory-failure.c | 6 ++++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/linux/swapops.h b/include/linux/swapops.h index dbf9df854124..86b95ccb81bb 100644 --- a/include/linux/swapops.h +++ b/include/linux/swapops.h @@ -602,11 +602,6 @@ static inline void num_poisoned_pages_inc(void) atomic_long_inc(&num_poisoned_pages); } -static inline void num_poisoned_pages_dec(void) -{ - atomic_long_dec(&num_poisoned_pages); -} - static inline void num_poisoned_pages_sub(long i) { atomic_long_sub(i, &num_poisoned_pages); diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 3966fa6abe03..69c4d1b48ad6 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -2596,7 +2596,7 @@ int soft_offline_page(unsigned long pfn, int flags) void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) { - int i; + int i, total = 0; /* * A further optimization is to have per section refcounted @@ -2609,8 +2609,10 @@ void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) for (i = 0; i < nr_pages; i++) { if (PageHWPoison(&memmap[i])) { - num_poisoned_pages_dec(); + total++; ClearPageHWPoison(&memmap[i]); } } + if (total) + num_poisoned_pages_sub(total); } -- 2.23.0