From: marc.zyngier@arm.com (Marc Zyngier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 07/12] arm64: kvm: define PAGE_S2_DEVICE as read-only by default
Date: Sat, 18 Oct 2014 12:56:57 +0100 [thread overview]
Message-ID: <1413633422-14907-8-git-send-email-marc.zyngier@arm.com> (raw)
In-Reply-To: <1413633422-14907-1-git-send-email-marc.zyngier@arm.com>
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Now that we support read-only memslots, we need to make sure that
pass-through device mappings are not mapped writable if the guest
has requested them to be read-only. The existing implementation
already honours this by calling kvm_set_s2pte_writable() on the new
pte in case of writable mappings, so all we need to do is define
the default pgprot_t value used for devices to be PTE_S2_RDONLY.
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
arch/arm64/include/asm/pgtable.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
index ffe1ba0..51f6f52 100644
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@ -79,7 +79,7 @@ extern void __pgd_error(const char *file, int line, unsigned long val);
#define PAGE_HYP_DEVICE __pgprot(PROT_DEVICE_nGnRE | PTE_HYP)
#define PAGE_S2 __pgprot(PROT_DEFAULT | PTE_S2_MEMATTR(MT_S2_NORMAL) | PTE_S2_RDONLY)
-#define PAGE_S2_DEVICE __pgprot(PROT_DEFAULT | PTE_S2_MEMATTR(MT_S2_DEVICE_nGnRE) | PTE_S2_RDWR | PTE_UXN)
+#define PAGE_S2_DEVICE __pgprot(PROT_DEFAULT | PTE_S2_MEMATTR(MT_S2_DEVICE_nGnRE) | PTE_S2_RDONLY | PTE_UXN)
#define PAGE_NONE __pgprot(((_PAGE_DEFAULT) & ~PTE_TYPE_MASK) | PTE_PROT_NONE | PTE_PXN | PTE_UXN)
#define PAGE_SHARED __pgprot(_PAGE_DEFAULT | PTE_USER | PTE_NG | PTE_PXN | PTE_UXN | PTE_WRITE)
--
2.1.1
next prev parent reply other threads:[~2014-10-18 11:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-18 11:56 [GIT PULL] Second pull request for KVM on arm/arm64 for 3.18 Marc Zyngier
2014-10-18 11:56 ` [PATCH 01/12] arm: kvm: fix CPU hotplug Marc Zyngier
2014-10-18 11:56 ` [PATCH 02/12] ARM: KVM: fix vgic-disabled build Marc Zyngier
2014-10-18 11:56 ` [PATCH 03/12] arm/arm64: KVM: use __GFP_ZERO not memset() to get zeroed pages Marc Zyngier
2014-10-18 11:56 ` [PATCH 04/12] arm/arm64: KVM: fix potential NULL dereference in user_mem_abort() Marc Zyngier
2014-10-18 11:56 ` [PATCH 05/12] arm/arm64: KVM: add 'writable' parameter to kvm_phys_addr_ioremap Marc Zyngier
2014-10-18 11:56 ` [PATCH 06/12] ARM: kvm: define PAGE_S2_DEVICE as read-only by default Marc Zyngier
2014-10-18 11:56 ` Marc Zyngier [this message]
2014-10-18 11:56 ` [PATCH 08/12] arm/arm64: KVM: map MMIO regions at creation time Marc Zyngier
2014-10-18 11:56 ` [PATCH 09/12] arm64: KVM: Implement 48 VA support for KVM EL2 and Stage-2 Marc Zyngier
2014-10-18 11:57 ` [PATCH 10/12] arm/arm64: KVM: Ensure memslots are within KVM_PHYS_SIZE Marc Zyngier
2014-10-18 11:57 ` [PATCH 11/12] arm: kvm: STRICT_MM_TYPECHECKS fix for user_mem_abort Marc Zyngier
2014-10-18 11:57 ` [PATCH 12/12] arm/arm64: KVM: Fix BE accesses to GICv2 EISR and ELRSR regs Marc Zyngier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413633422-14907-8-git-send-email-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).