KVM: selftests: Make sure kvm_create_max_vcpus test won't hit RLIMIT_NOFILE
PATCH v2 1/1 KVM: selftests: Make sure kvm_create_max_vcpus test won't hit RLIMIT_NOFILE
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).
---
Changes since v1:
- Drop 'NOFD' define replacing it with 'int nr_fds_wanted' [Sean]
- Drop 'errno' printout as TEST_ASSERT() already does that.
--- .../selftests/kvm/kvm_create_max_vcpus.c | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+)
tools/testing/selftests/kvm/kvm_create_max_vcpus.c +22 -0
@@ -12,6 +12,7 @@#include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/resource.h> #include "test_util.h"
@@ -40,10 +41,31 @@ 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) + rl.rlim_max = nr_fds_wanted; + +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
Signature · 1 line
2.33.1
Sean Christopherson
reviewerQuoted 50 lines · Vitaly Kuznetsov
With the elevated '
KVM_CAP_MAX_VCPUS' valuekvm_create_max_vcpustest may hitRLIMIT_NOFILElimits:# ./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 testAdjust
RLIMIT_NOFILElimits to make sureKVM_CAP_MAX_VCPUSfds can be opened. Note, raising hard limit ('rlim_max') requiresCAP_SYS_RESOURCEcapability 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 <[email protected]>---
Changes since v1:
- Drop 'NOFD' define replacing it with 'intnr_fds_wanted' [Sean]
- Drop 'errno' printout asTEST_ASSERT()already does that.--- .../selftests/kvm/kvm_create_max_vcpus.c | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+)tools/testing/selftests/kvm/kvm_create_max_vcpus.c +8
-0@@ -12,6 +12,7 @@#include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/resource.h> #include "test_util.h" @@ -40,10 +41,31 @@ 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); +/*
tools/testing/selftests/kvm/kvm_create_max_vcpus.c int main(int argc, char *argv[]) · line 64
Quoted 10 lines
tools/testing/selftests/kvm/kvm_create_max_vcpus.c +10
-0+* 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) + rl.rlim_max = nr_fds_wanted;
Nit, this could use max().
Paolo Bonzini
maintainerQuoted 6 lines · Sean Christopherson
Review
Quoted 5 lines
(quoted diff) +5
-0+ if (rl.rlim_cur < nr_fds_wanted) { + rl.rlim_cur = nr_fds_wanted; + + if (rl.rlim_max < nr_fds_wanted) + rl.rlim_max = nr_fds_wanted;Nit, this could use
max().
If the hard limit is too low, the right thing to do is to skip the test:
tools/testing/selftests/kvm/kvm_create_max_vcpus.c +11 -3
@@ -59,11 +59,19 @@ int main(int argc, char *argv[])if (rl.rlim_cur < nr_fds_wanted) { rl.rlim_cur = nr_fds_wanted; - -if (rl.rlim_max < nr_fds_wanted) +if (rl.rlim_max < nr_fds_wanted) { +int old_rlim_max = rl.rlim_max; rl.rlim_max = nr_fds_wanted; -TEST_ASSERT (!setrlimit (RLIMIT_NOFILE , &rl),"setrlimit() failed!" ); +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!" ); + } }/*
Nevertheless, thanks for the fix and the review! (I might have missed it if it wasn't for your remark).
Paolo
Quoted 2 lines
Reviewed-and-tested-by Sean Christopherson<[email protected]>