From nobody Fri May 3 21:00:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1675756769; cv=none; d=zohomail.com; s=zohoarc; b=TOVPpJwSFh2Qbs+bxY2pvnvCU6VP8RUhkvAxOBEhH1wJCJcVshQwqT7Eihj8SpEcdcsviWSFCfn64ZIZH00Pv3B7xajqgwmJX+KMP+Cki8tTXGLbISV+VtciDrU7nqaeNljojLeInLVduPq1Qdupiq+fw+uiRbKABQSSDB7Ir0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675756769; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=5gbyCaKdJ8Mi2SS92SeXVfp2L0hg2wIdbGtZaSSemJk=; b=Oo1xWS4gdykrhiyQxYN+CAhDHdabzJi3C0oSW+69n8MrLIh/UW2GpCF1/tU4HE75kwe0bOGDKS+fvcuSk2LwLk6WUH/DKpOKzvGxDdhfoizWR8oUB84pgGf7IFoisvenIyRbrCdJ1T1hzjerHyXaRGpPQkPpT4NKtGfiZcs8JhU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1675756769611128.83306553498335; Mon, 6 Feb 2023 23:59:29 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.490898.759797 (Exim 4.92) (envelope-from ) id 1pPIse-00025U-Da; Tue, 07 Feb 2023 07:59:08 +0000 Received: by outflank-mailman (output) from mailman id 490898.759797; Tue, 07 Feb 2023 07:59:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pPIse-00025N-Ak; Tue, 07 Feb 2023 07:59:08 +0000 Received: by outflank-mailman (input) for mailman id 490898; Tue, 07 Feb 2023 07:59:06 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pPIsc-00025H-S1 for xen-devel@lists.xenproject.org; Tue, 07 Feb 2023 07:59:06 +0000 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 4a61e4af-a6bd-11ed-93b5-47a8fe42b414; Tue, 07 Feb 2023 08:59:04 +0100 (CET) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 4186C340B7; Tue, 7 Feb 2023 07:59:04 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C8DD613467; Tue, 7 Feb 2023 07:59:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id k7yxL8cE4mOhXgAAMHmgww (envelope-from ); Tue, 07 Feb 2023 07:59:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 4a61e4af-a6bd-11ed-93b5-47a8fe42b414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1675756744; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5gbyCaKdJ8Mi2SS92SeXVfp2L0hg2wIdbGtZaSSemJk=; b=cSLouw+eDRwsEhh4tCdzm/mXIkiN3VaizXDinxf3AxfRlZvMB13J7nYgvv8ambeU0sM7ey DfSm73Mxx8bw6U4fEBZZv1JatzASdbZIRMW3lo65fJ3jM7DsZCHiJEcXBD8HwsYeoYT9mU PVM2qzsER8TVJkPgRfU9baF5PVtydIw= From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org, virtualization@lists.linux-foundation.org Cc: Juergen Gross , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , "Srivatsa S. Bhat (VMware)" , Alexey Makhalov , VMware PV-Drivers Reviewers , Andy Lutomirski , Peter Zijlstra , Boris Ostrovsky , xen-devel@lists.xenproject.org Subject: [PATCH v2] x86/paravirt: merge activate_mm and dup_mmap callbacks Date: Tue, 7 Feb 2023 08:59:02 +0100 Message-Id: <20230207075902.7539-1-jgross@suse.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1675756771589100001 Content-Type: text/plain; charset="utf-8" The two paravirt callbacks .mmu.activate_mm and .mmu.dup_mmap are sharing the same implementations in all cases: for Xen PV guests they are pinning the PGD of the new mm_struct, and for all other cases they are a NOP. In the end both callbacks are meant to register an address space with the underlying hypervisor, so there needs to be only a single callback for that purpose. So merge them to a common callback .mmu.enter_mmap (in contrast to the corresponding already existing .mmu.exit_mmap). As the first parameter of the old callbacks isn't used, drop it from the replacement one. Signed-off-by: Juergen Gross Reviewed-by: Boris Ostrovsky Reviewed-by: Srivatsa S. Bhat (VMware) --- V2: - expand commit message (Srivatsa S. Bhat) --- arch/x86/include/asm/mmu_context.h | 4 ++-- arch/x86/include/asm/paravirt.h | 14 +++----------- arch/x86/include/asm/paravirt_types.h | 7 ++----- arch/x86/kernel/paravirt.c | 3 +-- arch/x86/mm/init.c | 2 +- arch/x86/xen/mmu_pv.c | 12 ++---------- 6 files changed, 11 insertions(+), 31 deletions(-) diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_= context.h index b8d40ddeab00..6a14b6c2165c 100644 --- a/arch/x86/include/asm/mmu_context.h +++ b/arch/x86/include/asm/mmu_context.h @@ -134,7 +134,7 @@ extern void switch_mm_irqs_off(struct mm_struct *prev, = struct mm_struct *next, =20 #define activate_mm(prev, next) \ do { \ - paravirt_activate_mm((prev), (next)); \ + paravirt_enter_mmap(next); \ switch_mm((prev), (next), NULL); \ } while (0); =20 @@ -167,7 +167,7 @@ static inline void arch_dup_pkeys(struct mm_struct *old= mm, static inline int arch_dup_mmap(struct mm_struct *oldmm, struct mm_struct = *mm) { arch_dup_pkeys(oldmm, mm); - paravirt_arch_dup_mmap(oldmm, mm); + paravirt_enter_mmap(mm); return ldt_dup_context(oldmm, mm); } =20 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravir= t.h index 73e9522db7c1..07bbdceaf35a 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -332,16 +332,9 @@ static inline void tss_update_io_bitmap(void) } #endif =20 -static inline void paravirt_activate_mm(struct mm_struct *prev, - struct mm_struct *next) +static inline void paravirt_enter_mmap(struct mm_struct *next) { - PVOP_VCALL2(mmu.activate_mm, prev, next); -} - -static inline void paravirt_arch_dup_mmap(struct mm_struct *oldmm, - struct mm_struct *mm) -{ - PVOP_VCALL2(mmu.dup_mmap, oldmm, mm); + PVOP_VCALL1(mmu.enter_mmap, next); } =20 static inline int paravirt_pgd_alloc(struct mm_struct *mm) @@ -787,8 +780,7 @@ extern void default_banner(void); =20 #ifndef __ASSEMBLY__ #ifndef CONFIG_PARAVIRT_XXL -static inline void paravirt_arch_dup_mmap(struct mm_struct *oldmm, - struct mm_struct *mm) +static inline void paravirt_enter_mmap(struct mm_struct *mm) { } #endif diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/p= aravirt_types.h index 8c1da419260f..71bf64b963df 100644 --- a/arch/x86/include/asm/paravirt_types.h +++ b/arch/x86/include/asm/paravirt_types.h @@ -164,11 +164,8 @@ struct pv_mmu_ops { unsigned long (*read_cr3)(void); void (*write_cr3)(unsigned long); =20 - /* Hooks for intercepting the creation/use of an mm_struct. */ - void (*activate_mm)(struct mm_struct *prev, - struct mm_struct *next); - void (*dup_mmap)(struct mm_struct *oldmm, - struct mm_struct *mm); + /* Hook for intercepting the creation/use of an mm_struct. */ + void (*enter_mmap)(struct mm_struct *mm); =20 /* Hooks for allocating and freeing a pagetable top-level */ int (*pgd_alloc)(struct mm_struct *mm); diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index 327757afb027..ff1109b9c6cd 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -352,8 +352,7 @@ struct paravirt_patch_template pv_ops =3D { .mmu.make_pte =3D PTE_IDENT, .mmu.make_pgd =3D PTE_IDENT, =20 - .mmu.dup_mmap =3D paravirt_nop, - .mmu.activate_mm =3D paravirt_nop, + .mmu.enter_mmap =3D paravirt_nop, =20 .mmu.lazy_mode =3D { .enter =3D paravirt_nop, diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index cb258f58fdc8..cbc53da4c1b4 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -806,7 +806,7 @@ void __init poking_init(void) BUG_ON(!poking_mm); =20 /* Xen PV guests need the PGD to be pinned. */ - paravirt_arch_dup_mmap(NULL, poking_mm); + paravirt_enter_mmap(poking_mm); =20 /* * Randomize the poking address, but make sure that the following page diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index ee29fb558f2e..b3b8d289b9ab 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -885,14 +885,7 @@ void xen_mm_unpin_all(void) spin_unlock(&pgd_lock); } =20 -static void xen_activate_mm(struct mm_struct *prev, struct mm_struct *next) -{ - spin_lock(&next->page_table_lock); - xen_pgd_pin(next); - spin_unlock(&next->page_table_lock); -} - -static void xen_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm) +static void xen_enter_mmap(struct mm_struct *mm) { spin_lock(&mm->page_table_lock); xen_pgd_pin(mm); @@ -2153,8 +2146,7 @@ static const typeof(pv_ops) xen_mmu_ops __initconst = =3D { .make_p4d =3D PV_CALLEE_SAVE(xen_make_p4d), #endif =20 - .activate_mm =3D xen_activate_mm, - .dup_mmap =3D xen_dup_mmap, + .enter_mmap =3D xen_enter_mmap, .exit_mmap =3D xen_exit_mmap, =20 .lazy_mode =3D { --=20 2.35.3