From patchwork Tue Nov 7 10:47:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10046363 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 4949B60360 for ; Tue, 7 Nov 2017 10:49:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 262032846F for ; Tue, 7 Nov 2017 10:49:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1ACC629D1B; Tue, 7 Nov 2017 10:49:20 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 B9D722846F for ; Tue, 7 Nov 2017 10:49:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757386AbdKGKtI (ORCPT ); Tue, 7 Nov 2017 05:49:08 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:43751 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757392AbdKGKsn (ORCPT ); Tue, 7 Nov 2017 05:48:43 -0500 Received: by mail-wm0-f66.google.com with SMTP id r68so12479223wmr.0 for ; Tue, 07 Nov 2017 02:48:42 -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=Dj/aJeRuoHe+6ewek/cebLZxVvMCBu/6OPzHv44VZWs=; b=F+GyO6aXFpq0JGQv4vPPwvObxXKTVsiZZnVqGibBW8CeVjkSTgs1ChHGanJVVDuGBB /v77Frq1flaCznqqBxeZXdMa/ajwcn+5Ijbj2UfCCu+qkIksJcJhWqArnhLj9ya7T5hf qMByrIDIhKjISF5GAbBPiQ+U63sDCBNIUQ8xs= 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=Dj/aJeRuoHe+6ewek/cebLZxVvMCBu/6OPzHv44VZWs=; b=Fx/ygi7SUvjF9fq97RG3Ww3zFlKdIIKQA9yBQ5yReX0nYe9ZCunRjtiecwwjZJRlQ0 9QdNP+usO2paz6e41iawCTplkeLoKG12/W0v34KckzzkPxuRF6khPsUKpdAZh+WAdcdy lMts+0Ua4ltObAwATkkqO0/7CdENW65/Jjjo3c9C2LYr5mY/eEN7IjFz0SFEKqsQGJIk ADQaFmA22n69FIQvGbDJl1YLFP7XPrY+CNY78/dgzzdvu1f/1E+P1JoTGJ3wOC8VV6rp +d46SA/6BZYaXNXxwRQ0s1idpA5SFj0OTvGSZj/u5PhD1p1PX8XTMj1K4YisMCI9Q20F Jspg== X-Gm-Message-State: AMCzsaXe0Xx3bptYoTRsXXHD2202whPY0f07YCuH36UtUeO5Ajje3atO Mw2334QVxeSC/BSW1C73rTyv2w== X-Google-Smtp-Source: ABhQp+SE2n2bbaySvvTgr7827UPY/2fu0engPDu4zwPJDPA4lrk9pbuKpFVDQu4cCudUdcIgKK/9Cg== X-Received: by 10.80.185.68 with SMTP id m62mr24465986ede.239.1510051722322; Tue, 07 Nov 2017 02:48:42 -0800 (PST) Received: from localhost.localdomain (xd93dd96b.cust.hiper.dk. [217.61.217.107]) by smtp.gmail.com with ESMTPSA id q12sm1044958edj.29.2017.11.07.02.48.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Nov 2017 02:48:41 -0800 (PST) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Cc: Marc Zyngier , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Eric Auger , Christoffer Dall Subject: [PULL 22/26] KVM: arm/arm64: vgic-its: Free caches when GITS_BASER Valid bit is cleared Date: Tue, 7 Nov 2017 11:47:55 +0100 Message-Id: <20171107104800.30021-23-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171107104800.30021-1-christoffer.dall@linaro.org> References: <20171107104800.30021-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: Eric Auger When the GITS_BASER.Valid gets cleared, the data structures in guest RAM are not valid anymore. The device, collection and LPI lists stored in the in-kernel ITS represent the same information in some form of cache. So let's void the cache. Reviewed-by: Marc Zyngier Reviewed-by: Christoffer Dall Signed-off-by: Eric Auger Signed-off-by: Christoffer Dall --- virt/kvm/arm/vgic/vgic-its.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index d46256c07ba5..1732e08a4375 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -1431,7 +1431,7 @@ static void vgic_mmio_write_its_baser(struct kvm *kvm, unsigned long val) { const struct vgic_its_abi *abi = vgic_its_get_abi(its); - u64 entry_size, device_type; + u64 entry_size, table_type; u64 reg, *regptr, clearbits = 0; /* When GITS_CTLR.Enable is 1, we ignore write accesses. */ @@ -1442,12 +1442,12 @@ static void vgic_mmio_write_its_baser(struct kvm *kvm, case 0: regptr = &its->baser_device_table; entry_size = abi->dte_esz; - device_type = GITS_BASER_TYPE_DEVICE; + table_type = GITS_BASER_TYPE_DEVICE; break; case 1: regptr = &its->baser_coll_table; entry_size = abi->cte_esz; - device_type = GITS_BASER_TYPE_COLLECTION; + table_type = GITS_BASER_TYPE_COLLECTION; clearbits = GITS_BASER_INDIRECT; break; default: @@ -1459,10 +1459,24 @@ static void vgic_mmio_write_its_baser(struct kvm *kvm, reg &= ~clearbits; reg |= (entry_size - 1) << GITS_BASER_ENTRY_SIZE_SHIFT; - reg |= device_type << GITS_BASER_TYPE_SHIFT; + reg |= table_type << GITS_BASER_TYPE_SHIFT; reg = vgic_sanitise_its_baser(reg); *regptr = reg; + + if (!(reg & GITS_BASER_VALID)) { + /* Take the its_lock to prevent a race with a save/restore */ + mutex_lock(&its->its_lock); + switch (table_type) { + case GITS_BASER_TYPE_DEVICE: + vgic_its_free_device_list(kvm, its); + break; + case GITS_BASER_TYPE_COLLECTION: + vgic_its_free_collection_list(kvm, its); + break; + } + mutex_unlock(&its->its_lock); + } } static unsigned long vgic_mmio_read_its_ctlr(struct kvm *vcpu,