From patchwork Wed Nov 2 09:12:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 14130 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp3504052wru; Wed, 2 Nov 2022 02:14:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7DFLtW/pt3wAyokxR8YsBaqZWMRR2/0W5LjNQlDelYy30gQnUvrW7hoM1RAxny7o2qYTc7 X-Received: by 2002:a17:902:ab89:b0:186:7cfc:cde8 with SMTP id f9-20020a170902ab8900b001867cfccde8mr24149758plr.9.1667380487506; Wed, 02 Nov 2022 02:14:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667380487; cv=none; d=google.com; s=arc-20160816; b=h3LzHM0KX+m/9jtHEuS3gVNYw0sM3vGCuO14evE0H/Kv8r7sEUf7kjEIYcDBuIKgWZ Sfyvy3oeOWTXt05RXFWLlgirh8ZyftSiiHbPE2CGWY28xH5hWwTrKlH76cRq9UQeSOmO I5Z2ZPGD/dgxZlGeq5WinjBms7Jnmwz/GjlwHvDKTxVc0ugSXk+pE5BQmgVQiWV1kkna iYUi/+VADgWguxsd0m/c279RDN4uNE6+x8q7Uq0AG0W6eJECSWMQWxX3JvHKrz+TDjxP g+GngXMck9Kh5KkokySojk5rR8MD2Ej4g8fJByir0qbv1GLfOQKA0Amc37A6x5pQAuNc wHCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=nT/JozloBH7+PUWbpcAmpNUGYDd7rTLmAuTS7tB32Qc=; b=aS1fLotzV2EKNI+q+n+QxqDEvIRyN9BTXuscPZ3Jbe+kJ9/RCR6JlaadW/7QXQI+JO prNUFrpA9zGo8uov86egw0h37LfUxWBXsofRWn9v/vMZ+L3Ivb2XTB/mOb+fW1by8E+b sEkHsyKMBfKKNOunh3aWF5/QCPwATGrq6DhRetz5tV704jdk0B1KtrGsMS8WywzvFgaO rC/lHv8E9jlUfALkWV1OYaacseVssK8VyWv5Dmdu6cQjn6UbXJBZo0qyo7Vh1OvvFmJf BM33gvlJA68FTTlphEBxTfZq+UI057kgLfLdYAMqKdf5fJKnax8lK27sO/XIJ/ucgI2J Kcrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=JdlwGEuH; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s14-20020a170902ea0e00b00186ed93fc7fsi18784807plg.206.2022.11.02.02.14.34; Wed, 02 Nov 2022 02:14:47 -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; dkim=pass header.i=@linutronix.de header.s=2020 header.b=JdlwGEuH; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; 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=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231509AbiKBJOY (ORCPT + 99 others); Wed, 2 Nov 2022 05:14:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231420AbiKBJNF (ORCPT ); Wed, 2 Nov 2022 05:13:05 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF11528E24; Wed, 2 Nov 2022 02:12:44 -0700 (PDT) Date: Wed, 02 Nov 2022 09:12:41 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1667380363; h=from:from:sender:sender:reply-to: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; bh=nT/JozloBH7+PUWbpcAmpNUGYDd7rTLmAuTS7tB32Qc=; b=JdlwGEuHiz26RJhpzhJ5c4jctMsSqfmARje17mC/KQicmZcA7kdQiuJh6M9BdP4h57QqvP VCGYJ5uhSGDADRzBnbVFgiEElOFO/IvQ2/hBdD+wTJt6TkhuXnbL+8wrB+X7E1q4ci2kq8 FMtZiRhTWOuXs/RbG1nnQ7qUy6D9Pb3ICZYjkS+acMdZeS2++0g81G6bRv3g7d3287bdmq 1XFT52LEUffry8/gKbp86dzz5TM6C9sI6/BUetLelrJwbG10ExwGDmhnwmwo4B9BGB0bmJ qS1T/pEr9UtHBd3myiPC0gVg+6iCnAaAZvMutKc4cZAyhu40nxTX46Q742ScRw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1667380363; h=from:from:sender:sender:reply-to: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; bh=nT/JozloBH7+PUWbpcAmpNUGYDd7rTLmAuTS7tB32Qc=; b=NHiDrU3KA8ffCHFwEcWPHq3uVp6V4jZXyZXRy0qZUA2ReFrAVeuz0EvICdHadx1Hzx/7AN xv8WaqA5yo4sNBCg== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/mm] mm: Rename GUP_GET_PTE_LOW_HIGH Cc: Linus Torvalds , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <166738036185.7716.13753331721499010824.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS 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?1748375162051357898?= X-GMAIL-MSGID: =?utf-8?q?1748375162051357898?= The following commit has been merged into the x86/mm branch of tip: Commit-ID: 8f28b415703e1935457a4bf0be7f03dc5471d09f Gitweb: https://git.kernel.org/tip/8f28b415703e1935457a4bf0be7f03dc5471d09f Author: Peter Zijlstra AuthorDate: Fri, 21 Oct 2022 14:51:44 +02:00 Committer: Peter Zijlstra CommitterDate: Tue, 01 Nov 2022 13:44:01 +01:00 mm: Rename GUP_GET_PTE_LOW_HIGH Since it no longer applies to only PTEs, rename it to PXX. Suggested-by: Linus Torvalds Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20221022114424.776404066%40infradead.org --- arch/mips/Kconfig | 2 +- arch/sh/Kconfig | 2 +- arch/x86/Kconfig | 2 +- include/linux/pgtable.h | 4 ++-- mm/Kconfig | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index b26b776..15cb692 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -46,7 +46,7 @@ config MIPS select GENERIC_SCHED_CLOCK if !CAVIUM_OCTEON_SOC select GENERIC_SMP_IDLE_THREAD select GENERIC_TIME_VSYSCALL - select GUP_GET_PTE_LOW_HIGH if CPU_MIPS32 && PHYS_ADDR_T_64BIT + select GUP_GET_PXX_LOW_HIGH if CPU_MIPS32 && PHYS_ADDR_T_64BIT select HAVE_ARCH_COMPILER_H select HAVE_ARCH_JUMP_LABEL select HAVE_ARCH_KGDB if MIPS_FP_SUPPORT diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 5f220e9..0665ac0 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -24,7 +24,7 @@ config SUPERH select GENERIC_PCI_IOMAP if PCI select GENERIC_SCHED_CLOCK select GENERIC_SMP_IDLE_THREAD - select GUP_GET_PTE_LOW_HIGH if X2TLB + select GUP_GET_PXX_LOW_HIGH if X2TLB select HAVE_ARCH_AUDITSYSCALL select HAVE_ARCH_KGDB select HAVE_ARCH_SECCOMP_FILTER diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 67745ce..bb1f326 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -157,7 +157,7 @@ config X86 select GENERIC_TIME_VSYSCALL select GENERIC_GETTIMEOFDAY select GENERIC_VDSO_TIME_NS - select GUP_GET_PTE_LOW_HIGH if X86_PAE + select GUP_GET_PXX_LOW_HIGH if X86_PAE select HARDIRQS_SW_RESEND select HARDLOCKUP_CHECK_TIMESTAMP if X86_64 select HAVE_ACPI_APEI if ACPI diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 765fd4b..7dd3df7 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -305,7 +305,7 @@ static inline pmd_t pmdp_get(pmd_t *pmdp) } #endif -#ifdef CONFIG_GUP_GET_PTE_LOW_HIGH +#ifdef CONFIG_GUP_GET_PXX_LOW_HIGH /* * For walking the pagetables without holding any locks. Some architectures * (eg x86-32 PAE) cannot load the entries atomically without using expensive @@ -365,7 +365,7 @@ static inline pmd_t pmdp_get_lockless(pmd_t *pmdp) } #define pmdp_get_lockless pmdp_get_lockless #endif /* CONFIG_PGTABLE_LEVELS > 2 */ -#endif /* CONFIG_GUP_GET_PTE_LOW_HIGH */ +#endif /* CONFIG_GUP_GET_PXX_LOW_HIGH */ /* * We require that the PTE can be read atomically. diff --git a/mm/Kconfig b/mm/Kconfig index 57e1d8c..0eabd0b 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -1044,7 +1044,7 @@ config GUP_TEST comment "GUP_TEST needs to have DEBUG_FS enabled" depends on !GUP_TEST && !DEBUG_FS -config GUP_GET_PTE_LOW_HIGH +config GUP_GET_PXX_LOW_HIGH bool config ARCH_HAS_PTE_SPECIAL