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 0D675C001DC for ; Tue, 18 Jul 2023 23:49:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D384D8D002D; Tue, 18 Jul 2023 19:49:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CE3CB8D0012; Tue, 18 Jul 2023 19:49:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B5E998D002D; Tue, 18 Jul 2023 19:49:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A64C88D0012 for ; Tue, 18 Jul 2023 19:49:03 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 872FA1A04BA for ; Tue, 18 Jul 2023 23:49:03 +0000 (UTC) X-FDA: 81026375766.15.5AA8825 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf05.hostedemail.com (Postfix) with ESMTP id B55ED10000C for ; Tue, 18 Jul 2023 23:49:01 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=jr2fs44d; spf=pass (imf05.hostedemail.com: domain of 37CS3ZAYKCD8tfbokdhpphmf.dpnmjovy-nnlwbdl.psh@flex--seanjc.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=37CS3ZAYKCD8tfbokdhpphmf.dpnmjovy-nnlwbdl.psh@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=1689724141; 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=RgixHOC4KKphqTDNjO+JFitY6BYM03Mxe9+IG67pQW4=; b=YZ9e6S9NXuFECkaypm7WLGJe4fM3El5Vz+TAWWHi38m/ajdaZsuz7fJxLvJqprnSjHzZu1 kn5kRKE56yAuxSiSDD05RZb20AIODcIeO6oxEab5ylkW34j8MFVcjys3zExFiMHJxsH+ML zJhaFwDTF1QrXnvleZ6aKOqnVyoAUaI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689724141; a=rsa-sha256; cv=none; b=EZr98idLSGDqaRdDu9dPQMsz/alXnr+E3ogfmi5ndFfmo+OrXgrsqj1h2JzfKmT2Zze8NI OgkQLkSiRPFA7kKsJCyFik50LEQ32SIoUlNRnn3i/C/G07/z3l8bLzQlbVNouN2qVX70o4 rltAY6mcWXEEoPWoIAZsvk5H11QnHWE= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=jr2fs44d; spf=pass (imf05.hostedemail.com: domain of 37CS3ZAYKCD8tfbokdhpphmf.dpnmjovy-nnlwbdl.psh@flex--seanjc.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=37CS3ZAYKCD8tfbokdhpphmf.dpnmjovy-nnlwbdl.psh@flex--seanjc.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-1b896096287so48929975ad.0 for ; Tue, 18 Jul 2023 16:49:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689724140; x=1692316140; 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=RgixHOC4KKphqTDNjO+JFitY6BYM03Mxe9+IG67pQW4=; b=jr2fs44d+7BmMZPp9ybqRVhLe6DoUmnDVGGK/YxGf0Asu27qFmDOog5/7ezq8m4Ys7 LB4TAF+aUXOU9vvZC3f7sCq7Qp6i9IPbi3VCM23iiZE2lWsjgfpk1UphaC4PromgcBa9 nNuUO7C76a3+5q0Gf8ijV1dvvN0iI9MYocGBFlwlZWxo+oVA0VDDW9ZRP17wI+9kNKbR b/F5X7vtJ0QCTS7pjO0kMtxUEap2HU9N8Chl8h4VBmGvGutp4QtM3GkrHRbiuZH0RfDS Df8UlL/rj7lQEedr2TSELrHMasjkzJ51vXMKZpffeRoXHoSbQaRFODPANCOUb4yN0y8L ypGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689724140; x=1692316140; 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=RgixHOC4KKphqTDNjO+JFitY6BYM03Mxe9+IG67pQW4=; b=YTi8XM2pQqvY2CBg+nQYOr3sQnlGbxeay+ybrUZxmaXqiSDmQH2LfmyHs23Y7pU5bW GiY6As2n41z4HXLh+3AtLVLr9TSYir4nxdteypux9iqrUj47om456gEYEC47hJn4cau9 eCwKPYfEYpNEV6O3mw2cKcbLJmMDtoPrtAfK6svPKs2d/tHSEcgPERoQpM+QNMpXfAN4 1fHqMiZaIou2Td8aBrHAQP19jrqiGxB8Y1qVfSxuxOj2s3tXSkqz7vQ61MLuQ0fL6N6B O3N7i7N2hzUggLy1cZoHT4thWm4rvonVvrVVa+tembKkO2CVvSLL4fvVIXrhZHnwUjaZ bcfA== X-Gm-Message-State: ABy/qLZsI3AOYL9ENb1y+7RW/5k5KrWSV/UmfdblPZ4MNv6FyJUhzqQf wcEaq8dAU6hBHqqt6H6a4FDyDEbT8rI= X-Google-Smtp-Source: APBJJlGmnxKpuVWpCwuKlcGO555af6O2CzLSJLrftIAb/WXIRBmN0a0otiSNa7LmthtetMuC6YJJMcmnlto= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:d2cf:b0:1ba:a36d:f82c with SMTP id n15-20020a170902d2cf00b001baa36df82cmr7700plc.7.1689724140625; Tue, 18 Jul 2023 16:49:00 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 18 Jul 2023 16:44:58 -0700 In-Reply-To: <20230718234512.1690985-1-seanjc@google.com> Mime-Version: 1.0 References: <20230718234512.1690985-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog Message-ID: <20230718234512.1690985-16-seanjc@google.com> Subject: [RFC PATCH v11 15/29] 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 , Yu Zhang , Vishal Annapurve , Ackerley Tng , Maciej Szmigiero , Vlastimil Babka , David Hildenbrand , Quentin Perret , Michael Roth , Wang , Liam Merwick , Isaku Yamahata , "Kirill A . Shutemov" Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: B55ED10000C X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: e5i8174pctfe89etqriymawr9hetjkwf X-HE-Tag: 1689724141-318499 X-HE-Meta: U2FsdGVkX19OFsMg+YqaXHZq2s3zFfhWcQhqwE79tmnKQZdvPs016Vll9zmq/pRN+QWeI1idxqyNCA7tuw8InTjtZL2PPuG7+Ieb8B0cvYCD1inYqncxA4LiBLhlCzz7ZkRRam47qjy1UgD5ZAM7wm4uPZQ5Dce9CaAcbPahIyFWKOSgT8i9CJppfHIkfW4HvVaFdt+HfswjZl/CA5o+AqbINKLV0VMz4EMG0Udx25gL0kK4DoET6LfGPtxcIVssjghQZNyL/ECj6rft4swlxEKY4W7fNsluVHHERDe+4ZpqOruV1VDJwYo6GxRiNbmNm305rN76sp9IV+qJtscb6KH1Lp46lk+kl4Jz2LDpSZ/7wF6xrn3PERdpOKRhdgznGBlVWcXhN4YNqNXf9bwXaM1+yTAO9tn9dznay3JedS0qWRAqEWPGCxGcqZ3xTK2XKGdBCY+Y777CgxpwE9MXzPVbfEf+HPG7qLo22xtois33mlbnuzz7VZLBKzt721ZXeZFBlrqv920wugPP2g0kUX169/6TzctbSm2TRKnfXBEHPw+gJ4oxhNXFbbxWzpO1eFKrB9HUFO+lzC249kW5tHCqs9nBax8WPa6+SdwZycafuhfWcMg7+EKiz8+e5c43j+5n+MT7egLK6Ml2IPVBFhk2cuC9EbzjgO5A+zuqIGWC249YuqYWmrLHWoZy4ZAVFwr4bei1O8BL+xh44iSUSj7EetH8pZUpAPBUKrkA3hTBK5BxjMhPwoJyulWC4edIzUBAGX5k1px+G891ksUraJxbFpBU1ygteBHNDel5NEfptnjLDnYD7Z11h0KcMRod7ehGpHNg0ybi8V+1AHNnLbhXXjY9XIV9y1+prKesFARRHgBHuuzHbj4YhFCP+BXN8vPDPV3XXdcrOh1KxW4EBWB3q40Xp8jvVUXsjswEsbzOP9IKAXTanLcLWL+2D3X24sL86XbFg8hpoW1LdeY +WugYWBl vRoVSWqDNAERzwddS2IiRVMEEGq62HXnuvDou7bPGNmBR6AZHJJ8lrdLFO0bta/YMybLjBDS4GXkR/GwT2BVGK8oG2H+xL0Yr46F5A8HcMoLPttACcbL34nVW53GcFCAo26Ub0CIQeZI5R1dnEehZMc5Y252tepxksykqWkZ6miEdid7cNdqlTVRRnngFmpWcqdM6frahZle8cXeSufk9NmpLCUiVNL1bLv1/XGUvyvPuVgTNFoKDdgBQGAIzdQIsLVj4D6EMB4BU7D3mnxU1Jf+RLdmY+zR6AhRaro+RxzX3iKrNk+hWIitwUbzlx8Eqty3sU1zSt/rTP2GGgYdQkN6bnd7E4Xjo2+u8/zn2eQvVGLIFZTz9FU9YlkoH9vDFlnKMHVHwg/Qx0x7w08zxlumb0gVYv4A+2Yife92pEgIuURPvctB4bhP6sBtp4GQMD1NTGp/VChMY80WRP+Oh5W6Z3YKlbhod9PUV1NrFevdy94NAo45Paw85KYgv5VrZ8btlx8rLO3dtoQu9Lwiz16LIXgRnXbQspxLmhS2FjBshcpPU2OQsLZfgNG/FVgH9BYW8GnPkyysF69jgMjbKLyqPvMH4CiDwX3bS30Hv1+WmKYVhvMcf22Bx6Tf8Uk8z62lIT5DvjmbtM0aMK97cB+mo74cOBOeRAG0djvwdrYTr6z/xkguP6MAXwWFOcBmU+qhMt7tZw03TwiE160iGfea8gGBPDvFyw9I1tJ1/MVrwa4qeMO2ZET9Zezlmstr1jp6+Wt+YYkEqeJaSk3k9RXCci4Oz90f+aa3fFuP0CNJgqLDmzJllSseLDi/RM3YmWCRX 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: 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 b87ff7b601fa..7a905e033932 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2105,7 +2105,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 0d1e2ee8ae7a..5839ef44e145 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -693,7 +693,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.41.0.255.g8b1d071c50-goog