From patchwork Wed Aug 16 12:51:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 9903659 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 E65C96038C for ; Wed, 16 Aug 2017 12:54:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D7AB1289CD for ; Wed, 16 Aug 2017 12:54:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CCB6C289E0; Wed, 16 Aug 2017 12:54:49 +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 6BA8A289CD for ; Wed, 16 Aug 2017 12:54:49 +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 1dhxoE-0008La-UP; Wed, 16 Aug 2017 12:52:30 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhxoC-0008GD-Sz for xen-devel@lists.xenproject.org; Wed, 16 Aug 2017 12:52:28 +0000 Received: from [193.109.254.147] by server-10.bemta-6.messagelabs.com id D4/50-18185-C0044995; Wed, 16 Aug 2017 12:52:28 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRWlGSWpSXmKPExsVyuP0Ovy6Pw5R Ig6vTuCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oyW2SUFTRIVl+9fYmpg/CTYxcjJISFgJPF2 4j+mLkYuDiGBhYwSb9Z0s4Ak2ARUJTZcP8UKYosIKEncWzWZCcRmFiiUONndBxYXFkiSmPN7E zuIzQJU/3DZDTYQm1fARGJO22xmiAXyEh0HJoPN5ASKT95wDMwWEjCW2N7TyD6BkXsBI8MqRo 3i1KKy1CJdQxO9pKLM9IyS3MTMHF1DAzO93NTi4sT01JzEpGK95PzcTYxA7zIAwQ7G6xsDDjF KcjApifIGaU2JFOJLyk+pzEgszogvKs1JLT7EKMPBoSTB22cPlBMsSk1PrUjLzAGGGUxagoNH SYS3GSTNW1yQmFucmQ6ROsWoy/Fqwv9vTEIsefl5qVLivOEgRQIgRRmleXAjYCF/iVFWSpiXE egoIZ6C1KLczBJU+VeM4hyMSsK8EiBTeDLzSuA2vQI6ggnoiCvtk0COKElESEk1MC6MOtuaf0 Tkk9rNm6saPUKETe8kx/RYx+87kRLUvMO23H2HhX9mQbL7Do6FRx7FqrYdnZId9S0k9tgJCx3 /9X9/qzy8e+DPJQn7notnT05k2Z743CDmu420fVC68v6J0195z2r8u8OKfWPYvs9bdthzfjpl qXDzpY//5kOKp48IWlltCl75Z4MSS3FGoqEWc1FxIgAvMkJXdAIAAA== X-Env-Sender: jgross@suse.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1502887947!111773471!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 5144 invoked from network); 16 Aug 2017 12:52:28 -0000 Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by server-3.tower-27.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 16 Aug 2017 12:52:28 -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 C33D9AE84; Wed, 16 Aug 2017 12:52:27 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Wed, 16 Aug 2017 14:51:46 +0200 Message-Id: <20170816125219.5255-20-jgross@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170816125219.5255-1-jgross@suse.com> References: <20170816125219.5255-1-jgross@suse.com> Cc: Juergen Gross , Andrew Cooper , Jan Beulich Subject: [Xen-devel] [PATCH v3 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 Acked-by: Jan Beulich --- xen/arch/x86/setup.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index db5df6956d..1ae5b90fe9 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(const char *s); custom_param("acpi", parse_acpi_param); /* **** Linux config option: propagated to domain0. */ @@ -102,59 +102,70 @@ 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(const 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(const 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(const char *s) { /* Save the parameter so it can be propagated to domain0. */ safe_strcpy(acpi_param, s); @@ -180,6 +191,10 @@ static void __init parse_acpi_param(char *s) { acpi_noirq_set(); } + else + return -EINVAL; + + return 0; } static const module_t *__initdata initial_images;