From: Paolo Bonzini <pbonzini@redhat.com>
To: Sasha Levin <sashal@kernel.org>,
linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>,
Sean Christopherson <seanjc@google.com>,
shuah@kernel.org, kvm@vger.kernel.org,
linux-kselftest@vger.kernel.org
Subject: Re: [PATCH MANUALSEL 5.10 3/4] KVM: selftests: Make sure kvm_create_max_vcpus test won't hit RLIMIT_NOFILE
Date: Mon, 13 Dec 2021 15:22:01 +0100 [thread overview]
Message-ID: <72a3fabf-bb1d-002f-caaf-2656559aa2a8@redhat.com> (raw)
In-Reply-To: <20211213142020.352376-3-sashal@kernel.org>
On 12/13/21 15:20, Sasha Levin wrote:
> From: Vitaly Kuznetsov <vkuznets@redhat.com>
>
> [ Upstream commit 908fa88e420f30dde6d80f092795a18ec72ca6d3 ]
>
> With the elevated 'KVM_CAP_MAX_VCPUS' value kvm_create_max_vcpus test
> may hit RLIMIT_NOFILE limits:
>
> # ./kvm_create_max_vcpus
> KVM_CAP_MAX_VCPU_ID: 4096
> KVM_CAP_MAX_VCPUS: 1024
> Testing creating 1024 vCPUs, with IDs 0...1023.
> /dev/kvm not available (errno: 24), skipping test
>
> Adjust RLIMIT_NOFILE limits to make sure KVM_CAP_MAX_VCPUS fds can be
> opened. Note, raising hard limit ('rlim_max') requires CAP_SYS_RESOURCE
> capability which is generally not needed to run kvm selftests (but without
> raising the limit the test is doomed to fail anyway).
>
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> Message-Id: <20211123135953.667434-1-vkuznets@redhat.com>
> [Skip the test if the hard limit can be raised. - Paolo]
> Reviewed-by: Sean Christopherson <seanjc@google.com>
> Tested-by: Sean Christopherson <seanjc@google.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
> .../selftests/kvm/kvm_create_max_vcpus.c | 30 +++++++++++++++++++
> 1 file changed, 30 insertions(+)
>
> diff --git a/tools/testing/selftests/kvm/kvm_create_max_vcpus.c b/tools/testing/selftests/kvm/kvm_create_max_vcpus.c
> index 0299cd81b8ba2..aa3795cd7bd3d 100644
> --- a/tools/testing/selftests/kvm/kvm_create_max_vcpus.c
> +++ b/tools/testing/selftests/kvm/kvm_create_max_vcpus.c
> @@ -12,6 +12,7 @@
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> +#include <sys/resource.h>
>
> #include "test_util.h"
>
> @@ -40,10 +41,39 @@ int main(int argc, char *argv[])
> {
> int kvm_max_vcpu_id = kvm_check_cap(KVM_CAP_MAX_VCPU_ID);
> int kvm_max_vcpus = kvm_check_cap(KVM_CAP_MAX_VCPUS);
> + /*
> + * Number of file descriptors reqired, KVM_CAP_MAX_VCPUS for vCPU fds +
> + * an arbitrary number for everything else.
> + */
> + int nr_fds_wanted = kvm_max_vcpus + 100;
> + struct rlimit rl;
>
> pr_info("KVM_CAP_MAX_VCPU_ID: %d\n", kvm_max_vcpu_id);
> pr_info("KVM_CAP_MAX_VCPUS: %d\n", kvm_max_vcpus);
>
> + /*
> + * Check that we're allowed to open nr_fds_wanted file descriptors and
> + * try raising the limits if needed.
> + */
> + TEST_ASSERT(!getrlimit(RLIMIT_NOFILE, &rl), "getrlimit() failed!");
> +
> + if (rl.rlim_cur < nr_fds_wanted) {
> + rl.rlim_cur = nr_fds_wanted;
> + if (rl.rlim_max < nr_fds_wanted) {
> + int old_rlim_max = rl.rlim_max;
> + rl.rlim_max = nr_fds_wanted;
> +
> + int r = setrlimit(RLIMIT_NOFILE, &rl);
> + if (r < 0) {
> + printf("RLIMIT_NOFILE hard limit is too low (%d, wanted %d)\n",
> + old_rlim_max, nr_fds_wanted);
> + exit(KSFT_SKIP);
> + }
> + } else {
> + TEST_ASSERT(!setrlimit(RLIMIT_NOFILE, &rl), "setrlimit() failed!");
> + }
> + }
> +
> /*
> * Upstream KVM prior to 4.8 does not support KVM_CAP_MAX_VCPU_ID.
> * Userspace is supposed to use KVM_CAP_MAX_VCPUS as the maximum ID
>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
next prev parent reply other threads:[~2021-12-13 14:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20211213142020.352376-1-sashal@kernel.org>
2021-12-13 14:20 ` [PATCH MANUALSEL 5.10 2/4] KVM: VMX: clear vmx_x86_ops.sync_pir_to_irr if APICv is disabled Sasha Levin
2021-12-13 14:29 ` Paolo Bonzini
2021-12-13 14:20 ` [PATCH MANUALSEL 5.10 3/4] KVM: selftests: Make sure kvm_create_max_vcpus test won't hit RLIMIT_NOFILE Sasha Levin
2021-12-13 14:22 ` Paolo Bonzini [this message]
2021-12-13 14:20 ` [PATCH MANUALSEL 5.10 4/4] KVM: downgrade two BUG_ONs to WARN_ON_ONCE Sasha Levin
2021-12-13 14:22 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=72a3fabf-bb1d-002f-caaf-2656559aa2a8@redhat.com \
--to=pbonzini@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=seanjc@google.com \
--cc=shuah@kernel.org \
--cc=stable@vger.kernel.org \
--cc=vkuznets@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox