From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 948FA2E89 for ; Wed, 5 Nov 2014 12:45:38 +0100 (CET) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP; 05 Nov 2014 03:48:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,319,1413270000"; d="scan'208";a="617497066" Received: from irsmsx103.ger.corp.intel.com ([163.33.3.157]) by fmsmga001.fm.intel.com with ESMTP; 05 Nov 2014 03:54:58 -0800 Received: from irsmsx154.ger.corp.intel.com (163.33.192.96) by IRSMSX103.ger.corp.intel.com (163.33.3.157) with Microsoft SMTP Server (TLS) id 14.3.195.1; Wed, 5 Nov 2014 11:54:57 +0000 Received: from irsmsx105.ger.corp.intel.com ([169.254.7.56]) by IRSMSX154.ger.corp.intel.com ([169.254.12.116]) with mapi id 14.03.0195.001; Wed, 5 Nov 2014 11:54:56 +0000 From: "Ananyev, Konstantin" To: Thomas Monjalon , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH v2] eal: add option --master-lcore Thread-Index: AQHP+HghCMtw85nzn0OMUOBewYQ2fZxR6foA Date: Wed, 5 Nov 2014 11:54:56 +0000 Message-ID: <2601191342CEEE43887BDE71AB977258213A2877@IRSMSX105.ger.corp.intel.com> References: <1404808110-16314-1-git-send-email-simon.kuenzer@neclab.eu> <1415137233-6364-1-git-send-email-thomas.monjalon@6wind.com> In-Reply-To: <1415137233-6364-1-git-send-email-thomas.monjalon@6wind.com> Accept-Language: en-IE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.181] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v2] eal: add option --master-lcore X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Nov 2014 11:45:40 -0000 Hi Thomas, Few questions/comments below. Konstantin > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Thomas Monjalon > Sent: Tuesday, November 04, 2014 9:41 PM > To: dev@dpdk.org > Subject: [dpdk-dev] [PATCH v2] eal: add option --master-lcore >=20 > From: Simon Kuenzer >=20 > Enable users to specify the lcore id that is used as master lcore. >=20 > Signed-off-by: Simon Kuenzer > Signed-off-by: Thomas Monjalon > --- >=20 > changes in v2: > - rebase on HEAD including common options for BSD and Linux > - use strtol() instead of atoi() to check syntax errors > - unit tests >=20 > app/test/test.c | 1 + > app/test/test_eal_flags.c | 49 +++++++++++++++++++++++= ++++++ > lib/librte_eal/bsdapp/eal/eal.c | 7 +++++ > lib/librte_eal/common/eal_common_options.c | 31 ++++++++++++++++++ > lib/librte_eal/common/include/eal_options.h | 2 ++ > lib/librte_eal/linuxapp/eal/eal.c | 7 +++++ > 6 files changed, 97 insertions(+) >=20 > diff --git a/app/test/test.c b/app/test/test.c > index 9bee6bb..2fecff5 100644 > --- a/app/test/test.c > +++ b/app/test/test.c > @@ -82,6 +82,7 @@ do_recursive_call(void) > } actions[] =3D { > { "run_secondary_instances", test_mp_secondary }, > { "test_missing_c_flag", no_action }, > + { "test_master_lcore_flag", no_action }, > { "test_missing_n_flag", no_action }, > { "test_no_hpet_flag", no_action }, > { "test_whitelist_flag", no_action }, > diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c > index 21e6cca..45020b8 100644 > --- a/app/test/test_eal_flags.c > +++ b/app/test/test_eal_flags.c > @@ -520,6 +520,49 @@ test_missing_c_flag(void) > } >=20 > /* > + * Test --master-lcore option with matching coremask > + */ > +static int > +test_master_lcore_flag(void) > +{ > +#ifdef RTE_EXEC_ENV_BSDAPP > + /* BSD target doesn't support prefixes at this point */ > + const char * prefix =3D ""; > +#else > + char prefix[PATH_MAX], tmp[PATH_MAX]; > + if (get_current_prefix(tmp, sizeof(tmp)) =3D=3D NULL) { > + printf("Error - unable to get current prefix!\n"); > + return -1; > + } > + snprintf(prefix, sizeof(prefix), "--file-prefix=3D%s", tmp); > +#endif > + > + /* --master-lcore flag but no value */ > + const char *argv1[] =3D { prgname, prefix, mp_flag, "-n", "1", "-c", "3= ", "--master-lcore"}; > + /* --master-lcore flag with invalid value */ > + const char *argv2[] =3D { prgname, prefix, mp_flag, "-n", "1", "-c", "3= ", "--master-lcore", "-1"}; > + /* --master-lcore flag with invalid value */ > + const char *argv3[] =3D { prgname, prefix, mp_flag, "-n", "1", "-c", "3= ", "--master-lcore", "X"}; > + /* master lcore not in coremask */ > + const char *argv4[] =3D { prgname, prefix, mp_flag, "-n", "1", "-c", "3= ", "--master-lcore", "2"}; > + /* valid value */ > + const char *argv5[] =3D { prgname, prefix, mp_flag, "-n", "1", "-c", "3= ", "--master-lcore", "1"}; > + > + if (launch_proc(argv1) =3D=3D 0 > + || launch_proc(argv2) =3D=3D 0 > + || launch_proc(argv3) =3D=3D 0 > + || launch_proc(argv4) =3D=3D 0) { > + printf("Error - process ran without error with wrong --master-lcore\n"= ); > + return -1; > + } > + if (launch_proc(argv5) !=3D 0) { > + printf("Error - process did not run ok with valid --master-lcore\n"); > + return -1; > + } > + return 0; > +} > + > +/* > * Test that the app doesn't run without the -n flag. In all cases > * should give an error and fail to run. > * Since -n is not compulsory for MP, we instead use --no-huge and --no-= shconf > @@ -1214,6 +1257,12 @@ test_eal_flags(void) > return ret; > } >=20 > + ret =3D test_master_lcore_flag(); > + if (ret < 0) { > + printf("Error in test_master_lcore_flag()\n"); > + return ret; > + } > + > ret =3D test_missing_n_flag(); > if (ret < 0) { > printf("Error in test_missing_n_flag()\n"); > diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/= eal.c > index ca99cb9..c764fec 100644 > --- a/lib/librte_eal/bsdapp/eal/eal.c > +++ b/lib/librte_eal/bsdapp/eal/eal.c > @@ -354,6 +354,13 @@ eal_parse_args(int argc, char **argv) > if (opt =3D=3D '?') > return -1; >=20 > + if (opt =3D=3D OPT_MASTER_LCORE_NUM && !coremask_ok) { > + RTE_LOG(ERR, EAL, "please specify the master lcore id" > + "after specifying the coremask\n"); > + eal_usage(prgname); > + return -1; > + } > + > ret =3D eal_parse_common_option(opt, optarg, &internal_config); > /* common parser is not happy */ > if (ret < 0) { > diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/= common/eal_common_options.c > index 7a5d55e..9166ea1 100644 > --- a/lib/librte_eal/common/eal_common_options.c > +++ b/lib/librte_eal/common/eal_common_options.c > @@ -64,6 +64,7 @@ eal_short_options[] =3D > const struct option > eal_long_options[] =3D { > {OPT_HUGE_DIR, 1, 0, OPT_HUGE_DIR_NUM}, > + {OPT_MASTER_LCORE, 1, 0, OPT_MASTER_LCORE_NUM}, > {OPT_PROC_TYPE, 1, 0, OPT_PROC_TYPE_NUM}, > {OPT_NO_SHCONF, 0, 0, OPT_NO_SHCONF_NUM}, > {OPT_NO_HPET, 0, 0, OPT_NO_HPET_NUM}, > @@ -163,6 +164,27 @@ eal_parse_coremask(const char *coremask) > return 0; > } >=20 > +/* Changes the lcore id of the master thread */ > +static int > +eal_parse_master_lcore(const char *arg) > +{ > + long master_lcore; > + char *parsing_end; > + struct rte_config *cfg =3D rte_eal_get_configuration(); > + > + errno =3D 0; > + master_lcore =3D strtol(arg, &parsing_end, 0); > + if (errno || parsing_end =3D=3D arg) > + return -1; Why not: "errno || parsing_end[0] !=3D 0" ? Otherwise something like "1blah" would be considered as valid input. > + > + if (!(master_lcore >=3D 0 && master_lcore < RTE_MAX_LCORE)) > + return -1; If negative values are not allowed, then why not: unsigned long master_lcore; ... master_lcore =3D strtoul(...) ... if(master_clore > RTE_MAX_LCORE) return -1; =20 > + if (cfg->lcore_role[master_lcore] !=3D ROLE_RTE) > + return -1; > + cfg->master_lcore =3D master_lcore; > + return 0; > +} > + > static int > eal_parse_syslog(const char *facility, struct internal_config *conf) > { > @@ -320,6 +342,14 @@ eal_parse_common_option(int opt, const char *optarg, > conf->process_type =3D eal_parse_proc_type(optarg); > break; >=20 > + case OPT_MASTER_LCORE_NUM: > + if (eal_parse_master_lcore(optarg) < 0) { > + RTE_LOG(ERR, EAL, "invalid parameter for --" > + OPT_MASTER_LCORE "\n"); > + return -1; > + } > + break; > + > case OPT_VDEV_NUM: > if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, > optarg) < 0) { > @@ -364,6 +394,7 @@ eal_common_usage(void) > "[--proc-type primary|secondary|auto]\n\n" > "EAL common options:\n" > " -c COREMASK : A hexadecimal bitmask of cores to run on\n" > + " --"OPT_MASTER_LCORE" ID: Core ID that is used as master\n" > " -n NUM : Number of memory channels\n" > " -v : Display version information on startup\n" > " -m MB : memory to allocate (see also --"OPT_SOCKET_MEM= ")\n" > diff --git a/lib/librte_eal/common/include/eal_options.h b/lib/librte_eal= /common/include/eal_options.h > index 22819ec..deb872d 100644 > --- a/lib/librte_eal/common/include/eal_options.h > +++ b/lib/librte_eal/common/include/eal_options.h > @@ -43,6 +43,8 @@ enum { > OPT_LONG_MIN_NUM =3D 256, > #define OPT_HUGE_DIR "huge-dir" > OPT_HUGE_DIR_NUM =3D OPT_LONG_MIN_NUM, > +#define OPT_MASTER_LCORE "master-lcore" > + OPT_MASTER_LCORE_NUM, > #define OPT_PROC_TYPE "proc-type" > OPT_PROC_TYPE_NUM, > #define OPT_NO_SHCONF "no-shconf" > diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/= eal/eal.c > index 7a1d087..7fcb349 100644 > --- a/lib/librte_eal/linuxapp/eal/eal.c > +++ b/lib/librte_eal/linuxapp/eal/eal.c > @@ -550,6 +550,13 @@ eal_parse_args(int argc, char **argv) > if (opt =3D=3D '?') > return -1; >=20 > + if (opt =3D=3D OPT_MASTER_LCORE_NUM && !coremask_ok) { > + RTE_LOG(ERR, EAL, "please specify the master lcore id" > + "after specifying the coremask\n"); > + eal_usage(prgname); > + return -1; > + } > + I don't really like an idea of introducing strict order between -c and "--= master-lcore.. Can we move check for coremask_ok/ and assignment of cfg->master_lcore out = of =20 while (getopt_long(...)) loop? > ret =3D eal_parse_common_option(opt, optarg, &internal_config); > /* common parser is not happy */ > if (ret < 0) { > -- > 2.1.3