From patchwork Tue May 16 06:38:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 94447 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp212475vqo; Mon, 15 May 2023 23:26:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5xBL9WnWaRHJjIgAnXso3Oz2KtytAbfB1eU7ZmPR5ZdWKQexRacVVF8fp2J95RdGbPNc3H X-Received: by 2002:a17:90a:7e90:b0:24e:272:2469 with SMTP id j16-20020a17090a7e9000b0024e02722469mr35923715pjl.18.1684218360651; Mon, 15 May 2023 23:26:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684218360; cv=none; d=google.com; s=arc-20160816; b=ZssLKw6UjJmWqJfa9wXJRRBEdgLH+uSAgTtgSGgttDa7vAUTJsLguOAgHTHzsXpA0L dtpMNzBg+Sc87y8QsJ9NDd0gx8SI0ThW3/nDHlal6JefgEtMM1KyG4Ocd4KrIo5Z4riE 7KXuIYDJ/Gdygq+A6mKVqCCeAePdF21IV+cUVAXoyF2WdRNc5rarmYVUKXVLQu2lAPox YiqDfgNM+zxys0xGHfT3qKuTRBKl6+8fBc956VYOTuPUUweFV599l7MBqtfp8ItBwJeT pj91UA1Pa2/MRfZ0h9soXaTnhwNVec1PYcSNsakFIzQuhOGjduqY5fbqbIQ+X8t97D+R 5bvQ== 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=4b99EODE3M968cRu0gr5EcqMioO2UY6+VKVSbMny83w=; b=03uhYSMuBR3WS23yGJoKKyw6nXE4V+wx56jZHSlPNjRByuOd80wzZeRifPBw1KHaP6 R7HmR6hcnJ/70/1rbOUZdjfohLy2OBm/Wyqpg8RZa02EREtCyQzN4n79JXA5gQArzka8 yuw8XY3jxcOxyA0R/Avfcu/4HEyAY69UQ9pAfrsueQpbKPi/TamE/AqKsMmUIuOROfWp ggvx4D28xDvkpf28AbSopX8UoaQNIX3rktvZVpmCrMkQ40Ay23JBc5fQIBWAW/NY3Zup SLWepgrazMA9MhVnCQCMgHl0B9lqXo3sBIwTfCJtW1DjxFrIPtzxWOtLivObok4ecrNa 8HqQ== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j20-20020a633c14000000b005303c1de315si18521515pga.853.2023.05.15.23.25.48; Mon, 15 May 2023 23:26:00 -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 S230271AbjEPGWX (ORCPT + 99 others); Tue, 16 May 2023 02:22:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230158AbjEPGV4 (ORCPT ); Tue, 16 May 2023 02:21:56 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2AD05468F; Mon, 15 May 2023 23:21:40 -0700 (PDT) Received: from dggpemm500001.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4QL5cb0cKzzqSMx; Tue, 16 May 2023 14:17:19 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Tue, 16 May 2023 14:21:37 +0800 From: Kefeng Wang To: Andrew Morton , Mike Rapoport , CC: David Hildenbrand , Oscar Salvador , "Rafael J. Wysocki" , Pavel Machek , Len Brown , Luis Chamberlain , Kees Cook , Iurii Zaikin , , , , , Kefeng Wang Subject: [PATCH v2 13/13] mm: page_alloc: move is_check_pages_enabled() into page_alloc.c Date: Tue, 16 May 2023 14:38:21 +0800 Message-ID: <20230516063821.121844-14-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230516063821.121844-1-wangkefeng.wang@huawei.com> References: <20230516063821.121844-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500001.china.huawei.com (7.185.36.107) 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766030951909942203?= X-GMAIL-MSGID: =?utf-8?q?1766030951909942203?= The is_check_pages_enabled() only used in page_alloc.c, move it into page_alloc.c, also use it in free_tail_page_prepare(). Signed-off-by: Kefeng Wang --- mm/internal.h | 5 ----- mm/page_alloc.c | 7 ++++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 5fdf930a87b5..bb6542279599 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -208,11 +208,6 @@ extern char * const zone_names[MAX_NR_ZONES]; /* perform sanity checks on struct pages being allocated or freed */ DECLARE_STATIC_KEY_MAYBE(CONFIG_DEBUG_VM, check_pages_enabled); -static inline bool is_check_pages_enabled(void) -{ - return static_branch_unlikely(&check_pages_enabled); -} - extern int min_free_kbytes; void setup_per_zone_wmarks(void); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 5e8680669388..1023f41de2fb 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -983,6 +983,11 @@ static inline bool free_page_is_bad(struct page *page) return true; } +static inline bool is_check_pages_enabled(void) +{ + return static_branch_unlikely(&check_pages_enabled); +} + static int free_tail_page_prepare(struct page *head_page, struct page *page) { struct folio *folio = (struct folio *)head_page; @@ -994,7 +999,7 @@ static int free_tail_page_prepare(struct page *head_page, struct page *page) */ BUILD_BUG_ON((unsigned long)LIST_POISON1 & 1); - if (!static_branch_unlikely(&check_pages_enabled)) { + if (!is_check_pages_enabled()) { ret = 0; goto out; }