From nobody Fri Apr 19 07:52:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1637329486; cv=none; d=zohomail.com; s=zohoarc; b=Qjvr72++ODjS84BG2rvtuafa6jYaLyvHcTYOqPQNyE4aizYBaqAAePxMgiZDwAiR1Nhc+X2H3fL4G99C4Y0doLuSlm1M/xFFe7qSDoIHEcgLf/fvKBCbYUaSL48vfF7BoDGM35H4kWgSaJSgWopmrN5X6nbV5bvXGRClM80HkPk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637329486; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=f8u8FM8BrnQaqeKZSLjIGITV9/6ypIkWoGomKL4jc6o=; b=SeS5kAuqfSSB+My7yKukZsrrzefnUDKZddbOwv1b14BDnBB61e0mlDLdZ8JC8tpUcGv1PaFnBrou8nkR7o28BiRLRQcWcvugzUF4eVgszruwMwXFaeghqYgn7OMAQBQ/7/5s3dbvVwlfSDKpxkgjq3wWadVbuDByRhmQedeTbFQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 163732948615337.53253517804842; Fri, 19 Nov 2021 05:44:46 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.227951.394395 (Exim 4.92) (envelope-from ) id 1mo4Bq-0000Q5-SK; Fri, 19 Nov 2021 13:44:30 +0000 Received: by outflank-mailman (output) from mailman id 227951.394395; Fri, 19 Nov 2021 13:44:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mo4Bq-0000Px-PI; Fri, 19 Nov 2021 13:44:30 +0000 Received: by outflank-mailman (input) for mailman id 227951; Fri, 19 Nov 2021 13:44:29 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mo4Bp-0000Pm-Iz for xen-devel@lists.xenproject.org; Fri, 19 Nov 2021 13:44:29 +0000 Received: from esa4.hc3370-68.iphmx.com (esa4.hc3370-68.iphmx.com [216.71.155.144]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id cf75a8c5-493e-11ec-9787-a32c541c8605; Fri, 19 Nov 2021 14:44:27 +0100 (CET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: cf75a8c5-493e-11ec-9787-a32c541c8605 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1637329467; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=8gzb+RjcBp+fvaX5Uw6nHwqjnmxvrj4+nHvVFlvmWQw=; b=HqKQDbON8Hhr/iH5NL6+jRnUJ7XH9GecNXuYI9URSCCY8a25K+bdCLTV BE7yxRBLUO9ayXbEr3EBjy91mAyc7Ja4lW5EVvb8ElqEOIjof/BOu7xLf vwUnbh9Yufx7T3k1Ud3gE8OrkPMr0+/rIlOf3LHzWi7yydvaYaMgC3mMn Y=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 7cMpZqhf7chRG0om382q0thZdl12EA2gqks17noy6+a1253QW8jdKqE/fjtv3L+f+D1tscSDYd bqIf6hmYKW0/j6DZzJ6SC5hkQfYqM+Ux0ufKOC2tUK2yA8QuZwofwQK9We+ENt2n+XN26id2W9 jpcFIfkr9sxDQNNaweAiG2qW/xWexTEFvHysgmnXZXqN4Ek7gYG+EUPHupTAbR8tGt6xFc7V0K xYvzkQ1BrqDkttlR/V0bSpPtbJqV3HBjvRpN+UZ8sENqbkmBWkAEiepIggQhq6ZRURXojxhVyC fcmLhp3mld61zaZ9RCJsSvl8 X-SBRS: 5.1 X-MesageID: 60208877 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED 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== X-IronPort-AV: E=Sophos;i="5.87,247,1631592000"; d="scan'208";a="60208877" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu , Jane Malalane Subject: [PATCH] x86/dom0: Fix command line parsing issues with dom0_nodes= Date: Fri, 19 Nov 2021 13:44:16 +0000 Message-ID: <20211119134416.1110-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1637329488767100001 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=3D4foo` * Don't opencode the cmdline_strcmp() helper Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Wei Liu CC: Jane Malalane --- 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; =20 static int __init parse_dom0_nodes(const char *s) { + const char *ss; + int rc =3D 0; + do { + ss =3D strchr(s, ','); + if ( !ss ) + ss =3D strchr(s, '\0'); + if ( isdigit(*s) ) { + const char *endp; + if ( dom0_nr_pxms >=3D ARRAY_SIZE(dom0_pxms) ) - return -E2BIG; - dom0_pxms[dom0_nr_pxms] =3D simple_strtoul(s, &s, 0); - if ( !*s || *s =3D=3D ',' ) - ++dom0_nr_pxms; + rc =3D -E2BIG; + else if ( (dom0_pxms[dom0_nr_pxms] =3D simple_strtoul(s, &endp= , 0), + endp !=3D ss) ) + rc =3D -EINVAL; + else + dom0_nr_pxms++; } - else if ( !strncmp(s, "relaxed", 7) && (!s[7] || s[7] =3D=3D ',') ) - { + else if ( !cmdline_strcmp(s, "relaxed") ) dom0_affinity_relaxed =3D true; - s +=3D 7; - } - else if ( !strncmp(s, "strict", 6) && (!s[6] || s[6] =3D=3D ',') ) - { + else if ( !cmdline_strcmp(s, "strict") ) dom0_affinity_relaxed =3D false; - s +=3D 6; - } else - return -EINVAL; - } while ( *s++ =3D=3D ',' ); + rc =3D -EINVAL; =20 - return s[-1] ? -EINVAL : 0; + s =3D ss + 1; + } while ( *ss ); + + return rc; } custom_param("dom0_nodes", parse_dom0_nodes); =20 --=20 2.11.0