From patchwork Fri May 24 09:13:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaohe Lin X-Patchwork-Id: 13672900 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 2393CC25B7D for ; Fri, 24 May 2024 09:16:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 652E96B0099; Fri, 24 May 2024 05:16:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5425B6B009B; Fri, 24 May 2024 05:16:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 283D76B00A0; Fri, 24 May 2024 05:16:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id F2FFF6B009B for ; Fri, 24 May 2024 05:16:33 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A06141A09EB for ; Fri, 24 May 2024 09:16:33 +0000 (UTC) X-FDA: 82152733866.28.F1EBF4C Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf29.hostedemail.com (Postfix) with ESMTP id 7A9DA120017 for ; Fri, 24 May 2024 09:16:31 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf29.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716542191; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vePlv5vJfDtt13tD5NE8SAwiC4O3h+vsiWw+noK3XrI=; b=AMCy4RZKwowrPGNw7qUWj6vY6lOz/kBQS+ud7SIxmxdomq56qayziQE6CxffTWRwi+Ewkt SHrTc3W76e5TVifQBvcMfScH563uL3IbS5DlhqUgRqfODwUTkvykLLg6ReTJRzvePG0vx9 wnJbeaGJ0ybgrD5o+Dvf+jRNhLQ/gwk= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf29.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716542192; a=rsa-sha256; cv=none; b=Dt7NR+F3PCN/1Sv7axPzTK4KVt6rsV1siiehAyR3f7nVuTuPvPy74YfuLiR9eqfvD0jTLe Pc88XlDSNGvmLTxrA44/EiE4pRqDnovJ2K0UPsjK+IbfoZxSeQnLNcfYC8qRdtYfnvXpS0 +3KZQxXPkgRUV68nK453Z2jRx/pwFjA= Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4VlzpQ5VQJzwPF9; Fri, 24 May 2024 17:12:46 +0800 (CST) Received: from canpemm500002.china.huawei.com (unknown [7.192.104.244]) by mail.maildlp.com (Postfix) with ESMTPS id 8A84A18007E; Fri, 24 May 2024 17:16:27 +0800 (CST) Received: from huawei.com (10.173.135.154) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Fri, 24 May 2024 17:16:27 +0800 From: Miaohe Lin To: , , CC: , , , , Subject: [PATCH 03/13] mm/memory-failure: add macro GET_PAGE_MAX_RETRY_NUM Date: Fri, 24 May 2024 17:13:00 +0800 Message-ID: <20240524091310.1430048-4-linmiaohe@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240524091310.1430048-1-linmiaohe@huawei.com> References: <20240524091310.1430048-1-linmiaohe@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.173.135.154] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To canpemm500002.china.huawei.com (7.192.104.244) X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 7A9DA120017 X-Stat-Signature: ib9d6m1s3ws59bsuiw6dcwz31iap8nyp X-HE-Tag: 1716542191-308569 X-HE-Meta: U2FsdGVkX1/lkxF4wB0Sf7k045MJtrax66F8J8xY0csN9GK2wWTVQLw5qi12ayPOe4Ono6KXQAwjv1YAu15YB8ES1Zwjh9ZkARowkvEb9E/aGapxs8nzkPtfKZmNDTe70Xq2Hnoe5VBtRr/y0HBO2cJQDK5h6EcVTQWp5uHz9NPRDpNkJFSld8OH4bI2kFliASy15AhrsuvlKvGsOSxBeMvdqj/h2IpJgETvi+Pr+YQFazYLdbK0oKPrR5gKr9rOr7dHT0A1nZUOSIbR8UB2K/rglDAdPbF7a/wjbZ1hUuvuKu9IMtIisR6yesNyUi38tSv3YfpWz8GYLLQJdh6BdA/D6jYs1IOX41pl2J1R3Wu0DxTsj8RuFWEZuXT4UkQ+lR7riM+TPdloFuhadFhumccP2NwM4wOaAjrDgJcLJ50+2UuT/itJS3etQa05245kUUOFC6lZthDQUMEdn74V9otIuZsBkIe2+upa4PM7/zn6auJoRZD8kWkREO/L8PQgRiS0jLmR99nsodf+8i9zxH87Zz+KtX1zeB/Oj2JvIB/p9Phbd/FE+rrbNaHl2pL80BveNWPm8VguBmjtJ8m0lKcyKQEv/20qEKuMdCXCek4meCGCcuASCaWWEsuS0W/XREwGc103+St5kYsYeABh+cTR4XLI4xdo66c0j2jF6dyqGGNUs/QZ7E0Q0pWjaZ/BK/LT0neOEoUS4XMWQ15ELw2TgB9onU/E6yV3Zi2fPrqS9etiKFaX8JyYLOAhPpoNK/ENaAFpAAaOKKJS77/NiVNbXQRIQYA0liXkG7s23lj24RZIGFYrVmt+eHOhQZPWikdO9Y0gut8b0zta/MleImWHYZVDrxwQtA8BFcfj9W653IC/6bXVHDdTO/XnxhvOgtCmvRFsc3kzeXXu86MiAIKznIAvXx5a85eylNKPYfUvxg6lvEMvAOBQh+qivL7sVHLkmMyI1Rn1ET2xvwH ox8KB6Wi rkJwntFLdcgItS0PDGv5OAsm7+AkAw0bcWCSxHimclpXrSFLnAzAU3yTeEa1f1mNE4wTvzjwy91N76bt3QitCeoFSySU46ahSj3lSWkNADoqy9SxU5CdhMROzNoJTozYyTfM97n2itp+PTIZhLmNBrB2S/3ONdNkR099tuvA05ng/271pLUF4T3TrtPn34rwcDVgt5RqJM7m4hUy3b+zyhFZy/tOKYKLIfa46HFr8YzTs1LARBZowTYiYdLNbdFHsZAbv195ln6mtD0w= 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: List-Subscribe: List-Unsubscribe: Add helper macro GET_PAGE_MAX_RETRY_NUM to replace magic number 3. No functional change intended. Signed-off-by: Miaohe Lin --- mm/memory-failure.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 9c23adceee75..b571aaf987a2 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1446,6 +1446,8 @@ static int __get_hwpoison_page(struct page *page, unsigned long flags) return 0; } +#define GET_PAGE_MAX_RETRY_NUM 3 + static int get_any_page(struct page *p, unsigned long flags) { int ret = 0, pass = 0; @@ -1460,12 +1462,12 @@ static int get_any_page(struct page *p, unsigned long flags) if (!ret) { if (page_count(p)) { /* We raced with an allocation, retry. */ - if (pass++ < 3) + if (pass++ < GET_PAGE_MAX_RETRY_NUM) goto try_again; ret = -EBUSY; } else if (!PageHuge(p) && !is_free_buddy_page(p)) { /* We raced with put_page, retry. */ - if (pass++ < 3) + if (pass++ < GET_PAGE_MAX_RETRY_NUM) goto try_again; ret = -EIO; } @@ -1491,7 +1493,7 @@ static int get_any_page(struct page *p, unsigned long flags) * A page we cannot handle. Check whether we can turn * it into something we can handle. */ - if (pass++ < 3) { + if (pass++ < GET_PAGE_MAX_RETRY_NUM) { put_page(p); shake_page(p); count_increased = false;