From patchwork Wed May 3 09:45:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 13229993 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D368FC77B75 for ; Wed, 3 May 2023 09:46:32 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.529061.823017 (Exim 4.92) (envelope-from ) id 1pu943-0000Nu-63; Wed, 03 May 2023 09:46:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 529061.823017; Wed, 03 May 2023 09:46:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pu943-0000Nn-3F; Wed, 03 May 2023 09:46:23 +0000 Received: by outflank-mailman (input) for mailman id 529061; Wed, 03 May 2023 09:46:21 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pu941-0000NW-Hl for xen-devel@lists.xenproject.org; Wed, 03 May 2023 09:46:21 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2052.outbound.protection.outlook.com [40.107.7.52]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 5a6b7481-e997-11ed-8611-37d641c3527e; Wed, 03 May 2023 11:46:18 +0200 (CEST) Received: from AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) by DBBPR04MB7980.eurprd04.prod.outlook.com (2603:10a6:10:1f0::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.22; Wed, 3 May 2023 09:45:49 +0000 Received: from AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::768c:6df7:9afb:acd7]) by AM6PR04MB6551.eurprd04.prod.outlook.com ([fe80::768c:6df7:9afb:acd7%6]) with mapi id 15.20.6340.031; Wed, 3 May 2023 09:45:49 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 5a6b7481-e997-11ed-8611-37d641c3527e ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J4Ti2FyuNUFQo5B8p5+8s/4oJXDMxJr4KKeZe8p8wtr3e1k4W5eDwmb7tNGjKTiFZ8R/2fkCzoQvb6S4L99qPz2G34yxw8XbbZVeemMv81G3lhYCOHzpHw4I65ar99LXv10pzDykBzWDVazamiMiMmx9HfjndxVUJCgLzcbh/iKhqWcjIFPjzSsZHoI4EDdp4hGtkCI+hVrpMjP7b9moBgopZCanlq8r7+I7yKd5e6rTaE5py+ai2W+PWhln8wHBC1UuDxiGc6yU8NhPug96hjWXoHXzDDhvwxs3R8ICcyJBxNJvLh8YquXWKaSBk9wUBJV0V45n20+K72K9bOE8TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6s2ziFxyLLrxphcX9bcoXKx8fmbmlbg2IZSNSJNSJw4=; b=FMTOR7WhKDNt4LkIe9tfRUyAZ9nEOLx/by1cEAo2LlyZ5ifueXwpA/HV+aR6OoIW5CEkERNlu5TVRQn83k+D1B7mSuZurzkjyBo3tRgz1cuGopmXbf9lJ2Od1QcEIIdUxtJV430GitjlOt18S11dJA7r3u47WGDksihXrkR5QBWahZ0uAlSJnIa6Xtis2qJDSeOByAUFV8lTHfpNAhOEvaD4X5r+3GqSKbNf6Fn+6FJc1VvkRJ9KVQyO1vkIopyMzcWKR8owXyByqrCRNhi4rGAXqta5RjNKyk1U5z599nJ0K/81KV0vWi0VKomsTIC40pmDsKXZ21YC01BXucjgbQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6s2ziFxyLLrxphcX9bcoXKx8fmbmlbg2IZSNSJNSJw4=; b=ktwluAyIBMs75Hpu+3Nb54GPGgIiTdVoBjUA0PphmB0CUjFKOJ8yTC02HwGmI3PjNOqanvVR2B9VgCMxN2ckOEbsiNRTmPAkaihvZHoZMNe7w1VphDaNqHRLL4s8vGVMxMIC3OagahJ7OsCA15OpgCdr8ULVu/T9cMFuKLZX3RgR0yGdfc3QKa01jjk7kDS0vgr72tEk6VAmkSC/EMof96tEsQkMrOhuOhMSb9QEqEUNeS3zYVA+6qNHQ7culh1Ob5q0pNPAXqCJxKnj1+GlYKYmJTLzXnehamKrXeAD7aLU6HdAKskqtWor14jog8a7YX0T+dy3sEU2gHpwcCLFKA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <9dc789fe-6c03-165d-c361-6aaa4ba09763@suse.com> Date: Wed, 3 May 2023 11:45:48 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 Subject: [PATCH v2 3/6] x86/PV: restrict guest-induced WBINVD (or alike) to cache writeback Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?utf-8?q?Roger_Pau_Monn=C3=A9?= References: In-Reply-To: X-ClientProxiedBy: FR2P281CA0040.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:92::7) To AM6PR04MB6551.eurprd04.prod.outlook.com (2603:10a6:20b:fa::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB6551:EE_|DBBPR04MB7980:EE_ X-MS-Office365-Filtering-Correlation-Id: d6d72f2c-df64-4a34-50b1-08db4bbb2d63 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zfJSpX52zNoSJgSDqDh8oLyEvYsXe+x+6prtXbYx8ALGbJb96oKPqeyHF5F+meIC3b8O4RI4gNZhxPNXdDWBxyUElvQ9I/Lhv3I60Rwue4pRhfItPmrpK//PLjdVH5960/t612XGZePRHIKawThacTL0cka/7GjDCrvOhHBzgrcnBH98DzrcVP3cGCgtVAvNgOXZiBK8VsoGGrjazOguvxYU9wubhbZSRfC1rRyoTMOviOPKCE5Q7PSjhsXEleE5FuRysMF/XhmUn/KVFwNtMAlJea0hysPzlCKBQxdWY+tPuLFuwfy//EPhlMI5KkAGgf/ElUFbjnA9Mg1qGerYDU0EF8Av4SZzw/E8xq43HcOUZj/z0WlG1RpR8+zbY7pYO7vd3jYhbZ0aHblAVXPWmjBmn+v3kUZp/DckA8afR2Q+EeeSlDEzdPISB45X2c/IyhpzI2LvgCLRjMrwrqhVqPaC7g9z9S8dug8PyLISR169G6OSqN5LLy4DjrNSQuHQVz3XHTCgH/cIpxfLtyqPy7y4A8smtbRou9uLySp9suCu7YnlBkGrU8wWv8ye05NgDp4g7MSKDml3yZtKy1L7IoxnZwyxy+KLh42yDMebpWkBqhvp3SNU7Oeo9R7pB15Z260MTz6CSIrdpw7akGxAsg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB6551.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(136003)(346002)(376002)(366004)(396003)(451199021)(6506007)(26005)(6512007)(186003)(31686004)(2616005)(2906002)(5660300002)(83380400001)(8936002)(8676002)(6486002)(41300700001)(36756003)(478600001)(54906003)(38100700002)(66476007)(66556008)(316002)(31696002)(66946007)(6916009)(4326008)(86362001)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?UNdXhj+3d+oVtUDonitnQsbJ/Lo/?= =?utf-8?q?E/Mw5WqkvYChIACamHw54aptSDtlh4Z+HTSRYbyXDDo6hQ4FVWNu95BUjIY+TDRrO?= =?utf-8?q?Nz848rGDHwpZVMJuuE86nRMOw1opppQqoy7m2QjUElnOrbsqfG8otT1Rk+TPHQRqH?= =?utf-8?q?ST1sVkVmZ2/0beoEZUSfT0wQK4he+Ayp7C3dRTNp3S/MUGJPCprfkPuxywEyMy4YI?= =?utf-8?q?nKB/tlZPiZMiqhVYO5+Lx5s4Gp1UXbBI0kPqAU12ng1sIY8PRLEd2E7GHQbOectUA?= =?utf-8?q?Qe5UxxgrFRAcv7b3n+AIcIhm47CLrh6DnnVivTft+dLL4EWyXSu5eooba//+VaSvY?= =?utf-8?q?Nl41GhLI8f+V3Su8qdXFXHAJX8/T7do0pF3KzciFUQrbZrSHdm0x6CTpxJfhA0XNZ?= =?utf-8?q?CA934dttdTescW8C26n5LyyvVUUPGLPbHwGfEL/zRV05oxm7y1yC/qepdxPxjhI+x?= =?utf-8?q?QJTMhaijkZY714rHaoUe+2PIipfoyitr8qy3L/V5RfZkHQC/CGI+RHIDPLB5NRu3K?= =?utf-8?q?/WMGLNfscmaiXRvGDi05crRfuDNLp3pdWXu8DcCiNQ9LzkHkV0h8B9ZkPYV69ZevY?= =?utf-8?q?QjOGIZT1oMz6JENWtDgX+vZSPHrjUgKi89+8c24VzO3/uWolOdF8U6+Od7U5KOsj8?= =?utf-8?q?Ays47iGY+EOmduKlHw7nlitLnWZT97FDdSnoTctLIiYy3GRvPOPwUCuiTukz/w3Cg?= =?utf-8?q?RfuMU3KF6U/2PEswzicCjYR/lU+pevXJWnVhZXp2LeCjjvuLRKjha+btc/BFRlXnU?= =?utf-8?q?5oss5/GC89prhyg81QOH0ES7OZfR7cqIaKBKSMWNYDYDoS/y0VJiDobDwg9xl6Dre?= =?utf-8?q?/ogC5ghMibK8LFFlu4QWTPRhDWIFj8vqoBHbK0C8IArTwcBsYNt5ZnZ5uuEZP5a/q?= =?utf-8?q?4/yBrMKfA8wfSuGrWddvgi58PvUWQoPf2BubjIEI5AvZGziiFNXM3CKiornxy7YHl?= =?utf-8?q?mZyk8W5hofHeHsurWqw7VU3RGrhrgGLwFt2kavNEKa07eFbkjJ55NPG4uBecFuM60?= =?utf-8?q?N6SUCsHmFeW1ImssUMiPb1R1A+VyN9I2sxBpu9xMktJfCFsEsNYVTSe3JHEC2GFtg?= =?utf-8?q?NoTZcmvZnYhmX9MD4W/Mfyt0XBPUtWS7jwUTnVa76nG9VkkVyrAbE29bVbsk7xkre?= =?utf-8?q?AyTdXfZVlBlvk8MgTjHp6VzXPkHKLi7c3rneq15GLWbLGq0zhfTvLWMxA0VBfm4mY?= =?utf-8?q?jYh++zl9WDOZLG2Z8o9CqIF+mz7vvkMWdnW3PTZah0mYrh1jJykQBNI3trLtA6u4B?= =?utf-8?q?EOk6t7NappvUNH062pMQYhoFSOcrkftB3Jpbuc0drhiHgGL8hb/b8F0uRv1nYq4Q2?= =?utf-8?q?bzKRVwE+VImDWauFn41E15rN8VWQNRQpZKeFpC9P/xjeZClmrIsEOUrzbXxVxscn0?= =?utf-8?q?ZAJ8EtGNlGRCnY9UtjqBTT4tnUS/boPK3UE/4eoodavnEgOpokjyMx97VPna+mT18?= =?utf-8?q?FTAP8yzbEHYQJ3WXbK2J2L/tLdUhdIBRc+OezLxaQlnyTG1KkTyZTCaWxD72OPwrI?= =?utf-8?q?rqFmACPfYKct?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d6d72f2c-df64-4a34-50b1-08db4bbb2d63 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB6551.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2023 09:45:49.6761 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HZSwL4/OqmrpkAbdfihTLGdGwYzfL8zA+AX5fDWRIJJwdCV0osEFvJvWF/yJv3ziRbzjENpPGGkk5olv6NBIYw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7980 We allow its use for writeback purposes only anyway, so let's also carry these out that way on capable hardware. We can then also expose the WBNOINVD feature, as there's no difference to WBINVD anymore. Note that respective emulation logic has already been in place since ad3abc47dd23 ("x86emul: support WBNOINVD"). Signed-off-by: Jan Beulich --- v2: FLUSH_WRITEBACK -> FLUSH_CACHE_WRITEBACK. --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3772,7 +3772,7 @@ long do_mmuext_op( else if ( unlikely(!cache_flush_permitted(currd)) ) rc = -EACCES; else - wbinvd(); + wbnoinvd(); break; case MMUEXT_FLUSH_CACHE_GLOBAL: @@ -3788,7 +3788,7 @@ long do_mmuext_op( if ( !cpumask_intersects(mask, per_cpu(cpu_sibling_mask, cpu)) ) __cpumask_set_cpu(cpu, mask); - flush_mask(mask, FLUSH_CACHE); + flush_mask(mask, FLUSH_CACHE_WRITEBACK); } else rc = -EINVAL; --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -1196,10 +1196,8 @@ static int cf_check cache_op( * newer linux uses this in some start-of-day timing loops. */ ; - else if ( op == x86emul_wbnoinvd /* && cpu_has_wbnoinvd */ ) - wbnoinvd(); else - wbinvd(); + wbnoinvd(); return X86EMUL_OKAY; } --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -238,7 +238,7 @@ XEN_CPUFEATURE(EFRO, 7*32+10) / /* AMD-defined CPU features, CPUID level 0x80000008.ebx, word 8 */ XEN_CPUFEATURE(CLZERO, 8*32+ 0) /*A CLZERO instruction */ XEN_CPUFEATURE(RSTR_FP_ERR_PTRS, 8*32+ 2) /*A (F)X{SAVE,RSTOR} always saves/restores FPU Error pointers */ -XEN_CPUFEATURE(WBNOINVD, 8*32+ 9) /*S WBNOINVD instruction */ +XEN_CPUFEATURE(WBNOINVD, 8*32+ 9) /*A WBNOINVD instruction */ XEN_CPUFEATURE(IBPB, 8*32+12) /*A IBPB support only (no IBRS, used by AMD) */ XEN_CPUFEATURE(IBRS, 8*32+14) /*S MSR_SPEC_CTRL.IBRS */ XEN_CPUFEATURE(AMD_STIBP, 8*32+15) /*S MSR_SPEC_CTRL.STIBP */