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 C75B4C001DC for ; Fri, 21 Jul 2023 15:08:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D58D6B0074; Fri, 21 Jul 2023 11:08:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5856E6B0075; Fri, 21 Jul 2023 11:08:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 426B38D0001; Fri, 21 Jul 2023 11:08:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 2FC666B0074 for ; Fri, 21 Jul 2023 11:08:17 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id E62881A0348 for ; Fri, 21 Jul 2023 15:08:16 +0000 (UTC) X-FDA: 81035949792.09.C130F23 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf17.hostedemail.com (Postfix) with ESMTP id 4F8104005E for ; Fri, 21 Jul 2023 15:07:52 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=e5agMztH; spf=pass (imf17.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.133.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=1689952073; 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=AtcGzkETEnO18qgeRoihrAkrVd5qbbNpgaZO4bjwaRo=; b=L6jaXYUI92JbkplsqepYLvCf+ocjoFt6QMPZclrnTquHtHpSkHs1mZZc5q11evb8OdIQyg eJWBlzTm1xyYLuRK779E9p3Kh2CD8UkWUpYdZQRWtOqcm3qCXJoiRmE/ranUY7JKB5pplE G5rRmgFwaU5LYIxfMc+MMic7yJARH4Y= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689952073; a=rsa-sha256; cv=none; b=1c6OU3Sqg4mfIXQ1q7DygMf9v94rSkzir0m9DblgnZTMslIw6l+F2K9GSYiuxT24J4EIRC 68c0ilrNoZhs2NxGQ/35cEs2I4DjS5s79pzyPLEs6w5+lP4mPC4VFeaUTChFoSXBlawzSH bURLePjTzYs5HrhkemI16veeRvNMm44= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=e5agMztH; spf=pass (imf17.hostedemail.com: domain of pbonzini@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=pbonzini@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689952072; 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=AtcGzkETEnO18qgeRoihrAkrVd5qbbNpgaZO4bjwaRo=; b=e5agMztH7pB+1o3q6KiBZ4tRXfs+TmWM4m2WtNYtjhh0fnI9xYSb7eVpikN9eFJJh6saWe 5dwvc2VO2SObv2DQSzW4REzL8Og5C9FF7gORZffESYkkHYQ17V2U9p0VoBMtiBTaguGGtI WaLp3Q7r9VS4z4uy4RhPnAUOeUYweIo= Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-28-kKDGXBFLM3ab8jMVnHLs5g-1; Fri, 21 Jul 2023 11:07:49 -0400 X-MC-Unique: kKDGXBFLM3ab8jMVnHLs5g-1 Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-4fb76659d37so2051352e87.2 for ; Fri, 21 Jul 2023 08:07:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689952067; x=1690556867; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=AtcGzkETEnO18qgeRoihrAkrVd5qbbNpgaZO4bjwaRo=; b=N4rtAEgBMiFDIZhLohIqFo8ISwdcSeQxpXDKkZianYrOswzEvc1N49FKOIjFnLww9/ WpnK4Ibw+0Uh5gm5klbbjd1cf6tkoD09wYwAMlHLoaGUuH8DrqK3KbRyuzm+FalzVVf6 +Wvgx48fYMkHcB/TYcjK5ltPrboX6QoOC1lGllX/MwwQ+oRfLRGWBeOTyAI4QeNCaqT0 FtGS/O5QgsjjWTIvSkQxzZxLOM/kXOT6HO6hCovGcrL+sClpB8hwOjRfbX5V0bEU5PPH r2jwsM4Y02Mj+JRYRdNT8LJnxpzReL0LsPMjxiKJIyqfpNaGa5u8RYY2cBKt55rsM1ZR +e4A== X-Gm-Message-State: ABy/qLaDU0Or9wkm1hV8DvnbMGMDRhIPt9FrYW4MuOnj891gWTfG/ard Pc5ZmjzNpaw70RsAwBV2WerONB8sKPJN3n6zvACt+MBWyeeGvgkMrMdZtPqy5wWA+7iONx8cL2l 2DBYngFq8lHI= X-Received: by 2002:ac2:4191:0:b0:4f8:5ab0:68c4 with SMTP id z17-20020ac24191000000b004f85ab068c4mr1303841lfh.59.1689952067666; Fri, 21 Jul 2023 08:07:47 -0700 (PDT) X-Google-Smtp-Source: APBJJlGo8Pi+B+7hRHqSy6ClZ4oP94DPqHOZMbTIQ3rRFkaZiIFeWC2//bW1iNqq7vZ0rxNpIdgKag== X-Received: by 2002:ac2:4191:0:b0:4f8:5ab0:68c4 with SMTP id z17-20020ac24191000000b004f85ab068c4mr1303798lfh.59.1689952067306; Fri, 21 Jul 2023 08:07:47 -0700 (PDT) Received: from ?IPV6:2001:b07:6468:f312:9af8:e5f5:7516:fa89? ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.googlemail.com with ESMTPSA id p1-20020a056402074100b0051df5eefa20sm2257329edy.76.2023.07.21.08.07.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 21 Jul 2023 08:07:46 -0700 (PDT) Message-ID: <123035a3-9d0d-70be-9894-f89a84c7e8fd@redhat.com> Date: Fri, 21 Jul 2023 17:07:44 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [RFC PATCH v11 15/29] KVM: Drop superfluous __KVM_VCPU_MULTIPLE_ADDRESS_SPACE macro To: Sean Christopherson , Marc Zyngier , Oliver Upton , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , "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" References: <20230718234512.1690985-1-seanjc@google.com> <20230718234512.1690985-16-seanjc@google.com> From: Paolo Bonzini In-Reply-To: <20230718234512.1690985-16-seanjc@google.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4F8104005E X-Rspam-User: X-Stat-Signature: c8174sgyw8bwgoaie7o6u6g3bzfo74sn X-Rspamd-Server: rspam03 X-HE-Tag: 1689952072-721960 X-HE-Meta: U2FsdGVkX1/xuX/CRB+xNaNu27kx0KRY9qakgEbIetYssmZwzi3TgBACrN054MHWpOMdbBg3vNCMpRdSLjUZ9nXlnKFJtvseTWdQzZXMc6hKhKhrSGBtO/PRZxWezQgdd79GMEBgMF2tIey9n35YCxyEvlPvSWzQhin8Q/9P1fGWHmU2OIkitemyi5OicaD0ROe9Tdq0i+Z1AE9kFPTw9Co+JT2uCcCrJrdbdYUulOFxfAGy1fGW0rCa/DVemyqDDwDVT19HkLuUNl2x65E7U8gql9HjnWEv3iOez6uos5rgwT33CcgcFrgb/7032Q+yrJhap8XjfyBouIk8xJ1Q0cjxfgjEJCV79NKG9R01eGoCrAmPReQ8FSgA0yWwPdELM+Fw6P0jZh14MnAKhEMEc/IHcY8X1QNo5+OSrIghjsG0b7I4oIt1NCApxvvQ0fSNXgRUwmJvytu+jrZbCTgFXKvstEcT/eM1TuvESzP0lLdgs8QNLXJ6O/J3S+QCr4O+3YDBGilUbuBgyDxh3FvCIP3xr5PWPr6hDJxoLmWj6P4E9GcdScqnY20/R8pwldSA0FTDvKEUONC7XH7TWlklXDN4BGBulAytIKrJhhL2u6sWQ9CwBIjfybI8NCaV2tbg6WAX6P3yGPD5SC5EB3PX38mSMPjnysUt8Y7eLAGV/KWJ+QU1bRQXIW6u4KKOeUIn4U56rbFCvNdz0fxhFs+XwJVgT3Hfpt8jFfnVF9OpBAWbCudWQ7Nz3v19qA64g24CXEmbGK4KDwC0hx5Yh3sTFw3hpMMujgogDamedIekQP3/pObxZe1F2ETJmCpRN4oo5uM18IvnyjvGa39vVrLveFKSXyjt668PrSI+h3o1cXzHTPdU1jPi42drAVn/03KWVV0sfeowScDcV6jtiVm2lt6RGw2+7MFAbid4y0kf0LV2vyL12qZHNvBO6/HCnCsZbrN/0kxUQbuvBmGJmmN dXEUHLjo JXem+NHol1RnUFkXKixJ8G++tkLnoFtgMsvR660z9Gtaf7SqJFpr3hMh2338hc5GjBlsiysRcZR5jq7gG7MYuQZqOH4EEMK6on1LqBKiILlBS2QfI95tQOOWZy/PetUcpT4aXwD0s/9c/giHbuy0N/MtLlwTs64H1GqWF/wwMKmMWUK4qesz7GlHyjm31c5+gDpq6+aGvewZTGxNCBWKrn6WqrwvSYwaxq0SEKxZ9DzNX9QUfBjT7Xs1V8ltLnd9BRk9EGA5g0VQu+dkDz0G7p/4dbPojmhyTYLbyE1m5H0qURkpSfwL1DxSlNxwNtLp8bx3II2Rvzwmyo65ijGRvNFIVEAtNvQh/vyOHYXcjK4BUQvxYBZG7vnb5Lf4Vng6FjKQwcXu85GTY0xCxHfg82ssTBDhA7sVOOfnh9fhtK8PCOsMMoLt5/OhuAWDZm28cLiHC0RRCE5GakvV6ypWx0qg+7WwGNqM9eWOvk2B855TaAZ5/fEoknd4mFhdmqERT86hfHScd7mOVHU4= 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: On 7/19/23 01:44, Sean Christopherson wrote: > 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; Reviewed-by: Paolo Bonzini