summaryrefslogtreecommitdiffstats
path: root/net/test
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2020-02-05 07:42:59 -0800
committerMaciej Żenczykowski <maze@google.com>2020-02-05 07:51:50 -0800
commit8bc63c3a6cbbb642f350edaed0459ca772b586dc (patch)
tree198b3b9a448d8176fabef55874053bab613648d6 /net/test
parent1dbe505c83ce23bd77a302c0d5044aff4da0f6ac (diff)
downloadkernel_tests-8bc63c3a6cbbb642f350edaed0459ca772b586dc.tar.gz
kernel_tests-8bc63c3a6cbbb642f350edaed0459ca772b586dc.tar.bz2
kernel_tests-8bc63c3a6cbbb642f350edaed0459ca772b586dc.zip
net-test: add 'random.trust_cpu=on' to kernel command lineandroid-r-preview-1
Another workaround for boot time entropy starvation, which is only usable on sufficiently new kernels. While we could just enable CONFIG_RANDOM_TRUST_CPU=y instead of passing another thing via kernel commandline, this would only take effect for kernels we build ourselves - ie. for UML builds and not for gki/cuttlefish pre-built kernels. Test: passed Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ibb8fe056c52b96eca7b387cdcfad0f1440311f7b
Diffstat (limited to 'net/test')
-rwxr-xr-xnet/test/run_net_test.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/test/run_net_test.sh b/net/test/run_net_test.sh
index ce5dce60..ebfb15f3 100755
--- a/net/test/run_net_test.sh
+++ b/net/test/run_net_test.sh
@@ -311,7 +311,7 @@ cmdline="$cmdline net_test_args=\"$test_args\" net_test_mode=$testmode"
# into base64.
entropy="$(cat /proc/sys/kernel/random{/,/,/}uuid | tr -d '\n-')"
entropy="$(xxd -r -p <<< "${entropy}" | base64 -w 0)"
-cmdline="${cmdline} entropy=${entropy}"
+cmdline="${cmdline} random.trust_cpu=on entropy=${entropy}"
if [ "$ARCH" == "um" ]; then
# Get the absolute path to the test file that's being run.