From patchwork Fri Nov 29 16:32:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 11267345 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C5D4D930 for ; Fri, 29 Nov 2019 16:32:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9ACAD217AB for ; Fri, 29 Nov 2019 16:32:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ETwu8JJW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727117AbfK2Qc5 (ORCPT ); Fri, 29 Nov 2019 11:32:57 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:21932 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727070AbfK2Qcn (ORCPT ); Fri, 29 Nov 2019 11:32:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575045161; 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=Hbyl2iZZRhb5QuVojk7TiwphUcR02e+q5G1tP0VBGU4=; b=ETwu8JJWbxjlFB9Y9QbLmbGaiwfhLOR+iDuodR9zccMMLHnaRzcJS3VgQIW0SCynweNZj2 eL97sPDu9nND5czw6ySBGgNUmFWArvvp4st6MXi2zOAVfpfK8STVNK3Sy2CYKBouuJ3F/p wDAaQMiyMFK/TpIqekOLCU/4m1tGJRs= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-104-CuU_0zXyNVqmwWcNJVU70w-1; Fri, 29 Nov 2019 11:32:40 -0500 Received: by mail-qv1-f72.google.com with SMTP id a4so13060438qvn.14 for ; Fri, 29 Nov 2019 08:32:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0pt/Az8Wvxgx7uazfZToKoKUqCiGtbwmyJfL5cUmcEs=; b=Sp5wimZ3ZvdmiMw47UQEMo8puP6eEo3hp0w7NzYD7Ka1Uer424XpAplSBF+WN++aVd gtrnN3MJ9jJ4WPjQk30pQSAnpCCuUTQnlWp3rFCIp4GhACpfWWHiBNBkE/ZtNm1LEL/Z 3lKcyBSBuhyHKUSg16ftOOv7gpViSWT+vZGmyV1OCpEM+LAINj8/0F8y1pXVQjPrtecZ RTdkQOaX6L02Zb/r9Diw5Rru3Ux7lcUJt0DdK09y2kx4NhEMsoN8OR3vkDCh9Y0YuFWK UcCusCsIChyN07XGU42PSO1SkqNfZOTbqQd8ES0dEdFE87MxxHdFmfl+oBw1l6bCXgLC on0g== X-Gm-Message-State: APjAAAWKd60URTcKzB7bqkrSPt/0yDWg8l2PVCCppeCejFSWCyVvJDoo laKQjyRyhmEHeHn/ix9Jm8Hyqb2uecews3FlxDqr5Jk7X/j0oj29iVKzC7XlbrRa8Qh/y9McmTY 2obw6XU7JIg58 X-Received: by 2002:a37:8a06:: with SMTP id m6mr17328074qkd.86.1575045159732; Fri, 29 Nov 2019 08:32:39 -0800 (PST) X-Google-Smtp-Source: APXvYqyIatg4wHEW2JAb8sx6aQy+GlrVkTSUrwO3DQB72FuUrIsdYmHKwuBkFTMbo+c/NlFAlPM5nQ== X-Received: by 2002:a37:8a06:: with SMTP id m6mr17328032qkd.86.1575045159421; Fri, 29 Nov 2019 08:32:39 -0800 (PST) Received: from xz-x1.yyz.redhat.com ([104.156.64.74]) by smtp.gmail.com with ESMTPSA id d9sm4568329qtj.52.2019.11.29.08.32.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Nov 2019 08:32:38 -0800 (PST) From: Peter Xu To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Nitesh Narayan Lal , Paolo Bonzini , Sean Christopherson , peterx@redhat.com, Vitaly Kuznetsov Subject: [PATCH v2 2/3] KVM: X86: Use APIC_DEST_* macros properly Date: Fri, 29 Nov 2019 11:32:33 -0500 Message-Id: <20191129163234.18902-3-peterx@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191129163234.18902-1-peterx@redhat.com> References: <20191129163234.18902-1-peterx@redhat.com> MIME-Version: 1.0 X-MC-Unique: CuU_0zXyNVqmwWcNJVU70w-1 X-Mimecast-Spam-Score: 0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Previously we were using either APIC_DEST_PHYSICAL|APIC_DEST_LOGICAL or 0|1 to fill in kvm_lapic_irq.dest_mode, and it's done in an adhoc way. It's fine imho only because in most cases when we check against dest_mode it's against APIC_DEST_PHYSICAL (which equals to 0). However, that's not consistent, majorly because APIC_DEST_LOGICAL does not equals to 1, so if one day we check irq.dest_mode against APIC_DEST_LOGICAL we'll probably always get a false returned. This patch replaces the 0/1 settings of irq.dest_mode with the macros to make them consistent. Signed-off-by: Peter Xu --- arch/x86/kvm/ioapic.c | 9 ++++++--- arch/x86/kvm/irq_comm.c | 7 ++++--- arch/x86/kvm/x86.c | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c index 9fd2dd89a1c5..1e091637d5d5 100644 --- a/arch/x86/kvm/ioapic.c +++ b/arch/x86/kvm/ioapic.c @@ -331,7 +331,8 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val) irq.vector = e->fields.vector; irq.delivery_mode = e->fields.delivery_mode << 8; irq.dest_id = e->fields.dest_id; - irq.dest_mode = e->fields.dest_mode; + irq.dest_mode = e->fields.dest_mode ? + APIC_DEST_LOGICAL : APIC_DEST_PHYSICAL; bitmap_zero(&vcpu_bitmap, 16); kvm_bitmap_or_dest_vcpus(ioapic->kvm, &irq, &vcpu_bitmap); @@ -343,7 +344,8 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val) * keep ioapic_handled_vectors synchronized. */ irq.dest_id = old_dest_id; - irq.dest_mode = old_dest_mode; + irq.dest_mode = old_dest_mode ? + APIC_DEST_LOGICAL : APIC_DEST_PHYSICAL; kvm_bitmap_or_dest_vcpus(ioapic->kvm, &irq, &vcpu_bitmap); } @@ -369,7 +371,8 @@ static int ioapic_service(struct kvm_ioapic *ioapic, int irq, bool line_status) irqe.dest_id = entry->fields.dest_id; irqe.vector = entry->fields.vector; - irqe.dest_mode = entry->fields.dest_mode; + irqe.dest_mode = entry->fields.dest_mode ? + APIC_DEST_LOGICAL : APIC_DEST_PHYSICAL; irqe.trig_mode = entry->fields.trig_mode; irqe.delivery_mode = entry->fields.delivery_mode << 8; irqe.level = 1; diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c index 8ecd48d31800..673b6afd6dbf 100644 --- a/arch/x86/kvm/irq_comm.c +++ b/arch/x86/kvm/irq_comm.c @@ -52,8 +52,8 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, unsigned long dest_vcpu_bitmap[BITS_TO_LONGS(KVM_MAX_VCPUS)]; unsigned int dest_vcpus = 0; - if (irq->dest_mode == 0 && irq->dest_id == 0xff && - kvm_lowest_prio_delivery(irq)) { + if (irq->dest_mode == APIC_DEST_PHYSICAL && + irq->dest_id == 0xff && kvm_lowest_prio_delivery(irq)) { printk(KERN_INFO "kvm: apic: phys broadcast and lowest prio\n"); irq->delivery_mode = APIC_DM_FIXED; } @@ -114,7 +114,8 @@ void kvm_set_msi_irq(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e, irq->dest_id |= MSI_ADDR_EXT_DEST_ID(e->msi.address_hi); irq->vector = (e->msi.data & MSI_DATA_VECTOR_MASK) >> MSI_DATA_VECTOR_SHIFT; - irq->dest_mode = (1 << MSI_ADDR_DEST_MODE_SHIFT) & e->msi.address_lo; + irq->dest_mode = (1 << MSI_ADDR_DEST_MODE_SHIFT) & e->msi.address_lo ? + APIC_DEST_LOGICAL : APIC_DEST_PHYSICAL; irq->trig_mode = (1 << MSI_DATA_TRIGGER_SHIFT) & e->msi.data; irq->delivery_mode = e->msi.data & 0x700; irq->msi_redir_hint = ((e->msi.address_lo diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 3ed167e039e5..3b00d662dc14 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7356,7 +7356,7 @@ static void kvm_pv_kick_cpu_op(struct kvm *kvm, unsigned long flags, int apicid) struct kvm_lapic_irq lapic_irq; lapic_irq.shorthand = 0; - lapic_irq.dest_mode = 0; + lapic_irq.dest_mode = APIC_DEST_PHYSICAL; lapic_irq.level = 0; lapic_irq.dest_id = apicid; lapic_irq.msi_redir_hint = false;