Date: Tue, 2 May 2023 11:39:50 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 32bb28d8ad31 - main - amd64: move definition of the struct pmap_pcids into _pmap.h Message-ID: <202305021139.342BdoTQ092283@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=32bb28d8ad31294579bd95c29e84a5985e543ae5 commit 32bb28d8ad31294579bd95c29e84a5985e543ae5 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2023-05-01 11:06:30 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2023-05-02 11:32:20 +0000 amd64: move definition of the struct pmap_pcids into _pmap.h and rename the structure to pmap_pcid. Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D39890 --- sys/amd64/amd64/pmap.c | 2 ++ sys/amd64/include/_pmap.h | 39 +++++++++++++++++++++++++++++++++++++++ sys/amd64/include/pmap.h | 8 ++------ 3 files changed, 43 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index e8a88aab3225..92d9a66837cd 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -4362,6 +4362,8 @@ pmap_free_pt_page(pmap_t pmap, vm_page_t m, bool zerofilled) pmap_pt_page_count_adj(pmap, -1); } +_Static_assert(sizeof(struct pmap_pcid) == 8, "Fix pcpu zone for pm_pcidp"); + /* * Initialize a preallocated and zeroed pmap structure, * such as one in a vmspace structure. diff --git a/sys/amd64/include/_pmap.h b/sys/amd64/include/_pmap.h new file mode 100644 index 000000000000..b4b1b5962838 --- /dev/null +++ b/sys/amd64/include/_pmap.h @@ -0,0 +1,39 @@ +/*- + * Copyright (c) 2014-2020 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by + * Konstantin Belousov <kib@FreeBSD.org> under sponsorship from + * the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _MACHINE__PMAP_H_ +#define _MACHINE__PMAP_H_ + +struct pmap_pcid { + uint32_t pm_pcid; + uint32_t pm_gen; +}; + +#endif diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h index d74f25cc8024..3b99b88742e5 100644 --- a/sys/amd64/include/pmap.h +++ b/sys/amd64/include/pmap.h @@ -291,6 +291,7 @@ #include <sys/_lock.h> #include <sys/_mutex.h> #include <sys/_pctrie.h> +#include <machine/_pmap.h> #include <sys/_pv_entry.h> #include <sys/_rangeset.h> #include <sys/_smr.h> @@ -371,11 +372,6 @@ enum pmap_type { PT_RVI, /* AMD's nested page tables */ }; -struct pmap_pcids { - uint32_t pm_pcid; - uint32_t pm_gen; -}; - /* * The kernel virtual address (KVA) of the level 4 page table page is always * within the direct map (DMAP) region. @@ -394,7 +390,7 @@ struct pmap { long pm_eptgen; /* EPT pmap generation id */ smr_t pm_eptsmr; int pm_flags; - struct pmap_pcids pm_pcids[MAXCPU]; + struct pmap_pcid pm_pcids[MAXCPU]; struct rangeset pm_pkru; };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305021139.342BdoTQ092283>