From: Ahmed Abd El Mawgood <ahmedsoliman0x666@gmail.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
rkrcmar@redhat.com, Jonathan Corbet <corbet@lwn.net>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
hpa@zytor.com, x86@kernel.org, kvm@vger.kernel.org,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
ahmedsoliman0x666@gmail.com, Ovich00@gmail.com,
kernel-hardening@lists.openwall.com, nigel.edwards@hpe.com,
Boris Lukashev <blukashev@sempervictus.com>,
Hossam Hassan <7ossam9063@gmail.com>,
Ahmed Lotfy <A7med.lotfey@gmail.com>
Subject: [PATCH V4 5/5] KVM: Small Refactoring to kvm_free_memslot
Date: Sun, 21 Oct 2018 00:21:27 +0200 [thread overview]
Message-ID: <20181020222127.6368-6-ahmedsoliman0x666@gmail.com> (raw)
In-Reply-To: <20181020222127.6368-1-ahmedsoliman0x666@gmail.com>
This should be a little bit more readable and prone to memory leaks
Signed-off-by: Ahmed Abd El Mawgood <ahmedsoliman0x666@gmail.com>
---
virt/kvm/kvm_main.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index d4f36faacd29..75b5b2c987e9 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -552,11 +552,11 @@ static void kvm_destroy_dirty_bitmap(struct kvm_memory_slot *memslot)
* Free any memory in @free but not in @dont.
*/
static void kvm_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,
- struct kvm_memory_slot *dont)
+ struct kvm_memory_slot *dont,
+ enum kvm_mr_change change)
{
+ if (change == KVM_MR_DELETE) {
#ifdef CONFIG_KVM_ROE
- if (!dont) {
- //TODO still this might leak
struct protected_chunk *pos, *n;
struct list_head *head = free->prot_list;
kvfree(free->roe_bitmap);
@@ -566,10 +566,9 @@ static void kvm_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,
kvfree(pos);
}
kvfree(free->prot_list);
- }
#endif
- if (!dont || free->dirty_bitmap != dont->dirty_bitmap)
kvm_destroy_dirty_bitmap(free);
+ }
kvm_arch_free_memslot(kvm, free, dont);
@@ -584,7 +583,7 @@ static void kvm_free_memslots(struct kvm *kvm, struct kvm_memslots *slots)
return;
kvm_for_each_memslot(memslot, slots)
- kvm_free_memslot(kvm, memslot, NULL);
+ kvm_free_memslot(kvm, memslot, NULL, KVM_MR_DELETE);
kvfree(slots);
}
@@ -1097,14 +1096,14 @@ int __kvm_set_memory_region(struct kvm *kvm,
kvm_arch_commit_memory_region(kvm, mem, &old, &new, change);
- kvm_free_memslot(kvm, &old, &new);
+ kvm_free_memslot(kvm, &old, &new, change);
kvfree(old_memslots);
return 0;
out_slots:
kvfree(slots);
out_free:
- kvm_free_memslot(kvm, &new, &old);
+ kvm_free_memslot(kvm, &new, &old, change);
out:
return r;
}
--
2.18.1
prev parent reply other threads:[~2018-10-20 22:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-20 22:21 Read Only Enforcement patches V4 [VMM based kernel hardening] Ahmed Abd El Mawgood
2018-10-20 22:21 ` [PATCH V4 1/5] KVM: X86: Memory ROE documentation Ahmed Abd El Mawgood
2018-10-20 22:21 ` [PATCH V4 2/5] KVM: X86: Adding arbitrary data pointer in kvm memslot iterator functions Ahmed Abd El Mawgood
2018-10-20 22:21 ` [PATCH V4 3/5] KVM: X86: Adding skeleton for Memory ROE Ahmed Abd El Mawgood
2018-10-20 22:21 ` [PATCH V4 4/5] KVM: X86: Adding support for byte granular memory ROE Ahmed Abd El Mawgood
2018-10-20 22:21 ` Ahmed Abd El Mawgood [this message]
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=20181020222127.6368-6-ahmedsoliman0x666@gmail.com \
--to=ahmedsoliman0x666@gmail.com \
--cc=7ossam9063@gmail.com \
--cc=A7med.lotfey@gmail.com \
--cc=Ovich00@gmail.com \
--cc=blukashev@sempervictus.com \
--cc=bp@alien8.de \
--cc=corbet@lwn.net \
--cc=hpa@zytor.com \
--cc=kernel-hardening@lists.openwall.com \
--cc=kvm@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=nigel.edwards@hpe.com \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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).