From patchwork Thu Sep 3 15:26:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 11754227 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 7210C109B for ; Thu, 3 Sep 2020 15:57:49 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 48D282072A for ; Thu, 3 Sep 2020 15:57:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="jpuELGGv"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="s/yMoN+W" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 48D282072A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=G/UTPThkmCuFvrv9OuAboi2FgMKemIJkd2AoA7TuliM=; b=jpuELGGveTagjP0H0xhhUnTB6 jwUiP++Gh8YuckwmGgoniaGVqiUWEN6bzrgpl7ZWIvdEZMS5Cf6kQ/csKdJetDelUPrzVEDtC15d/ JtCgbPcJC91QoCaRxqVSEwidLGvpPXl/2ZS9WREJCvsof1LhBy6dMODeiXrgHC/GNqpyZCuxN/GZW +koQVvkiIuWnvKmDvUK/PhMVImid6GAtykUuGBDfZdCCEAbhiHZJL8zic83uMeEH9Yy4PJ1KVYOKs yvz86GtmchwMwZgrLV9bnu14UmloCMN6vV7RTc1GlN78CHJSQu0aUQGMOnN1eVGqBFEhNu/r0qRsE 71Ae/3vNg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDrcC-0001Ze-PE; Thu, 03 Sep 2020 15:57:33 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDray-0000tu-5Q for linux-arm-kernel@lists.infradead.org; Thu, 03 Sep 2020 15:56:17 +0000 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 350A020775; Thu, 3 Sep 2020 15:56:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599148575; bh=EUAnw+lWQ+cQMNjPnrjGEu/3OgEkhBEkYZ7J3y/Lfa4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s/yMoN+W2anQfzITjpc+JTuk6Xq6VnN3WDqBgtQAQZiT/Yphxl771Tpeg6fORHqPl vdhN46HuDry2tT0/F2jjip/4/e0eREqymzdJG7NrJPF2YnfG+cEd+zvXBre+fkR+mA PP5EGIM97bGGCgaQ1AzkIROOTrNkZVlMe2P7OtT0= Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kDr8G-008vT9-JA; Thu, 03 Sep 2020 16:26:37 +0100 From: Marc Zyngier To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: [PATCH 23/23] KVM: arm64: Add debugfs files for the rVIC/rVID implementation Date: Thu, 3 Sep 2020 16:26:10 +0100 Message-Id: <20200903152610.1078827-24-maz@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200903152610.1078827-1-maz@kernel.org> References: <20200903152610.1078827-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kernel-team@android.com, Christoffer.Dall@arm.com, lorenzo.pieralisi@arm.com, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200903_115616_376188_5EE509FB X-CRM114-Status: GOOD ( 20.68 ) X-Spam-Score: -5.2 (-----) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-5.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [198.145.29.99 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lorenzo Pieralisi , Suzuki K Poulose , Christoffer Dall , James Morse , kernel-team@android.com, Julien Thierry Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org It turns out that having these debugfs information is really useful when trying to understand what is going wrong in a guest, or even in the host kernel... Signed-off-by: Marc Zyngier --- arch/arm64/kvm/rvic-cpu.c | 140 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/arch/arm64/kvm/rvic-cpu.c b/arch/arm64/kvm/rvic-cpu.c index 5fb200c637d9..0e91bf6633d5 100644 --- a/arch/arm64/kvm/rvic-cpu.c +++ b/arch/arm64/kvm/rvic-cpu.c @@ -6,6 +6,7 @@ * Author: Marc Zyngier */ +#include #include #include #include @@ -707,6 +708,8 @@ static int rvic_inject_userspace_irq(struct kvm *kvm, unsigned int type, } } +static void rvic_create_debugfs(struct kvm_vcpu *vcpu); + static int rvic_vcpu_init(struct kvm_vcpu *vcpu) { struct rvic_vm_data *data = vcpu->kvm->arch.irqchip_data; @@ -743,6 +746,8 @@ static int rvic_vcpu_init(struct kvm_vcpu *vcpu) irq->line_level = false; } + rvic_create_debugfs(vcpu); + return 0; } @@ -913,6 +918,8 @@ static void rvic_device_destroy(struct kvm_device *dev) kfree(dev); } +static void rvid_create_debugfs(struct kvm *kvm); + static int rvic_set_attr(struct kvm_device *dev, struct kvm_device_attr *attr) { struct rvic_vm_data *data; @@ -969,6 +976,7 @@ static int rvic_set_attr(struct kvm_device *dev, struct kvm_device_attr *attr) } dev->kvm->arch.irqchip_data = data; + rvid_create_debugfs(dev->kvm); ret = 0; break; @@ -1071,3 +1079,135 @@ int kvm_register_rvic_device(void) { return kvm_register_device_ops(&rvic_dev_ops, KVM_DEV_TYPE_ARM_RVIC); } + +static void rvic_irq_debug_show_one(struct seq_file *s, struct rvic_irq *irq) +{ + unsigned long flags; + + spin_lock_irqsave(&irq->lock, flags); + + seq_printf(s, "%d: [%d] %c %c %ps %c %c\n", + irq->intid, irq->host_irq, + irq->pending ? 'P' : 'p', + irq->masked ? 'M' : 'm', + irq->get_line_level, + irq->get_line_level ? 'x' : (irq->line_level ? 'H' : 'L'), + rvic_irq_queued(irq) ? 'Q' : 'i'); + + spin_unlock_irqrestore(&irq->lock, flags); +} + +static int rvic_irq_debug_show(struct seq_file *s, void *p) +{ + rvic_irq_debug_show_one(s, s->private); + return 0; +} + +static int rvic_irq_debug_open(struct inode *inode, struct file *file) +{ + return single_open(file, rvic_irq_debug_show, inode->i_private); +} + +static const struct file_operations rvic_irq_debug_fops = { + .open = rvic_irq_debug_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + +static int rvic_debug_show(struct seq_file *s, void *p) +{ + struct kvm_vcpu *vcpu = s->private; + struct rvic *rvic = kvm_vcpu_to_rvic(vcpu); + struct rvic_irq *irq; + unsigned long flags; + + spin_lock_irqsave(&rvic->lock, flags); + + seq_printf(s, "%s\n", rvic->enabled ? "Enabled" : "Disabled"); + seq_printf(s, "%d Trusted\n", rvic->nr_trusted); + seq_printf(s, "%d Total\n", rvic->nr_total); + list_for_each_entry(irq, &rvic->delivery, delivery_entry) + rvic_irq_debug_show_one(s, irq); + + spin_unlock_irqrestore(&rvic->lock, flags); + + return 0; +} + +static int rvic_debug_open(struct inode *inode, struct file *file) +{ + return single_open(file, rvic_debug_show, inode->i_private); +} + +static const struct file_operations rvic_debug_fops = { + .open = rvic_debug_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + +static void rvic_create_debugfs(struct kvm_vcpu *vcpu) +{ + struct rvic *rvic = kvm_vcpu_to_rvic(vcpu); + struct dentry *rvic_root; + char dname[128]; + int i; + + snprintf(dname, sizeof(dname), "rvic-%d", vcpu->vcpu_id); + rvic_root = debugfs_create_dir(dname, vcpu->kvm->debugfs_dentry); + if (!rvic_root) + return; + + debugfs_create_file("state", 0444, rvic_root, vcpu, &rvic_debug_fops); + for (i = 0; i < rvic->nr_total; i++) { + snprintf(dname, sizeof(dname), "%d", i); + debugfs_create_file(dname, 0444, rvic_root, + rvic_get_irq(rvic, i), + &rvic_irq_debug_fops); + } +} + +static int rvid_debug_show(struct seq_file *s, void *p) +{ + struct kvm *kvm = s->private; + struct rvic_vm_data *data = kvm->arch.irqchip_data; + unsigned long flags; + int i; + + spin_lock_irqsave(&data->lock, flags); + + seq_printf(s, "%d Trusted\n", data->nr_trusted); + seq_printf(s, "%d Total\n", data->nr_total); + + for (i = 0; i < rvic_nr_untrusted(data); i++) { + if (data->rvid_map[i].intid < data->nr_trusted) + continue; + + seq_printf(s, "%4u: vcpu-%u %u\n", + i, data->rvid_map[i].target_vcpu, + data->rvid_map[i].intid); + } + + spin_unlock_irqrestore(&data->lock, flags); + + return 0; +} + +static int rvid_debug_open(struct inode *inode, struct file *file) +{ + return single_open(file, rvid_debug_show, inode->i_private); +} + +static const struct file_operations rvid_debug_fops = { + .open = rvid_debug_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + +static void rvid_create_debugfs(struct kvm *kvm) +{ + debugfs_create_file("rvid", 0444, kvm->debugfs_dentry, + kvm, &rvid_debug_fops); +}