From patchwork Fri Jul 8 05:36:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naoya Horiguchi X-Patchwork-Id: 12910588 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22D35C433EF for ; Fri, 8 Jul 2022 05:38:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A5DD36B007D; Fri, 8 Jul 2022 01:38:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9E6FD6B007E; Fri, 8 Jul 2022 01:38:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 887456B0080; Fri, 8 Jul 2022 01:38:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7459F6B007D for ; Fri, 8 Jul 2022 01:38:00 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 51C0F120EA3 for ; Fri, 8 Jul 2022 05:38:00 +0000 (UTC) X-FDA: 79662826320.03.08480B0 Received: from out2.migadu.com (out2.migadu.com [188.165.223.204]) by imf05.hostedemail.com (Postfix) with ESMTP id E56FF10001D for ; Fri, 8 Jul 2022 05:37:59 +0000 (UTC) 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=1657258678; 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=a5cfdoF+Q3PicJ4hUmNvih68gRFF+QsIiLkN3fSd50o=; b=dGZnVxCkoUtL6sNLsB3dTwycJsCSweuvR53NKdprQWpUOF7aAitjtx8LO8PaN2o98Fy0Iz U92RPkDv9w4zWN06Pq4UhoK1d12SJknNswFbK97MQc7h6K44GKn4u0LA6yzlKK1TQsa4Ym hSaN806fuk++YW//Bo8IG36oV2501gc= From: Naoya Horiguchi To: linux-mm@kvack.org Cc: Andrew Morton , David Hildenbrand , Mike Kravetz , Miaohe Lin , Liu Shixin , Yang Shi , Oscar Salvador , Muchun Song , Naoya Horiguchi , linux-kernel@vger.kernel.org Subject: [mm-unstable PATCH v5 6/8] mm, hwpoison: make __page_handle_poison returns int Date: Fri, 8 Jul 2022 14:36:51 +0900 Message-Id: <20220708053653.964464-7-naoya.horiguchi@linux.dev> In-Reply-To: <20220708053653.964464-1-naoya.horiguchi@linux.dev> References: <20220708053653.964464-1-naoya.horiguchi@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657258680; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=a5cfdoF+Q3PicJ4hUmNvih68gRFF+QsIiLkN3fSd50o=; b=B/d3TyZIYrbtUV/66aK1cgEMSr7W0F/kVIK9RT8jOj26U/FnpJpdpIrwxnd4PTK1Y6CzdB NgCrf2fSoCsIP1buMiEnZ5oCW2sbfp0f++9/ep/HrXPKm+oTCBsRwDCiV3AemIRiBTAZrL 1Mjc0GqvJpzFutd27vSsXmjMwYFEnEs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657258680; a=rsa-sha256; cv=none; b=k+2KY8MhUGi9hCt9wyrlFWResS5m/cGcPNSUYhN4aGpeo8WN9+rJ0h9IQ7gc3u8zErMVDR n2VcAIsAIeN0GYDTJPclN1BryY3ScpFCQ3b96rha6R+j5Eg/2f5o03tBOPdIGxOx60vT3W PWW81m97JDwWLjymcbOP41trwWLywv0= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=dGZnVxCk; spf=pass (imf05.hostedemail.com: domain of naoya.horiguchi@linux.dev designates 188.165.223.204 as permitted sender) smtp.mailfrom=naoya.horiguchi@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Rspamd-Queue-Id: E56FF10001D Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=dGZnVxCk; spf=pass (imf05.hostedemail.com: domain of naoya.horiguchi@linux.dev designates 188.165.223.204 as permitted sender) smtp.mailfrom=naoya.horiguchi@linux.dev; dmarc=pass (policy=none) header.from=linux.dev X-Rspam-User: X-Rspamd-Server: rspam06 X-Stat-Signature: unpgaei9qcg7bmxosgyx6zuyzcdbdog5 X-HE-Tag: 1657258679-508206 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Naoya Horiguchi __page_handle_poison() returns bool that shows whether take_page_off_buddy() has passed or not now. But we will want to distinguish another case of "dissolve has passed but taking off failed" by its return value. So change the type of the return value. No functional change. Signed-off-by: Naoya Horiguchi Reviewed-by: Miaohe Lin --- v2 -> v3: - move deleting "res = MF_FAILED" to the later patch. (by Miaohe) --- mm/memory-failure.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index f17f0475db93..e38a94007ffe 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -71,7 +71,13 @@ atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0); static bool hw_memory_failure __read_mostly = false; -static bool __page_handle_poison(struct page *page) +/* + * Return values: + * 1: the page is dissolved (if needed) and taken off from buddy, + * 0: the page is dissolved (if needed) and not taken off from buddy, + * < 0: failed to dissolve. + */ +static int __page_handle_poison(struct page *page) { int ret; @@ -81,7 +87,7 @@ static bool __page_handle_poison(struct page *page) ret = take_page_off_buddy(page); zone_pcp_enable(page_zone(page)); - return ret > 0; + return ret; } static bool page_handle_poison(struct page *page, bool hugepage_or_freepage, bool release) @@ -91,7 +97,7 @@ static bool page_handle_poison(struct page *page, bool hugepage_or_freepage, boo * Doing this check for free pages is also fine since dissolve_free_huge_page * returns 0 for non-hugetlb pages as well. */ - if (!__page_handle_poison(page)) + if (__page_handle_poison(page) <= 0) /* * We could fail to take off the target page from buddy * for example due to racy page allocation, but that's @@ -1086,7 +1092,7 @@ static int me_huge_page(struct page_state *ps, struct page *p) * subpages. */ put_page(hpage); - if (__page_handle_poison(p)) { + if (__page_handle_poison(p) > 0) { page_ref_inc(p); res = MF_RECOVERED; } @@ -1855,7 +1861,7 @@ static int try_memory_failure_hugetlb(unsigned long pfn, int flags, int *hugetlb if (res == 0) { unlock_page(head); res = MF_FAILED; - if (__page_handle_poison(p)) { + if (__page_handle_poison(p) > 0) { page_ref_inc(p); res = MF_RECOVERED; }