From patchwork Thu Jun 6 06:32:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaohe Lin X-Patchwork-Id: 13687854 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 1506FC27C55 for ; Thu, 6 Jun 2024 06:36:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 55D8F6B009D; Thu, 6 Jun 2024 02:36:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C6996B009F; Thu, 6 Jun 2024 02:36:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 13B606B009C; Thu, 6 Jun 2024 02:36:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id E57446B009D for ; Thu, 6 Jun 2024 02:36:29 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 80E11141376 for ; Thu, 6 Jun 2024 06:36:29 +0000 (UTC) X-FDA: 82199504898.25.54C117D Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf02.hostedemail.com (Postfix) with ESMTP id 230C580010 for ; Thu, 6 Jun 2024 06:36:26 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf02.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.189 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=1717655787; 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=X2T5SjfSLlo3Fw+620ziHItY48mlr8d/xzkyNpMM/iY=; b=WLtXNk6fVS/RTo+pZSHQ4EkfsDyIXh71+h3Z/IzJFYEY2Eja1jFZLW3v3Ef7YFpF0GmIZT oP5lXeCLKqpF+11d2YCw1sLu9A0N9pQ5XqLrKah93HczRs8AJXLK8ys+kXrkar6Qx8bwFo vONz5z+bd80e+hb3Wa8rHnhoxl/MXOY= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf02.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717655787; a=rsa-sha256; cv=none; b=T9LnuRM0EtplPZjunZtXI3O96v+nFgsF7KSUxgqY02MyEE6urcxULwo3Do18xaZ01MnGFJ p3a5z+wIvkNOwVz5YZLL0tsbreCXGMh0dchTWA/KLLYf/5l/BHXqtZsKNV9hsyQvUyFmcO OeWRP9Qq1m5iKuU3gBjekSjQe9satGg= Received: from mail.maildlp.com (unknown [172.19.88.194]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4Vvvf95PB3zPpZH; Thu, 6 Jun 2024 14:33:05 +0800 (CST) Received: from canpemm500002.china.huawei.com (unknown [7.192.104.244]) by mail.maildlp.com (Postfix) with ESMTPS id 16305140133; Thu, 6 Jun 2024 14:36:24 +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; Thu, 6 Jun 2024 14:36:23 +0800 From: Miaohe Lin To: , , CC: , , , , Subject: [PATCH v2 03/13] mm/memory-failure: add macro GET_PAGE_MAX_RETRY_NUM Date: Thu, 6 Jun 2024 14:32:37 +0800 Message-ID: <20240606063247.712575-4-linmiaohe@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240606063247.712575-1-linmiaohe@huawei.com> References: <20240606063247.712575-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-Stat-Signature: 9ufcyi3g33w5ff9sefpxw9t5ggbhzthj X-Rspamd-Queue-Id: 230C580010 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1717655786-599041 X-HE-Meta: U2FsdGVkX1/9yfAhFB41zUVxGJ2xeOUC3Zc53WLRDDbg3sxT0wpDIJiEI/04w5cyt8itH2v1xmRUf5UuW3UU6fjXVNaNYHG6Q1F13voER9r6zVLOCsFvX3N40sKZ0C8EMAmcFNSdXR1ZmkkXgWGJUSQKUnB0TKmhMxhlVeu1Zhv3SdanJhfUPvzXyysyWsTlyOOPKQfeUD/qi9TKa/HCQtIgt7foSI/SmaqfOUM2xDqZMTmb42VywC1jjqRTGL6eJyCIzKA9KC70MEQnz5Z7ahZ0I5f2mcZUvIf6glYCWxa0Jl+u0kPgcLvSzlAMWQkXBGOHSqKWBoeiwhvtN8MrDMLpmVdP0Am7hKHMCY5SrLh8tzfVR4he2Yvu/CvyCv7ZAneRrcIAoWtf9gUYfNuzg1q/kB5r3ZcG9wlxK+N6Q+Yrs/KA6yUx5s3i+WvWim2mdULkAcr+8FC64e5HiPBzRBnrcMZ6IyWYQ/ZHjfpfTosib3llIWM3O21b9LWWbL8e3gudxDKFSZ5DUH3HEECub+Mn8Ce7zkjfFAvgTe+Wm5TRAqeivZk/LtwS72pALL4eHE7PX5XBJ1XnhAZNeH5yk97z9avaaKsnlIfMCUfOGDghlSD30yx3rOcuslQrwSvf50KdYBk3qqWmVhL5Xr2Tizj4yer00jKCnKCKx7XmsucDyWXuC6g3AXA3Ho/pYK+bSr8FydN83HSwOmcCLjl+ySaKQhq+DNhoaRd70glEEgqFsdxJsBUpupCobYY2pTB8S5CtXerBNbD8VYB9KmQASMRQ1ExJMfHl7H5uN7B2DeTrZeaOwgLZVBkl7U/8HGkOMS9ULix1ukEurI+cVofPD0PtqBaYMpNhhYQsssfnsV8ZE6M/cRGfmftu4MsSMONhduyRB8l0bdxdJmXbbDkf4soYZjl8eoMZLtHcpYJ1Ip68VNPXQjRspwJZquC/dBsp6MZCX6j3xMSKigELEBS RW2xYahB HZ0NixrneOHtxBK/wZx5bOLrTwGuaYb8s9VXUlZlqkQk74sheOBYegpXSNQcejqdimK/JQBN3ATKxm38tybH6niiHzznrGKLtrdnQFsqcf0MXIORA4m2A5wDmUhebxSTxk37H4LG4J4/JsWk092I3mxQdffd9WbSVS5YpdiVdowY4aCR3GErzS91xGmumTZuczHnNSqtYopF4KRqZT1VdMp7aE8DAyW9pcRhOZ83ajv9dquc3X5WpTrHcePT6gu4+HDmkOcH79uAL65c= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000003, 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 4b9a9298d478..958b17a4b0f5 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1417,6 +1417,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; @@ -1431,12 +1433,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; } @@ -1462,7 +1464,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;