From patchwork Thu Sep 14 01:55:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13384026 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 44A55EE0216 for ; Thu, 14 Sep 2023 01:56:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5FA496B02B4; Wed, 13 Sep 2023 21:56:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A7696B02B5; Wed, 13 Sep 2023 21:56:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4272A6B02B6; Wed, 13 Sep 2023 21:56:16 -0400 (EDT) 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 2C72E6B02B4 for ; Wed, 13 Sep 2023 21:56:16 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 0B757B4293 for ; Thu, 14 Sep 2023 01:56:16 +0000 (UTC) X-FDA: 81233537952.01.BE087F5 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by imf25.hostedemail.com (Postfix) with ESMTP id 3F331A001E for ; Thu, 14 Sep 2023 01:56:14 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=CBCXzbnE; spf=pass (imf25.hostedemail.com: domain of 3PWgCZQYKCEY0mivrkowwotm.kwutqv25-uus3iks.wzo@flex--seanjc.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3PWgCZQYKCEY0mivrkowwotm.kwutqv25-uus3iks.wzo@flex--seanjc.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694656574; a=rsa-sha256; cv=none; b=SXm8iosmvShAxwuc7x/AGyy0NLq4dj9W3j+G9fDmE6RKjzy4YME2LM5dfX0ErIUfU3PcCn fEHb1fIEa1QNE413mvbhjKg03GNLwcbkKcZLwampEJadDnLAMsgpDu7NfjMgD5X5sfNmPO D6TY2Fz9KPCh4voJ5fxS5/hvRgFemhU= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=CBCXzbnE; spf=pass (imf25.hostedemail.com: domain of 3PWgCZQYKCEY0mivrkowwotm.kwutqv25-uus3iks.wzo@flex--seanjc.bounces.google.com designates 209.85.128.202 as permitted sender) smtp.mailfrom=3PWgCZQYKCEY0mivrkowwotm.kwutqv25-uus3iks.wzo@flex--seanjc.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694656574; h=from:from:sender:reply-to: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=TEdWNzKShragyniQ9J+Ve2p49++UXy1fA45JB0RVd2M=; b=uKSmNjQ88nkyG1bPf8sZh4v763ZoXWm0UA0WTHN9GesLSxz35s69Ziud6jnO65J3IkULcr bHDUy3uPaXKSl5eEkhjS7us6NW/+eFXMj1EBNq+2MYe2OH2FEQJIPJX2KeemQ+oiVX2lRi j52Ozt66eRbdZQzbVy0KarRvB1cAWwg= Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-58fb8933e18so6410687b3.3 for ; Wed, 13 Sep 2023 18:56:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694656573; x=1695261373; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=TEdWNzKShragyniQ9J+Ve2p49++UXy1fA45JB0RVd2M=; b=CBCXzbnEiqVOkx0xvSWNruAE/w1qPrcS/OiRFLCkUo2kS06xrRPuHlCo0VAMIiT+A4 rZxqILwMiNIW/aQC18QcMiJDIStKnElryesd/90vL4KlieRlfvNTnc3OxF+uTcF60Grx XLr0de9TiWO/BkMViJjFPQo41H0/WCYeOY2/9yA3kfdsHEvJ+t+pzxYxqgq7hCwfgvKW uEIFK8S9+d8yrvo6R3oeFeE2XPj86T4xMJc8Ods0rzYlyVqt8nf745vD33/sJgmQxa8D Tvx+4miZpXy7xljzABd/aE8bCn5vTJ6A6T452d0a4YbrtUNWlEN3N1gZtEWfnxspdcdv MLFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694656573; x=1695261373; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=TEdWNzKShragyniQ9J+Ve2p49++UXy1fA45JB0RVd2M=; b=RpK0Ce2OiWD47wWzpATwfKztevoyBvtfG64ZVsT9qhI5gtFMG1AwOEcmD1341M8qho VasVmvJdNvwSqFRLHjXfODxoCHptNqsX5XuHxIA5E0u0oUO6VLqDnk4XbYRmSFwmeNXs 82eZ73MCuqzjH5VhTDrdTmntg1HIWLk4aJyIHs9lrVJ3SeVTn4NPjtRLM7wCidKxdQIl rnAXq4d77OSDjiO4J2nK7WYNxwbLGgdbMg4KMoRhEqvdaP1atqjZCT/1oiI4Wp0boYxR nP4mIVO+ZwGhRqs4Sy47b0YKNg98tOH4OuQ+XvXf4cCHwCboo7aYXgtd+Ojz60EryCwy 9Qjw== X-Gm-Message-State: AOJu0YyTFoL/yQh2qkGG7EG9ijrOLnUIXazcu0EXAf58JvJ5R+vLxL+k tO8Tzcc+hp30ayq0gZk94l370cSzNZU= X-Google-Smtp-Source: AGHT+IGYm//r9vLVsRhCBexYLsW+kyUM6dthNH5+IPZo7SQZB/dk4at291uiQmKPgon5iad9USRf5MgW9tA= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:400c:0:b0:589:a855:7af with SMTP id l12-20020a81400c000000b00589a85507afmr107415ywn.7.1694656573483; Wed, 13 Sep 2023 18:56:13 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 13 Sep 2023 18:55:17 -0700 In-Reply-To: <20230914015531.1419405-1-seanjc@google.com> Mime-Version: 1.0 References: <20230914015531.1419405-1-seanjc@google.com> X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog Message-ID: <20230914015531.1419405-20-seanjc@google.com> Subject: [RFC PATCH v12 19/33] KVM: Drop superfluous __KVM_VCPU_MULTIPLE_ADDRESS_SPACE macro From: Sean Christopherson To: Paolo Bonzini , Marc Zyngier , Oliver Upton , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Sean Christopherson , "Matthew Wilcox (Oracle)" , Andrew Morton , Paul Moore , James Morris , "Serge E. Hallyn" 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-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Chao Peng , Fuad Tabba , Jarkko Sakkinen , Anish Moorthy , Yu Zhang , Isaku Yamahata , Xu Yilun , Vlastimil Babka , Vishal Annapurve , Ackerley Tng , Maciej Szmigiero , David Hildenbrand , Quentin Perret , Michael Roth , Wang , Liam Merwick , Isaku Yamahata , "Kirill A . Shutemov" X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 3F331A001E X-Stat-Signature: ahk5gd8cjqx6ywjje8w4jm44sr3bg4hx X-Rspam-User: X-HE-Tag: 1694656574-443864 X-HE-Meta: U2FsdGVkX1/OSu0bS5bHnsqIcEIOoKlaSuXJTSFfK7PgNPtMhQCVpuZ1sYdCSnYk89b/HNzr3bbXdKMNI6IDW05pDZcJWcw0OZyxV7icH1+1jgkexCiVI07dzps3f5WZTQh6bp/mfWP2/VbHCXT+FO6xv2ohCYzof39+A6H1V6PspvOMcAzmm8GwsjYdD/F+/NsAy1ulQm5xdi3phFF8VGU5lZ3A28FrKDWF5SU0znBvj9Uk/0z7hShh4FIugIa/1Rm/+P7VS9PxoqjRPWSUt5ITcRCsNQSzQ5NUE4w2+iNQzy7dXfiXYWDg13yMmgaiscN7H7MtF7tlMFS+POyOQry/m9tGUxNfbpMopB5CffMi0wN132en3Hi7ydheGjx7WDIS4NA3Q5NEEypzXTPhvMuoWfvV3IUCBXeNpBAFViFLl6lgihRbw84VyjleO5a4FaM9RRPLO7P0s+FGVCV8AjiL5JA+gcXz0M7GzIhRNVeopZYLzC2Izz+DIGjKvJE/B61CLfFDTmG/gVL2JBroPWvIbGSIPWSm2/mVYJ+hzweKChQZfSOuWG3mQUZo4icW+u0Y55P4MK0nGU+flsTO6PVwM/NgcVAQWpcwwchpw9Bc0NeRiLhDWUfB4SvWYK+o6BBP9yvHvsMRNaYTNVmnJqRWo2hwPgMAbLiDsPdNUVL0WHbfdFix79Ev9XBfbglIMYwYa5B8sEiKCo+El7hqsHsHCnZnNmuZZrzB0os+ZSgevvKsfKFkjJcExssS9Y0suHJRKBPpXyB5WsfEBRfOMc0fOzBamwDkQbs5UXIJSwpa3CdiGEJBctNu1hBbWJ7EeIa/1KWWh8Lk9HdlkwQEyaWMduIIWIAl5Ve/zXiLaT+aIwQF4SaQM956IajID7Lr5RQM90SNm8qzaF223lTGLukYcD/VG8M44ayiFNevgYdkZJsXBCbhp1vU8qVYDzjeeaz6vcfuvLt8xsnZQTR fU/2dRX9 dFu2/Va9oJsGyKPbNq2Z2RyGKIBsDJ01lxpQg1sGVpgVweF4oorZGy7IWKglm1xmvQsoKPSiA1I8F+8obsA4R7ntJ3e1719w7f6qqadiyiQC+Qt5IrYd3nGwuJJCrvG57O+frMLKuFA4VmDmbbLRY4SBYTDe/g6wi6wrPX3SZHuRv13mPWFMlKeZGVB2EGcm8rCN+GIVw06Kyb1ns4UhcDxblM/uzbB9DN9mql8ZMiF+K92XWJFc6kWrKo97lEUx9gGOiYjcHsD4qLuZXm2mi71PUT1V8dgBn6+ci1AJgpRZIYUmXeK0Uhl1gyueyLpra4L+ECYGIHYt6Wf0sioZ9c1xm+PQvPg/bR70YIsoAX02DjNAcKsQ370LQk0XOXBDP4FdhVeVqMD3XisPTuTW0A0ZkvJ6iWQeDPbNX7YwiH9q2brlTA4AP/jSuF6iqKcU6XsNqK3FbceXAOLugaduzo5eXUC+cIpARFDavlaNGdEwAt6c9pzyw3n4KOoseVmIrGGGekAc9SECvTfcHd1uHbTts5B806kx7MjQG9lWe/1ERmWtnYHlhkUBnN3J89aUgTRczMHEChaUVRmrTxAiVAll4HtGNFSXIY83s5ObcLJ1eMX6uDIrtELIs8/hOPYfW9HGggKMinHXkocSoMnd+7xG42Vqq2YfLkOPrXp2vw73fgrT+DYnUq+7l/QoxGTSchXStVL2uiNbb+aJLeveSlTpoyKmA4n4SK/RYUzfF3OtzP1dCCJtwJAgwAx54Tb6e36lUr6zjFU0kFG4cbuoE6HdsGnj6HrPMn04LOJJynlS0hMyivq/j4Q0SgBmO4CgzBzmyiyvxHtIQDpcCPt7wM8J3vQ== 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: 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 --- 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 91a28ddf7cfd..78d641056ec5 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2126,7 +2126,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 18d8f02a99a3..aea1b4306129 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -692,7 +692,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;