From patchwork Tue Mar 27 21:31:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Babu Moger X-Patchwork-Id: 10311711 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 A3DC56037D for ; Tue, 27 Mar 2018 21:31:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 950AF29AC3 for ; Tue, 27 Mar 2018 21:31:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 89B7629B4B; Tue, 27 Mar 2018 21:31:33 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F22B29AC3 for ; Tue, 27 Mar 2018 21:31:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752066AbeC0Vbb (ORCPT ); Tue, 27 Mar 2018 17:31:31 -0400 Received: from mail-sn1nam02on0076.outbound.protection.outlook.com ([104.47.36.76]:53483 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752044AbeC0Vb0 (ORCPT ); Tue, 27 Mar 2018 17:31:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=odel4yMzHbyhO64NempkePwo7kTXt8IM7yEH+ucph3Q=; b=bsnl65RfDlchwKLLvmCatOqfdYn2yGyrChsrjyB0t8nznX/ID5bhhcH94BOGRaVchBx9cBSSZqyS01ppL1MdsZQ4yR6TKzsxeDmEShrHUhOB1YPMCraFKVPWDdSNs8V+I4Dtp8htWPXZVWN9BI1UwgN29lxx3vR+j+vXpRZWu9M= Received: from linux-pyp0.amd.com (165.204.77.1) by DM5PR12MB1771.namprd12.prod.outlook.com (2603:10b6:3:113::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.609.10; Tue, 27 Mar 2018 21:31:23 +0000 From: Babu Moger To: mst@redhat.com, marcel@redhat.com, pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, mtosatti@redhat.com Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, kash@tripleback.net, babu.moger@amd.com Subject: [PATCH v5 4/9] i386: Add new property to control cache info Date: Tue, 27 Mar 2018 17:31:06 -0400 Message-Id: <1522186271-27743-5-git-send-email-babu.moger@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1522186271-27743-1-git-send-email-babu.moger@amd.com> References: <1522186271-27743-1-git-send-email-babu.moger@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CY4PR04CA0039.namprd04.prod.outlook.com (2603:10b6:903:c6::25) To DM5PR12MB1771.namprd12.prod.outlook.com (2603:10b6:3:113::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 81b023c2-d17f-4b77-8f4e-08d5942a16f6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM5PR12MB1771; X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1771; 3:xeGAHp5b7pZAOJwOluh4MiWEpVs2prWnRDjVp0zbzMnpKj136+pyT6ISr/ioY9yV8+7rLOCkvsSqdGOgB4ufHue2SVrmMZaBkA2Ge/xkmInLCsTnkMpVF7Fr86msDoyucNgvBbwhCfW+uG3q0uv6D+4TdorlStAaNO+w8krAW/CCcUa2ElCXIPC45arryX07xtEceoTKuiQpK3sKNMconhgixfaZeGJLbQ5Fol8ErIlx5N7C/O1jt33q+oPLJjsL; 25:FSRIEJQTnaCOmnsaOfhTBqbXDtgvSrTlf9sXOWxcL9n4fUIMBNGxs0V2c+0D+w9AczDKrWkUg1Q8itN3SJ80wTMpBVrGJXG6v5G5xYGxln9SXnEVo5HC9+apTbUvvD5Jj/e3403GVi0HPBgNOn2ZhaWvEj07SeGe78RRQwBeDJucV6uY1PonoMO9R/3xSbwdfZnFLX//Mu1BIVa95c4RAQRe0lNeBa+I6Rp28nuV2lEsCbMN9ErOLE3/J4qdzyKCf5E3nGNl48XH9QKMOtD0Mz7IAWsHOBqUxH2G1lEdtjOy9zyxxnxED6jdU1mfkGBmKhS0VCt9akM1sA+Y30O9/w==; 31:RjQtrL3nVaX5soHdSaczaNBTb44+HUIaXdA9jXxUyzwWho+rgecufJCy+RamD3k0KhNDLcehCDpWyVsB1maQ2ahfCd8+J8rAKkSGJakymDn5HT/Np89P01ouXp5nmqbxQupN7Lci0paW9jGHom5d7k+dcjnmkJKc9uvBixFIjwrN2xfaSsKFVJzptfNJR7VPLKjBUtk3FklQSvFaj2JmZfqcrxsgtISjxIstfKZbj5s= X-MS-TrafficTypeDiagnostic: DM5PR12MB1771: X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1771; 20:Tof/SaV1uRHN2EwVu73f0XSeuI99lvxSuYHb5Fjpjoy/gMIiKdSnwhV5tHCD989P+voKqCtgClwRab6alj4i2FDfyM0mzuke/x6+RPHtD3ZeE8AEu8F+MpwDZS/M3wKeL9I9qF4YZjEx1MvYe6S/fKqD92FTdv51APurcJAMT7B5rNoh/xbiLrZHaDw4F+To7jR28DkBtHdTUNwtrCT2sBbooidlQ0SSBBM4g2lwOFvD04VztUBs4PyTpjBZANHe10bvB5QANRxdwwDd53qWNkS94fWtDdlxcVF+9HAR8Q6idb0noKx2kJ0Ma5k1u8Iy6cCnbTaAvePUxe5ON6R0x2KWkISNs6Y7jGEW8wVgr/tIOa6R/RvrU0xWSuXIK9+eIaKJN66bqsWmdIb/E9hqzJQrrt/KZYZtJxMD6Ka7Dp98a3gXtdAVLrRZK67ogDt7SgpM0WkwGjoEEdghmDqZyB8CzmCL/xr2iwJmmvqy+eSSsWz974GJg+AsmUt4YO9q; 4:6tNbLEmsoNmpfyPPCxVIDggnN0UoqigjchrwfqffHDV64hP34FnW2kUyIXELTxrokps+bIBG9Ibi6r3BmzGstGxkW1DsQs3o5cykz/6XoBJabU5VMtnIXpc0jbo4mZBBMop7qxqRz67bcp6jV59+pPE4bjlxVKIPnvSVZ7Ou30OXv6HK/p8n2XTQ3/Co03sFMhIpAMXyqwv2NFg98jufkzrJJfrKw/13O0gLG1rDgqoch8hLK+OGH0Rtngw3mn4AZQUTQQLPXHlqvSYw6QDGfAzug1wuq6I7jA4gkJq4LW0lRRGYF8GRqjFCl7RmMJci X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR12MB1771; BCL:0; PCL:0; RULEID:; SRVR:DM5PR12MB1771; X-Forefront-PRVS: 0624A2429E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(366004)(346002)(39380400002)(376002)(39860400002)(199004)(189003)(36756003)(6666003)(105586002)(47776003)(76176011)(25786009)(66066001)(53416004)(97736004)(7696005)(51416003)(386003)(486005)(59450400001)(486005)(2906002)(72206003)(4720700003)(6486002)(52116002)(4326008)(11346002)(5660300001)(7736002)(305945005)(53936002)(81156014)(50466002)(8676002)(6346003)(81166006)(16526019)(106356001)(68736007)(50226002)(8936002)(3846002)(476003)(478600001)(45080400002)(26005)(2616005)(186003)(446003)(316002)(6116002)(956004)(86362001)(16586007)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR12MB1771; H:linux-pyp0.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Babu.Moger@amd.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR12MB1771; 23:dB96TCVWxZyFhZAEoCq0sOZ1fzBo9wH+uOHza1qCD?= =?us-ascii?Q?B4yTLUBP32/9dq94gmgw0M8qRwLcNvU4v+HWCm2o61K2SRXkMua5ptEUwhPk?= =?us-ascii?Q?7PZQEFZRzGDqcNG9tGmQ6/5a2vY3nWL9TlBRnIHAMrGEpGLwrsbqXSneHEGD?= =?us-ascii?Q?TNH3q+aogyk2sKPuOXuQWlcxXDifwrJfIG2y97+DWegXK7DLngXMAYmyKOmG?= =?us-ascii?Q?iwNKtBRvEWJXC6gknX5igFydFUsbX3dt9kIUBWzIZXx+79hPRT8N1MloPOEg?= =?us-ascii?Q?yqtqRApVAp+qn1zGCvWZwDVtjjv4ejbth2kM1fnR9h5+Gb+jr66JipmJ4MTd?= =?us-ascii?Q?pM75V92d+yO49dPBi54z2Zr+qdACoM2nkgF6GdPcP4fXlJTcectZrIeNgjmX?= =?us-ascii?Q?ZzyW26hoa9e9RBfya79VZnLGXpotvCK7pKhnwXAbDak7j8XRX6MD1kXH+1wa?= =?us-ascii?Q?RSDqw21doZjLeLn0x8De+Np/E2GIFvlLhsiZpxf3bWpxbYkJOpPcrrkfsbL3?= =?us-ascii?Q?v3LhwZWs2ro5yVgHOG+4mMhF9NMZ3wcpAc6kq9BVYxavyPQ5Mbvu3xZCS7Gm?= =?us-ascii?Q?EXbo2AJTMebqzToALMHUfxYzptXssjm5PiB5bG9IThl8KKHxkszkcJdBGPpQ?= =?us-ascii?Q?UAJqq8oJ6mfP8CMhIjbDMP8d4kG+tJRiuqakbheDat5VP2nFhPIZCTR0SApg?= =?us-ascii?Q?0NmJriTG5J+RQMDmRMCZjRpZzRt5B004yJY8SLESgWEesUtN1tS468xJMCtV?= =?us-ascii?Q?4bcA7vfgsHZ4mnYItkuT/8IowT596f8ky3wBu4l0dkpjHiSkcBEypTgf5SzS?= =?us-ascii?Q?lgk0eCa8w0EHg+/q092/gHwl6+3UG8b5lWiuTGzTCw0GC4Ma4/qlqy1yTQjH?= =?us-ascii?Q?+e1gO6n8WAEzrWlw9V8sn6CU0ALmRrwjEVOMmXy5f1iB0hCjLX2Inz/lS4ZY?= =?us-ascii?Q?pDcgZYicfPzKTB+LW7fJoPvZSwStlxOja7FoM1Fe+L/APxe3HLHTeGW4CJRI?= =?us-ascii?Q?J0tZ87H/ur3Yvnn7A5ZTfltpxY+5GW5ZHh3zqLoc2WJ3dx17fn3DeBDHbt7R?= =?us-ascii?Q?mrMbHIJeybMEfuEacl3jqDpEA726a86ZbNsiYqiXiVRSnjM7MJNGkEMYmasY?= =?us-ascii?Q?g2eRoywt5UW8baW4Skjc1OmZk9Je8xcv39iN0OLOu9xqFyRsxWQYw8o01l77?= =?us-ascii?Q?FELtig6x2pvHBcugTf7pp2IhAnnZShmm7KGuwcSq0nJirsWiIgm0h/AUIS7k?= =?us-ascii?Q?6ENiP5DBaloU9PpSNFfvGngJvareo0vyhBxf+o+MNvhS0HWsrPPrzmL/sYn+?= =?us-ascii?B?UT09?= X-Microsoft-Antispam-Message-Info: dFYY82csvS2Hz4Er6mvpSbEGCSBV0Wh8eJf3+9SUQU5y4gzdHcipXWuJIPuqJrBlsoGZM6fG2YnjPKLd1//xH5qFli7patknWatRCgO1LFIQbTLRBrsgEec958uh/Y3dscozO+xBHddMZxYDE7vbr6GIo5f2TS1p94J1zjwrmTqChiz9HkeESR+4A+zO/Smh X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1771; 6:zYli6TzUoKqiI+hDQPm39BzAKaPr43Er2A7YK2IKg/gKwe82iSccoQNmK6SgO9/+Dj9+ZCl3F1had9OnE6DEDZbAIkGnlq9cysjHYfp7iov68KeWWbdk0sttb0RpS9VzDs2aKMVOq7xdTttbNnPhQGGt97SeeowZhC0bkmT8qbteL+iTk7FBEkV1tHVGKDSz3hs1v531enHf9LxiHVEwodAmNKV8giUhPn5CN8G41rJnDtN2XaCZQzltjypeiFIfH2S4YF7D+fNsadMgQ2t/Rbual4CIEr/C+XGThHqYHO80RTKJ/HrGZSXYEw6et0yCyVoyz+TqufKqaPriiPuk4ClakWal6ojVHTYDAZ/1kWlR6N6AvNw+pLd6ifCG2o74t6zJvMV2nKCNsCK57LWUJF+SMXoJeD4om2laoupikggWolFGJyg6llnXInovFeZ/cLjQ9eMnbuMWZbMqdYnbXA==; 5:gXtE0r8VZBMMGjWEacdB7BGeCKyFSvvEzisUp04vZPgASkhy5zn1QL+nA2n8Az9zVGMfd6ZXrHNVxLq+D0bd7vbXGcTF4KPwWJvvFeI/lLEjT2qlZWAFGKfMpY1uVMRCJ6tVVoYY1l5jREqLqaYv4PC3to7SYwhC3wuGiRUpfLw=; 24:44eyqhGEkUCOWVWKs+JG2lj5XjH39xKL4HX0iA7OZMtQmorDhtrq8aGzYCLzSmjtC+WIcJCPFo1ewyRk9dalTpE+CSjt9/kKrSnIHMcxphI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR12MB1771; 7:L9rrw7Fksb4WUKK3UmTjhzsuWR5B19PdulnL7NrW+5XRY/F42WGRnWMN/sJQLf2AvqCcw9twyDi90RrgUPQE65BqieqNBdyWWGNsU5rzCgbKTJ3kftPdw4CoWB2Yb/NyYkDCrVWaSFEaA4lXc/qX14MixZn/cZG6FmcKD2btpwve14Tg6n5nTczx1J5O9ST1pz4/6MGf6FrT540pp+rPyXhN76umuPLROZQ2S41oqWehQqPJB0cJNCGcrCBVklSG; 20:r5amFmvGy1bU6AI+3bc0RyKs0FWmYAR2g+PWfTxT+c4meqgCWNdIj1l4ZoS/bidl5pICvM7fLSogVXVvmWwwOzE5YSCG6u+dRxydpi+ZroJOOGGYsuAFX+306/OXmm+exrI5njhrtNoBJi8gXpdBG0wzcauGwjpLSuAoTnE7HuOPJML2d5e62puqX3a7iKGvUWyWzDpwBUwTYFFSC24QnwTwaerx1jGvhdr741zybNAVgmKif9+MF4/1dvK1eiNV X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2018 21:31:23.1806 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 81b023c2-d17f-4b77-8f4e-08d5942a16f6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1771 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This will be used to control the cache information. By default new information will be displayed. If user passes "-cpu legacy-cache" then older information will be displayed even if the hardware supports new information. Signed-off-by: Babu Moger --- include/hw/i386/pc.h | 6 +++++- target/i386/cpu.c | 1 + target/i386/cpu.h | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index ffee841..9cda1ab 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -327,7 +327,11 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .driver = "q35-pcihost",\ .property = "x-pci-hole64-fix",\ .value = "off",\ - }, + },{\ + .driver = TYPE_X86_CPU,\ + .property = "legacy-cache",\ + .value = "off",\ + },\ #define PC_COMPAT_2_9 \ HW_COMPAT_2_9 \ diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 67faa53..f4fbe3a 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5132,6 +5132,7 @@ static Property x86_cpu_properties[] = { false), DEFINE_PROP_BOOL("vmware-cpuid-freq", X86CPU, vmware_cpuid_freq, true), DEFINE_PROP_BOOL("tcg-cpuid", X86CPU, expose_tcg, true), + DEFINE_PROP_BOOL("legacy-cache", X86CPU, legacy_cache, false), /* * From "Requirements for Implementing the Microsoft diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 806c34b..bbe13f2 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1394,6 +1394,11 @@ struct X86CPU { */ bool enable_l3_cache; + /* Compatibility bits for old machine types. + * If true present the old cache topology information + */ + bool legacy_cache; + /* Compatibility bits for old machine types: */ bool enable_cpuid_0xb;