From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E44B6C4332F for ; Sun, 5 Nov 2023 16:33:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 88C29440161; Sun, 5 Nov 2023 11:33:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 83C94440150; Sun, 5 Nov 2023 11:33:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6DEB7440161; Sun, 5 Nov 2023 11:33:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 5EB7B440150 for ; Sun, 5 Nov 2023 11:33:28 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 3F2EC14043F for ; Sun, 5 Nov 2023 16:33:28 +0000 (UTC) X-FDA: 81424446096.29.5BBD684 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 77B89180006 for ; Sun, 5 Nov 2023 16:33:26 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EjC087JG; spf=pass (imf16.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699202006; h=from:from:sender: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:dkim-signature; bh=qfeiaA9Zm3lDYCkoTrnfofIiBFTO8MQOwDWpndcpgFA=; b=Sig5z/ga/O8gxvXjRBHqRHZHa3hwITC46FQPf55LrU2yfTTV3Xof7NoaIU3C0FCCjGZ6v/ 8WFI4OS5jiYqEG9xH9hx9R6yvzYVCcy4V1PbogCsvQNWLX0ke0KTdJqg6UD62RFYWiL4Nv frj/oE0R5if/w3QEt01zB05RSuUYROI= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EjC087JG; spf=pass (imf16.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699202006; a=rsa-sha256; cv=none; b=WeIeu5hJhsjv8ylWY6UB3XUdgMILOdc10iCgKIN9ZAjJYlp9VRsWFVfE/7gTkTQ3WDBjDJ y/uNUv+SKRfDlza0MvLGlevdABMeRA5Ho3hH8CUFbJZiZi+rEV8ljQFB6WtM7p9r9vL9N9 qqfavpATZZXyRPWcZ4/GeaoJ8l2RgSI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699202005; 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=qfeiaA9Zm3lDYCkoTrnfofIiBFTO8MQOwDWpndcpgFA=; b=EjC087JG1gyGLwGABGhAqeP+T+ipfr8MXPuy08GdBhm+2gwlAudDoS9SBK0AzfVzLjPQ9E BuZkFQb1asIrJ02iwZ0rjLg4Zd330NxKdZeoVahzmGU5vEOFbsww9xiJfaZ9cks9ULTDtH P9NFqCOdSAnfTS/3DB32yeKxuw2rktA= 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-695-2hs99GbVMSuoqusTkGwtCA-1; Sun, 05 Nov 2023 11:33:20 -0500 X-MC-Unique: 2hs99GbVMSuoqusTkGwtCA-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 BD00180B642; Sun, 5 Nov 2023 16:33:18 +0000 (UTC) Received: from avogadro.redhat.com (unknown [10.39.192.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id 387F52166B26; Sun, 5 Nov 2023 16:33:10 +0000 (UTC) From: Paolo Bonzini To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Sean Christopherson , Alexander Viro , Christian Brauner , "Matthew Wilcox (Oracle)" , Andrew Morton Cc: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Xiaoyao Li , Xu Yilun , Chao Peng , Fuad Tabba , Jarkko Sakkinen , Anish Moorthy , David Matlack , Yu Zhang , Isaku Yamahata , =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Vlastimil Babka , Vishal Annapurve , Ackerley Tng , Maciej Szmigiero , David Hildenbrand , Quentin Perret , Michael Roth , Wang , Liam Merwick , Isaku Yamahata , "Kirill A. Shutemov" Subject: [PATCH 19/34] KVM: Drop superfluous __KVM_VCPU_MULTIPLE_ADDRESS_SPACE macro Date: Sun, 5 Nov 2023 17:30:22 +0100 Message-ID: <20231105163040.14904-20-pbonzini@redhat.com> In-Reply-To: <20231105163040.14904-1-pbonzini@redhat.com> References: <20231105163040.14904-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Rspamd-Queue-Id: 77B89180006 X-Rspam-User: X-Stat-Signature: kyb39jzdsaa45hj6cbrurzx5htpgfhns X-Rspamd-Server: rspam01 X-HE-Tag: 1699202006-711726 X-HE-Meta: U2FsdGVkX18ccepUn89dx0++l+QzTz185N74MANY8NvIy53SuU1R1Wlh8SqC/g/NwOVVxeRJBcA2LfQE967X/C0f+ePDp8hBj5VPHtEpd9KRICdpvHETK1DBbj0vl1/xt3TLClfyrKMmi6eGF2bjTLdJvcu5EsxhTDN1Oe7tMgXG5+2XyKqufQ6dnW2y2mDhnJfaRz6XmmgZEs+zwznFX4Nyxl9X9IOX9dWOaqGHd4uYOzSmarToc5hFXHR1nI5UijYUKcH5iJpgCe9p+zYBO5WYcTNeBNKCcdza1Dya++uuRQNC3359m76hEMXmiOLhkgmkhMnfoids/lk9xfxiBSHuYGR2lHZhxHt42Stv7L1C+7aeyTWIogoWPHsWLZKlsYE0msRNY42XH2RtHPbtcNisluOfGx1jiMNKQRTK4ikjCmLW3nJBX8Ej7DGYqfyf7opcc98hCE6wlyV+Oljsi5K0kKxrvLWEfy/eYVIa4m5bFyvi42kE7mk0V02rDqAMNPTYO4+srhLHVKje4LazJHTBltklRno80xujKrMdpjt0P8llVVB1hfeaHY8PcE4QqiKDGkj/rFZl++iQejwUDRb3cpK0jkOuY+893rve/qrHlU7pjRoH5G0SACH0cPnQ++h7rk/zza6TT4QrIQv8OFszkeFlTArN9hoWszmu5/t3MPyXB9L8mK3VkM2VSJ1diF59HgBU/ynaQyoh2EFNPe0+LbfnX/xm/Xr52xIh793HajaWz7a9mGNQXxTi2WQFx2KMCY3XR2ZrizttWb5CzJfwKIpC8e6mON0w7bUzdncCaVvnfXfIGLSUYR4kBLacUjZduvtcoFR4WtZCt3qinXK/NKeeIaHQbZkYn7XefY+xxq6vt8hJYFTBIX4mfkpGPwSjnL/cMTxUtNnpsZd2g7XD6mtEGzG36O/44Pv6k0nnQ38QBjGP85vSYnzkklULXJxXIyFa246NPCq0aqL Di1f5NLs Vu9wv2hlP9R3JRzb8puELTY1W+iN2sLdgVi2F1XxSmUZdJLQ/A0TPb8V750+ofY4XuPIHJM2VdVxCkbKVkyTpzBvAkOx7BBIchMK/tl2MdG0qbri28wZyAEIoS54aUbxE/WFOoyxABBkCVbzWXN6Ov0N+F8OoB7dywS2pOPchbhFllo94/Nq4NWodjv9XKdt0ZlC720LPtJ4ljZpsW2mPyw22jcW0ng7SSBe6zBudsaiUzI5f5Y9MwzLWddw23l/RCqHP5N1RZ92qVYEKtP51zYEoy1DQa4pfg2i+Tm52j3C7tIfgPQ+G+2ZmNCeD7jQ+VViE X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Sean Christopherson Drop __KVM_VCPU_MULTIPLE_ADDRESS_SPACE and instead check the value of KVM_ADDRESS_SPACE_NUM. No functional change intended. Reviewed-by: Paolo Bonzini Signed-off-by: Sean Christopherson Reviewed-by: Fuad Tabba Tested-by: Fuad Tabba Message-Id: <20231027182217.3615211-22-seanjc@google.com> Signed-off-by: Paolo Bonzini --- arch/x86/include/asm/kvm_host.h | 1 - include/linux/kvm_host.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index fa0d42202405..061eec231299 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2136,7 +2136,6 @@ enum { #define HF_SMM_MASK (1 << 1) #define HF_SMM_INSIDE_NMI_MASK (1 << 2) -# define __KVM_VCPU_MULTIPLE_ADDRESS_SPACE # define KVM_ADDRESS_SPACE_NUM 2 # define kvm_arch_vcpu_memslots_id(vcpu) ((vcpu)->arch.hflags & HF_SMM_MASK ? 1 : 0) # define kvm_memslots_for_spte_role(kvm, role) __kvm_memslots(kvm, (role).smm) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 67dfd4d79529..db423ea9e3a4 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -690,7 +690,7 @@ bool kvm_arch_irqchip_in_kernel(struct kvm *kvm); #define KVM_MEM_SLOTS_NUM SHRT_MAX #define KVM_USER_MEM_SLOTS (KVM_MEM_SLOTS_NUM - KVM_INTERNAL_MEM_SLOTS) -#ifndef __KVM_VCPU_MULTIPLE_ADDRESS_SPACE +#if KVM_ADDRESS_SPACE_NUM == 1 static inline int kvm_arch_vcpu_memslots_id(struct kvm_vcpu *vcpu) { return 0; -- 2.39.1