From owner-dev-commits-src-main@freebsd.org Wed Jul 28 15:27:48 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 19FD865D04E; Wed, 28 Jul 2021 15:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GZcx00FVFz3LPk; Wed, 28 Jul 2021 15:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E5305206E4; Wed, 28 Jul 2021 15:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16SFRlu9087809; Wed, 28 Jul 2021 15:27:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16SFRlVM087808; Wed, 28 Jul 2021 15:27:47 GMT (envelope-from git) Date: Wed, 28 Jul 2021 15:27:47 GMT Message-Id: <202107281527.16SFRlVM087808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger Pau Monn=C3=A9?= Subject: git: b6ff9345a46a - main - xen: create VM_MEMATTR_XEN for Xen memory mappings MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6ff9345a46af564da32ad480490eaa97840d0b6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2021 15:27:48 -0000 The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=b6ff9345a46af564da32ad480490eaa97840d0b6 commit b6ff9345a46af564da32ad480490eaa97840d0b6 Author: Elliott Mitchell AuthorDate: 2021-04-06 07:59:30 +0000 Commit: Roger Pau Monné CommitDate: 2021-07-28 15:27:02 +0000 xen: create VM_MEMATTR_XEN for Xen memory mappings The requirements for pages shared with Xen/other VMs may vary from architecture to architecture. As such create a macro which various architectures can use. Remove a use of PAT_WRITE_BACK in xenstore.c. This is a x86-ism which shouldn't have been present in a common area. Original idea: Julien Grall , 2014-01-14 06:44:08 Approach suggested by: royger Reviewed by: royger, mhorne Differential Revision: https://reviews.freebsd.org/D29351 --- sys/dev/xen/bus/xenpv.c | 2 +- sys/dev/xen/console/xen_console.c | 2 +- sys/dev/xen/xenstore/xenstore.c | 2 +- sys/x86/include/xen/xen-os.h | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/xen/bus/xenpv.c b/sys/dev/xen/bus/xenpv.c index d9db10b7005d..080c82c73f08 100644 --- a/sys/dev/xen/bus/xenpv.c +++ b/sys/dev/xen/bus/xenpv.c @@ -125,7 +125,7 @@ xenpv_alloc_physmem(device_t dev, device_t child, int *res_id, size_t size) phys_addr = rman_get_start(res); error = vm_phys_fictitious_reg_range(phys_addr, phys_addr + size, - VM_MEMATTR_DEFAULT); + VM_MEMATTR_XEN); if (error) { bus_release_resource(child, SYS_RES_MEMORY, *res_id, res); return (NULL); diff --git a/sys/dev/xen/console/xen_console.c b/sys/dev/xen/console/xen_console.c index 7eed30885e6b..8ad755dbf214 100644 --- a/sys/dev/xen/console/xen_console.c +++ b/sys/dev/xen/console/xen_console.c @@ -273,7 +273,7 @@ static void xencons_early_init_ring(struct xencons_priv *cons) { cons->intf = pmap_mapdev_attr(ptoa(xen_get_console_mfn()), PAGE_SIZE, - VM_MEMATTR_WRITE_BACK); + VM_MEMATTR_XEN); cons->evtchn = xen_get_console_evtchn(); } diff --git a/sys/dev/xen/xenstore/xenstore.c b/sys/dev/xen/xenstore/xenstore.c index 890cfe009411..dc00ed0d50b8 100644 --- a/sys/dev/xen/xenstore/xenstore.c +++ b/sys/dev/xen/xenstore/xenstore.c @@ -1130,7 +1130,7 @@ xs_attach(device_t dev) } else { xs.gpfn = xen_get_xenstore_mfn(); xen_store = pmap_mapdev_attr(ptoa(xs.gpfn), PAGE_SIZE, - PAT_WRITE_BACK); + VM_MEMATTR_XEN); xs.initialized = true; } diff --git a/sys/x86/include/xen/xen-os.h b/sys/x86/include/xen/xen-os.h index 86bacadc8521..78d44ad7c9d7 100644 --- a/sys/x86/include/xen/xen-os.h +++ b/sys/x86/include/xen/xen-os.h @@ -30,6 +30,9 @@ #ifndef _MACHINE_X86_XEN_XEN_OS_H_ #define _MACHINE_X86_XEN_XEN_OS_H_ +/* Shared memory needs write-back as its cache attribute for coherency. */ +#define VM_MEMATTR_XEN VM_MEMATTR_WRITE_BACK + /* Everything below this point is not included by assembler (.S) files. */ #ifndef __ASSEMBLY__