From: ard.biesheuvel@linaro.org (Ard Biesheuvel)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/6] arm64: kvm: define PAGE_S2_DEVICE as read-only by default
Date: Wed, 17 Sep 2014 14:56:20 -0700 [thread overview]
Message-ID: <1410990981-665-6-git-send-email-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <1410990981-665-1-git-send-email-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.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@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 ffe1ba0506d1..51f6f5284ce5 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)
--
1.8.3.2
next prev parent reply other threads:[~2014-09-17 21:56 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-17 21:56 [PATCH 0/6] KVM: handling of MMIO pass-through regions Ard Biesheuvel
2014-09-17 21:56 ` [PATCH 1/6] arm/arm64: KVM: use __GFP_ZERO not memset() to get zeroed pages Ard Biesheuvel
2014-09-29 13:02 ` Christoffer Dall
2014-10-09 12:59 ` Marc Zyngier
2014-09-17 21:56 ` [PATCH 2/6] arm/arm64: KVM: fix potential NULL dereference in user_mem_abort() Ard Biesheuvel
2014-09-29 13:01 ` Christoffer Dall
2014-10-09 13:05 ` Marc Zyngier
2014-10-09 13:10 ` Ard Biesheuvel
2014-10-09 13:11 ` Christoffer Dall
2014-10-09 13:13 ` Marc Zyngier
2014-09-17 21:56 ` [PATCH 3/6] arm/arm64: KVM: add 'writable' parameter to kvm_phys_addr_ioremap Ard Biesheuvel
2014-09-25 0:03 ` Mario Smarduch
2014-09-29 12:23 ` Christoffer Dall
2014-09-29 18:02 ` Mario Smarduch
2014-09-29 18:26 ` Christoffer Dall
2014-09-29 12:59 ` Christoffer Dall
2014-10-09 13:07 ` Marc Zyngier
2014-10-09 13:11 ` Ard Biesheuvel
2014-10-09 13:46 ` Marc Zyngier
2014-09-17 21:56 ` [PATCH 4/6] ARM: kvm: define PAGE_S2_DEVICE as read-only by default Ard Biesheuvel
2014-09-29 13:05 ` Christoffer Dall
2014-10-09 13:10 ` Marc Zyngier
2014-09-17 21:56 ` Ard Biesheuvel [this message]
2014-09-29 13:06 ` [PATCH 5/6] arm64: " Christoffer Dall
2014-09-29 13:34 ` Will Deacon
2014-10-09 13:10 ` Marc Zyngier
2014-09-17 21:56 ` [PATCH 6/6] arm/arm64: KVM: map MMIO regions at creation time Ard Biesheuvel
2014-09-29 12:52 ` Christoffer Dall
2014-09-29 13:07 ` [PATCH 0/6] KVM: handling of MMIO pass-through regions Christoffer Dall
2014-10-01 5:36 ` Ard Biesheuvel
2014-10-10 11:08 ` Christoffer Dall
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=1410990981-665-6-git-send-email-ard.biesheuvel@linaro.org \
--to=ard.biesheuvel@linaro.org \
--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).