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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 55F9DCA0EED for ; Thu, 28 Aug 2025 12:49:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version: Content-Transfer-Encoding:Content-Type:In-Reply-To:References:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=dhEedpfYEt1PcCJtARYDpqAPZgRl3DEDExfgwDPiBsk=; b=wY4w0EcLTxwpSbADFEjpuZH+GI 9zlEwIM5U7u3FAL9O2OyZWZBJfE5dKEOrpFpKkxWSrNWodO0jQNM9iwjOwzcypxzQH9wfO4nh21k3 m8og6uI9Uq2B/xEJ9kTFwbe6KJB56vu/bp7jEFsS9XoXzCOPyiw+KARUB1x0b334e6vznWL3WQoD4 4BvuZbG3F3iXYSQFe5mxFtmhl/9VqwcxapEvSzFjlMYIc53yBdT17cHeQ2/Doa7HPSC1z5WxF8Isn LhslzlTJO7huwSi1k7P/dwIxYEbDMZ43i+yOeJUB/OEkkiCNOd8VhjUn8Vs74vbUVuvvEAlSqEC6G 2+iGQ6kQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1urc4c-00000001cHP-1vxZ; Thu, 28 Aug 2025 12:49:50 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1urZ6d-0000000107B-2kKe for linux-arm-kernel@bombadil.infradead.org; Thu, 28 Aug 2025 09:39:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=MIME-Version:Content-Transfer-Encoding :Content-Type:In-Reply-To:References:Message-ID:Date:Subject:CC:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=dhEedpfYEt1PcCJtARYDpqAPZgRl3DEDExfgwDPiBsk=; b=U2n9bQp1Z7sq9qf9uGtAgpRNFR gliqBZflXQzmKg96SxowdgI5ishtmZmrOzvT2bIyzx3cYVqz2GLmpFx2keZoLwLRr/QltowHkLW8Y JqxiT01cJIbEjzj9p4rIVDwub/yAICcNz8K/1CMnt8Z1YsEb754MEqAbG1MKKsNVSRzkCxguSZvLN XkQRPq5cC7C2Y2GTWnuZJVvBuKzxrDlHeMlVswozjUk0ahZMheEUWS8C3mYfsG2+4GXFpNug5H6mt XeWHKPsqdOdDvYEWvHEdu382xycSBI0fDOwNu9o9x/eY/n+/MoJJ06sS9bW1y9hwnm3ePBuVmX/vm Dn/oWdjg==; Received: from fra-out-006.esa.eu-central-1.outbound.mail-perimeter.amazon.com ([18.197.217.180]) by desiato.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1urZ6a-00000002gTE-2bWt for linux-arm-kernel@lists.infradead.org; Thu, 28 Aug 2025 09:39:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.uk; i=@amazon.co.uk; q=dns/txt; s=amazoncorp2; t=1756373980; x=1787909980; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=dhEedpfYEt1PcCJtARYDpqAPZgRl3DEDExfgwDPiBsk=; b=aqr7VwiLFuoK7JYE07GOy3SyLCd8NwnsrRcefcNT0mkGAr0uWT7KRYCg xWTb0oTQummOQPNac7pclcytDw5TmoLalH4byEq3gNerEwTTxzLFlLyWA lSe1sa3DpWcXQw2edcMG4Hjeos9f3zgOnKw4zuTZWqzygYUWZWznFSxui l00l+TWulhULGltv47/QmSu3zP4n1IUMS8QEZOvzpyL0BmZOTbF8IL0Sy cYuUcsx2lludkUJ/zpuq1/XanI/vNdmhdY9CudbmWgdc4QyTCjUPCZyIe TX/401IYriaJXzqFxKjozYgrlaXYVXlqyYvy8opEjftjCJED1s6WQ9GLM Q==; X-CSE-ConnectionGUID: 94cnJsPZSVCixxOlDSzfKw== X-CSE-MsgGUID: 1aQWO5cOQ+KHlvOc/xQGIg== X-IronPort-AV: E=Sophos;i="6.17,290,1747699200"; d="scan'208";a="1302930" Received: from ip-10-6-11-83.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.11.83]) by internal-fra-out-006.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Aug 2025 09:39:30 +0000 Received: from EX19MTAEUB002.ant.amazon.com [54.240.197.224:20645] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.11.1:2525] with esmtp (Farcaster) id 2dd33327-f6b5-4325-83df-38702bedd8bd; Thu, 28 Aug 2025 09:39:29 +0000 (UTC) X-Farcaster-Flow-ID: 2dd33327-f6b5-4325-83df-38702bedd8bd Received: from EX19D015EUB003.ant.amazon.com (10.252.51.113) by EX19MTAEUB002.ant.amazon.com (10.252.51.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.17; Thu, 28 Aug 2025 09:39:25 +0000 Received: from EX19D015EUB004.ant.amazon.com (10.252.51.13) by EX19D015EUB003.ant.amazon.com (10.252.51.113) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.17; Thu, 28 Aug 2025 09:39:25 +0000 Received: from EX19D015EUB004.ant.amazon.com ([fe80::2dc9:7aa9:9cd3:fc8a]) by EX19D015EUB004.ant.amazon.com ([fe80::2dc9:7aa9:9cd3:fc8a%3]) with mapi id 15.02.2562.017; Thu, 28 Aug 2025 09:39:25 +0000 From: "Roy, Patrick" To: "david@redhat.com" , "seanjc@google.com" CC: "Roy, Patrick" , "tabba@google.com" , "ackerleytng@google.com" , "pbonzini@redhat.com" , "kvm@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "kvmarm@lists.linux.dev" , "linux-kernel@vger.kernel.org" , "linux-mm@kvack.org" , "rppt@kernel.org" , "will@kernel.org" , "vbabka@suse.cz" , "Cali, Marco" , "Kalyazin, Nikita" , "Thomson, Jack" , "Manwaring, Derek" Subject: [PATCH v5 07/12] KVM: selftests: set KVM_MEM_GUEST_MEMFD in vm_mem_add() if guest_memfd != -1 Thread-Topic: [PATCH v5 07/12] KVM: selftests: set KVM_MEM_GUEST_MEMFD in vm_mem_add() if guest_memfd != -1 Thread-Index: AQHcF/+kFWmAB7yvMUW8ahTYWv+Nrg== Date: Thu, 28 Aug 2025 09:39:25 +0000 Message-ID: <20250828093902.2719-8-roypat@amazon.co.uk> References: <20250828093902.2719-1-roypat@amazon.co.uk> In-Reply-To: <20250828093902.2719-1-roypat@amazon.co.uk> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.19.88.180] Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250828_103940_868802_9BC59DB9 X-CRM114-Status: GOOD ( 13.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Have vm_mem_add() always set KVM_MEM_GUEST_MEMFD in the memslot flags if=0A= a guest_memfd is passed in as an argument. This eliminates the=0A= possibility where a guest_memfd instance is passed to vm_mem_add(), but=0A= it ends up being ignored because the flags argument does not specify=0A= KVM_MEM_GUEST_MEMFD at the same time.=0A= =0A= This makes it easy to support more scenarios in which no vm_mem_add() is=0A= not passed a guest_memfd instance, but is expected to allocate one.=0A= Currently, this only happens if guest_memfd =3D=3D -1 but flags &=0A= KVM_MEM_GUEST_MEMFD !=3D 0, but later vm_mem_add() will gain support for=0A= loading the test code itself into guest_memfd (via=0A= GUEST_MEMFD_FLAG_MMAP) if requested via a special=0A= vm_mem_backing_src_type, at which point having to make sure the src_type=0A= and flags are in-sync becomes cumbersome.=0A= =0A= Signed-off-by: Patrick Roy =0A= ---=0A= tools/testing/selftests/kvm/lib/kvm_util.c | 26 +++++++++++++---------=0A= 1 file changed, 15 insertions(+), 11 deletions(-)=0A= =0A= diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/sel= ftests/kvm/lib/kvm_util.c=0A= index c3f5142b0a54..cc67dfecbf65 100644=0A= --- a/tools/testing/selftests/kvm/lib/kvm_util.c=0A= +++ b/tools/testing/selftests/kvm/lib/kvm_util.c=0A= @@ -1107,22 +1107,26 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_back= ing_src_type src_type,=0A= =0A= region->backing_src_type =3D src_type;=0A= =0A= - if (flags & KVM_MEM_GUEST_MEMFD) {=0A= - if (guest_memfd < 0) {=0A= + if (guest_memfd < 0) {=0A= + if (flags & KVM_MEM_GUEST_MEMFD) {=0A= uint32_t guest_memfd_flags =3D 0;=0A= TEST_ASSERT(!guest_memfd_offset,=0A= "Offset must be zero when creating new guest_memfd");=0A= guest_memfd =3D vm_create_guest_memfd(vm, mem_size, guest_memfd_flags);= =0A= - } else {=0A= - /*=0A= - * Install a unique fd for each memslot so that the fd=0A= - * can be closed when the region is deleted without=0A= - * needing to track if the fd is owned by the framework=0A= - * or by the caller.=0A= - */=0A= - guest_memfd =3D dup(guest_memfd);=0A= - TEST_ASSERT(guest_memfd >=3D 0, __KVM_SYSCALL_ERROR("dup()", guest_memf= d));=0A= }=0A= + } else {=0A= + /*=0A= + * Install a unique fd for each memslot so that the fd=0A= + * can be closed when the region is deleted without=0A= + * needing to track if the fd is owned by the framework=0A= + * or by the caller.=0A= + */=0A= + guest_memfd =3D dup(guest_memfd);=0A= + TEST_ASSERT(guest_memfd >=3D 0, __KVM_SYSCALL_ERROR("dup()", guest_memfd= ));=0A= + }=0A= +=0A= + if (guest_memfd > 0) {=0A= + flags |=3D KVM_MEM_GUEST_MEMFD;=0A= =0A= region->region.guest_memfd =3D guest_memfd;=0A= region->region.guest_memfd_offset =3D guest_memfd_offset;=0A= -- =0A= 2.50.1=0A= =0A=