From patchwork Mon Nov 13 09:17:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10055313 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B9D6F60586 for ; Mon, 13 Nov 2017 09:18:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0F8D291B9 for ; Mon, 13 Nov 2017 09:18:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B6154291DC; Mon, 13 Nov 2017 09:18:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7186B291B9 for ; Mon, 13 Nov 2017 09:18:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752330AbdKMJSM (ORCPT ); Mon, 13 Nov 2017 04:18:12 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:56965 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752169AbdKMJSK (ORCPT ); Mon, 13 Nov 2017 04:18:10 -0500 Received: by mail-wm0-f66.google.com with SMTP id z3so13636538wme.5 for ; Mon, 13 Nov 2017 01:18:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FHvy9eAfpSuXjy0a7aFiBDmmQEoZDNMXTQL3ntGscE8=; b=UmxE8oxJ2Mm4LN+WH0yQ7w53uwJeAKugku9CLXDzfuGM1p6HEFJoUUFXKzi47f1Y/F INvqgA/RlYd4nCQDQpvCemDj/BgAsek/MC/0jHLZB2Csn0Asp4oRni1fgCa0xap/QIxj 9vg75afB+NQbxMRY3AuRq7YNdptqZfJ1b/EBQ= 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; bh=FHvy9eAfpSuXjy0a7aFiBDmmQEoZDNMXTQL3ntGscE8=; b=kqtcE9zuYruAvIcGWnEc+53Q4faaD9PxH6igBSVubBbd8+DuJyRDV8dmZzaWcUlgx2 PB0po8sg6OV0QAOilXnL9S5BHG6ZrjyGI5qc4PoPR/ncs18/t2lAr4RsFr9yFI6+00Sv F09GqUHYAes5bvix+4SNHYpKm2QUiWCaMH+5lteZqkiZeTFtLKIdvMLLsk/CmxWi/cqo M2THlCtFN9FdAQpG1XelP6uRQGBXvU5zGG7lR1C5sDou2sceRXqc53FczoA+E2FqHpKm k0BHZLpR5W/SsiDNFeizKV8M/6YjETEWXF/FjWaMXK99a2/vuDrF83d7/U31mqK+ACi8 PWCg== X-Gm-Message-State: AJaThX6OJ39HoGHSutvFN8TK+oO+26dQIfHQ8o/pHTu7CBKqvkdEyfxv shU0AE2R5JJ4CDJPRRr3fqDkM7iMNBg= X-Google-Smtp-Source: AGs4zMY5Bt8M/9MTBKzbhF16Y9pjcLHtLPQ7VfvOymcUO1gHKDfGQbu7ncb+rZxl9joMwC1G9TF3dQ== X-Received: by 10.28.168.88 with SMTP id r85mr3345362wme.63.1510564689427; Mon, 13 Nov 2017 01:18:09 -0800 (PST) Received: from localhost.localdomain (xd93dd96b.cust.hiper.dk. [217.61.217.107]) by smtp.gmail.com with ESMTPSA id x63sm9651399wma.39.2017.11.13.01.18.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Nov 2017 01:18:08 -0800 (PST) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Cc: Marc Zyngier , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, Christoffer Dall Subject: [PULL 11/27] KVM: arm/arm64: GICv4: Unmap VLPI when freeing an LPI Date: Mon, 13 Nov 2017 10:17:36 +0100 Message-Id: <20171113091752.10663-12-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171113091752.10663-1-christoffer.dall@linaro.org> References: <20171113091752.10663-1-christoffer.dall@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marc Zyngier When freeing an LPI (on a DISCARD command, for example), we need to unmap the VLPI down to the physical ITS level. Acked-by: Christoffer Dall Signed-off-by: Marc Zyngier Signed-off-by: Christoffer Dall --- virt/kvm/arm/vgic/vgic-its.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index 590f794b7330..ad14af8a4412 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -631,8 +631,12 @@ static void its_free_ite(struct kvm *kvm, struct its_ite *ite) list_del(&ite->ite_list); /* This put matches the get in vgic_add_lpi. */ - if (ite->irq) + if (ite->irq) { + if (ite->irq->hw) + WARN_ON(its_unmap_vlpi(ite->irq->host_irq)); + vgic_put_irq(kvm, ite->irq); + } kfree(ite); }