From patchwork Mon Mar 7 18:42:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 8521631 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7CAE09F46A for ; Mon, 7 Mar 2016 18:45:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D39F202DD for ; Mon, 7 Mar 2016 18:45:22 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 88D07202BE for ; Mon, 7 Mar 2016 18:45:21 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1ad07O-0003Ae-MR; Mon, 07 Mar 2016 18:42:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1ad07N-0003AV-El for xen-devel@lists.xen.org; Mon, 07 Mar 2016 18:42:57 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 47/0D-03651-0BBCDD65; Mon, 07 Mar 2016 18:42:56 +0000 X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1457376175!17868736!1 X-Originating-IP: [209.85.160.196] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13559 invoked from network); 7 Mar 2016 18:42:56 -0000 Received: from mail-yk0-f196.google.com (HELO mail-yk0-f196.google.com) (209.85.160.196) by server-4.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 7 Mar 2016 18:42:56 -0000 Received: by mail-yk0-f196.google.com with SMTP id r203so802514ykd.0 for ; Mon, 07 Mar 2016 10:42:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe.com; s=google; h=from:to:cc:subject:date:message-id; bh=+2TqwCM0oh4Ys6F/vE9G4epn9hCY2WA8FOeJqyo264w=; b=ag31geUmYwjpVSYNigOfk0JlVdEm0zTlkawS4N2I3EoXzNYX7twQ8f5fnJ0TwiQqej JpYgOH9PZVNtiuoFyVLzfGq8ieIf/TYmxqcRHkQGOie+hIdFZJVRRAD8nay79u3ngzaC /YqszA6K+nVCJ+360z2/icF6IJP702DzPogds= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+2TqwCM0oh4Ys6F/vE9G4epn9hCY2WA8FOeJqyo264w=; b=BoF+q9wxlMFZP5CYMz4b7sflRwd2VHQ7uKRHKWuw/qpzuiw1z09ZagkmcpODic2ZIe b5kfbDCA8nfnvetClAaF5sAHsqI2/WrCQ7RBX/NDvP+HVL/Hb0ObemVnnRNRl9jKwMVk bLBoHMk35N9eNgVIr9WOb9oVOHltzxMU71pqEtm6t3fF1bnR4V1pOetXE7RO8+H5oOvU d+flIW/vp1qf66IqMlPLt97QM1hYuek/TNW065DsbOvAkz+jHe6+zduRQd4Z1O4Jkb/a Ii4e178zLZq7KBY7VoP3XuFqtnpXHQm7Srqyou/yM30S23wQ0CTvRPKo+sNJPju4xE9t 0t0w== X-Gm-Message-State: AD7BkJIiQJIQtNDUyFo60j+UDP5fguifB04e55wxhS3yxvefZVSdnq38kWpcEE9e+YJZNA== X-Received: by 10.37.29.193 with SMTP id d184mr13813617ybd.111.1457376174748; Mon, 07 Mar 2016 10:42:54 -0800 (PST) Received: from swanson.lan (c-68-46-196-185.hsd1.al.comcast.net. [68.46.196.185]) by smtp.gmail.com with ESMTPSA id a10sm12614886ywc.52.2016.03.07.10.42.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Mar 2016 10:42:53 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Mon, 7 Mar 2016 12:42:40 -0600 Message-Id: <1457376161-24982-1-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.4.10 Cc: Daniel De Graaf , Doug Goldstein Subject: [Xen-devel] [PATCH 1/2] xsm: move the XSM_MAGIC value to Kconfig 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-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Let Kconfig set the XSM_MAGIC value for us. Signed-off-by: Doug Goldstein --- CC: Daniel De Graaf --- xen/common/Kconfig | 8 ++++++++ xen/include/xen/config.h | 1 - xen/include/xsm/xsm.h | 5 +---- xen/xsm/xsm_core.c | 4 ++-- xen/xsm/xsm_policy.c | 6 +++--- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 8fbc46d..d661da3 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -113,6 +113,14 @@ config XSM If unsure, say N. +# XSM magic for policy detection +config XSM_MAGIC + hex + default 0xf97cff8c if FLASK + default 0 if !FLASK + ---help--- + Identifies a FLASK XSM policy start point + # Enable schedulers menu "Schedulers" visible if EXPERT = "y" diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index 96f5539..3f8c53d 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -79,7 +79,6 @@ #define STR(...) __STR(__VA_ARGS__) #ifdef CONFIG_FLASK -#define XSM_MAGIC 0xf97cff8c /* Maintain statistics on the access vector cache */ #define FLASK_AVC_STATS 1 #endif diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 3afed70..7f313ad 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -21,11 +21,8 @@ typedef void xsm_op_t; DEFINE_XEN_GUEST_HANDLE(xsm_op_t); -/* policy magic number (defined by XSM_MAGIC) */ +/* policy magic number (defined by CONFIG_XSM_MAGIC) */ typedef u32 xsm_magic_t; -#ifndef XSM_MAGIC -#define XSM_MAGIC 0x00000000 -#endif /* These annotations are used by callers and in dummy.h to document the * default actions of XSM hooks. They should be compiled out otherwise. diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index 5e432de..d6965ba 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -67,7 +67,7 @@ int __init xsm_multiboot_init(unsigned long *module_map, printk("XSM Framework v" XSM_FRAMEWORK_VERSION " initialized\n"); - if ( XSM_MAGIC ) + if ( CONFIG_XSM_MAGIC ) { ret = xsm_multiboot_policy_init(module_map, mbi, bootstrap_map); if ( ret ) @@ -92,7 +92,7 @@ int __init xsm_dt_init(void) printk("XSM Framework v" XSM_FRAMEWORK_VERSION " initialized\n"); - if ( XSM_MAGIC ) + if ( CONFIG_XSM_MAGIC ) { ret = xsm_dt_policy_init(); if ( ret ) diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c index b60d822..52aa4a9 100644 --- a/xen/xsm/xsm_policy.c +++ b/xen/xsm/xsm_policy.c @@ -54,7 +54,7 @@ int __init xsm_multiboot_policy_init(unsigned long *module_map, _policy_start = bootstrap_map(mod + i); _policy_len = mod[i].mod_end; - if ( (xsm_magic_t)(*_policy_start) == XSM_MAGIC ) + if ( (xsm_magic_t)(*_policy_start) == CONFIG_XSM_MAGIC ) { policy_buffer = (char *)_policy_start; policy_size = _policy_len; @@ -89,10 +89,10 @@ int __init xsm_dt_policy_init(void) copy_from_paddr(&magic, paddr, sizeof(magic)); - if ( magic != XSM_MAGIC ) + if ( magic != CONFIG_XSM_MAGIC ) { printk(XENLOG_ERR "xsm: Invalid magic for XSM blob got 0x%x " - "expected 0x%x\n", magic, XSM_MAGIC); + "expected 0x%x\n", magic, CONFIG_XSM_MAGIC); return -EINVAL; }