From patchwork Wed Jan 31 22:50:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 195012 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:106:209c:c626 with SMTP id mn5csp77004dyc; Wed, 31 Jan 2024 15:02:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IGBB1ogffSAfS1sD4f9HuyKh7VnSKx4xAwXip2FG7wv81BG53swYnIIpVNGloqc9LmO93+a X-Received: by 2002:a17:902:ed45:b0:1d5:f255:d386 with SMTP id y5-20020a170902ed4500b001d5f255d386mr2702266plb.11.1706742133084; Wed, 31 Jan 2024 15:02:13 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706742133; cv=pass; d=google.com; s=arc-20160816; b=CBSKJQxQRbZEeuiDdwh6w6GOFi7phIlfhH8dRHyLf8xpSODBnZq11WTPLADKX6r7XN AZDKzug9uwM7b7oNFNjyZjlCJj7pBySLoGnR5xwNiHGEHz4T/jOQp+0gl6rf/luvl3AT F9ueXM1Nx1advI52Q1PIRLHNrSCYDqdJTG04m6cDxYbL9X0VAkZQisUJscCz4w35vr6q C3HrqtWKWUvFZuDna1nTcbkxqgbljzpUT7HI15gROIaPVlkljjzqOsysHBx8TGlaF2Oy QHhplDyLY317hu89mHj5p/1zLu1T6x3Zd50sIoQlswiKwmdlD3O9StoDSq/ZLb4/p4AS uoFQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=w4Bff5uM3q8eLthCYLMVDr14Of+ziM6eQHIEK7k2YKg=; fh=KkTLd6hN7Hqrog+TOpwExO4ugn+Bj4wFY0WDTtLz5Sg=; b=Amc28MuITVwsROdNjlPnFlh7h8RGni6G26nlVWhJFeV5Di776fjJhkfyWJ7cs1debp VplZNAvB1HhMR4G/Kp6QCMc9ilhW0HPZyZ5s3pXc3wd9WahHASerAxpmjjfPd7w9Xp51 GBcZ40iQchIFxm7Am8lbRpXzOD4oHSXeWg/nrZwtBvRQjTAmXDlIOnc66Xt75O9snGF6 EIotibpbkljvICehw5EJdQl8EHABnsgcJS4G+WjLpLZog+LTupOkeB33hkQAitdpI9nA JQmxa6YcLrW5r1DbXidYgLcliL7tsOHOZzPK3tVlNnEVk+HQ56G1tn1XsGo/b+mYelZQ 9dtg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ihPIffyt; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-47275-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47275-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Forwarded-Encrypted: i=1; AJvYcCV/xmtoPdY1YbXsrJMYC8MfrCTNh2a5EFEzJX9VUx0zd2YPv34N2huB1EvgmzOrk8veJfDP3JYoUCAgZMuL+nQEKcpVwA== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id n4-20020a170902968400b001d4891f73f0si10184755plp.549.2024.01.31.15.02.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 15:02:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-47275-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ihPIffyt; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-47275-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47275-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 4C877293488 for ; Wed, 31 Jan 2024 22:51:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D27623B295; Wed, 31 Jan 2024 22:50:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ihPIffyt" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5FDDA3A1DF for ; Wed, 31 Jan 2024 22:50:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706741419; cv=none; b=ZEFTBALMCPP+uZoBJFhcUmaZbynijcfyafOcPCgBwenrHCT3I+LY4lFxJmA1eXDbIZ5lisgq7eu1giqXeoPux73XhH18t93tRD5/IqbGrTsoMczASHaVr3Xnwnu9Ka6rbbPkaGh1D2WYH5cf4+T2ZBMxadZquUzDCN4vykPm1O0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706741419; c=relaxed/simple; bh=1/4WEIAIKqQBXE0ZhDljCAFK3p148tD/jCshuVONiGI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=LayH1714v+TRldMAGmTYbpgNYPqSsRs2PGQkZ8hgJNb5euG8adDkIWxrAEcNoE9nZBJPEhns9xZakvhKk+CB87bDEmrQ0XFGHSN97W509qs44LM9Di+ZlOEppWVk1lT7sceewgMiXvKv+MSf/3DSrxBzwB78QRbid70WGNI8wTU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=ihPIffyt; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706741416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w4Bff5uM3q8eLthCYLMVDr14Of+ziM6eQHIEK7k2YKg=; b=ihPIffyt/4ppT4ubaRNL4bw0/FjO+Cxvkp5FBj1Fv3lmOl8Ha2zs8+URPgcV5P4qVh/dvz 4SCZk2b5eRTXCi1bUptOgrY6R16tsD8cwd62IiHtp3bDSL1sXNpxPdQKZNWyl6sZ+AKuRT ZHDlUDklaSpfG1vj1AjPPV3nkbnRPSg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-645-4ALEoIVjPnW3OisOpzO0ow-1; Wed, 31 Jan 2024 17:50:11 -0500 X-MC-Unique: 4ALEoIVjPnW3OisOpzO0ow-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5C1D4185A785; Wed, 31 Jan 2024 22:50:11 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A6AE2166B31; Wed, 31 Jan 2024 22:50:11 +0000 (UTC) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: dionnaglaze@google.com, seanjc@google.com Subject: [PATCH 2/3] kvm: x86: use a uapi-friendly macro for BIT Date: Wed, 31 Jan 2024 17:50:09 -0500 Message-Id: <20240131225010.2872733-3-pbonzini@redhat.com> In-Reply-To: <20240131225010.2872733-1-pbonzini@redhat.com> References: <20240131225010.2872733-1-pbonzini@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789648838589596458 X-GMAIL-MSGID: 1789648838589596458 From: Dionna Glaze Change uapi header uses of BIT to instead use the uapi/linux/const.h bit macros, since BIT is not defined in uapi headers. The PMU mask uses _BITUL since it targets a 32 bit flag field, whereas the longmode definition is meant for a 64 bit flag field. Cc: Sean Christophersen Cc: Paolo Bonzini Signed-off-by: Dionna Glaze Message-Id: <20231207001142.3617856-1-dionnaglaze@google.com> Signed-off-by: Paolo Bonzini --- arch/x86/include/uapi/asm/kvm.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/kvm.h index a448d0964fc0..9ae91a21ffea 100644 --- a/arch/x86/include/uapi/asm/kvm.h +++ b/arch/x86/include/uapi/asm/kvm.h @@ -7,6 +7,7 @@ * */ +#include #include #include #include @@ -526,7 +527,7 @@ struct kvm_pmu_event_filter { #define KVM_PMU_EVENT_ALLOW 0 #define KVM_PMU_EVENT_DENY 1 -#define KVM_PMU_EVENT_FLAG_MASKED_EVENTS BIT(0) +#define KVM_PMU_EVENT_FLAG_MASKED_EVENTS _BITUL(0) #define KVM_PMU_EVENT_FLAGS_VALID_MASK (KVM_PMU_EVENT_FLAG_MASKED_EVENTS) /* @@ -552,7 +553,7 @@ struct kvm_pmu_event_filter { (GENMASK_ULL(7, 0) | GENMASK_ULL(35, 32)) #define KVM_PMU_MASKED_ENTRY_UMASK_MASK (GENMASK_ULL(63, 56)) #define KVM_PMU_MASKED_ENTRY_UMASK_MATCH (GENMASK_ULL(15, 8)) -#define KVM_PMU_MASKED_ENTRY_EXCLUDE (BIT_ULL(55)) +#define KVM_PMU_MASKED_ENTRY_EXCLUDE (_BITULL(55)) #define KVM_PMU_MASKED_ENTRY_UMASK_MASK_SHIFT (56) /* for KVM_{GET,SET,HAS}_DEVICE_ATTR */ @@ -560,7 +561,7 @@ struct kvm_pmu_event_filter { #define KVM_VCPU_TSC_OFFSET 0 /* attribute for the TSC offset */ /* x86-specific KVM_EXIT_HYPERCALL flags. */ -#define KVM_EXIT_HYPERCALL_LONG_MODE BIT(0) +#define KVM_EXIT_HYPERCALL_LONG_MODE _BITULL(0) #define KVM_X86_DEFAULT_VM 0 #define KVM_X86_SW_PROTECTED_VM 1