From patchwork Mon Oct 24 06:20:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naoya Horiguchi X-Patchwork-Id: 8170 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp280240wru; Sun, 23 Oct 2022 23:21:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM52fYAJxzfLGxUZRT6thMso/dUNf0nc6eH3G2RJ6lBFNqzvp2ARz9UV45WdQaJv4NQ4JvGN X-Received: by 2002:a17:906:db07:b0:77b:82cf:54af with SMTP id xj7-20020a170906db0700b0077b82cf54afmr27087535ejb.666.1666592513563; Sun, 23 Oct 2022 23:21:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666592513; cv=none; d=google.com; s=arc-20160816; b=P3EAGMyOQYcDtzoH0w+P0sMPNhrpRVg9Gu4JbwRIbbLEWPz4MvgyKNJlHUijIL/9rL 1qgfJtdFXAqucdW5/BXalQlnvFaPx+F8Ha4iIPL0lkpeGS6jJCrsTr66ixq5ukCVcEVo +kkXEtsx2rGEN+gvZeuRv053lg/cSB96CmLNdMJXRcnoAgnLNaM7i+127BKvnqZedZ3W hL2izB3catllj0s88f7Uor4K9eBei1JucJF+rKn62uT2Zn1lP3lL7IlayEHS8vtZKsyv WOOFopdsmBpaR0w9d64YocSK2uGeM/C0q6acWJzAm5DpxnQi8FM9Xfh0gzqByAguotEq k0Lw== 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 :dkim-signature; bh=Fdcd5K2Zm1oroc0cuGQtvJdbZtbqPLVuISUqhZii2k4=; b=mibUfsdxiEGhEpWGRHw95ypfaxtgaEfp4Zg4wKFWj+eWmI+mWgyBn2fgOwj6XU8Mb+ A68bv8F73leJTNxONmr+L5HRCcpeLLInr4b4IxXD9qGN8FhnfAhQipQVAhsHTP+7EPnh lru/ZtLE54Q2UKihKJ5MzbTKgkLrr/lTbm8VDfhyfuDoIZHb/l82ZxmL7XAJU9f+yf1Z uTcbQFMlaJY+sZFJ98j5YG7sST9+SHy7+ollaBXHAmFztwGN7ex+M4r3VP2Lo7UJVxn5 Og9e0+8xb8MNUGP3DbRwXsJ/Buj58W3MKk/m72jVH+aYHSLDK7zjmX+2ZuQOrl5UZ73v 0NFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.dev header.s=key1 header.b=c8loFVBO; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dn20-20020a17090794d400b007123952b00dsi27124889ejc.100.2022.10.23.23.21.30; Sun, 23 Oct 2022 23:21:53 -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; dkim=pass header.i=@linux.dev header.s=key1 header.b=c8loFVBO; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linux.dev Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230331AbiJXGUy (ORCPT + 99 others); Mon, 24 Oct 2022 02:20:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230230AbiJXGUn (ORCPT ); Mon, 24 Oct 2022 02:20:43 -0400 Received: from out0.migadu.com (out0.migadu.com [IPv6:2001:41d0:2:267::]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9713E48A0D for ; Sun, 23 Oct 2022 23:20:39 -0700 (PDT) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1666592438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fdcd5K2Zm1oroc0cuGQtvJdbZtbqPLVuISUqhZii2k4=; b=c8loFVBOLyhb5hGT+4t/Yooug5C55tinrhnDsKGqIIIM4vYSOPcNMx5zi4B4DrVEiBrqiH vfmHhbA87DyOaEgpLbL9zzb+IZw/l9gNwipzBNu2LzZVUnPYzzQmE8JkDx1KpFkwQdUWLd O7G/zsS1barp3U72MMcvBgOjD8i0ns4= From: Naoya Horiguchi To: linux-mm@kvack.org Cc: Andrew Morton , Miaohe Lin , David Hildenbrand , Mike Kravetz , Yang Shi , Oscar Salvador , Muchun Song , Jane Chu , Naoya Horiguchi , linux-kernel@vger.kernel.org Subject: [PATCH v7 3/4] mm/hwpoison: pass pfn to num_poisoned_pages_*() Date: Mon, 24 Oct 2022 15:20:11 +0900 Message-Id: <20221024062012.1520887-4-naoya.horiguchi@linux.dev> In-Reply-To: <20221024062012.1520887-1-naoya.horiguchi@linux.dev> References: <20221024062012.1520887-1-naoya.horiguchi@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS, SPF_PASS 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?1747548911807438770?= X-GMAIL-MSGID: =?utf-8?q?1747548911807438770?= From: Naoya Horiguchi No functional change. Signed-off-by: Naoya Horiguchi Reviewed-by: Miaohe Lin --- ChangeLog v2 -> v3: - added declaration of num_poisoned_pages_inc() in #ifdef CONFIG_MEMORY_FAILURE --- arch/parisc/kernel/pdt.c | 2 +- include/linux/mm.h | 4 ++-- mm/memory-failure.c | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/parisc/kernel/pdt.c b/arch/parisc/kernel/pdt.c index fdc880e2575a..80943a00e245 100644 --- a/arch/parisc/kernel/pdt.c +++ b/arch/parisc/kernel/pdt.c @@ -231,7 +231,7 @@ void __init pdc_pdt_init(void) /* mark memory page bad */ memblock_reserve(pdt_entry[i] & PAGE_MASK, PAGE_SIZE); - num_poisoned_pages_inc(); + num_poisoned_pages_inc(addr >> PAGE_SHIFT); } } diff --git a/include/linux/mm.h b/include/linux/mm.h index 80d7c2987c3b..278e24a0e3d3 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3248,7 +3248,7 @@ extern int soft_offline_page(unsigned long pfn, int flags); #ifdef CONFIG_MEMORY_FAILURE extern int __get_huge_page_for_hwpoison(unsigned long pfn, int flags, bool *migratable_cleared); -extern void num_poisoned_pages_inc(void); +extern void num_poisoned_pages_inc(unsigned long pfn); #else static inline int __get_huge_page_for_hwpoison(unsigned long pfn, int flags, bool *migratable_cleared) @@ -3256,7 +3256,7 @@ static inline int __get_huge_page_for_hwpoison(unsigned long pfn, int flags, return 0; } -static inline void num_poisoned_pages_inc(void) +static inline void num_poisoned_pages_inc(unsigned long pfn) { } #endif diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 3e0e20cac211..527ee0867742 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -74,12 +74,12 @@ atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0); static bool hw_memory_failure __read_mostly = false; -inline void num_poisoned_pages_inc(void) +inline void num_poisoned_pages_inc(unsigned long pfn) { atomic_long_inc(&num_poisoned_pages); } -static inline void num_poisoned_pages_sub(long i) +static inline void num_poisoned_pages_sub(unsigned long pfn, long i) { atomic_long_sub(i, &num_poisoned_pages); } @@ -125,7 +125,7 @@ static bool page_handle_poison(struct page *page, bool hugepage_or_freepage, boo if (release) put_page(page); page_ref_inc(page); - num_poisoned_pages_inc(); + num_poisoned_pages_inc(page_to_pfn(page)); return true; } @@ -1198,7 +1198,7 @@ static int action_result(unsigned long pfn, enum mf_action_page_type type, { trace_memory_failure_event(pfn, type, result); - num_poisoned_pages_inc(); + num_poisoned_pages_inc(pfn); pr_err("%#lx: recovery action for %s: %s\n", pfn, action_page_types[type], action_name[result]); @@ -1747,7 +1747,7 @@ static int hugetlb_set_page_hwpoison(struct page *hpage, struct page *page) llist_add(&raw_hwp->node, head); /* the first error event will be counted in action_result(). */ if (ret) - num_poisoned_pages_inc(); + num_poisoned_pages_inc(page_to_pfn(page)); } else { /* * Failed to save raw error info. We no longer trace all @@ -2421,7 +2421,7 @@ int unpoison_memory(unsigned long pfn) unlock_mutex: mutex_unlock(&mf_mutex); if (!ret || freeit) { - num_poisoned_pages_sub(count); + num_poisoned_pages_sub(pfn, count); unpoison_pr_info("Unpoison: Software-unpoisoned page %#lx\n", page_to_pfn(p), &unpoison_rs); } @@ -2637,5 +2637,5 @@ void clear_hwpoisoned_pages(struct page *memmap, int nr_pages) } } if (total) - num_poisoned_pages_sub(total); + num_poisoned_pages_sub(0, total); }