Received: by 2002:a05:6358:111d:b0:dc:6189:e246 with SMTP id f29csp1454948rwi; Thu, 3 Nov 2022 05:37:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM65cFDCT3R1HPkxaSDNqF9Vn7fCzryUHtKm92+0XFpGMwcTZJ9/mjP+C4uPW04bcUxOAlqr X-Received: by 2002:a17:906:d555:b0:7ae:fdd:d0b4 with SMTP id cr21-20020a170906d55500b007ae0fddd0b4mr5114247ejc.185.1667479029049; Thu, 03 Nov 2022 05:37:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667479029; cv=none; d=google.com; s=arc-20160816; b=MSi9dQKP4AyCpNfpjdfBYzMzdnMp8HAntjVaM11DV2/HqxROkZ7/kgP7UoSlIpOtMx 83hj2UlVSIz3c8eNIRCX42YNv3h6rxfEueOoxoAXERuQVnnHUF7m7PTbWHWUslvR+3XJ HGsXc+iSXYKsu3K4R2w/L1dY/7UagYoltM6obGsnWkFXLCcjseFx23pL9hWUcGEbCXdb PXB9YmzCjrXYPeZLmGGRqCr6wOBbOFrj6J+eh6HkKOsjAdydoPtUets918y/pYURO3ko UbAQwJ0u46Dg+7z7LzDpwuMHVLh1Ae6xSY9Oqu8dJkZCqMh741E4duLZBJ9PwKVIVmI5 GVmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7CU5Zv+MxpH9Viqrq9cuAJbtGqlqKE19LW/YuoUb07c=; b=ECBse8LF3bdxwroT5lbXJ7kTO3c0Noxy9H10q1L62gCTA1yMyl94SeeHh0fyzlVlsq FZmpju7R6l+l79Zy0DbB7NYwLOPoXC3wGgV6XaFoyfiu772NTSZo5L3R0roubp2hLWEs eA8cKiuKzRHd5kPUIfCOhnMYnQZgKyxybXD5mG5BLfDy9JK1vkFLCOJKdL00DHD8L5wO YMYfspfOkEvAXzE/2L+jFWQfP8lRQvzNL1/9fQo7ada7Q6IO+Gxc8lDIKJ/YY26EeIlB 4a5M3AUUpwnuPeZDPKFUBWlIinooR8jy/gINvTljfPaQFeghBMZr9SjzF+DF5GdUdk0d 8fAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=EoOrn3NQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b90-20020a509f63000000b00463817b0ba1si1024809edf.163.2022.11.03.05.36.40; Thu, 03 Nov 2022 05:37:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=EoOrn3NQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231359AbiKCLg6 (ORCPT + 97 others); Thu, 3 Nov 2022 07:36:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231356AbiKCLgw (ORCPT ); Thu, 3 Nov 2022 07:36:52 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00E091209D for ; Thu, 3 Nov 2022 04:36:51 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B5D0921D0A; Thu, 3 Nov 2022 11:36:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1667475410; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7CU5Zv+MxpH9Viqrq9cuAJbtGqlqKE19LW/YuoUb07c=; b=EoOrn3NQCcelDwLrz6uRb8Qdpe2LcmeDtFqRskvTLgiYp1OIbmEUexGEbMyEIOYJ42dKu/ 12zWG8reRqNsGvcRjBnqFgs8u2C5XKriMxPc4fnl1Yc+FvgUrhX7K0Dl2C6TbloaatAyqV ljzr7Loq/CVmv4IC7XuZaPSEWg0URFU= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 72B7713480; Thu, 3 Nov 2022 11:36:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id sJJtGtKnY2P4HgAAMHmgww (envelope-from ); Thu, 03 Nov 2022 11:36:50 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org, x86@kernel.org Cc: Juergen Gross , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Subject: [PATCH 1/4] x86: add X86_FEATURE_XENPV to disabled-features.h Date: Thu, 3 Nov 2022 12:36:33 +0100 Message-Id: <20221103113636.25543-2-jgross@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20221103113636.25543-1-jgross@suse.com> References: <20221103113636.25543-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add X86_FEATURE_XENPV to the features handled specially in disabled-features.h. Signed-off-by: Juergen Gross --- arch/x86/include/asm/disabled-features.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/disabled-features.h b/arch/x86/include/asm/disabled-features.h index 33d2cd04d254..c862552d7d6d 100644 --- a/arch/x86/include/asm/disabled-features.h +++ b/arch/x86/include/asm/disabled-features.h @@ -81,6 +81,12 @@ # define DISABLE_SGX (1 << (X86_FEATURE_SGX & 31)) #endif +#ifdef CONFIG_XEN_PV +# define DISABLE_XENPV 0 +#else +# define DISABLE_XENPV (1 << (X86_FEATURE_XENPV & 31)) +#endif + #ifdef CONFIG_INTEL_TDX_GUEST # define DISABLE_TDX_GUEST 0 #else @@ -98,7 +104,7 @@ #define DISABLED_MASK5 0 #define DISABLED_MASK6 0 #define DISABLED_MASK7 (DISABLE_PTI) -#define DISABLED_MASK8 (DISABLE_TDX_GUEST) +#define DISABLED_MASK8 (DISABLE_XENPV|DISABLE_TDX_GUEST) #define DISABLED_MASK9 (DISABLE_SGX) #define DISABLED_MASK10 0 #define DISABLED_MASK11 (DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET) -- 2.35.3