Fix unsynchronized access to sev members through svm_register_enc_region
Subsystems (2)
PATCH 1/1 Fix unsynchronized access to sev members through svm_register_enc_region
commit 19a23da53932bc8011220bd8c410cb76012de004 upstream.
Grab kvm->lock before pinning memory when registering an encrypted region; sev_pin_memory() relies on kvm->lock being held to ensure correctness when checking and updating the number of pinned pages.
Add a lockdep assertion to help prevent future regressions.
V2
- Fix up patch description
- Correct file paths svm.c -> sev.c
- Add unlock of kvm->lock on sev_pin_memory error
V1
- https://lore.kernel.org/kvm/[email protected]/
Message-Id: <[email protected]>
--- arch/x86/kvm/svm.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
arch/x86/kvm/svm.c +11 -7
@@ -1830,6 +1830,8 @@ static struct page **sev_pin_memory(struct kvm *kvm, unsigned long uaddr,struct page **pages;unsigned long first, last; +lockdep_assert_held (&kvm->lock); +if (ulen ==0 || uaddr + ulen < uaddr)return NULL ;
@@ -7086,12 +7088,21 @@ static int svm_register_enc_region(struct kvm *kvm,if (!region)return -ENOMEM ; +mutex_lock (&kvm->lock); region->pages =sev_pin_memory (kvm, range->addr, range->size, ®ion->npages,1 );if (!region->pages) { ret = -ENOMEM ; +mutex_unlock (&kvm->lock); goto e_free; } + region->uaddr = range->addr; + region->size = range->size; + +mutex_lock (&kvm->lock); +list_add_tail (®ion->list, &sev->regions_list); +mutex_unlock (&kvm->lock); +/* * The guest may change the memory encryption attribute from C=0 -> C=1 * or vice versa for this memory range. Lets make sure caches are
@@ -7100,13 +7111,6 @@ static int svm_register_enc_region(struct kvm *kvm,*/ sev_clflush_pages (region->pages, region->npages); - region->uaddr = range->addr; - region->size = range->size; - -mutex_lock (&kvm->lock); -list_add_tail (®ion->list, &sev->regions_list); -mutex_unlock (&kvm->lock); -return ret; e_free:
Signature · 1 line
2.30.0.478.g8a0d178c01-goog
Quoted 77 lines · Peter Gonda
commit
19a23da53932bc8011220bd8c410cb76012de004upstream.Grab
kvm->lockbefore pinning memory when registering an encrypted region;sev_pin_memory()relies onkvm->lockbeing held to ensure correctness when checking and updating the number of pinned pages.Add a lockdep assertion to help prevent future regressions.
Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Joerg Roedel <[email protected]>Cc Tom Lendacky <[email protected]>Cc Brijesh Singh <[email protected]>Cc Sean Christopherson <[email protected]>Fixes 1e80fdc09d12 ("KVM: SVM: Pin guest memory when SEV is active")Signed-off-by Peter Gonda <[email protected]>V2
- Fix up patch description
- Correct file pathssvm.c->sev.c
- Add unlock ofkvm->lockonsev_pin_memoryerrorV1
- https://lore.kernel.org/kvm/[email protected]/Message-Id: <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>--- arch/x86/kvm/svm.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)arch/x86/kvm/svm.c +11
-0@@ -1830,6 +1830,8 @@ static struct page **sev_pin_memory(struct kvm *kvm, unsigned long uaddr,struct page **pages;unsigned long first, last; +lockdep_assert_held (&kvm->lock); +if (ulen ==0 || uaddr + ulen < uaddr)return NULL ;@@ -7086,12 +7088,21 @@ static int svm_register_enc_region(struct kvm *kvm,if (!region)return -ENOMEM ; +mutex_lock (&kvm->lock); region->pages =sev_pin_memory (kvm, range->addr, range->size, ®ion->npages,1 );if (!region->pages) { ret = -ENOMEM ; +mutex_unlock (&kvm->lock); goto e_free; } + region->uaddr = range->addr; + region->size = range->size; + +mutex_lock (&kvm->lock); +list_add_tail (®ion->list, &sev->regions_list); +mutex_unlock (&kvm->lock); +/* * The guest may change the memory encryption attribute from C=0 -> C=1 * or vice versa for this memory range. Lets make sure caches are @@ -7100,13 +7111,6 @@ static int svm_register_enc_region(struct kvm *kvm,*/ sev_clflush_pages (region->pages, region->npages);
arch/x86/kvm/svm.c static int svm_register_enc_region(struct kvm *kvm, · line 7116
Quoted 10 lines
arch/x86/kvm/svm.c +0
-7- region->uaddr = range->addr; - region->size = range->size; - -mutex_lock (&kvm->lock); -list_add_tail (®ion->list, &sev->regions_list); -mutex_unlock (&kvm->lock); -return ret; e_free:
Quoted 28 lines · Peter Gonda
commit
19a23da53932bc8011220bd8c410cb76012de004upstream.Grab
kvm->lockbefore pinning memory when registering an encrypted region;sev_pin_memory()relies onkvm->lockbeing held to ensure correctness when checking and updating the number of pinned pages.Add a lockdep assertion to help prevent future regressions.
Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Joerg Roedel <[email protected]>Cc Tom Lendacky <[email protected]>Cc Brijesh Singh <[email protected]>Cc Sean Christopherson <[email protected]>Fixes 1e80fdc09d12 ("KVM: SVM: Pin guest memory when SEV is active")Signed-off-by Peter Gonda <[email protected]>V2
- Fix up patch description
- Correct file pathssvm.c->sev.c
- Add unlock ofkvm->lockonsev_pin_memoryerror
Quoted 8 lines
V1
- https://lore.kernel.org/kvm/[email protected]/Message-Id: <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>--- arch/x86/kvm/svm.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)a
Both backports now queued up, thanks.
greg k-h
Hi Peter,
Quoted 56 lines · Peter Gonda
commit
19a23da53932bc8011220bd8c410cb76012de004upstream.Grab
kvm->lockbefore pinning memory when registering an encrypted region;sev_pin_memory()relies onkvm->lockbeing held to ensure correctness when checking and updating the number of pinned pages.Add a lockdep assertion to help prevent future regressions.
Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Joerg Roedel <[email protected]>Cc Tom Lendacky <[email protected]>Cc Brijesh Singh <[email protected]>Cc Sean Christopherson <[email protected]>Fixes 1e80fdc09d12 ("KVM: SVM: Pin guest memory when SEV is active")Signed-off-by Peter Gonda <[email protected]>V2
- Fix up patch description
- Correct file pathssvm.c->sev.c
- Add unlock ofkvm->lockonsev_pin_memoryerrorV1
- https://lore.kernel.org/kvm/[email protected]/Message-Id: <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>--- arch/x86/kvm/svm.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)arch/x86/kvm/svm.c +3
-0@@ -1830,6 +1830,8 @@ static struct page **sev_pin_memory(struct kvm *kvm, unsigned long uaddr,struct page **pages;unsigned long first, last; +lockdep_assert_held (&kvm->lock); +if (ulen ==0 || uaddr + ulen < uaddr)return NULL ;@@ -7086,12 +7088,21 @@ static int svm_register_enc_region(struct kvm *kvm,if (!region)return -ENOMEM ; +mutex_lock (&kvm->lock); region->pages =sev_pin_memory (kvm, range->addr, range->size, ®ion->npages,1 );
arch/x86/kvm/svm.c static int svm_register_enc_region(struct kvm *kvm, · line 7102
Quoted 10 lines
arch/x86/kvm/svm.c +5
-0if (!region->pages) { ret = -ENOMEM ; +mutex_unlock (&kvm->lock); goto e_free; } + region->uaddr = range->addr; + region->size = range->size; + +mutex_lock (&kvm->lock);
This extra mutex_lock call doesn't appear in the upstream patch (committed as 19a23da5393), but does appear in the 5.4 and 4.19 backports. Is it needed here?
-Dov
Quoted 21 lines
arch/x86/kvm/svm.c +3
-7+list_add_tail (®ion->list, &sev->regions_list); +mutex_unlock (&kvm->lock); +/* * The guest may change the memory encryption attribute from C=0 -> C=1 * or vice versa for this memory range. Lets make sure caches are @@ -7100,13 +7111,6 @@ static int svm_register_enc_region(struct kvm *kvm,*/ sev_clflush_pages (region->pages, region->npages); - region->uaddr = range->addr; - region->size = range->size; - -mutex_lock (&kvm->lock); -list_add_tail (®ion->list, &sev->regions_list); -mutex_unlock (&kvm->lock); -return ret; e_free:
Paolo Bonzini
maintainerQuoted 65 lines · Dov Murik
Hi Peter,
Quoted 62 lines · Peter Gonda
commit
19a23da53932bc8011220bd8c410cb76012de004upstream.Grab
kvm->lockbefore pinning memory when registering an encrypted region;sev_pin_memory()relies onkvm->lockbeing held to ensure correctness when checking and updating the number of pinned pages.Add a lockdep assertion to help prevent future regressions.
Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc "H. Peter Anvin" <[email protected]>Cc Paolo Bonzini <[email protected]>Cc Joerg Roedel <[email protected]>Cc Tom Lendacky <[email protected]>Cc Brijesh Singh <[email protected]>Cc Sean Christopherson <[email protected]>Fixes 1e80fdc09d12 ("KVM: SVM: Pin guest memory when SEV is active")Signed-off-by Peter Gonda <[email protected]>V2
- Fix up patch description
- Correct file pathssvm.c->sev.c
- Add unlock ofkvm->lockonsev_pin_memoryerrorV1
- https://lore.kernel.org/kvm/[email protected]/Message-Id: <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>--- arch/x86/kvm/svm.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)arch/x86/kvm/svm.c +4
-0@@ -1830,6 +1830,8 @@ static struct page **sev_pin_memory(struct kvm *kvm, unsigned long uaddr,struct page **pages;unsigned long first, last; +lockdep_assert_held (&kvm->lock); +if (ulen ==0 || uaddr + ulen < uaddr)return NULL ;@@ -7086,12 +7088,21 @@ static int svm_register_enc_region(struct kvm *kvm,if (!region)return -ENOMEM ; +mutex_lock (&kvm->lock); region->pages =sev_pin_memory (kvm, range->addr, range->size, ®ion->npages,1 );if (!region->pages) { ret = -ENOMEM ; +mutex_unlock (&kvm->lock); goto e_free; }
Quoted 8 lines
arch/x86/kvm/svm.c static int svm_register_enc_region(struct kvm *kvm, · line 7102
Quoted 4 lines
arch/x86/kvm/svm.c +4
-0+ region->uaddr = range->addr; + region->size = range->size; + +mutex_lock (&kvm->lock);This extra
mutex_lockcall doesn't appear in the upstream patch (committed as19a23da5393), but does appear in the 5.4 and 4.19 backports. Is it needed here?
Ouch. No it isn't and it's an insta-deadlock. Let me send a fix.
Paolo
Quoted 25 lines
-Dov
Quoted 21 lines
arch/x86/kvm/svm.c +3
-7+list_add_tail (®ion->list, &sev->regions_list); +mutex_unlock (&kvm->lock); +/* * The guest may change the memory encryption attribute from C=0 -> C=1 * or vice versa for this memory range. Lets make sure caches are @@ -7100,13 +7111,6 @@ static int svm_register_enc_region(struct kvm *kvm,*/ sev_clflush_pages (region->pages, region->npages); - region->uaddr = range->addr; - region->size = range->size; - -mutex_lock (&kvm->lock); -list_add_tail (®ion->list, &sev->regions_list); -mutex_unlock (&kvm->lock); -return ret; e_free: