From: Ricardo Koller <ricarkol@google.com>
To: Ben Gardon <bgardon@google.com>
Cc: kvm <kvm@vger.kernel.org>, Marc Zyngier <maz@kernel.org>,
Paolo Bonzini <pbonzini@redhat.com>,
Axel Rasmussen <axelrasmussen@google.com>,
kvmarm@lists.cs.columbia.edu
Subject: Re: [PATCH 06/11] KVM: selftests: Add missing close and munmap in __vm_mem_region_delete
Date: Fri, 18 Mar 2022 13:33:51 -0700 [thread overview]
Message-ID: <YjTsr3zPilDvHIF1@google.com> (raw)
In-Reply-To: <CANgfPd9d=C65y=hbpcf5y68d=u+p0LTtk3OO+q8reGmjv8TEEg@mail.gmail.com>
On Wed, Mar 16, 2022 at 12:09:44PM -0600, Ben Gardon wrote:
> On Fri, Mar 11, 2022 at 12:02 AM Ricardo Koller <ricarkol@google.com> wrote:
> >
> > Deleting a memslot (when freeing a VM) is not closing the backing fd,
> > nor it's unmapping the alias mapping. Fix by adding the missing close
> > and munmap.
> >
> > Signed-off-by: Ricardo Koller <ricarkol@google.com>
> > ---
> > tools/testing/selftests/kvm/lib/kvm_util.c | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
> > index ae21564241c8..c25c79f97695 100644
> > --- a/tools/testing/selftests/kvm/lib/kvm_util.c
> > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c
> > @@ -702,6 +702,12 @@ static void __vm_mem_region_delete(struct kvm_vm *vm,
> > sparsebit_free(®ion->unused_phy_pages);
> > ret = munmap(region->mmap_start, region->mmap_size);
> > TEST_ASSERT(ret == 0, "munmap failed, rc: %i errno: %i", ret, errno);
> > + if (region->fd >= 0) {
> > + /* There's an extra map if shared memory. */
>
> Nit: indentation
Will fix in v2.
Thanks for the reviews!
>
> > + ret = munmap(region->mmap_alias, region->mmap_size);
> > + TEST_ASSERT(ret == 0, "munmap failed, rc: %i errno: %i", ret, errno);
> > + close(region->fd);
> > + }
> >
> > free(region);
> > }
> > --
> > 2.35.1.723.g4982287a31-goog
> >
_______________________________________________
kvmarm mailing list
kvmarm@lists.cs.columbia.edu
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2022-03-18 20:34 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-11 6:01 [PATCH 00/11] KVM: selftests: Add aarch64/page_fault_test Ricardo Koller
2022-03-11 6:01 ` [PATCH 01/11] KVM: selftests: Add a userfaultfd library Ricardo Koller
2022-03-16 18:02 ` Ben Gardon
2022-03-18 20:27 ` Ricardo Koller
2022-03-11 6:01 ` [PATCH 02/11] KVM: selftests: Add vm_mem_region_get_src_fd library function Ricardo Koller
2022-03-16 18:08 ` Ben Gardon
2022-03-18 20:30 ` Ricardo Koller
2022-03-21 17:01 ` Ben Gardon
2022-03-11 6:01 ` [PATCH 03/11] KVM: selftests: aarch64: Add vm_get_pte_gpa " Ricardo Koller
2022-03-11 6:02 ` [PATCH 04/11] KVM: selftests: Add vm_alloc_page_table_in_memslot " Ricardo Koller
2022-03-16 18:07 ` Ben Gardon
2022-03-18 20:33 ` Ricardo Koller
2022-03-11 6:02 ` [PATCH 05/11] KVM: selftests: aarch64: Export _virt_pg_map with a pt_memslot arg Ricardo Koller
2022-03-11 6:02 ` [PATCH 06/11] KVM: selftests: Add missing close and munmap in __vm_mem_region_delete Ricardo Koller
2022-03-16 18:09 ` Ben Gardon
2022-03-18 20:33 ` Ricardo Koller [this message]
2022-03-11 6:02 ` [PATCH 07/11] KVM: selftests: aarch64: Add aarch64/page_fault_test Ricardo Koller
2022-03-11 6:02 ` [PATCH 08/11] KVM: selftests: aarch64: Add userfaultfd tests into page_fault_test Ricardo Koller
2022-03-11 6:02 ` [PATCH 09/11] KVM: selftests: aarch64: Add dirty logging " Ricardo Koller
2022-03-11 6:02 ` [PATCH 10/11] KVM: selftests: aarch64: Add readonly memslot " Ricardo Koller
2022-03-11 6:02 ` [PATCH 11/11] KVM: selftests: aarch64: Add mix of " Ricardo Koller
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=YjTsr3zPilDvHIF1@google.com \
--to=ricarkol@google.com \
--cc=axelrasmussen@google.com \
--cc=bgardon@google.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=maz@kernel.org \
--cc=pbonzini@redhat.com \
/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).