From nobody Mon Feb 9 15:08:34 2026 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 97D711CF96 for ; Fri, 20 Dec 2024 01:39:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734658754; cv=none; b=OpLTKFZV/8kO5AGkXuyXCJA/SkDCWoNgFJMrnjEhdkkvrCkDzDDG2UlB2gHWikdcgGrb+u2KhhtGcMOrdthDbddjKebUlXm8ZV+s429cAAVn/RKS2T4KqHWxy1ql3vmdmfNQJnsgb50z+fhJmzZirMRrLZDXTX5X8Td7G/lzIsk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734658754; c=relaxed/simple; bh=x+G/SKe65zYqmcjfUDWiwO99pE05MNdhz6X9PomzPYg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jPynmLQSpecoNVLLj8MSQZWXB8OXuZrY+Lj2wJIGhm4hEMDD+SSodGa0fxph4z3vg0U0+g9+jjJdWnK68eesrVcBGwbQ+NNOcdFQ5F/g5LLsXYLHBb4ibjG4ZSNz7y4JIzAoZXPI2Bt+cv0KNIps4ds4+HqWNgrt/oGC3Hs0qJ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Gy1sOYJ/; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Gy1sOYJ/" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-21655569152so12654755ad.2 for ; Thu, 19 Dec 2024 17:39:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1734658752; x=1735263552; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=VJst1sRt7o765YHKTsyCLHu+qBA9pewJkWtnndgMLN0=; b=Gy1sOYJ/9dNZiwp6AIpFu5aEI/7NnphKHg0vq0utlmoJw0iAG+yjGkYoeZ7HfFfSAA ZZBox9PpDLPhsQPOBoSiD7+ujZaWvJOK4MC8E9+Re8czgvInh4QrmQW7e/034Q1MrPna 0HSVUhFnWoWERjNYXIzAJS2Ouv0oDkpqTkZNzYJyUFpwjQWbVFSyX+lBgThwAi/zYUt9 jCjuSyJWzyQCf49Jw7tLuy8DOvsru5t7LdI02U6mwHDaXnIV1NesprwWMXIW0ccKu6S1 0cdOmOHqydF8XjdQJWsfxr3IgqB0BlfmFXW4JvYTdAvF5AfixJ+IVJNZWgXZMqF04KtP n3jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734658752; x=1735263552; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=VJst1sRt7o765YHKTsyCLHu+qBA9pewJkWtnndgMLN0=; b=e6uoMN/rAyUEEHgDr3cqZuR/l9YrAfPv562Xnr2JUlssvvqkoc+GtFytb+FBmiTLRg EVaR2ZqsW+a6jTXTl4TE4LtDLLcMrg3zIqT7CCS3DH7chNQYDi/y/lyoLDtQ+IN3hR9y /MDSSQU+n/CXKufcht4VCMoXuNcQwNiU+PeQ1l0rxvSPg11SrMAuePhAdGbNPLb+he/j dMvVp8ky4dY+3tNvaJrzDsmcUtBZfUgmA8CjMoQF9tOQZckralYudYpK/LJyd6b8RHyd X4dfVbpdeP+q95zQd5IE2PeWZb9vIUzG+ijGv/pqT63VPVNj2hLvdkJEQVK7Ly/d4Faj ZOSw== X-Forwarded-Encrypted: i=1; AJvYcCW81vq+30yE3sdwL6yqdJwaZJpRoXvjQDd4m6a8BPdsevCgOCkCTvgbIG4uVxdij6UMYgu6anyz8XzU+Uo=@vger.kernel.org X-Gm-Message-State: AOJu0Yw3iVsTyhStE+nBjxmv8FuQjXHleDB8UvgWUT8XphltZzyMoRLL Zpk1aD65nnn9csXh7F8P/VpCFBTu+8w3R7/MCrbLAHkgQsk5RBXC3c+lfJemTyqhxxniyC/V5Ez 8cQ== X-Google-Smtp-Source: AGHT+IGsWQbkvzY4Nq8NW+TxgBWjNbfzrSia5xRKbrBdsJJ8VjsmNkZOW2nxKqNkxRXVufnLriMmB7/RPeQ= X-Received: from plbkw12.prod.google.com ([2002:a17:902:f90c:b0:216:3e9d:6bc4]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:c406:b0:215:854c:a71a with SMTP id d9443c01a7336-219e6ebb68dmr11030635ad.34.1734658751894; Thu, 19 Dec 2024 17:39:11 -0800 (PST) Reply-To: Sean Christopherson Date: Thu, 19 Dec 2024 17:39:00 -0800 In-Reply-To: <20241220013906.3518334-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241220013906.3518334-1-seanjc@google.com> X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Message-ID: <20241220013906.3518334-3-seanjc@google.com> Subject: [PATCH 2/8] KVM: selftests: Close VM's binary stats FD when releasing VM From: Sean Christopherson To: Marc Zyngier , Oliver Upton , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson , Paolo Bonzini Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Close/free a VM's binary stats cache when the VM is released, not when the VM is fully freed. When a VM is re-created, e.g. for state save/restore tests, the stats FD and descriptor points at the old, defunct VM. The FD is still valid, in that the underlying stats file won't be freed until the FD is closed, but reading stats will always pull information from the old VM. Note, this is a benign bug in the current code base as none of the tests that recreate VMs use binary stats. Fixes: 83f6e109f562 ("KVM: selftests: Cache binary stats metadata for durat= ion of test") Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/lib/kvm_util.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/sel= ftests/kvm/lib/kvm_util.c index 91d295ef5d02..9138801ecb60 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -709,6 +709,15 @@ void kvm_vm_release(struct kvm_vm *vmp) =20 ret =3D close(vmp->kvm_fd); TEST_ASSERT(!ret, __KVM_SYSCALL_ERROR("close()", ret)); + + /* Free cached stats metadata and close FD */ + if (vmp->stats_desc) { + free(vmp->stats_desc); + vmp->stats_desc =3D NULL; + + ret =3D close(vmp->stats_fd); + TEST_ASSERT(!ret, __KVM_SYSCALL_ERROR("close()", ret)); + } } =20 static void __vm_mem_region_delete(struct kvm_vm *vm, @@ -748,12 +757,6 @@ void kvm_vm_free(struct kvm_vm *vmp) if (vmp =3D=3D NULL) return; =20 - /* Free cached stats metadata and close FD */ - if (vmp->stats_desc) { - free(vmp->stats_desc); - close(vmp->stats_fd); - } - /* Free userspace_mem_regions. */ hash_for_each_safe(vmp->regions.slot_hash, ctr, node, region, slot_node) __vm_mem_region_delete(vmp, region); --=20 2.47.1.613.gc27f4b7a9f-goog