From patchwork Wed Jan 31 22:50:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 195009 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:106:209c:c626 with SMTP id mn5csp72352dyc; Wed, 31 Jan 2024 14:51:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IFKn/e+YSPBi8BrGfuNToFBsf0yaVw9n6I5AxNDnpWE9avw12KZQU3tCK3qf1DR5pgE249C X-Received: by 2002:a05:620a:6893:b0:784:99b:fe3c with SMTP id rv19-20020a05620a689300b00784099bfe3cmr1222610qkn.28.1706741491513; Wed, 31 Jan 2024 14:51:31 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706741491; cv=pass; d=google.com; s=arc-20160816; b=bWdpXXiyw+HRGtb8UbqP/tyYw7+Mlfrs93p0KErm50oYjj2+GjP6TfeX4MjT36d+g7 0OE3gvDGJKvBpBgyst+GTm0Zp1gX5BupRlJWWO8b1GOtSdyocCBdqyFx6x5AwZdtiSV6 FdmCtmN7VCVl0q6V+O4UIAMDilQPHZLd7frvsw/d+lHrw/FZp6Lv5ffg/MAkh3d8np1t A9c6qQTbUu079+plc7sI73qUp2rSyEjgdDlIrAEydK6AXEgjwd+vnOBYDQ1yKi2dD/OM 667DNHrShFpixIXQ9sv4I2jg0HQ+NM26MJGgQebmsu6Ghw9hWRhVk7Y8QcNQXN8CJ5ng /NWQ== 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=FcW4aA4QUlOADw+pKX0iGEX+H00vP76wOtrVID4JVvo=; fh=42w2tA7GvqOmE71riqvaGEvZ4V5QVy/RkBtArpU57vM=; b=Z+/LWhTCG+kVf3HVEBGZ30L18K0E7tLdisDi5dR126zxHEb5OKbyUyRcDz7930hAef 7Nzx69aO4gcy81+zdtxb2eRI9Wd/P9cgNxrkj/asOd5OaA/onzdV5la/AxNN/BOAhRjW nP018d5mMYarih5YLcZMxxzbMYGeiZIRzafOAguY86TDfklfcW/cSbCBp/p7ybDyk6A8 3STaauyKUM9gpTTET8082Hy7njo+0hpMBdqhLo6uo5ykPO7xDW4w/a6lU3UJTMDXzy6r OEwljlLyPIaC8ITECw8c1N0Sh074Tv6fWGJ5GIwG8pWKpKOGw9MfrPjYXN0zwa+Rpm0k hicQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SveXXnsB; 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-47277-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47277-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Forwarded-Encrypted: i=1; AJvYcCUZ+srx7611hzHAxRPe7lbeJVeY21pX6iCCKYd0RdEWScu3lxJHoS9JptokpG9ZXSt5ymmq9K/2WsjnWyJBHFwmmf+Vrg== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id y18-20020a05620a09d200b00783f6cfcd81si8546329qky.249.2024.01.31.14.51.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 14:51:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-47277-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SveXXnsB; 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-47277-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47277-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 510931C244BB for ; Wed, 31 Jan 2024 22:51:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B47133A8C2; Wed, 31 Jan 2024 22:50:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SveXXnsB" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 73BA03B797 for ; Wed, 31 Jan 2024 22:50:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706741425; cv=none; b=kdJKIkSgjCUpucu0BeLWXOlXWuRjg4QvLykreb/GARQbDXHOof6J3VnqYWoEd704p2MFFjYbYvRT0gDXZHFKf5CS0ne25cpTilwh3UuBwA3AP0pYmbsP+jgHs934A94967xwzLLi2Pxs0z+ZvUTC/v1zK+tOio4KZVNj/P6oMvw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706741425; c=relaxed/simple; bh=AYdMEWZrrFVOE5/Y3TiS+Iapcw8zW/FHFD57cTayr5Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=Qaw65lZcz5S8p4oraaEfz4sKer74xtghQJkd4MI+OWkqMeyOdJtgkI74aMycRma6Z2+gbQC3e6WiIqEorY0w+PaeCt0JAc0/MXEL0X5SWascDv0YIW0ABZEQK8u2T52tskN+F2bBZTBcs1JxmqTb0a7BkxJUffLciIhdCsUmBOA= 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=SveXXnsB; arc=none smtp.client-ip=170.10.133.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=1706741422; 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=FcW4aA4QUlOADw+pKX0iGEX+H00vP76wOtrVID4JVvo=; b=SveXXnsBu5hYvZ5clmg3TN6vUaNje4HL10VCW4dcW0xn9gbFKeupEfQFAnx07AI5kidcUn PscGN7S2mbGKmUSfhXM5bzgeUxLc9nK6yTaLAPGtsStoSafrzvn+8FpJ9/mIAhNUP1mgWM Pd4OUH9ga8BY84PZYhXSnCwBk8XZ2rY= 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-370-PhiVAquEOmSRTXpoEibaxg-1; Wed, 31 Jan 2024 17:50:11 -0500 X-MC-Unique: PhiVAquEOmSRTXpoEibaxg-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 85444185A787; 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 63A5D2166B31; 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 3/3] kvm: x86: use a uapi-friendly macro for GENMASK Date: Wed, 31 Jan 2024 17:50:10 -0500 Message-Id: <20240131225010.2872733-4-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: 1789648166230922479 X-GMAIL-MSGID: 1789648166230922479 Change uapi header uses of GENMASK to instead use the uapi/linux/bits.h bit macros, since GENMASK is not defined in uapi headers. Signed-off-by: Paolo Bonzini --- arch/arm64/include/uapi/asm/kvm.h | 8 ++++---- arch/x86/include/uapi/asm/kvm.h | 7 ++++--- arch/x86/include/uapi/asm/kvm_para.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h index 89d2fc872d9f..6b8b57b97228 100644 --- a/arch/arm64/include/uapi/asm/kvm.h +++ b/arch/arm64/include/uapi/asm/kvm.h @@ -76,11 +76,11 @@ struct kvm_regs { /* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */ #define KVM_ARM_DEVICE_TYPE_SHIFT 0 -#define KVM_ARM_DEVICE_TYPE_MASK GENMASK(KVM_ARM_DEVICE_TYPE_SHIFT + 15, \ - KVM_ARM_DEVICE_TYPE_SHIFT) +#define KVM_ARM_DEVICE_TYPE_MASK __GENMASK(KVM_ARM_DEVICE_TYPE_SHIFT + 15, \ + KVM_ARM_DEVICE_TYPE_SHIFT) #define KVM_ARM_DEVICE_ID_SHIFT 16 -#define KVM_ARM_DEVICE_ID_MASK GENMASK(KVM_ARM_DEVICE_ID_SHIFT + 15, \ - KVM_ARM_DEVICE_ID_SHIFT) +#define KVM_ARM_DEVICE_ID_MASK __GENMASK(KVM_ARM_DEVICE_ID_SHIFT + 15, \ + KVM_ARM_DEVICE_ID_SHIFT) /* Supported device IDs */ #define KVM_ARM_DEVICE_VGIC_V2 0 diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/kvm.h index 9ae91a21ffea..bd36d74b593b 100644 --- a/arch/x86/include/uapi/asm/kvm.h +++ b/arch/x86/include/uapi/asm/kvm.h @@ -8,6 +8,7 @@ */ #include +#include #include #include #include @@ -550,9 +551,9 @@ struct kvm_pmu_event_filter { ((__u64)(!!(exclude)) << 55)) #define KVM_PMU_MASKED_ENTRY_EVENT_SELECT \ - (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)) + (__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 (_BITULL(55)) #define KVM_PMU_MASKED_ENTRY_UMASK_MASK_SHIFT (56) diff --git a/arch/x86/include/uapi/asm/kvm_para.h b/arch/x86/include/uapi/asm/kvm_para.h index 6e64b27b2c1e..6bc3456a8ebf 100644 --- a/arch/x86/include/uapi/asm/kvm_para.h +++ b/arch/x86/include/uapi/asm/kvm_para.h @@ -92,7 +92,7 @@ struct kvm_clock_pairing { #define KVM_ASYNC_PF_DELIVERY_AS_INT (1 << 3) /* MSR_KVM_ASYNC_PF_INT */ -#define KVM_ASYNC_PF_VEC_MASK GENMASK(7, 0) +#define KVM_ASYNC_PF_VEC_MASK __GENMASK(7, 0) /* MSR_KVM_MIGRATION_CONTROL */ #define KVM_MIGRATION_READY (1 << 0)