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 AA881C4345F for ; Thu, 25 Apr 2024 15:09:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3036D6B0099; Thu, 25 Apr 2024 11:09:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2B2E46B009B; Thu, 25 Apr 2024 11:09:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 153CF6B009C; Thu, 25 Apr 2024 11:09:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id ED03B6B0099 for ; Thu, 25 Apr 2024 11:09:53 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 98C40805E6 for ; Thu, 25 Apr 2024 15:09:53 +0000 (UTC) X-FDA: 82048389066.13.061948D Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf01.hostedemail.com (Postfix) with ESMTP id BC8AA4000A for ; Thu, 25 Apr 2024 15:09:51 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=wU2SCMjB; spf=pass (imf01.hostedemail.com: domain of 3PnIqZgYKCAUxjfsohlttlqj.htrqnsz2-rrp0fhp.twl@flex--seanjc.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3PnIqZgYKCAUxjfsohlttlqj.htrqnsz2-rrp0fhp.twl@flex--seanjc.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714057791; a=rsa-sha256; cv=none; b=hEyivLT3E7vtOIX8TSS1JDhKCbZA42f8PpK4zUPZLGLGNdlQbXMNDwrTSSuzs+r9HQ6x3B W6wLAFwpIi8En+Dg6bgN2NiV9Xg++5TwRwQyoKN/MXzqfEQN2ybYFzoAFow4ANdBfBm1ti 61tdlgnz3MepsuHMhXvucI2se39h0D8= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=wU2SCMjB; spf=pass (imf01.hostedemail.com: domain of 3PnIqZgYKCAUxjfsohlttlqj.htrqnsz2-rrp0fhp.twl@flex--seanjc.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3PnIqZgYKCAUxjfsohlttlqj.htrqnsz2-rrp0fhp.twl@flex--seanjc.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714057791; 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=m1qzGW4ycfJBkwOtQag42BpB9F1dgLw6AsC1TpSQ/BE=; b=LqvQPU+TdT2v/Ouh+NwIAbGI6eIipmfs9mKrceVGiaGpVJecWdXyl05HKZgKjZbCr8dtZM ydD3lVqUK3cfIPbRmVKD8gtk8F4Ri8heFF4tSipRxH8b33BNHMmoVsk5Tghw76UBf6kzyE iNtDm2eKCVDWiUk43tx/Rupt4zcB/bg= Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc6ceade361so2820231276.0 for ; Thu, 25 Apr 2024 08:09:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1714057791; x=1714662591; 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=m1qzGW4ycfJBkwOtQag42BpB9F1dgLw6AsC1TpSQ/BE=; b=wU2SCMjBM6IMNP35m7+vWNem19JIIZDdyneNSRiOwcWK+1KJ3mq4E8zhxz2NI/qD0o mEf1qkZUlJCG7fREsEW8WoF+3r36Wm+y0bY0xaDA2q3Ga82TPN8KwaKgB/Gj3fZcKV6M cCRv6si4xqXSKBpmsNIOKgs91lqIoMkoLyWymgBSXZSwn+oB9el0PJ98mz6/qp35moFp 3DHQ9zU0NZ8gVnul0G8Vzd6oI3KcRteObTyuPo7MdmVyjGE+zdvDeRhrkedO0Yxtz7/R bmn4kGbqH1ogpJn4TlX/nCBdeLI+63/7JEvTR1vqm9huL25vAAXnGQHpFLt95ykf3E58 6cmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714057791; x=1714662591; 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=m1qzGW4ycfJBkwOtQag42BpB9F1dgLw6AsC1TpSQ/BE=; b=s+gr8QZLyAJJ11wH/uCHAqNEKrx7NxwYwiV1Pc2vHxzw88ZRmx6JlJSPwqpwd9Bezh oEepmW56Kmh04YLhk0/quXIqRNFKkEuohkgvKYXzAgDISqCrUNTCH2tJGhReevl/Yc/E evU59OF4ZPh1+y7JPc4qH5ciQCr1PRPhMvK8mZJoh/as89AU3uzPlLXPvrd+kVilBclg M7bdEfg6vArMHXxARfR5UHwCWF/P9/eDe7zjrO0KCzpfed4Hoy77NhZkKQ9oC2WDh2DL ebhxKx7UV7fty6IC18CAgj5+y0eiJQQ4m5u04ce7N8DOLbfS7q8uy/c4bY/Pb0V/itbd CyFg== X-Forwarded-Encrypted: i=1; AJvYcCWrmcrnPmUvtA+Dj3vWB67B4uYobjWufVZBOUWDGfMB2sQTNElDaxmsbN7+ck9iTr6mR0Mb6SfktbamFJNJIzgOrHU= X-Gm-Message-State: AOJu0YxbF9aMP5JrQzGbkGaMybQe29QYsax6uLHNeAbhZl1ySg4yZqWr 2ek5LrL6rIwW7TWhYUta3p4F6I2Ol/RQyyU1LLcD/R5ckxCzjQGIfGG+0AsNQ2e97UB2hb1IGRp cOA== X-Google-Smtp-Source: AGHT+IESJpACVh541xxXAQ9OLoBU3w6/mlBcJ1Y0e41i9MN7u+mraz/pMXzsHrFUz1aVf7/+mBldg/ztHFs= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:698a:0:b0:de4:c2d4:e14f with SMTP id e132-20020a25698a000000b00de4c2d4e14fmr1617703ybc.11.1714057790783; Thu, 25 Apr 2024 08:09:50 -0700 (PDT) Date: Thu, 25 Apr 2024 08:09:49 -0700 In-Reply-To: <3848a9ad-07aa-48da-a2b7-264c4a990b5b@linuxfoundation.org> Mime-Version: 1.0 References: <20231027182217.3615211-1-seanjc@google.com> <20231027182217.3615211-26-seanjc@google.com> <69ae0694-8ca3-402c-b864-99b500b24f5d@moroto.mountain> <3848a9ad-07aa-48da-a2b7-264c4a990b5b@linuxfoundation.org> Message-ID: Subject: Re: [PATCH v13 25/35] KVM: selftests: Convert lib's mem regions to KVM_SET_USER_MEMORY_REGION2 From: Sean Christopherson To: Shuah Khan Cc: Dan Carpenter , Shuah Khan , Greg Kroah-Hartman , Paolo Bonzini , Marc Zyngier , Oliver Upton , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexander Viro , Christian Brauner , "Matthew Wilcox (Oracle)" , Andrew Morton , 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_Sala=C3=BCn?=" , Vlastimil Babka , Vishal Annapurve , Ackerley Tng , Maciej Szmigiero , David Hildenbrand , Quentin Perret , Michael Roth , Wang , Liam Merwick , Isaku Yamahata , "Kirill A . Shutemov" , Naresh Kamboju , Anders Roxell , Benjamin Copeland Content-Type: text/plain; charset="us-ascii" X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: BC8AA4000A X-Stat-Signature: bqiietqawhwyxm37b1ncn7wpwbehj535 X-Rspam-User: X-HE-Tag: 1714057791-658240 X-HE-Meta: U2FsdGVkX1/e6Nqvj6aRC+VHjqBWLjEafryIMPohsm875zkyPf/LQdBz3JnTLZiAfiNhEQx5zd2K0ivvT9+QDF+97brzHHBS8sMgOlxnQSX91xpRhH1kV+yVUTNLK76qv0kgIHF9aL3OeFJHZNIWmT9lUKy0VRVfE8v7IGbIb8/OFt7nKrPNk/clrN4zw1F6fTWKtAS0vZdEyyw6luaVzxfqnl2Y1Bj8tAbSo+HXBKUmjbnUOKnsCVjj1xPOwvD+SmG/dcTeIiW2V1pNTNWlxoZ/+AYYd5Tr5GrSR0BNYcbqy93VqnWtCNzIJ57131blrzzKBKJx8oa/ip+Mdvv0yf3fr9ziZO2fN2uGBVBUNCwQB/kihprt9AOFD4U+P857rIKcP7DyaUpnoWMvQzAtI67ck3Fh3YN/kaLWDJgnzjnmd/SDMJHMn4RMd8+mCos4fIWWRg1DSX52Fs0jmYG5luwxoMsUEqeEkJRSgvGcXqvqdJkFvskqpJBeyqxeZPXCFBPSRPHIV3butNsrjfpkzJuPO/lTqCfzfFephb/KDFy7GeVYqw3qoly8duZobliG7xGUFzl7sI04OsXLW739aIyKGkXkRpsbm7X9ZIi/GAzWQ39JiyQzqVK0gi7pSl3mBSNSd8CON5x8HDcgpv1JMNxkyB0Wp09YCCSpns4Ud4HNoiwlJOtj5P31Up5UOiD/eUs0x0rbVzq4dRx0vfy7bkA4LqBUA6bei/RHC/5vB2QPmdqYTjjZRDH8WSfNDe8Ol89kGet0ALf6l3ZyWaxx/B89Hla9/DDgBtaLxaaiWMY1OayDwPZHoras9xyHxXBZIzINgF834ElBMtUCFZNMWM1IJluVEeyAOTZqo+diwstbFsgiDuSe0LanHt+KAvELDOiJFECs1Q/4ltWoKsCurMy7VTwqaMZliLqzuOsVMvQMcf+AKEBUJ9FYhBfk14fB8BS/ym0egUqYJO4tZ3x mr1jGt0l S5ALX7okzOqfDrOkiB4I017MvzGLxg8KWJYfWEaZPjB+9zjlYIiH5ub3C7SS5mhcJXU9Gk3cgeSc+18Zlsi5vGfYxaydrlnmoha0c0H2lNEOF3SLYbvGPBRrvYjSVW4laQFZQk2PlZ3rBM02mSe3u0r9FGOgCRGQCOejbQXXoQiXacidotNL871s52D0elNSjkD2GFy9onGte2ldg/6+rwvekL1ISTYvXzM/jDj7TT77+LRtwkJhiN7D7UJS2tjrs/nS/V0+zF5b11lF7dQd1kY2RaJwYwzNQ2SPaS2Z/JQW3OmcZLFB7W34CozZ1d+hD8pbA5aF/jD7/8fti6JOWUKAcy09P5NckFR2Qsv12TeANT9bdFs9U0aIcfrYguYK9mkl5x7YDaW3IVgza4CpqUrkOeRG6qpJ3ZZ97Iuu2tKO5gzlKGFb8Xv7LIr5Ygv4RRJwhiztEPKj0KNw2p8Og4AD3d19jFGwCRIp3TX/eXX3lExjtFFq6q7YQa2omxn+xy9UtOLMYlIz//GrvX2xMOgQUbyE9gqfeJzkiJzfEMvZBbHMnJZo90iwxWXUGIVozT9Dwq27I1JIhATJi4P2Y/tj4mAghWLuJyRfsT18HiwbhXqU/1icEmCt38kuejf1IQwX0Psq+g7C6xQXpURD97FBVhtW7bRhw5aQpPhOiH01fqzP3StSQNM57gjq2HmdmuBarijev+4whenQ= 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: On Thu, Apr 25, 2024, Shuah Khan wrote: > On 4/25/24 08:12, Dan Carpenter wrote: > > On Fri, Oct 27, 2023 at 11:22:07AM -0700, Sean Christopherson wrote: > > > Use KVM_SET_USER_MEMORY_REGION2 throughout KVM's selftests library so that > > > support for guest private memory can be added without needing an entirely > > > separate set of helpers. > > > > > > Note, this obviously makes selftests backwards-incompatible with older KVM > > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > > versions from this point forward. > > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > > > Is there a way we could disable the tests on older kernels instead of > > making them fail? Check uname or something? There is probably a > > standard way to do this... It's these tests which fail. > > They shouldn't fail - the tests should be skipped on older kernels. Ah, that makes sense. Except for a few outliers that aren't all that interesting, all KVM selftests create memslots, so I'm tempted to just make it a hard requirement to spare us headache, e.g. diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index b2262b5fad9e..4b2038b1f11f 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -2306,6 +2306,9 @@ void __attribute((constructor)) kvm_selftest_init(void) /* Tell stdout not to buffer its content. */ setbuf(stdout, NULL); + __TEST_REQUIRE(kvm_has_cap(KVM_CAP_USER_MEMORY2), + "KVM selftests from v6.8+ require KVM_SET_USER_MEMORY_REGION2"); + kvm_selftest_arch_init(); } -- but it's also easy enough to be more precise and skip only those that actually create memslots. diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index b2262b5fad9e..b21152adf448 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -944,6 +944,9 @@ int __vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t flag .guest_memfd_offset = guest_memfd_offset, }; + __TEST_REQUIRE(kvm_has_cap(KVM_CAP_USER_MEMORY2), + "KVM selftests from v6.8+ require KVM_SET_USER_MEMORY_REGION2"); + return ioctl(vm->fd, KVM_SET_USER_MEMORY_REGION2, ®ion); } @@ -970,6 +973,9 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, size_t mem_size = npages * vm->page_size; size_t alignment; + __TEST_REQUIRE(kvm_has_cap(KVM_CAP_USER_MEMORY2), + "KVM selftests from v6.8+ require KVM_SET_USER_MEMORY_REGION2"); + TEST_ASSERT(vm_adjust_num_guest_pages(vm->mode, npages) == npages, "Number of guest pages is not compatible with the host. " "Try npages=%d", vm_adjust_num_guest_pages(vm->mode, npages)); --