From patchwork Wed Jun 14 01:12:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9785115 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 15B4060384 for ; Wed, 14 Jun 2017 01:27:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06A8026E75 for ; Wed, 14 Jun 2017 01:27:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE0B328539; Wed, 14 Jun 2017 01:27:46 +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 53DEC26E75 for ; Wed, 14 Jun 2017 01:27:45 +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 1dKx4R-0007ur-RJ; Wed, 14 Jun 2017 01:26:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dKx4P-0007rl-Pt for xen-devel@lists.xenproject.org; Wed, 14 Jun 2017 01:26:05 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id CF/88-02006-DA090495; Wed, 14 Jun 2017 01:26:05 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPLMWRWlGSWpSXmKPExsVywNykWHfNBId Igz/7tS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oyHj94wFjyVq3j47hNTA+N8sS5GLg4hgWmM Ep9nL2DvYuTkkBDglTiybAYrhO0ncXfla1aIogZGiZ/PL7OBJNgE1CUef+1hArFFBJQk7q2az ARSxCywk0li3envzCAJYQFniQWrPoBNZRFQlWi4fwtoEgcHr4CnRPNVfYgFchInj00GW8YJFO 5+/QxsppCAh8TPK1OZJjDyLmBkWMWoUZxaVJZapGtkqJdUlJmeUZKbmJmja2hgqpebWlycmJ6 ak5hUrJecn7uJERgQ9QwMjDsY7072O8QoycGkJMq7xM4hUogvKT+lMiOxOCO+qDQntfgQowwH h5IE75s+oJxgUWp6akVaZg4wNGHSEhw8SiK8tW1Aad7igsTc4sx0iNQpRkUpcd5TIH0CIImM0 jy4Nlg8XGKUlRLmZWRgYBDiKUgtys0sQZV/xSjOwagkzHu8H2gKT2ZeCdz0V0CLmYAWX79iA7 K4JBEhJdXAaK0hd6nRoHR+6oNwc40Jga5MQWoW8pmbH6rpxu97dH6OfMWZn8m+R6pkZRUy//z N+XGw8tU5+deH4s9oxqrd+/t7b0S5Zsoc3iVeu163JMySnVDk7tJQrM4X8feGwJoZl9at4XA+ dH3PudMNLDKV255caVk04fGS7PKr11+92XKro+6MfH9chhJLcUaioRZzUXEiAEULi1KCAgAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1497403511!87398197!18 X-Originating-IP: [192.55.52.115] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 50331 invoked from network); 14 Jun 2017 01:26:04 -0000 Received: from mga14.intel.com (HELO mga14.intel.com) (192.55.52.115) by server-16.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 14 Jun 2017 01:26:04 -0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jun 2017 18:26:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,340,1493708400"; d="scan'208";a="99174013" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.64]) by orsmga002.jf.intel.com with ESMTP; 13 Jun 2017 18:26:00 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Wed, 14 Jun 2017 09:12:50 +0800 Message-Id: <1497402776-22348-18-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1497402776-22348-1-git-send-email-yi.y.sun@linux.intel.com> References: <1497402776-22348-1-git-send-email-yi.y.sun@linux.intel.com> Cc: kevin.tian@intel.com, wei.liu2@citrix.com, andrew.cooper3@citrix.com, dario.faggioli@citrix.com, he.chen@linux.intel.com, ian.jackson@eu.citrix.com, Yi Sun , mengxu@cis.upenn.edu, jbeulich@suse.com, chao.p.peng@linux.intel.com, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v12 17/23] x86: L2 CAT: implement get hw info flow. 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 This patch implements L2 CAT get HW info flow and interface in sysctl. Signed-off-by: Yi Sun Reviewed-by: Jan Beulich --- v10: - modify macro name according to previous patch change. (suggested by Jan Beulich) - modify commit message. v9: - reuse 'cat_get_feat_info' for L2 CAT to reduce redundant codes. (suggested by Roger Pau) - modify sysctl implementation of L2 CAT to input data[3] to use 'cat_get_feat_info'. (suggested by Roger Pau) - modify macros names to newly defined ones. (suggested by Jan Beulich) - remove 'l2_info' to reuse 'l3_info'. (suggested by Jan Beulich) - modify macro name according to previous patch change. (suggested by Jan Beulich) v5: - rename 'dat[]' to 'data[]' (suggested by Jan Beulich) - remove type check in callback function. (suggested by Jan Beulich) v4: - create this patch because of codes architecture change. (suggested by Jan Beulich) --- --- xen/arch/x86/psr.c | 5 +++++ xen/arch/x86/sysctl.c | 23 +++++++++++++++++++++-- xen/include/public/sysctl.h | 1 + 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 60202b2..22de787 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -235,6 +235,10 @@ static enum psr_feat_type psr_cbm_type_to_feat_type(enum cbm_type type, feat_type = PSR_SOCKET_L3_CDP; break; + case PSR_CBM_TYPE_L2: + feat_type = PSR_SOCKET_L2_CAT; + break; + default: ASSERT_UNREACHABLE(); } @@ -386,6 +390,7 @@ static const struct feat_props l3_cdp_props = { static const struct feat_props l2_cat_props = { .cos_num = 1, .type[0] = PSR_CBM_TYPE_L2, + .get_feat_info = cat_get_feat_info, }; static void __init parse_psr_bool(char *s, char *value, char *feature, diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index c23270d..5e91755 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -174,10 +174,10 @@ long arch_do_sysctl( case XEN_SYSCTL_psr_cat_op: switch ( sysctl->u.psr_cat_op.cmd ) { - case XEN_SYSCTL_PSR_CAT_get_l3_info: - { uint32_t data[PSR_INFO_ARRAY_SIZE]; + case XEN_SYSCTL_PSR_CAT_get_l3_info: + { ret = psr_get_info(sysctl->u.psr_cat_op.target, PSR_CBM_TYPE_L3, data, ARRAY_SIZE(data)); if ( ret ) @@ -195,6 +195,25 @@ long arch_do_sysctl( break; } + case XEN_SYSCTL_PSR_CAT_get_l2_info: + { + ret = psr_get_info(sysctl->u.psr_cat_op.target, + PSR_CBM_TYPE_L2, data, ARRAY_SIZE(data)); + if ( ret ) + break; + + sysctl->u.psr_cat_op.u.l3_info.cos_max = + data[PSR_INFO_IDX_COS_MAX]; + sysctl->u.psr_cat_op.u.l3_info.cbm_len = + data[PSR_INFO_IDX_CAT_CBM_LEN]; + sysctl->u.psr_cat_op.u.l3_info.flags = + data[PSR_INFO_IDX_CAT_FLAG]; + + if ( !ret && __copy_field_to_guest(u_sysctl, sysctl, u.psr_cat_op) ) + ret = -EFAULT; + break; + } + default: ret = -EOPNOTSUPP; break; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index ee76a66..4c76d3a 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -744,6 +744,7 @@ typedef struct xen_sysctl_pcitopoinfo xen_sysctl_pcitopoinfo_t; DEFINE_XEN_GUEST_HANDLE(xen_sysctl_pcitopoinfo_t); #define XEN_SYSCTL_PSR_CAT_get_l3_info 0 +#define XEN_SYSCTL_PSR_CAT_get_l2_info 1 struct xen_sysctl_psr_cat_op { uint32_t cmd; /* IN: XEN_SYSCTL_PSR_CAT_* */ uint32_t target; /* IN */