Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp3486947pxu; Mon, 30 Nov 2020 04:23:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxQNZOgteqVLCG7bYAy5+9hZLS8h0oFpEIc8Vj+tht9hozblG4KPjMDe4oBsP0eOP9xhSrj X-Received: by 2002:a17:907:262d:: with SMTP id aq13mr20599401ejc.484.1606739037655; Mon, 30 Nov 2020 04:23:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606739037; cv=none; d=google.com; s=arc-20160816; b=hthz6B+Bx/dvCeO6zskJBv237s94MKvczxCXlNpvOcSsMW9y644icC2QOQ2WgWYiQs oEKrX0YthaRYRkAMVyyv//05mmSaZ6KJygOLlTd3et/gi9IPiaCB4T4cohhW4hQq/tyP rt2+yOcckdCt0hq65rn3CiVy1L2NFjB90WaJ/lAnlTVVqKWS7vW8/miJxsyF4mDjmC2/ qzYUSIZsrDQBQO0/8/l5yAKKbZaBKj0fiu3f1AW6g7G3KaJrtVCpTy6p1nvFum1Gnok3 21Cvub4k5n7ugBTLS1TzSSMZIGOeYI6D83PJIDvEojwvZ5Xtkn7yj2nkwABX1aP9nuph L7Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=S5Hvbi+Z7liLU4bGF5nRqCe6Qp5R/TE7BTD2ghHuZtA=; b=Wn4kmRqIfwzcxYkH6isOoROpr1XUXTs3oqaPcuk/2Kt+KfKERovJfeOA3/lnM/TTun WyhJFdT/AFTcAftetfRDMIdQ6eTG31YdPB1Ff8NrkyUkuBnbiqS6+VURfqflfretFTvU c7NA8JttShevpEkvPcLSBp4ujTbesQdxRLHtLeZwGGZnnUnWY6Jy17+BACp3FXLjWatl 6n6/DT9Gs6qZ6NuRuTSd+QgkaiA5zUv0V7vJq2WRXtLKKjJiMR0u9s6gNdgF7p1Twz9n IZYItc6OJ8pkU2KwI/s92Ub5f6C+MyftXCVkmsCdiBF15zTBvEhw8NI6NL3IsRGDGU0a dHmw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gv4si5735797ejb.273.2020.11.30.04.23.33; Mon, 30 Nov 2020 04:23:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726827AbgK3MUG (ORCPT + 99 others); Mon, 30 Nov 2020 07:20:06 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:9073 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726137AbgK3MUG (ORCPT ); Mon, 30 Nov 2020 07:20:06 -0500 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Cl45T3JkGzLxpr; Mon, 30 Nov 2020 20:18:37 +0800 (CST) Received: from DESKTOP-TMVL5KK.china.huawei.com (10.174.186.123) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.487.0; Mon, 30 Nov 2020 20:19:00 +0800 From: Yanan Wang To: , , Marc Zyngier , Catalin Marinas , Will Deacon , James Morse , "Julien Thierry" , Suzuki K Poulose , Gavin Shan , Quentin Perret CC: , , , , , , , Yanan Wang Subject: [RFC PATCH 0/3] Fix several bugs in KVM stage 2 translation Date: Mon, 30 Nov 2020 20:18:44 +0800 Message-ID: <20201130121847.91808-1-wangyanan55@huawei.com> X-Mailer: git-send-email 2.8.4.windows.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.174.186.123] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Several problems about KVM stage 2 translation were found when testing based on the mainline code. The following is description of the problems and the corresponding patchs. When installing a new pte entry or updating an old valid entry in stage 2 translation, we use get_page()/put_page() to record page_count of the page-table pages. PATCH 1/3 aims to fix incorrect use of get_page()/put_page() in stage 2, which might make page-table pages unable to be freed when unmapping a range. When dirty logging of a guest with hugepages is finished, we should merge tables back into a block entry if adjustment of huge mapping is found necessary. In addition to installing the block entry, mapping of the lower-levels for the block should also be unmapped to avoid multiple TLB entries. PATCH 2/3 adds unmap operation when merge tables into a block entry. The rewrite of page-table code and fault handling add two different handlers for "just relaxing permissions" and "map by stage2 page-table walk", that's great improvement. Yet, in function user_mem_abort(), conditions where we choose the above two fault handlers are not strictly distinguished. This will causes guest errors such as infinite-loop (soft lockup will occur in result), because of calling the inappropriate fault handler. So, a solution that can strictly distinguish conditions is introduced in PATCH 3/3. Yanan Wang (3): KVM: arm64: Fix possible memory leak in kvm stage2 KVM: arm64: Fix handling of merging tables into a block entry KVM: arm64: Add usage of stage 2 fault lookup level in user_mem_abort() arch/arm64/include/asm/esr.h | 1 + arch/arm64/include/asm/kvm_emulate.h | 5 +++++ arch/arm64/kvm/hyp/pgtable.c | 22 +++++++++++++++++----- arch/arm64/kvm/mmu.c | 11 +++++++++-- 4 files changed, 32 insertions(+), 7 deletions(-) -- 2.19.1