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 617B7C4167D for ; Sun, 5 Nov 2023 16:35:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EF66F440175; Sun, 5 Nov 2023 11:35:18 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EA5AC440150; Sun, 5 Nov 2023 11:35:18 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D1FE5440175; Sun, 5 Nov 2023 11:35:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id BC391440150 for ; Sun, 5 Nov 2023 11:35:18 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 97442120438 for ; Sun, 5 Nov 2023 16:35:18 +0000 (UTC) X-FDA: 81424450716.03.065EC31 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf29.hostedemail.com (Postfix) with ESMTP id E2454120015 for ; Sun, 5 Nov 2023 16:35:16 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NT4jtxvX; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf29.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699202116; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=C3cPw9fVJCr14nLNRz67sgxMTBasbZijMDuS/BBzhTY=; b=lhkqsASN2hP1VjtQjk1Y57ATAZTS7Ruy1VY1RBW2tad+c85BuH9iDjQKgxMNXHJEcILpWp 4vWltX5qxJtbm1GGZruZGErCqEr0st6S+y/Z20MpOkofvU4ueJNyFX3TpczERIJCgZ5JF5 BK7vpskkYKkg0Yw3bSi0vj6w2ptC9q8= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=NT4jtxvX; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf29.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699202116; a=rsa-sha256; cv=none; b=35I7dPr7SuWGB0GRaPf4UdbpSRp204AammI8AY3DKqtlm1Im6CkYHatTFxPcDIrEXDXaTL cNrxfB5Hr+ho/7inxCQcwaPO6EOBjZxBS3uiRrRfsELYCCfcVj1kcalwH0fiHvQWB7OB+s IBwLaRwbvjsgG6qofo37BMGE6blQ5Oo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699202116; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C3cPw9fVJCr14nLNRz67sgxMTBasbZijMDuS/BBzhTY=; b=NT4jtxvXdcdUXKERd1fmTTRAa7DswFboQ9rmN9V3Ps6JLPy11JMCFn4rzr3MJtUnatesPh b9FEJQswOsOeYhjqMZGi0kI02piPuQlJ4ONmaeyXhhTSfIbKbRQiww2bE7ap2l4XVvsasb 1lO8gp5XuUNzXQZqoMv7J8w22M75IpM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-689-u2wPgqfeNgKSVK3J8tJjNw-1; Sun, 05 Nov 2023 11:35:12 -0500 X-MC-Unique: u2wPgqfeNgKSVK3J8tJjNw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CF79D80C344; Sun, 5 Nov 2023 16:35:10 +0000 (UTC) Received: from avogadro.redhat.com (unknown [10.39.192.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id 101EF2166B26; Sun, 5 Nov 2023 16:35:03 +0000 (UTC) From: Paolo Bonzini To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Sean Christopherson , Alexander Viro , Christian Brauner , "Matthew Wilcox (Oracle)" , Andrew Morton Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Xiaoyao Li , Xu Yilun , Chao Peng , Fuad Tabba , Jarkko Sakkinen , Anish Moorthy , David Matlack , Yu Zhang , Isaku Yamahata , =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Vlastimil Babka , Vishal Annapurve , Ackerley Tng , Maciej Szmigiero , David Hildenbrand , Quentin Perret , Michael Roth , Wang , Liam Merwick , Isaku Yamahata , "Kirill A. Shutemov" Subject: [PATCH 34/34] KVM: selftests: Add a memory region subtest to validate invalid flags Date: Sun, 5 Nov 2023 17:30:37 +0100 Message-ID: <20231105163040.14904-35-pbonzini@redhat.com> In-Reply-To: <20231105163040.14904-1-pbonzini@redhat.com> References: <20231105163040.14904-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Rspam-User: X-Stat-Signature: udhq6fsrhdx3snu63a5joh9mzetdu8x4 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E2454120015 X-HE-Tag: 1699202116-24745 X-HE-Meta: U2FsdGVkX19VEA+O2AfcDSoQzgwo6wQCulcIZqq4q0jib35Ek/fbPSc3nDTIVFtj1StCFFaC1bIUNErGAknhXdWe5c/pUjF4BA9LQHOOwLH+ppoebRwv8U24QPi81OPjD4F07y/x6S5vI0U4dtuQLvK2KrTQJ1TmMZnJuQzSchyLStLKu2QOnGdqou1p8yVn/Kn4p8duE2kuSMw2MqhiMnWKdyUjtKd8X72KORBOcFabRgiJyoH6GGptjQ0/uYBE1o4sM+xL4H37HUlXCOuUZdR2VMdFusv4nSDVDs2SP8OCIYbg+IPQjWpQxxM8DqyOmZtLIqjtll2iODcl2sjdoySvca0nh1n2uMJbXAKuIGU3B/YzJysb5j3mTPOnqh7GEgUYV3NU0aTR2LoZIqxL468nRNq3aIZWvfcY+dyupCU3sMuV9y2ZTTvBY7VG/ge70NSnY0yyX7CU0z2ofhqEcDvLV1MKBunA2NHtRWaiN0gZnI1+Wc2iS8WjgDZuQiWZe5lzoLiuFij4z0RhWgVK68JA7Bvk5kvYe2ZOZPV0513LNpUeqeb9ru6Z2dqYlKzsvKRhd83x9U8A+LH6TxsFTGWgJUeQZvMfkCuIYuvZdXrqVDIRjCpGMoOk/ht18z55Xq1RS2irYZPX08EJF0DG4uAhfnL0IeDcK2/ZlFtiBsOplWdNhHJyAi5DLZEWI6qb4ESMw9ZC6XECpzwpX+XCu+doL3kuwwm7mlIPpylgYgHFKYDv+lVOb1/7fnL22gspyxtq0wEV8XmFjkLC7FjmF+5FKOyOQdTyLM8fTV60mKeu3yAfQveFxO2GlekzvxdwJz9Aaa9xXUO7Dqcs6b74y/5yZL5PHMZ9AGN/Yz01hg3IBTa2tIEPw6hjK92D16ib6Cx0PF2G5FSvpq0/tkFl/leoAmrE9yhhK2rlz2cr4UEAtvtfT1h9dthrBxZNhi20faTsEaUZ5ZOt/62lATQ wNVKKOPS ORirpEvNCS4ZUqN+OnnRB4hzXI1NjMt7yqlCN45SVbdUOtaobO5T+lpWncLYeGdCpYbURzYyQ2xnfke2w4WHxn62o+S3gkI/ypmOUi4QKeH5JQCKK+LMSrhjleNYDv+LSEeYIHDY04BdBUMzdFmrTkbgVom90tD5yjX4Uiyba83eL4ZHDeniyGy7qfpdMPgt8y0D/gsEr/ukRCy2erHlsJhxZ+SACPKieCpzHf1/c2c/fWltZOlOivTw8569iyKb5ywdwR/FHklsDa/E= 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: From: Sean Christopherson Add a subtest to set_memory_region_test to verify that KVM rejects invalid flags and combinations with -EINVAL. KVM might or might not fail with EINVAL anyways, but we can at least try. Signed-off-by: Sean Christopherson Message-Id: <20231031002049.3915752-1-seanjc@google.com> Signed-off-by: Paolo Bonzini --- .../selftests/kvm/set_memory_region_test.c | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tools/testing/selftests/kvm/set_memory_region_test.c b/tools/testing/selftests/kvm/set_memory_region_test.c index 1891774eb6d4..343e807043e1 100644 --- a/tools/testing/selftests/kvm/set_memory_region_test.c +++ b/tools/testing/selftests/kvm/set_memory_region_test.c @@ -326,6 +326,53 @@ static void test_zero_memory_regions(void) } #endif /* __x86_64__ */ +static void test_invalid_memory_region_flags(void) +{ + uint32_t supported_flags = KVM_MEM_LOG_DIRTY_PAGES; + const uint32_t v2_only_flags = KVM_MEM_GUEST_MEMFD; + struct kvm_vm *vm; + int r, i; + +#ifdef __x86_64__ + supported_flags |= KVM_MEM_READONLY; + + if (kvm_check_cap(KVM_CAP_VM_TYPES) & BIT(KVM_X86_SW_PROTECTED_VM)) + vm = vm_create_barebones_protected_vm(); + else +#endif + vm = vm_create_barebones(); + + if (kvm_check_cap(KVM_CAP_MEMORY_ATTRIBUTES) & KVM_MEMORY_ATTRIBUTE_PRIVATE) + supported_flags |= KVM_MEM_GUEST_MEMFD; + + for (i = 0; i < 32; i++) { + if ((supported_flags & BIT(i)) && !(v2_only_flags & BIT(i))) + continue; + + r = __vm_set_user_memory_region(vm, MEM_REGION_SLOT, BIT(i), + MEM_REGION_GPA, MEM_REGION_SIZE, NULL); + + TEST_ASSERT(r && errno == EINVAL, + "KVM_SET_USER_MEMORY_REGION should have failed on v2 only flag 0x%lx", BIT(i)); + + if (supported_flags & BIT(i)) + continue; + + r = __vm_set_user_memory_region2(vm, MEM_REGION_SLOT, BIT(i), + MEM_REGION_GPA, MEM_REGION_SIZE, NULL, 0, 0); + TEST_ASSERT(r && errno == EINVAL, + "KVM_SET_USER_MEMORY_REGION2 should have failed on unsupported flag 0x%lx", BIT(i)); + } + + if (supported_flags & KVM_MEM_GUEST_MEMFD) { + r = __vm_set_user_memory_region2(vm, MEM_REGION_SLOT, + KVM_MEM_LOG_DIRTY_PAGES | KVM_MEM_GUEST_MEMFD, + MEM_REGION_GPA, MEM_REGION_SIZE, NULL, 0, 0); + TEST_ASSERT(r && errno == EINVAL, + "KVM_SET_USER_MEMORY_REGION2 should have failed, dirty logging private memory is unsupported"); + } +} + /* * Test it can be added memory slots up to KVM_CAP_NR_MEMSLOTS, then any * tentative to add further slots should fail. @@ -491,6 +538,8 @@ int main(int argc, char *argv[]) test_zero_memory_regions(); #endif + test_invalid_memory_region_flags(); + test_add_max_memory_regions(); if (kvm_has_cap(KVM_CAP_GUEST_MEMFD) && -- 2.39.1