From patchwork Thu Mar 16 11:08:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Sun X-Patchwork-Id: 9627873 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 1970660522 for ; Thu, 16 Mar 2017 11:16:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10CBC28573 for ; Thu, 16 Mar 2017 11:16:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 05860285A1; Thu, 16 Mar 2017 11:16:08 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 A30402857D for ; Thu, 16 Mar 2017 11:16:07 +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 1coTMW-0004st-Jp; Thu, 16 Mar 2017 11:14:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coTMV-0004rT-Mr for xen-devel@lists.xenproject.org; Thu, 16 Mar 2017 11:14:31 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id E4/36-05091-7937AC85; Thu, 16 Mar 2017 11:14:31 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLLMWRWlGSWpSXmKPExsVywNwkVnda8ak Igx+/FCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oylj/uYCo7JVMyfdoC5gfGpaBcjFweLwC0m iRk/77CDOEIC0xglVi9uZ+li5OSQEOCVOLJsBiuE7S/R13UIqqiBUaLn6TM2kASbgLrE4689T CC2iICSxL1Vk5lAipgFdjJJrDv9nRkkISzgJPHk5lSwqSwCqhI7Hi0Ci/MKeEicfnICapucxM ljk8G2cQLFP7a3g9lCAu4S7zb8ZZ/AyLeAkWEVo0ZxalFZapGuoYleUlFmekZJbmJmjq6hgbF ebmpxcWJ6ak5iUrFecn7uJkZgsDAAwQ7GFds9DzFKcjApifKW/zgRIcSXlJ9SmZFYnBFfVJqT WnyIUYaDQ0mC94jSyQghwaLU9NSKtMwcYNjCpCU4eJREeHNB0rzFBYm5xZnpEKlTjIpS4rwXQ BICIImM0jy4NlisXGKUlRLmZQQ6RIinILUoN7MEVf4VozgHo5Iw72aQKTyZeSVw018BLWYCWv z2wwmQxSWJCCmpBsa181VFrXeYORnZ3jATy/y99mDmnJVlJUafDonvfC1kqDJbZ29cmMn9gw5 69w/cOlBqcFsiM4ip4W2l26Qmn6mmZ+1u37202fetnnFJBm9Sp8gam6J//dxbWB8EhJ/geJyQ 9Ta7xCqZ+fSUdfsehpxqmG8hk9tdd7nDV8697HtlVy633emaj0osxRmJhlrMRcWJANcZbPaQA gAA X-Env-Sender: yi.y.sun@linux.intel.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1489662818!78881615!18 X-Originating-IP: [192.55.52.93] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTkyLjU1LjUyLjkzID0+IDMyNDY2NQ==\n X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13310 invoked from network); 16 Mar 2017 11:14:30 -0000 Received: from mga11.intel.com (HELO mga11.intel.com) (192.55.52.93) by server-2.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 16 Mar 2017 11:14:30 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1489662870; x=1521198870; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=WNvzFR83u1CxJdirKG8ekw1xp/GiCboGB+6nxDWQxeI=; b=pCwn/sVk/ApuMdA+AlVxlTrdYCgCj2MdgK7TaN7+3eWG/E5Ah/bDQ014 vhT9Y3RGviJkePTbuBG0lNvA6Nqlow==; Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Mar 2017 04:14:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,172,1486454400"; d="scan'208";a="944976730" Received: from vmmmba-s2600wft.bj.intel.com ([10.240.193.63]) by orsmga003.jf.intel.com with ESMTP; 16 Mar 2017 04:14:26 -0700 From: Yi Sun To: xen-devel@lists.xenproject.org Date: Thu, 16 Mar 2017 19:08:09 +0800 Message-Id: <1489662495-5375-20-git-send-email-yi.y.sun@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1489662495-5375-1-git-send-email-yi.y.sun@linux.intel.com> References: <1489662495-5375-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 v9 19/25] 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 get HW info flow for L2 CAT including L2 CAT callback function. Signed-off-by: Yi Sun --- 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 | 4 ++++ xen/arch/x86/sysctl.c | 18 ++++++++++++++++++ xen/include/asm-x86/psr.h | 1 + xen/include/public/sysctl.h | 1 + 4 files changed, 24 insertions(+) diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 576914d..39f249e 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -280,6 +280,9 @@ static enum psr_feat_type psr_cbm_type_to_feat_type(enum cbm_type type) case PSR_CBM_TYPE_L3_CODE: feat_type = PSR_SOCKET_L3_CDP; break; + case PSR_CBM_TYPE_L2: + feat_type = PSR_SOCKET_L2_CAT; + break; default: feat_type = PSR_SOCKET_UNKNOWN; break; @@ -635,6 +638,7 @@ struct feat_ops l3_cdp_ops = { /* L2 CAT ops */ struct feat_ops l2_cat_ops = { .get_cos_max = cat_get_cos_max, + .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 3bf51a4..f701910 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -216,6 +216,24 @@ long arch_do_sysctl( break; } + case XEN_SYSCTL_PSR_CAT_get_l2_info: + { + uint32_t data[PSR_INFO_CAT_SIZE]; + + 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.cbm_len = data[PSR_INFO_IDX_CBM_LEN]; + sysctl->u.psr_cat_op.u.l3_info.cos_max = data[PSR_INFO_IDX_COS_MAX]; + sysctl->u.psr_cat_op.u.l3_info.flags = data[PSR_INFO_IDX_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/asm-x86/psr.h b/xen/include/asm-x86/psr.h index 4e392c8..a08bb94 100644 --- a/xen/include/asm-x86/psr.h +++ b/xen/include/asm-x86/psr.h @@ -58,6 +58,7 @@ enum cbm_type { PSR_CBM_TYPE_L3, PSR_CBM_TYPE_L3_CODE, PSR_CBM_TYPE_L3_DATA, + PSR_CBM_TYPE_L2, }; extern struct psr_cmt *psr_cmt; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 00f5e77..1fe8fe4 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 */