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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E7D8CCA47E for ; Fri, 24 Jun 2022 16:08:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230449AbiFXQIv (ORCPT ); Fri, 24 Jun 2022 12:08:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231233AbiFXQIt (ORCPT ); Fri, 24 Jun 2022 12:08:49 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9EAE73EF15 for ; Fri, 24 Jun 2022 09:08:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656086927; 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=be1w3XMJSjWVaoG29km4VcWhwBK4h/2G5veMS+PhA+U=; b=Ztyk2YBYOJpCxfBhkwHHVjQcBsU+vU7TcpCibwldws4AIYdvI75q52NrIu9vqUA1+tWys1 UKybsJxuCPhKjnx33MFEWRHzAaMBHO21WB6C8USPmd+Hcn/iFP/g4W9tMxRFQyOjaBwoP9 oweCBfrNAxIkijEICDQ7T6AsCqMSgzg= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-662-xhWQk7S3MnawQ3-8MeKeaA-1; Fri, 24 Jun 2022 12:08:46 -0400 X-MC-Unique: xhWQk7S3MnawQ3-8MeKeaA-1 Received: by mail-ej1-f72.google.com with SMTP id k7-20020a1709062a4700b006fe92440164so1044342eje.23 for ; Fri, 24 Jun 2022 09:08:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=be1w3XMJSjWVaoG29km4VcWhwBK4h/2G5veMS+PhA+U=; b=EQ76UUswamx7rsIKI6e5bwyyya/zhcBh0zrtbkJyGpqX4KajaNZr9NKTWYtSNwkJTr h02f5+FR+MFXHmpPVMJnyTQMMvc9P50+F2GaJ/kfUMbJLOxMX2s11Pesf0tE3vh32aYY 74PQDuXUSKMeM6jUY174zP+naW840SvQgxQoNNn2qIyf37+/edv8RKKqYDfBulj/wopi 9pSsfe7qnfFXCHVdusUKqoQalBIMAlsnOZxrS/tELlloB75Bw4fSsllhu10qnGoqeGy8 uEIEq/A+efPGLx+E83A5i9ymg26dvbxcTFrmY6P1ojDMPhEoZUD2ntw9JJUeqZ/FEYpv nT8w== X-Gm-Message-State: AJIora/QCEEQDhMJDgBsiWpUJDFOC9aMOfUVNvUDgbRcKaQRKaw08Z+U 9zMam/8lKz5ZUl1blVIdAvmWSvT3vdJlt0FkOuhyPYMXYzuLQY5LZ+MA5m89bI7/VTqYf31ISD+ 0KCr7wO3NcUNwvmhIUa1l+ttp X-Received: by 2002:a05:6402:3224:b0:435:80fd:333 with SMTP id g36-20020a056402322400b0043580fd0333mr18771652eda.76.1656086925298; Fri, 24 Jun 2022 09:08:45 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uXYghp9ZnBSEx33GwyKSaey/8LMSpKuk8zD0DPQx/yJyCXPb5SDkZZNyvT+OS3Uqu+7N1/Iw== X-Received: by 2002:a05:6402:3224:b0:435:80fd:333 with SMTP id g36-20020a056402322400b0043580fd0333mr18771627eda.76.1656086925038; Fri, 24 Jun 2022 09:08:45 -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 q4-20020a1709064cc400b006fec4ee28d0sm1334565ejt.189.2022.06.24.09.08.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Jun 2022 09:08:44 -0700 (PDT) Message-ID: <4cd170cb-4c1d-8532-22ac-fcee6b7d33bb@redhat.com> Date: Fri, 24 Jun 2022 18:08:43 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Subject: Re: [PATCH v6 02/17] KVM: x86: lapic: Rename [GET/SET]_APIC_DEST_FIELD to [GET/SET]_XAPIC_DEST_FIELD Content-Language: en-US To: Suravee Suthikulpanit , linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: mlevitsk@redhat.com, seanjc@google.com, joro@8bytes.org, jon.grimm@amd.com, wei.huang2@amd.com, terry.bowman@amd.com, Pankaj Gupta References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> <20220519102709.24125-3-suravee.suthikulpanit@amd.com> From: Paolo Bonzini In-Reply-To: <20220519102709.24125-3-suravee.suthikulpanit@amd.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 5/19/22 12:26, Suravee Suthikulpanit wrote: > To signify that the macros only support 8-bit xAPIC destination ID. > > Suggested-by: Maxim Levitsky > Reviewed-by: Maxim Levitsky > Reviewed-by: Pankaj Gupta > Signed-off-by: Suravee Suthikulpanit > --- > arch/x86/hyperv/hv_apic.c | 2 +- > arch/x86/include/asm/apicdef.h | 4 ++-- > arch/x86/kernel/apic/apic.c | 2 +- > arch/x86/kernel/apic/ipi.c | 2 +- > arch/x86/kvm/lapic.c | 2 +- > arch/x86/kvm/svm/avic.c | 4 ++-- > 6 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/arch/x86/hyperv/hv_apic.c b/arch/x86/hyperv/hv_apic.c > index db2d92fb44da..fb8b2c088681 100644 > --- a/arch/x86/hyperv/hv_apic.c > +++ b/arch/x86/hyperv/hv_apic.c > @@ -46,7 +46,7 @@ static void hv_apic_icr_write(u32 low, u32 id) > { > u64 reg_val; > > - reg_val = SET_APIC_DEST_FIELD(id); > + reg_val = SET_XAPIC_DEST_FIELD(id); > reg_val = reg_val << 32; > reg_val |= low; > > diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h > index 5716f22f81ac..863c2cad5872 100644 > --- a/arch/x86/include/asm/apicdef.h > +++ b/arch/x86/include/asm/apicdef.h > @@ -89,8 +89,8 @@ > #define APIC_DM_EXTINT 0x00700 > #define APIC_VECTOR_MASK 0x000FF > #define APIC_ICR2 0x310 > -#define GET_APIC_DEST_FIELD(x) (((x) >> 24) & 0xFF) > -#define SET_APIC_DEST_FIELD(x) ((x) << 24) > +#define GET_XAPIC_DEST_FIELD(x) (((x) >> 24) & 0xFF) > +#define SET_XAPIC_DEST_FIELD(x) ((x) << 24) > #define APIC_LVTT 0x320 > #define APIC_LVTTHMR 0x330 > #define APIC_LVTPC 0x340 > diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c > index b70344bf6600..e6b754e43ed7 100644 > --- a/arch/x86/kernel/apic/apic.c > +++ b/arch/x86/kernel/apic/apic.c > @@ -275,7 +275,7 @@ void native_apic_icr_write(u32 low, u32 id) > unsigned long flags; > > local_irq_save(flags); > - apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(id)); > + apic_write(APIC_ICR2, SET_XAPIC_DEST_FIELD(id)); > apic_write(APIC_ICR, low); > local_irq_restore(flags); > } > diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c > index d1fb874fbe64..2a6509e8c840 100644 > --- a/arch/x86/kernel/apic/ipi.c > +++ b/arch/x86/kernel/apic/ipi.c > @@ -99,7 +99,7 @@ void native_send_call_func_ipi(const struct cpumask *mask) > > static inline int __prepare_ICR2(unsigned int mask) > { > - return SET_APIC_DEST_FIELD(mask); > + return SET_XAPIC_DEST_FIELD(mask); > } > > static inline void __xapic_wait_icr_idle(void) > diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c > index 137c3a2f5180..8b8c4a905976 100644 > --- a/arch/x86/kvm/lapic.c > +++ b/arch/x86/kvm/lapic.c > @@ -1326,7 +1326,7 @@ void kvm_apic_send_ipi(struct kvm_lapic *apic, u32 icr_low, u32 icr_high) > if (apic_x2apic_mode(apic)) > irq.dest_id = icr_high; > else > - irq.dest_id = GET_APIC_DEST_FIELD(icr_high); > + irq.dest_id = GET_XAPIC_DEST_FIELD(icr_high); > > trace_kvm_apic_ipi(icr_low, irq.dest_id); > > diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c > index 54fe03714f8a..a8f514212b87 100644 > --- a/arch/x86/kvm/svm/avic.c > +++ b/arch/x86/kvm/svm/avic.c > @@ -328,7 +328,7 @@ static int avic_kick_target_vcpus_fast(struct kvm *kvm, struct kvm_lapic *source > if (apic_x2apic_mode(vcpu->arch.apic)) > dest = icrh; > else > - dest = GET_APIC_DEST_FIELD(icrh); > + dest = GET_XAPIC_DEST_FIELD(icrh); > > /* > * Try matching the destination APIC ID with the vCPU. > @@ -364,7 +364,7 @@ static void avic_kick_target_vcpus(struct kvm *kvm, struct kvm_lapic *source, > */ > kvm_for_each_vcpu(i, vcpu, kvm) { > if (kvm_apic_match_dest(vcpu, source, icrl & APIC_SHORT_MASK, > - GET_APIC_DEST_FIELD(icrh), > + GET_XAPIC_DEST_FIELD(icrh), > icrl & APIC_DEST_MASK)) { > vcpu->arch.apic->irr_pending = true; > svm_complete_interrupt_delivery(vcpu, Reviewed-by: Paolo Bonzini