[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] x86/dom0: Fix command line parsing issues with dom0_nodes=
- To: Xen-devel <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
- Date: Fri, 19 Nov 2021 13:44:16 +0000
- Authentication-results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none
- Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Jan Beulich <JBeulich@xxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Jane Malalane <jane.malalane@xxxxxxxxxx>
- Delivery-date: Fri, 19 Nov 2021 13:44:31 +0000
- Ironport-data: A9a23:KlaVLaOQ8IQebcjvrR1okMFynXyQoLVcMsEvi/4bfWQNrUp31DdTz mBJUWnSOf/eYDbxKt1xa4iz/UhSuJWDnIVrTwto+SlhQUwRpJueD7x1DKtR0wB+jCHnZBg6h ynLQoCYdKjYdpJYz/uUGuCJQUNUjMlkfZKhTr6bUsxNbVU8En540Esyw7dRbrNA2rBVPSvc4 bsenOWHULOV82Yc3rU8sv/rRLtH5ZweiRtA1rAMTakjUGz2zhH5OKk3N6CpR0YUd6EPdgKMq 0Qv+5nilo/R109F5tpICd8XeGVSKlLZFVDmZna7x8FOK/WNz8A/+v9TCRYSVatYoyyVw9RJx exrjIW5FUAVb5PzgN0TUQYNRkmSPYUekFPGCX22sMjVxEzaaXr8hf5pCSnaP6VBpLwxWzsXs 6VFdnZdNXhvhMrvqF6/YsBqit4uM4/AO4QHt2s75TrYEewnUdbIRKCiCdpwgm9q3pAeQqm2i 8wxUjddK03gPEB0B0pIJpACpsWOmUTkWmgNwL6SjfVuuDWCpOBr65DyNPLFd9rMQt9a9m66j G/b+2XyAjkBKceSjzGC9xqEluLJ2C/2Ro8WPLm57eJxxk2ewHQJDx8bXkf9puO24nNSQPoGd RZSoHB36/Fvqgr7FbERQiFUvladokIYY9dpNdQj4V3K9vvq3B6gCGobG2sphMMdiOc6Qjkj1 1msltzvBCByvLD9dU9x5ot4vhvpZ3FLcDZqiTssCFJcvoK9+N1bYgfnF447SMaIYsvJ9SYcK txghAw3nP0tgMECzM1XFniX0mv39vAlouPYjzg7v15JDCslO+ZJhKTysDA3CMqsyq7DEzFtW 1BexaCjABgmV83lqcB0aLxl8EuVz/iEKibAplVkAoMs8T+gk1b6I9sPum8mdRc0b5ZYEdMMX KM1kVkMjHO0FCH0BZKbnqrrU5h6pUQePYqNug/ogipmPcEqKV7vENBGbk+MxWH9+HXAYolkU ap3hf2EVC5AYYw+lWLeb75EjdcDm3BvrUuOFMuT50n2jtKjiIu9FO5t3K2mNbtisstpYWz9r r5iCid940kFDbClPHCIqdV7wJJjBSFTOK0aYvd/LoarSjeK0kl7YxMI6b9+KYFjgYpPkeLEo iO0VkNCkQKtjnzbMwSaLHtkbeq3D5p4qHs6Ow0qPEqphCd/Mdr+sv9HestlZ6Qj+cxi0eVwE 6sPdfKfD6kdUT/A4TkcM8Xw9dQwaBSxiAuSFCO5ezxjLYV4TgnE94a8LAvi/SUDFAStss46r +Hy3w/XW8NbFQ9jENzXeLSkyFbo5SoRn+d7Xk3pJNhPeRqzrNg2enKp1vJuepMCMxTOwDeex j26OxZAqLmfuZIx/fnImbuA89WjHdxhExcIBGLc97u3a3XXpzLx3Y9aXe+UVjnBT2eoqr66b OBYwvygYv0KmFFG79h1H7pxlP9s4tLuo/lRzxh+HWWNZFOuU+syLn6D1MhJl6tM2r4G5lfmB hPRooFXaeeTJcfoMF8NPw50PO2M2MYdliTW8flocl7x4zV6/ebfXEhfV/VWZPex8Feh3FsZ/ Noc
- Ironport-hdrordr: A9a23:JOQbKKOku3+HHsBcTs+jsMiBIKoaSvp037Eqv3oRdfUzSL3/qy nOpoV96faaskdzZJhNo7+90cq7MBfhHPxOkOss1N6ZNWGM0gbFEGgL1/qa/9SKIU3DH4Bmu5 uIC5IObeHNMQ==
- Ironport-sdr: 7cMpZqhf7chRG0om382q0thZdl12EA2gqks17noy6+a1253QW8jdKqE/fjtv3L+f+D1tscSDYd bqIf6hmYKW0/j6DZzJ6SC5hkQfYqM+Ux0ufKOC2tUK2yA8QuZwofwQK9We+ENt2n+XN26id2W9 jpcFIfkr9sxDQNNaweAiG2qW/xWexTEFvHysgmnXZXqN4Ek7gYG+EUPHupTAbR8tGt6xFc7V0K xYvzkQ1BrqDkttlR/V0bSpPtbJqV3HBjvRpN+UZ8sENqbkmBWkAEiepIggQhq6ZRURXojxhVyC fcmLhp3mld61zaZ9RCJsSvl8
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
This is a simple comma separated list, so use the normal form.
* Don't cease processing subsequent elements on an error
* Do report -EINVAL for things like `dom0_nodes=4foo`
* Don't opencode the cmdline_strcmp() helper
Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
CC: Jan Beulich <JBeulich@xxxxxxxx>
CC: Roger Pau Monné <roger.pau@xxxxxxxxxx>
CC: Wei Liu <wl@xxxxxxx>
CC: Jane Malalane <jane.malalane@xxxxxxxxxx>
---
xen/arch/x86/dom0_build.c | 37 ++++++++++++++++++++++---------------
1 file changed, 22 insertions(+), 15 deletions(-)
diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c
index fe24e11b37fb..5a7441ed5b79 100644
--- a/xen/arch/x86/dom0_build.c
+++ b/xen/arch/x86/dom0_build.c
@@ -169,30 +169,37 @@ bool __initdata dom0_affinity_relaxed;
static int __init parse_dom0_nodes(const char *s)
{
+ const char *ss;
+ int rc = 0;
+
do {
+ ss = strchr(s, ',');
+ if ( !ss )
+ ss = strchr(s, '\0');
+
if ( isdigit(*s) )
{
+ const char *endp;
+
if ( dom0_nr_pxms >= ARRAY_SIZE(dom0_pxms) )
- return -E2BIG;
- dom0_pxms[dom0_nr_pxms] = simple_strtoul(s, &s, 0);
- if ( !*s || *s == ',' )
- ++dom0_nr_pxms;
+ rc = -E2BIG;
+ else if ( (dom0_pxms[dom0_nr_pxms] = simple_strtoul(s, &endp, 0),
+ endp != ss) )
+ rc = -EINVAL;
+ else
+ dom0_nr_pxms++;
}
- else if ( !strncmp(s, "relaxed", 7) && (!s[7] || s[7] == ',') )
- {
+ else if ( !cmdline_strcmp(s, "relaxed") )
dom0_affinity_relaxed = true;
- s += 7;
- }
- else if ( !strncmp(s, "strict", 6) && (!s[6] || s[6] == ',') )
- {
+ else if ( !cmdline_strcmp(s, "strict") )
dom0_affinity_relaxed = false;
- s += 6;
- }
else
- return -EINVAL;
- } while ( *s++ == ',' );
+ rc = -EINVAL;
- return s[-1] ? -EINVAL : 0;
+ s = ss + 1;
+ } while ( *ss );
+
+ return rc;
}
custom_param("dom0_nodes", parse_dom0_nodes);
--
2.11.0
|