From patchwork Fri Jul 14 11:47:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 120221 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2271810vqm; Thu, 13 Jul 2023 21:47:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlFxC+J8rdl53YAc2osRu74rOw9qzcyjFs5cKUHPw+cpwLyYWk2Wa8JXabaKoCM4YAY34Hg5 X-Received: by 2002:a17:903:24d:b0:1b7:e49f:39 with SMTP id j13-20020a170903024d00b001b7e49f0039mr2782959plh.60.1689310070540; Thu, 13 Jul 2023 21:47:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689310070; cv=none; d=google.com; s=arc-20160816; b=YU9G+hqkWcY+wpOF4Zg56AMOJWm39giFm5ALUbyeV8W69c2kGx65TKvnkWRqjLbvCk tl+XcwpJ/j1dWPxCYulw1DY2fDjy4QVHsZvGA9UTYL8qW4FqiCVgjh6dmk7n0Pn7BGYx Ilu82iinFA93nqz1M1pnW76IpIytsauNbMH1ZH3+ol5QASvg5hwEZj1QGPmVcRs/6yEf SlYwb9tMJbjSSlHX8x2RMwG0ZgJjWA7QRpekVLF4EPHZ3bTPHKnqHopvh15sC3y9BG7/ CbS1WACo2teH6EanuUw+YwmA4Fk2mJz+96LhQ4iTDfXd98oGq76Ydi0GsnWjJa+c7r5k R28g== 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=HuAFzkYCtudd2IfjyV2rTq0SZj9mUjYjzTYhxEiIWeY=; fh=Gzi1aFpH4bsuJxl33dRilzaRcjMW8JVkCVkQbG3Bsew=; b=kqtt1hE3eBEIs2vQV4/WhSr2ogJDmRVCxMrWC9nScx7tv/Kxbkpl3fcZM8LtwRt+XV yjzdP1ud4VIcwoOYTy1hkjPv9o6kxCuwbtkJsFuwsAGY97lKrkhwaN3bJRDE7QO52dz1 0FWhIrqS9xuXEXaez0ff/Xvz6yIlXaMRzFHvAWLrvU/JyumdmVouz46DnI4cOrsqilyt aAfOLvekau0cpT9gG8kOC6BfV0UiOyHcQtVnZHJFjiZhEGaSmHUcMZ8SCDzSNXB70wwd mjrk5xLGlE5Lm3UX6I5MbGf4ncwzTvXfy76Y1p8SFvuw88wBCapazZSuKWbmwarEVqGR QEWA== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f4-20020a170902ce8400b001b8c6890612si6521427plg.594.2023.07.13.21.47.36; Thu, 13 Jul 2023 21:47:50 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234890AbjGNDrS (ORCPT + 99 others); Thu, 13 Jul 2023 23:47:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234575AbjGNDrO (ORCPT ); Thu, 13 Jul 2023 23:47:14 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7CAE26B6 for ; Thu, 13 Jul 2023 20:47:12 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R2HV46tfZz4f3jJJ for ; Fri, 14 Jul 2023 11:47:08 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBnTbE8xbBk4HW0Nw--.17751S3; Fri, 14 Jul 2023 11:47:09 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: shikemeng@huaweicloud.com Subject: [PATCH 1/3] mm/page_ext: remove unused return value of offline_page_ext Date: Fri, 14 Jul 2023 19:47:47 +0800 Message-Id: <20230714114749.1743032-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230714114749.1743032-1-shikemeng@huaweicloud.com> References: <20230714114749.1743032-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBnTbE8xbBk4HW0Nw--.17751S3 X-Coremail-Antispam: 1UD129KBjvdXoW7Xr1DtF4DKrWrJw1fGr4kWFg_yoWDJFb_AF Z7tw1kWw1qvF9Iv3WDJws7XryxJFWq9FnrWF1kJ3yayryxZrn5XF1rt3sxXr1kXr45ZFWa ga1qvrnFkry7XjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb6kFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_Jrv_JF4l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYx C7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWU JVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIx AIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyTuYvjTRN189UUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,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: INBOX X-GMAIL-THRID: 1771369996312464573 X-GMAIL-MSGID: 1771369996312464573 offline_page_ext always returns 0 and no caller checks the return value. Just remove unused return value of offline_page_ext. Signed-off-by: Kemeng Shi --- mm/page_ext.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mm/page_ext.c b/mm/page_ext.c index dc1626be458b..096451df1c87 100644 --- a/mm/page_ext.c +++ b/mm/page_ext.c @@ -430,7 +430,7 @@ static int __meminit online_page_ext(unsigned long start_pfn, return -ENOMEM; } -static int __meminit offline_page_ext(unsigned long start_pfn, +static void __meminit offline_page_ext(unsigned long start_pfn, unsigned long nr_pages) { unsigned long start, end, pfn; @@ -454,8 +454,6 @@ static int __meminit offline_page_ext(unsigned long start_pfn, for (pfn = start; pfn < end; pfn += PAGES_PER_SECTION) __free_page_ext(pfn); - return 0; - } static int __meminit page_ext_callback(struct notifier_block *self, From patchwork Fri Jul 14 11:47:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 120217 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2258961vqm; Thu, 13 Jul 2023 21:10:29 -0700 (PDT) X-Google-Smtp-Source: APBJJlFbvUdM3qt0Ic7mmqRivKas9LK2oqtdDCdIUwEyZIUY5dtcXeTN9m44FeeRwJ2Ri1+octMI X-Received: by 2002:a17:90b:19c3:b0:256:807e:6bd with SMTP id nm3-20020a17090b19c300b00256807e06bdmr2631405pjb.28.1689307829404; Thu, 13 Jul 2023 21:10:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689307829; cv=none; d=google.com; s=arc-20160816; b=PzMMvrHlouKrQZxqhp0l8qwiPqJVt/XqwDpIhJ5b0qqZdYSbkhinQPKrrqbm9tiiE7 zpV03KfOqxpsnn7e+mQCJLXIDms2eZceVmtSRwvH8Zbh9yCge1P9i9CNlgrUC+nMvj69 gjkmvGa+R3lHHYoVnVKubqAX+O8ZYmEdLbsDHsbBhkZIGdvoD+dnAUajMJupIjQDXWpH 2bG0tfvpQ1p+/qKUD8a6Axx2QcHFNhAsLz/GK954GKNAJj3kOmVzsXeLGMMc8SIX/zbf iKnkUqnnf4gsROqo6lGSEvK2+1CudCZR5g0jFIg391ulF1hxkc4BkvxdevNr5/mRf5vK 0hmA== 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=YIF/CILq6xB7k2rsfEIAFjPPlshvGr9SaJOMxy2kl1Q=; fh=Gzi1aFpH4bsuJxl33dRilzaRcjMW8JVkCVkQbG3Bsew=; b=IKBh0VewAi2UGTj9uZ0trFZ1JkycbvNvWv9WywLQUJQC88d7zyI+TE5OK9d4UlWZcr tln/NXqQOlimzpYnI2IGbRuOE+NVEU2+KbQp9/PabUzEaKQTbQuieFBaJTsGskAc0b2k VAg/CJpW6a+8DavEdoi3iGIn/hrnq3miBsOtWNkgp4Kxzy0WMu7/p13MWN80l14SCZtD p1qOClfVyKYbsq6NLkbZFIsWQk9hFe5nOnJPSp/wnpVuvRxpsbn/H7xegaU6P3cDHmzE 5JCyHeYvVe0Vxf4j4U3p5X7UHDTnoRtDAkSSU3VNjpBJL9dsu49DZjbf+hr9XJh6RS2r vnfA== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mh15-20020a17090b4acf00b00260f28b14e4si594343pjb.4.2023.07.13.21.10.15; Thu, 13 Jul 2023 21:10:29 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234886AbjGNDrP (ORCPT + 99 others); Thu, 13 Jul 2023 23:47:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234383AbjGNDrO (ORCPT ); Thu, 13 Jul 2023 23:47:14 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C8C226B5 for ; Thu, 13 Jul 2023 20:47:12 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4R2HV35Dmgz4f3swL for ; Fri, 14 Jul 2023 11:47:07 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBnTbE8xbBk4HW0Nw--.17751S4; Fri, 14 Jul 2023 11:47:10 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: shikemeng@huaweicloud.com Subject: [PATCH 2/3] mm/page_ext: remove rollback for untouched mem_section in online_page_ext Date: Fri, 14 Jul 2023 19:47:48 +0800 Message-Id: <20230714114749.1743032-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230714114749.1743032-1-shikemeng@huaweicloud.com> References: <20230714114749.1743032-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBnTbE8xbBk4HW0Nw--.17751S4 X-Coremail-Antispam: 1UD129KBjvdXoWrKFy8uF45CrW8Wr48Xr18Xwb_yoWfXFb_Aa 1xXFn7Xw1jvFnIqFWjywn7XryDW398Cw4jgFn7Gw4YyFySqwsYka4DtwnxZr1kXr4ay34Y kwsrZF4qqry2qjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb6AFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYx C7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8 JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIx AIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRET5lUUUUUU= = X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, MAY_BE_FORGED,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE, 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: INBOX X-GMAIL-THRID: 1771367646707393754 X-GMAIL-MSGID: 1771367646707393754 If init_section_page_ext failed, we only need rollback for mem_section before failed mem_section. Make rollback end point to failed mem_section to remove unnecessary rollback. As pfn += PAGES_PER_SECTION will be executed even if init_section_page_ext failed. So pfn points to mem_section after failed mem_section. Subtract one mem_section from pfn to get failed mem_section. Signed-off-by: Kemeng Shi --- mm/page_ext.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mm/page_ext.c b/mm/page_ext.c index 096451df1c87..f052397dc70f 100644 --- a/mm/page_ext.c +++ b/mm/page_ext.c @@ -424,6 +424,7 @@ static int __meminit online_page_ext(unsigned long start_pfn, return 0; /* rollback */ + end = pfn - PAGES_PER_SECTION; for (pfn = start; pfn < end; pfn += PAGES_PER_SECTION) __free_page_ext(pfn); From patchwork Fri Jul 14 11:47:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 120222 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2272061vqm; Thu, 13 Jul 2023 21:48:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlH/GDti2I9u/zVLW6T7jFlVhOadUIGtg6bD9DAyBFx8Y3r1ZNZqfzDYQ/fOo9Ve05WFYv1E X-Received: by 2002:a05:6830:39c8:b0:6b9:8357:61e6 with SMTP id bt8-20020a05683039c800b006b9835761e6mr4107745otb.35.1689310120023; Thu, 13 Jul 2023 21:48:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689310119; cv=none; d=google.com; s=arc-20160816; b=NmUSEFQSXg2RdXW6z2A0NCNNvOA0yVsbhirfYhe9kD7evp9HQP80b8r1Dcl/j6DwRm FSI6e74MiSfk35aI7k8nCmjvraxwU9odeH9fRfc2AjaQ+EIEG991eNu+vDmMDNGoR1aw ermgskH4Zrq55eYN5hQWdTazYPhfDTwU2YjFkPIbRW5t2ihEWpPqgZ9mtHvyADeVKwEx 1kLLoZzfr5+tOBsIDCQ0+wEw7AXMXz8ii4De+pmEviBcLxcEDd1HYvabGPb2oO8WY/g2 LiYT5S96d5+MPrlcl2C3Vc7sJ9mbpUPY/i+hkr3CsyW1+OeDMZfelYITnQYimLHa29iN EgQA== 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=315iybBJ6fMjnDRV9a8J/EZ4Zb1HUNpFnwxRjwE4fmY=; fh=Gzi1aFpH4bsuJxl33dRilzaRcjMW8JVkCVkQbG3Bsew=; b=xpFYqxyYjtJsE7cP2QoT0WDcaGrB7TA9bcmex7hNLplqwJxdxSLzB1f+bI52Pu6yuN mKjNbE3mZf0JxBLFXRbkQZJrx662J/T/PrXEIct17q1mqjqA9f+OdJ6Tb1mX/suhxVNe xLeOrCS6vr7KvXzocyPRPcZcEIWWv2GlzuGrZZgvj62YBiiklAexJyYDgZKs/2jKute3 7VVKERC9VIq8jc6o+pYBWtjJGKX3igOjOjwz9OXG0x1wrgjUnys9Ly800VNsAqUUhHbA 5pHb0OnFghHWRMvKxVcOZL2c5lWxBGzQTW5XKwQdvrOHBq/Q+1MNcyGhxUtHh3T8rxC7 6vLA== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s28-20020a63525c000000b0055bbb6fb4fasi6384795pgl.6.2023.07.13.21.48.26; Thu, 13 Jul 2023 21:48:39 -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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234915AbjGNDrX (ORCPT + 99 others); Thu, 13 Jul 2023 23:47:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234880AbjGNDrO (ORCPT ); Thu, 13 Jul 2023 23:47:14 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13D3D26BB for ; Thu, 13 Jul 2023 20:47:12 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4R2HV54lCsz4f3kKR for ; Fri, 14 Jul 2023 11:47:09 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBnTbE8xbBk4HW0Nw--.17751S5; Fri, 14 Jul 2023 11:47:10 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: shikemeng@huaweicloud.com Subject: [PATCH 3/3] mm/page_ext: move functions around for minor cleanups to page_ext Date: Fri, 14 Jul 2023 19:47:49 +0800 Message-Id: <20230714114749.1743032-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230714114749.1743032-1-shikemeng@huaweicloud.com> References: <20230714114749.1743032-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgBnTbE8xbBk4HW0Nw--.17751S5 X-Coremail-Antispam: 1UD129KBjvJXoWxWrWkJF4xJw47Aw13Zr45Awb_yoW5KFyfpr 1akw17tw15J3Wagwn7Ja1kCr15Grn5G3y7Jr17Kw1Fv3WYkr40gry7Kr90vryvgrW8Xry5 Xr4ktr1qk3WkJaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPSb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zV CS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E 5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAV WUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY 1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI 0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7s RNBT5UUUUUU== X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE,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: INBOX X-GMAIL-THRID: 1771370048344515785 X-GMAIL-MSGID: 1771370048344515785 1. move page_ext_get and page_ext_put down to remove forward declaration of lookup_page_ext. 2. move page_ext_init_flatmem_late down to existing non SPARS block to remove a new non SPARS block and to keep code for non SPARS tight. Signed-off-by: Kemeng Shi --- mm/page_ext.c | 96 ++++++++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 50 deletions(-) diff --git a/mm/page_ext.c b/mm/page_ext.c index f052397dc70f..4548fcc66d74 100644 --- a/mm/page_ext.c +++ b/mm/page_ext.c @@ -90,7 +90,6 @@ static struct page_ext_operations *page_ext_ops[] __initdata = { unsigned long page_ext_size; static unsigned long total_usage; -static struct page_ext *lookup_page_ext(const struct page *page); bool early_page_ext __meminitdata; static int __init setup_early_page_ext(char *str) @@ -137,62 +136,16 @@ static void __init invoke_init_callbacks(void) } } -#ifndef CONFIG_SPARSEMEM -void __init page_ext_init_flatmem_late(void) -{ - invoke_init_callbacks(); -} -#endif - static inline struct page_ext *get_entry(void *base, unsigned long index) { return base + page_ext_size * index; } -/** - * page_ext_get() - Get the extended information for a page. - * @page: The page we're interested in. - * - * Ensures that the page_ext will remain valid until page_ext_put() - * is called. - * - * Return: NULL if no page_ext exists for this page. - * Context: Any context. Caller may not sleep until they have called - * page_ext_put(). - */ -struct page_ext *page_ext_get(struct page *page) -{ - struct page_ext *page_ext; - - rcu_read_lock(); - page_ext = lookup_page_ext(page); - if (!page_ext) { - rcu_read_unlock(); - return NULL; - } - - return page_ext; -} - -/** - * page_ext_put() - Working with page extended information is done. - * @page_ext: Page extended information received from page_ext_get(). - * - * The page extended information of the page may not be valid after this - * function is called. - * - * Return: None. - * Context: Any context with corresponding page_ext_get() is called. - */ -void page_ext_put(struct page_ext *page_ext) +#ifndef CONFIG_SPARSEMEM +void __init page_ext_init_flatmem_late(void) { - if (unlikely(!page_ext)) - return; - - rcu_read_unlock(); + invoke_init_callbacks(); } -#ifndef CONFIG_SPARSEMEM - void __meminit pgdat_page_ext_init(struct pglist_data *pgdat) { @@ -536,3 +489,46 @@ void __meminit pgdat_page_ext_init(struct pglist_data *pgdat) } #endif + +/** + * page_ext_get() - Get the extended information for a page. + * @page: The page we're interested in. + * + * Ensures that the page_ext will remain valid until page_ext_put() + * is called. + * + * Return: NULL if no page_ext exists for this page. + * Context: Any context. Caller may not sleep until they have called + * page_ext_put(). + */ +struct page_ext *page_ext_get(struct page *page) +{ + struct page_ext *page_ext; + + rcu_read_lock(); + page_ext = lookup_page_ext(page); + if (!page_ext) { + rcu_read_unlock(); + return NULL; + } + + return page_ext; +} + +/** + * page_ext_put() - Working with page extended information is done. + * @page_ext: Page extended information received from page_ext_get(). + * + * The page extended information of the page may not be valid after this + * function is called. + * + * Return: None. + * Context: Any context with corresponding page_ext_get() is called. + */ +void page_ext_put(struct page_ext *page_ext) +{ + if (unlikely(!page_ext)) + return; + + rcu_read_unlock(); +}