From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by dpdk.org (Postfix) with ESMTP id 292394C99 for ; Fri, 27 Jul 2018 12:18:10 +0200 (CEST) Received: by mail-wm0-f47.google.com with SMTP id s9-v6so4747738wmh.3 for ; Fri, 27 Jul 2018 03:18:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vMDRrIpvoZ8xuShVLVnNuAZm0fqfNuN1atKvoEfmqt0=; b=vIIwm0PAo+Wn4iQFLw5QrTb/FNeN/qECVy8lV9HfvGrwyUnjvvNleEYPAUkzTqqvgC huR2Jct9mXq8mdRwUEA3g6MFXo57CW6GxLYlILs2aE6eVBqjCi92jQsr/m62vzfuqTUj Mv1TyXmOGKIdXNAEYjTCH9qi2w3uYEwSG5gByBE15iVbOMUD2u4Xe5/0LWZKAJo73pcs bY9/GceLcGDCQraJ2QiL/MMGURPRyYYXoBbhxRGof54kFU/l5SZImqcHUbk4hW4GwJRf 078tSETYXcocDvYC3q63y2dVpWrjYzJ1Hdf13Z7EryBJQtJgf2SedhgT86RK1vVdlF3e +m6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vMDRrIpvoZ8xuShVLVnNuAZm0fqfNuN1atKvoEfmqt0=; b=idsnOZEl+Re2fvRqSbKI5qhM2w1Zcuuxo7jVX3CV3brQUGbTW9fLJJ2aWm9ucT/3h5 jLoaonEFnLNh3MIGa3z+vHHCFiQ0cIwv2aA1enkcDL/bfEpcGO3d9cfRX8Ca+LT2zFih g588gzhHoMdYrJULv2yTHJHdUvLcHiQsFVLJUu3ORxDQbJCDptqNu+VfOi3D8B0vpxY3 A7f5oFF9x+Mz1vU2AlvMY/ISR7ZZ2sFJAAHgprZ4kxgFsC5EvaUshRTFMnuIwE3lkJyC RrOeSJT1IjsYQ4gHMsBREDtN7GbiqTPYEyASgF4ke6qoEIIwkxK4ejsPNKIp8CxyKFrm jgsQ== X-Gm-Message-State: AOUpUlHCxtbVbqO2fr3OuqbYWbPQjAN8S50jCWXzdgb6xivz1pcO2Pow cKUwZZfCpgx9+y1WP5OoPlg= X-Google-Smtp-Source: AAOMgpdq3H4J9jnkpi3ZsUP/8OIyEEspc0VQd45lyQeMxbPC0Gwut5NvvS65F2HH9Tj6vcwrcCvRtw== X-Received: by 2002:a1c:4885:: with SMTP id v127-v6mr3790757wma.161.1532686689852; Fri, 27 Jul 2018 03:18:09 -0700 (PDT) Received: from localhost ([2a00:23c5:be94:4600:7b12:f8a0:fd52:f87d]) by smtp.gmail.com with ESMTPSA id o4-v6sm3444745wmo.20.2018.07.27.03.18.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Jul 2018 03:18:08 -0700 (PDT) From: luca.boccassi@gmail.com To: Anatoly Burakov Cc: Changqing Wu , dpdk stable Date: Fri, 27 Jul 2018 11:17:45 +0100 Message-Id: <20180727101748.30228-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180727101748.30228-1-luca.boccassi@gmail.com> References: <20180724160752.20287-34-luca.boccassi@gmail.com> <20180727101748.30228-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'test: fix EAL flags autotest on FreeBSD' has been queued to LTS release 16.11.8 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jul 2018 10:18:10 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/29/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From 0dba56e259801e01eec77dc2a4b073c07d6a961e Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Mon, 16 Jul 2018 17:34:04 +0100 Subject: [PATCH] test: fix EAL flags autotest on FreeBSD [ upstream commit b5d878e6db56c76ffe5e8c69b6c19faac4e97d80 ] FreeBSD does not support running multiple primary processes concurrently, because all DPDK instances will allocate memory from the same place (memory provided by contigmem driver). While it is technically possible to launch a DPDK process using no-shconf switch, it will actually corrupt main process' for the above reason. Fix EAL flags autotest to not run primary processes unless both no-shconf and no-huge are specified. Signed-off-by: Anatoly Burakov Tested-by: Changqing Wu --- app/test/test_eal_flags.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c index 15248ea28..b66132285 100644 --- a/app/test/test_eal_flags.c +++ b/app/test/test_eal_flags.c @@ -409,17 +409,17 @@ test_invalid_vdev_flag(void) #endif /* Test with invalid vdev option */ - const char *vdevinval[] = {prgname, prefix, "-n", "1", + const char *vdevinval[] = {prgname, prefix, no_huge, "-n", "1", "-c", "1", vdev, "eth_dummy"}; /* Test with valid vdev option */ - const char *vdevval1[] = {prgname, prefix, "-n", "1", + const char *vdevval1[] = {prgname, prefix, no_huge, "-n", "1", "-c", "1", vdev, "net_ring0"}; - const char *vdevval2[] = {prgname, prefix, "-n", "1", + const char *vdevval2[] = {prgname, prefix, no_huge, "-n", "1", "-c", "1", vdev, "net_ring0,args=test"}; - const char *vdevval3[] = {prgname, prefix, "-n", "1", + const char *vdevval3[] = {prgname, prefix, no_huge, "-n", "1", "-c", "1", vdev, "net_ring0,nodeaction=r1:0:CREATE"}; if (launch_proc(vdevinval) == 0) { @@ -948,13 +948,10 @@ test_misc_flags(void) const char *argv4[] = {prgname, prefix, mp_flag, "-c", "1", "--syslog"}; /* With invalid --syslog */ const char *argv5[] = {prgname, prefix, mp_flag, "-c", "1", "--syslog", "error"}; - /* With no-sh-conf */ + /* With no-sh-conf, also use no-huge to ensure this test runs on BSD */ const char *argv6[] = {prgname, "-c", "1", "-n", "2", "-m", DEFAULT_MEM_SIZE, - no_shconf, nosh_prefix }; + no_shconf, nosh_prefix, no_huge}; -#ifdef RTE_EXEC_ENV_BSDAPP - return 0; -#endif /* With --huge-dir */ const char *argv7[] = {prgname, "-c", "1", "-n", "2", "-m", DEFAULT_MEM_SIZE, "--file-prefix=hugedir", "--huge-dir", hugepath}; @@ -988,6 +985,7 @@ test_misc_flags(void) const char *argv15[] = {prgname, "--file-prefix=intr", "-c", "1", "-n", "2", "--vfio-intr=invalid"}; + /* run all tests also applicable to FreeBSD first */ if (launch_proc(argv0) == 0) { printf("Error - process ran ok with invalid flag\n"); @@ -1001,6 +999,16 @@ test_misc_flags(void) printf("Error - process did not run ok with -v flag\n"); return -1; } + if (launch_proc(argv6) != 0) { + printf("Error - process did not run ok with --no-shconf flag\n"); + return -1; + } + +#ifdef RTE_EXEC_ENV_BSDAPP + /* no more tests to be done on FreeBSD */ + return 0; +#endif + if (launch_proc(argv3) != 0) { printf("Error - process did not run ok with --syslog flag\n"); return -1; @@ -1013,13 +1021,6 @@ test_misc_flags(void) printf("Error - process run ok with invalid --syslog flag\n"); return -1; } - if (launch_proc(argv6) != 0) { - printf("Error - process did not run ok with --no-shconf flag\n"); - return -1; - } -#ifdef RTE_EXEC_ENV_BSDAPP - return 0; -#endif if (launch_proc(argv7) != 0) { printf("Error - process did not run ok with --huge-dir flag\n"); return -1; -- 2.18.0