From patchwork Mon Aug 14 07:08:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 9898185 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AACC66038C for ; Mon, 14 Aug 2017 07:11:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D98B26538 for ; Mon, 14 Aug 2017 07:11:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 927D626E4A; Mon, 14 Aug 2017 07:11:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C920526538 for ; Mon, 14 Aug 2017 07:11:05 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dh9Uo-0003hI-LF; Mon, 14 Aug 2017 07:09:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dh9Um-0003fK-Ml for xen-devel@lists.xenproject.org; Mon, 14 Aug 2017 07:09:04 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 3D/EF-01993-F8C41995; Mon, 14 Aug 2017 07:09:03 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRWlGSWpSXmKPExsVyuP0Ov26fz8R Ig9nPpC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oznfxsZC7aLV5yc+JylgXGTYBcjJ4eEgJHE 24n/mLoYuTiEBBYySvxcdZcRJMEmoCqx4fopVhBbREBJ4t6qyUwgNrNAocTJ7j6wuLBAksSxb 1fYQWwWoPqDu46C2bwCphJfTpxig1ggL9FxYDILiM0JFL+0bymYLSRgItG3tYtlAiP3AkaGVY waxalFZalFuoYWeklFmekZJbmJmTm6hgamermpxcWJ6ak5iUnFesn5uZsYgf5lAIIdjE3bPQ8 xSnIwKYnyJvj0RgrxJeWnVGYkFmfEF5XmpBYfYpTh4FCS4J3hPTFSSLAoNT21Ii0zBxhoMGkJ Dh4lEd48kDRvcUFibnFmOkTqFKMux6sJ/78xCbHk5eelSonzPgUpEgApyijNgxsBC/pLjLJSw ryMQEcJ8RSkFuVmlqDKv2IU52BUEuZlApnCk5lXArfpFdARTEBH9IHcz1tckoiQkmpglFViEU 79dFxvFWfIHdPJJXv3N1zIOVqjsvNfWK28uqTZ6cWnRB0Yz73IEO6fH1d6Sf/VqUjDgyksqrV eS1L0diayaU3KEK9u5ks6M7H/a2Fd4LRT3Subrnu9sqnhv+T79+DkuBJ+T4kpqc2z3JRlec4X 1vvpF7amqO1emOkZ1Oy+Im/DpmolluKMREMt5qLiRACeYscpdQIAAA== X-Env-Sender: jgross@suse.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1502694542!104230790!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24990 invoked from network); 14 Aug 2017 07:09:02 -0000 Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by server-7.tower-206.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 14 Aug 2017 07:09:02 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 231A1ACFF; Mon, 14 Aug 2017 07:09:02 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Mon, 14 Aug 2017 09:08:16 +0200 Message-Id: <20170814070849.20986-20-jgross@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170814070849.20986-1-jgross@suse.com> References: <20170814070849.20986-1-jgross@suse.com> Cc: Juergen Gross , Andrew Cooper , Jan Beulich Subject: [Xen-devel] [PATCH v2 19/52] xen/arch/x86/setup.c: let custom parameter parsing routines return errno X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Modify the custom parameter parsing routines in: xen/arch/x86/setup.c to indicate whether the parameter value was parsed successfully. Cc: Jan Beulich Cc: Andrew Cooper Signed-off-by: Juergen Gross Acked-by: Wei Liu --- xen/arch/x86/setup.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index db5df6956d..edb6d44dc6 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -67,7 +67,7 @@ unsigned long __read_mostly cr4_pv32_mask; /* "acpi=force": Override the disable blacklist. */ /* "acpi=ht": Limit ACPI just to boot-time to enable HT. */ /* "acpi=noirq": Disables ACPI interrupt routing. */ -static void parse_acpi_param(char *s); +static int parse_acpi_param(char *s); custom_param("acpi", parse_acpi_param); /* **** Linux config option: propagated to domain0. */ @@ -102,59 +102,67 @@ unsigned long __read_mostly mmu_cr4_features = XEN_MINIMAL_CR4; /* smep: Enable/disable Supervisor Mode Execution Protection (default on). */ #define SMEP_HVM_ONLY (-1) static s8 __initdata opt_smep = 1; -static void __init parse_smep_param(char *s) +static int __init parse_smep_param(char *s) { if ( !*s ) { opt_smep = 1; - return; + return 0; } switch ( parse_bool(s) ) { case 0: opt_smep = 0; - return; + return 0; case 1: opt_smep = 1; - return; + return 0; } if ( !strcmp(s, "hvm") ) opt_smep = SMEP_HVM_ONLY; + else + return -EINVAL; + + return 0; } custom_param("smep", parse_smep_param); /* smap: Enable/disable Supervisor Mode Access Prevention (default on). */ #define SMAP_HVM_ONLY (-1) static s8 __initdata opt_smap = 1; -static void __init parse_smap_param(char *s) +static int __init parse_smap_param(char *s) { if ( !*s ) { opt_smap = 1; - return; + return 0; } switch ( parse_bool(s) ) { case 0: opt_smap = 0; - return; + return 0; case 1: opt_smap = 1; - return; + return 0; } if ( !strcmp(s, "hvm") ) opt_smap = SMAP_HVM_ONLY; + else + return -EINVAL; + + return 0; } custom_param("smap", parse_smap_param); bool __read_mostly acpi_disabled; bool __initdata acpi_force; static char __initdata acpi_param[10] = ""; -static void __init parse_acpi_param(char *s) +static int __init parse_acpi_param(char *s) { /* Save the parameter so it can be propagated to domain0. */ safe_strcpy(acpi_param, s); @@ -180,6 +188,10 @@ static void __init parse_acpi_param(char *s) { acpi_noirq_set(); } + else + return -EINVAL; + + return 0; } static const module_t *__initdata initial_images;