diff options
| author |   Maros Ondrejicka <maros.ondrejicka@pantheon.tech> | 2022-11-10 14:11:40 +0100 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2022-11-14 21:03:02 +0000 |
| commit | 568ef4686653b644967ab26c8764e7c56ad96451 (patch) | |
| tree | 4090a764953577fc3029226b227c267071229188 | |
| parent | 468d7876b97c4ee130da0d9922f1fdcf877133bc (diff) | |
crypto-ipsecmb: fix plugin crash in VirtualBox
Plugin checks just for AVX2 instruction set, while the v1.3 of IPsec
Multi-Buffer library checks for both AVX2 and BMI2 sets during init.
VirtualBox VM doesn't provide BMI2 by default to guest operating system.
Result is that VPP plugin decides to use AVX2 initialization and library
then doesn't do it. Since flush_job remains empty, the self-check fails
and with that the whole VPP crashes on start-up.
Type: fix
Signed-off-by: Maros Ondrejicka <maros.ondrejicka@pantheon.tech>
Change-Id: I6b661f2b9bbe6dd03b499c55c38a9b814e6d718a
| -rw-r--r-- | src/plugins/crypto_ipsecmb/ipsecmb.c | 2 | ||||
| -rw-r--r-- | src/vppinfra/cpu.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/crypto_ipsecmb/ipsecmb.c b/src/plugins/crypto_ipsecmb/ipsecmb.c index 3ceda1e3f9d..02e13456704 100644 --- a/src/plugins/crypto_ipsecmb/ipsecmb.c +++ b/src/plugins/crypto_ipsecmb/ipsecmb.c @@ -928,7 +928,7 @@ crypto_ipsecmb_init (vlib_main_t * vm) #endif if (clib_cpu_supports_avx512f ()) init_mb_mgr_avx512 (ptd->mgr); - else if (clib_cpu_supports_avx2 ()) + else if (clib_cpu_supports_avx2 () && clib_cpu_supports_bmi2 ()) init_mb_mgr_avx2 (ptd->mgr); else init_mb_mgr_sse (ptd->mgr); diff --git a/src/vppinfra/cpu.h b/src/vppinfra/cpu.h index 3c5e59e6e01..31049f5458c 100644 --- a/src/vppinfra/cpu.h +++ b/src/vppinfra/cpu.h @@ -123,6 +123,7 @@ _CLIB_MARCH_FN_REGISTRATION(fn) _ (avx, 1, ecx, 28) \ _ (rdrand, 1, ecx, 30) \ _ (avx2, 7, ebx, 5) \ + _ (bmi2, 7, ebx, 8) \ _ (rtm, 7, ebx, 11) \ _ (pqm, 7, ebx, 12) \ _ (pqe, 7, ebx, 15) \ |