From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 540A8C3ABD8 for ; Wed, 14 May 2025 23:43:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4B9F26B00CF; Wed, 14 May 2025 19:43:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 418A36B00D0; Wed, 14 May 2025 19:43:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 244106B00D2; Wed, 14 May 2025 19:43:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id ED2756B00CF for ; Wed, 14 May 2025 19:43:15 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 28F9C5A185 for ; Wed, 14 May 2025 23:43:17 +0000 (UTC) X-FDA: 83443142034.10.693C387 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf01.hostedemail.com (Postfix) with ESMTP id 5DD2040008 for ; Wed, 14 May 2025 23:43:15 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="kh/ul4ci"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf01.hostedemail.com: domain of 3kiolaAsKCMMjltn0un72wppxxpun.lxvurw36-vvt4jlt.x0p@flex--ackerleytng.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3kiolaAsKCMMjltn0un72wppxxpun.lxvurw36-vvt4jlt.x0p@flex--ackerleytng.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747266195; a=rsa-sha256; cv=none; b=1OEljYfTt0flXRAEiQz8wQ3t1EOdbZBO9y18b0nmcYel9fo7zpZgVHcFZP2RRfvRi85kMR MiWF7BEV7oS1FbwbKu8980XvNXQhI8SW3gprVOwYa8m97opJGZGKDgfln0NSTHd+VtMBNu WikKlFIZxtRy2bwwSeQzDmwPDvlDkbo= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b="kh/ul4ci"; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf01.hostedemail.com: domain of 3kiolaAsKCMMjltn0un72wppxxpun.lxvurw36-vvt4jlt.x0p@flex--ackerleytng.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3kiolaAsKCMMjltn0un72wppxxpun.lxvurw36-vvt4jlt.x0p@flex--ackerleytng.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747266195; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=mGWGFLne1bJyu7laipcwQPaVQw6rHvasb6OTJEqGffc=; b=bb3SFtxlLJz/jsjG1IZoFb5vcpdcG3N8BAPjoVhro9/p7v7NKm2NVi/EjKA1KTDzKz/Yvy oqc0IYtP1lavSkLJazV208liRflfMdrEBglke5RGJ2mI+ysws/k02vDRBY6/ustR81ikme LzR9VANl86UDsgZjLp1CO1tEPftYpfQ= Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-30ad9303655so659132a91.2 for ; Wed, 14 May 2025 16:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747266194; x=1747870994; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=mGWGFLne1bJyu7laipcwQPaVQw6rHvasb6OTJEqGffc=; b=kh/ul4ci+FH3NbpvZ7SxyQPQy1WjazdAAWv3io1BqKEg1ndXvDFN63OljYb4bp7ahF 9JJwQZOMJDiRZcgKNsy/uwI6LEAfGynAikdKyV9QDX0wZGtXuEgv7VGcAzAXUdMV6Wg2 sjziyhEY88QAKKsSSFPrI95Wm3OHMatltkNqQZqW/N+Xrtyg3eiwXKg/a5z0ZAOCEcgx JRL+hrNRMGTLS7a+YSgWnSBqfBeXl8ba85moGKYvBt1Z7SyevGbk1pdQIofU2Cnqlp8/ WhF9R/0G4WzVxyDJWR7ew7XmROxIWExPH0BsrGFjc/Di1qo+OeTAv3x+L8EsTnbW7AnU wAsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747266194; x=1747870994; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=mGWGFLne1bJyu7laipcwQPaVQw6rHvasb6OTJEqGffc=; b=bAnPoqKJsbZ3dnKmZalUwz5WHEz0m8Cl1vnjdu+1oYYHEWcUm7NqBrqyWeP935G525 0Vg0dsXc15MBGRW1cnZKu5kGMfPwaKAQzUB/nhTWNUyL260Ym0VW445ySNtxZ01OFaaQ EJZEFw6LGj+fYyyaAHf6SXWi6n/T1U1SRWAvkTtIkINoZEIgg7L/JJM30wZrNz6lAOUn 3p3vscpPg+lKivfzEMJQEAKla2Cm2eX5g3t5GCyVKsCn+j8Nkvqc/v0Y75x+VsD+E+78 9o5/wwLnK3dCIdSP+NHQ42yGFeuhtdFZzktJ2k10VWIepmk/SkQLL+52dpw0UgVBmIo2 aFYg== X-Forwarded-Encrypted: i=1; AJvYcCW6p1gy5Rm/bPAFmHHl18gKScmJPwPqag1ZQefOH49nQ3OYuwXcvuZ3ySEwXS4Nkatlk/P5GbeLyQ==@kvack.org X-Gm-Message-State: AOJu0Yx9iHHtj+erktvtBMxRQHmaFPesI5ni83Kzb6F9YnVSduq8CxyO b9mw6HFphdrXmlLPFuusFjZkMnGdpknumope1vzmpbT93OqmkTb7snv+xK7JVCw35Qy0ADOvS4v gFDDOVegZm5yIEQlNy4obWQ== X-Google-Smtp-Source: AGHT+IHW8Awj1az2kZDKXFyRTHzAsu7nHW73nuWNFHatSp354fmtn6egEeLp32OhYFxf0/BZ1Nce5gFMY5p11LmLng== X-Received: from pjbee14.prod.google.com ([2002:a17:90a:fc4e:b0:301:1bf5:2f07]) (user=ackerleytng job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:5788:b0:2fe:baa3:b8bc with SMTP id 98e67ed59e1d1-30e51930f95mr563390a91.23.1747266194209; Wed, 14 May 2025 16:43:14 -0700 (PDT) Date: Wed, 14 May 2025 16:41:50 -0700 In-Reply-To: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.49.0.1045.g170613ef41-goog Message-ID: <09e75529c3f844b1bb4dd5a096ed4160905fca7f.1747264138.git.ackerleytng@google.com> Subject: [RFC PATCH v2 11/51] KVM: selftests: Allow cleanup of ucall_pool from host From: Ackerley Tng To: kvm@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-fsdevel@vger.kernel.org Cc: ackerleytng@google.com, aik@amd.com, ajones@ventanamicro.com, akpm@linux-foundation.org, amoorthy@google.com, anthony.yznaga@oracle.com, anup@brainfault.org, aou@eecs.berkeley.edu, bfoster@redhat.com, binbin.wu@linux.intel.com, brauner@kernel.org, catalin.marinas@arm.com, chao.p.peng@intel.com, chenhuacai@kernel.org, dave.hansen@intel.com, david@redhat.com, dmatlack@google.com, dwmw@amazon.co.uk, erdemaktas@google.com, fan.du@intel.com, fvdl@google.com, graf@amazon.com, haibo1.xu@intel.com, hch@infradead.org, hughd@google.com, ira.weiny@intel.com, isaku.yamahata@intel.com, jack@suse.cz, james.morse@arm.com, jarkko@kernel.org, jgg@ziepe.ca, jgowans@amazon.com, jhubbard@nvidia.com, jroedel@suse.de, jthoughton@google.com, jun.miao@intel.com, kai.huang@intel.com, keirf@google.com, kent.overstreet@linux.dev, kirill.shutemov@intel.com, liam.merwick@oracle.com, maciej.wieczor-retman@intel.com, mail@maciej.szmigiero.name, maz@kernel.org, mic@digikod.net, michael.roth@amd.com, mpe@ellerman.id.au, muchun.song@linux.dev, nikunj@amd.com, nsaenz@amazon.es, oliver.upton@linux.dev, palmer@dabbelt.com, pankaj.gupta@amd.com, paul.walmsley@sifive.com, pbonzini@redhat.com, pdurrant@amazon.co.uk, peterx@redhat.com, pgonda@google.com, pvorel@suse.cz, qperret@google.com, quic_cvanscha@quicinc.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, quic_svaddagi@quicinc.com, quic_tsoni@quicinc.com, richard.weiyang@gmail.com, rick.p.edgecombe@intel.com, rientjes@google.com, roypat@amazon.co.uk, rppt@kernel.org, seanjc@google.com, shuah@kernel.org, steven.price@arm.com, steven.sistare@oracle.com, suzuki.poulose@arm.com, tabba@google.com, thomas.lendacky@amd.com, usama.arif@bytedance.com, vannapurve@google.com, vbabka@suse.cz, viro@zeniv.linux.org.uk, vkuznets@redhat.com, wei.w.wang@intel.com, will@kernel.org, willy@infradead.org, xiaoyao.li@intel.com, yan.y.zhao@intel.com, yilun.xu@intel.com, yuzenghui@huawei.com, zhiquan1.li@intel.com Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 5DD2040008 X-Stat-Signature: q6tndhe93n6ca4hapkw3w3u34jcd8be8 X-HE-Tag: 1747266195-883784 X-HE-Meta: U2FsdGVkX1/7hYUoOTA4llOUomSMKK60v5Oae2oKifctiGpwKeFe/lF1C4A5d3siNhRUk2Hl1aM1UaVKXTIvZISJxuMx7MT+iT1xwVSJgRC0DxCTyE1fVYmkFQZx9mCa6qvZArSs+fCAtFsYSUASfcD7uBrxKfwVBYEnFS0dPc8PQcotqSXAzPqm+EdZVk0UX+DolJJCMHOeAkSEZEbiP5T5dN730uKtX2HsGGn+CbsLRkZzTG/62TEj6ahH0nhYVd/OGJrsdPcaiqK/ZEloV7OjAn8WzPhCqT+U5rZyrYP7HNv4cu3xCHvHOxCbZhp/zw0fDm61LcsQQOjyGycviCt+PW6oUG9QzI7uos4QxXVmyJX7aB7hdS0WtHxuGNcbpr+uNE3rmwcwvNeJNruMemxrIac/muKGO025yXqgKWQ5Xk046bJiWITtEWZ18tKX3Qb5o3VpDE/ViqFGx5SfR7ldL6uCp9hMTtLaJh/x+l/I0OVU06WgxvqBY6RYHmh+FhDwg5gW2HRkTijB3Cnl7tA3jVFRmiB82xFU3xsycerU6PUHjmdhMhPsm2l8hVcR7GU+WmoMYvz4/e+M8iQd4MelPyUnB5km5OrndaWTDETUueVZvHtzHsKzn+LgMvqEC0pWGtqUXs30KQXa6a8WnLmq2lvjAYrq9tzQ99XnEpW8pGEM6oytzj1mvVjTfEaQGgW/Eyoz7Mr4PI56ezS73AVOY2KdjRap9CgAEMZzGNFdofoD5rRxQmPQaTy9uU6YI1DgL7eu8evsAsa+76tpBZ9WZUC+PXq2I+usjFJYkyfhEPiJIfMKdSzOi9Tong5BIyg913bZdfddRpUa40rH3fPyC23fW7IuKi/lBx2U5jdrV7x2m33lP+g24vrXV/0cdm7q6o3Ns6YW/UD8Eew6Ol2MDTi+dUbciYh40E8pg/S+wwW/aG4yHj41dzSBMfNK2555TGpOgBkrW72+FA7 z30kkoDO iRsMLgwhyZhNQO5/tQfotuBxqpxA8XYBqt9nQFzJl4LqNUohTnaRXnqRrL1AsJb+ul1h0vmppqWyd4yT1BcI6OImDBJlH3BlWU/f49/V7uWYYk0PbDW9HMx5NkdkqHQ2iH+7X4cQRFm8FVU2OAIW1JP129fs4/BPXdfROFAEIXvRN6CEH0FVuMrw6kg6MewfBTZTd+JzbRh3cVjKThWXaVSyOrIlhJ9TjFULvc7CbridlyC5LRPgC78IYQFrPpZ2pIzD3Rw07JUy04zL8c4bx9tDSt6WH66SqnPBKsWfWW1XwmxuSfEh7jjQg2VRvcP0OEjoCI0G24I1lU1IMxg50lxbdDn23wjCfCml5cUqg3pTUIFl1nv7zbmcbdN1RmlDsHKj55srLyHvi9gVVEzIQsDVZOI9Q4iyLUKpO/QQXHd39EROIDFAn5hBFR9Fi2/t7SWJJ7NdEEoXo/jPf3eI+RpUJIbi28KzjUCVVJC4IxEZzYEwm9pDlOiOxfOuHC39lVQiB/yLYwjpAKNpwXxa5JaM+nsMybbUqVdKriNSganWYkMqguMKGevJr+fmXPXAPMkOlSD82ayhR2lakVdaNRn6FEYAO1J7WxA9p7p6E44dOXIiTCFtYICNQ4Nag75OINdvT4/1YbBg3pP8oruPzTbH4Ym9ndqs9f8nYLRLWPaGX3wJnoXsFs+lOM7oRj2dedhSYe8UZeQSsdMU= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Many selftests use GUEST_DONE() to signal the end of guest code, which is handled in userspace. In most tests, the test exits and there is no need to clean up the ucall_pool->in_use bitmap. If there are many guest code functions using GUEST_DONE(), or of guest code functions are run many times, the ucall_pool->in_use bitmap will fill up, causing later runs of the same guest code function to fail. This patch allows ucall_free() to be called from userspace on uc.hva, which will unset and free the correct struct ucall in the pool, allowing ucalls to continue being used. Change-Id: I2cb2aeed4b291b1bfb2bece001d09c509cd10446 Signed-off-by: Ackerley Tng --- .../testing/selftests/kvm/include/ucall_common.h | 1 + tools/testing/selftests/kvm/lib/ucall_common.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/kvm/include/ucall_common.h b/tools/testing/selftests/kvm/include/ucall_common.h index d9d6581b8d4f..b6b850d0319a 100644 --- a/tools/testing/selftests/kvm/include/ucall_common.h +++ b/tools/testing/selftests/kvm/include/ucall_common.h @@ -40,6 +40,7 @@ __printf(5, 6) void ucall_assert(uint64_t cmd, const char *exp, const char *fmt, ...); uint64_t get_ucall(struct kvm_vcpu *vcpu, struct ucall *uc); void ucall_init(struct kvm_vm *vm, vm_paddr_t mmio_gpa); +void ucall_free(struct ucall *uc); int ucall_nr_pages_required(uint64_t page_size); /* diff --git a/tools/testing/selftests/kvm/lib/ucall_common.c b/tools/testing/selftests/kvm/lib/ucall_common.c index 42151e571953..9b6865c39ea7 100644 --- a/tools/testing/selftests/kvm/lib/ucall_common.c +++ b/tools/testing/selftests/kvm/lib/ucall_common.c @@ -21,24 +21,24 @@ int ucall_nr_pages_required(uint64_t page_size) /* * ucall_pool holds per-VM values (global data is duplicated by each VM), it - * must not be accessed from host code. + * should generally not be accessed from host code other than via ucall_free(), + * to cleanup after using GUEST_DONE() */ static struct ucall_header *ucall_pool; void ucall_init(struct kvm_vm *vm, vm_paddr_t mmio_gpa) { - struct ucall_header *hdr; struct ucall *uc; vm_vaddr_t vaddr; int i; - vaddr = vm_vaddr_alloc_shared(vm, sizeof(*hdr), KVM_UTIL_MIN_VADDR, - MEM_REGION_DATA); - hdr = (struct ucall_header *)addr_gva2hva(vm, vaddr); - memset(hdr, 0, sizeof(*hdr)); + vaddr = vm_vaddr_alloc_shared(vm, sizeof(*ucall_pool), + KVM_UTIL_MIN_VADDR, MEM_REGION_DATA); + ucall_pool = (struct ucall_header *)addr_gva2hva(vm, vaddr); + memset(ucall_pool, 0, sizeof(*ucall_pool)); for (i = 0; i < KVM_MAX_VCPUS; ++i) { - uc = &hdr->ucalls[i]; + uc = &ucall_pool->ucalls[i]; uc->hva = uc; } @@ -73,7 +73,7 @@ static struct ucall *ucall_alloc(void) return NULL; } -static void ucall_free(struct ucall *uc) +void ucall_free(struct ucall *uc) { /* Beware, here be pointer arithmetic. */ clear_bit(uc - ucall_pool->ucalls, ucall_pool->in_use); -- 2.49.0.1045.g170613ef41-goog