From patchwork Tue Oct 5 09:01:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Perret X-Patchwork-Id: 12535999 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1012DC433F5 for ; Tue, 5 Oct 2021 09:04:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 D61E7613B5 for ; Tue, 5 Oct 2021 09:04:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D61E7613B5 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=xADWCAVTsrsVhA3Eviaqdsx/+cC9VmqxPo+PKmPEnJw=; b=ow3qpJG3pRCpsI6CtaSPYQqMuZ LMN76/Nf9PczZna4S7xn2R/aImsLTONgO2aV79W5jjy900AsgIgXccpukR0Uz/pOUdOoKwGGLjeEA A3rpnYeIbe2dEeTUD60zmj3W9OOcCapdkChRqGPPjjgxhisdmK/aKJSjZ/fgFqFOLql6WboHptMW4 ph2ynZ+gaGNTSukE1lBq/2DM8pY614G5H5Hjk328XMa0MOjyFCBFoT7eALg56Xx7+BE6unGqGpnjE s6ZGoA0sllaovd4FKUn0o4yDMdVHp11LK1Qx/1PZABEvsTQtUQC3F+k32gkKYuMCQLo0WH6shY7II Wvn1yL6A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mXgLA-009dJz-TS; Tue, 05 Oct 2021 09:02:25 +0000 Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mXgL6-009dII-Ms for linux-arm-kernel@lists.infradead.org; Tue, 05 Oct 2021 09:02:22 +0000 Received: by mail-wr1-x44a.google.com with SMTP id n18-20020adff092000000b001609d9081d4so2526380wro.18 for ; Tue, 05 Oct 2021 02:02:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=tHk4fNmSvcmkrUgevYD4U41Hr/4Newl1f8mzt2RPUWc=; b=miKQfMbrmMeNk1nN5Us0pRryucqshdMsoMrRtD78bnN0xpMXDyebUIGBm2N9+RsrjS UXs1cSibDRvi2j5buA7f3EAJmJVPTQXbPoOTBYvIY/gj/8Pk4xMg9LHmvDqHKoPbzWhj CKw2r5ZL72icTM4eRY5uiI5Cmba4u3bLD6i7BCUh0Di04EY+fYYHfezaua/ZlZ0xG3CC XzkqJunDQFO8KNIKYFbmJHYzFqBlmK9kO4mzgbotS+atB5CwSM97GuY5iOwp7Apy6CUd 9TDvI6JR/UrYgq52ZKMtEgOdcvtnUbgVt8CZhlFNzrhTdHOzXm/mu3rdOcnC9ZxCdibz l0sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=tHk4fNmSvcmkrUgevYD4U41Hr/4Newl1f8mzt2RPUWc=; b=v1auctM06SeROVkk5Ay/dmmQgi/qBQ7ksOF3E8ydd5h48d1LbcbEFA00XNBHL0efAZ rShVVoOuS+O5SkZivmkohzTnqgvihCxCyyIfMcDNufG5nwFWsvRQbuzToU1f6oSVNI/k 1W6FoERRQTl02W592qUJ2bqBLfyUbRsExjBf2qNNNJD49rDYvuMyEK4TD/oFIxbDGyEk 0MVFNSbV8Om8iDivgF0TRiBk0dCYtLGm5dKxpHtQhOamYZAlrI2R2Eb+b1eetf95+zE9 6xTxf9hzfjF/DENxBbTvYWVheKbOrDkdV38sJCeQIEwFVpdKsi2QhmX7vuRDoxOlnmTI qWAg== X-Gm-Message-State: AOAM532UoBXo/LGePIftLegLvnywy35sl5aRyQG8OBRk4gEssqSciuFK MToGgKuHKbeklhSiUQB4wrg3wRw+l7FO X-Google-Smtp-Source: ABdhPJwGSCqnQhZEyqfA74Q3qEcGbDWSwK0xwXi4KbcWnIWu2bbm4tNiHp9f0/QTwusKaq+9TcjstDkn7Ba3 X-Received: from luke.lon.corp.google.com ([2a00:79e0:d:210:5700:9128:3106:b389]) (user=qperret job=sendgmr) by 2002:a5d:4b50:: with SMTP id w16mr19856776wrs.71.1633424538044; Tue, 05 Oct 2021 02:02:18 -0700 (PDT) Date: Tue, 5 Oct 2021 10:01:38 +0100 In-Reply-To: <20211005090155.734578-1-qperret@google.com> Message-Id: <20211005090155.734578-2-qperret@google.com> Mime-Version: 1.0 References: <20211005090155.734578-1-qperret@google.com> X-Mailer: git-send-email 2.33.0.800.g4c38ced690-goog Subject: [PATCH 1/2] KVM: arm64: Fix host stage-2 PGD refcount From: Quentin Perret To: Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , Will Deacon , Quentin Perret , Fuad Tabba , David Brazdil , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org Cc: kernel-team@android.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211005_020220_790229_B9590535 X-CRM114-Status: GOOD ( 14.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The KVM page-table library refcounts the pages of concatenated stage-2 PGDs individually. However, the host's stage-2 PGD is currently managed by EL2 as a single high-order compound page, which can cause the refcount of the tail pages to reach 0 when they really shouldn't, hence corrupting the page-table. Fix this by introducing a new hyp_split_page() helper in the EL2 page allocator (matching EL1's split_page() function), and make use of it from host_s2_zalloc_page(). Fixes: 1025c8c0c6ac ("KVM: arm64: Wrap the host with a stage 2") Suggested-by: Will Deacon Signed-off-by: Quentin Perret --- arch/arm64/kvm/hyp/include/nvhe/gfp.h | 1 + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 6 +++++- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/gfp.h b/arch/arm64/kvm/hyp/include/nvhe/gfp.h index fb0f523d1492..0a048dc06a7d 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/gfp.h +++ b/arch/arm64/kvm/hyp/include/nvhe/gfp.h @@ -24,6 +24,7 @@ struct hyp_pool { /* Allocation */ void *hyp_alloc_pages(struct hyp_pool *pool, unsigned short order); +void hyp_split_page(struct hyp_page *page); void hyp_get_page(struct hyp_pool *pool, void *addr); void hyp_put_page(struct hyp_pool *pool, void *addr); diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index bacd493a4eac..93a79736c283 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -35,7 +35,11 @@ const u8 pkvm_hyp_id = 1; static void *host_s2_zalloc_pages_exact(size_t size) { - return hyp_alloc_pages(&host_s2_pool, get_order(size)); + void *addr = hyp_alloc_pages(&host_s2_pool, get_order(size)); + + hyp_split_page(hyp_virt_to_page(addr)); + + return addr; } static void *host_s2_zalloc_page(void *pool) diff --git a/arch/arm64/kvm/hyp/nvhe/page_alloc.c b/arch/arm64/kvm/hyp/nvhe/page_alloc.c index 41fc25bdfb34..a6e874e61a40 100644 --- a/arch/arm64/kvm/hyp/nvhe/page_alloc.c +++ b/arch/arm64/kvm/hyp/nvhe/page_alloc.c @@ -193,6 +193,20 @@ void hyp_get_page(struct hyp_pool *pool, void *addr) hyp_spin_unlock(&pool->lock); } +void hyp_split_page(struct hyp_page *p) +{ + unsigned short order = p->order; + unsigned int i; + + p->order = 0; + for (i = 1; i < (1 << order); i++) { + struct hyp_page *tail = p + i; + + tail->order = 0; + hyp_set_page_refcounted(tail); + } +} + void *hyp_alloc_pages(struct hyp_pool *pool, unsigned short order) { unsigned short i = order; From patchwork Tue Oct 5 09:01:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Perret X-Patchwork-Id: 12536001 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95386C433F5 for ; Tue, 5 Oct 2021 09:05:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 63EBE61371 for ; Tue, 5 Oct 2021 09:05:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 63EBE61371 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=v/SppXpXz3LZCJ4QluIJrWxMVNLV81BnuFiNDNYuwbU=; b=rQzEA9c6SjD42Icq5nztfM2sUy I7Ow0iDwloV+otejO2oIEvFc6UmDx9yOISv/a46fJHSRSFyr1WVHem+mWarPyQ4SWcuat6Vl1gNad Fc6oW9YWGWMSu9zg4BS+vb5Kt5LEWQqmGAYJYio4Yo+zuQXZfS/vqIgTt5vU1gcvOMM5ePYc89z1T Bry4CIrUd6qNkhdvglATy4nXfmB61cXqBFNOjemDTqOmrXTUD+hUZLhlnqjrk3187VsDqlpzJF6r6 MJqs13utVICoa0aZGbW5cRWJr/UjVs2NrLgEUikKRAsNm8F/l8TqCR+dK4U8RV7VADJ6OOD9M+4na XL1BD9bg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mXgLQ-009dPE-VJ; Tue, 05 Oct 2021 09:02:41 +0000 Received: from mail-qt1-x849.google.com ([2607:f8b0:4864:20::849]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mXgLL-009dNA-Rf for linux-arm-kernel@lists.infradead.org; Tue, 05 Oct 2021 09:02:37 +0000 Received: by mail-qt1-x849.google.com with SMTP id d9-20020ac86149000000b002a6d33107c5so22630388qtm.8 for ; Tue, 05 Oct 2021 02:02:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=wkyuiZINwNBLMyCf2gjjqTHN+Go0IESaSFToIb6F4Fw=; b=EKFnh/sXPfL6SyxAQSUAY6zRBxqFcb3PSl/vj5lGE5JSiKVIYXjqNkN1c3ma+yItZf Sk0o0NPthUFScy8hUZ0wwOootL0G4y2vL/YJuxg3Dtw4kvPj4ocxd0/gXRLX1ih/LGSv kJieebl7g9OC5vkrvzjJ+WIu1oy3uhPGasNwC17W2CNL4nezRMLhlsl77YmYptBherI1 RgFFqaUthvhyo277EzH+4gHTmvxLf9dWDJ31uiYuUcGjUlwSsAR0phVTLp8+gM3LfCBk kOW+OG0MAYoB5rguVBaWbIDO/tcBdGv7n83nZne3vgNNIs3aqfeDZM4jt3A7FSzg85LE AMcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=wkyuiZINwNBLMyCf2gjjqTHN+Go0IESaSFToIb6F4Fw=; b=h3H/PKCX56o5wOcNLHTasHDNFwDY9Lm4P9gd/rmnM3unnZ9bZgE85jk3Gnw4Uzh6Ux 6ChAz6jiy6ImaD+W/w8MPC877I9ew4cMx5crrRolk6zGmpdvteMBcGj6cPMROphQwkKR FJEeNGsJXeh5f+lo2Fp53McZzulUUGtkR/p4BVxa8jLhbCDHZNe7vq//wfBRT9qmWU5L iBC8m7KLuKuNgUdfOq4H+8MTvTQycUhFZpoZJslfKp0degynnnmUOfoWtazRX0uEga7s dpsqZWyQJZVqKDGXUZKMVIXM+hb0KLebDs0kASa3iIkBXja49BuiPt9ygbE2ufCVB2M7 RvqA== X-Gm-Message-State: AOAM531Tr6Vl/mUuUL/c2ToFWP2ppABjWAKTvS/PIJWbLAmZ++d3udBu nLBKUvUOLyeHpikw0xS7q/aIgOnIy6dX X-Google-Smtp-Source: ABdhPJwLRnkFWRvGHIY32Rqa3Eiquzx86qZPVIsgO2JHnhRBY0a0MNCuAi59I89wj4Q70Jl6kpZxagSP7sBv X-Received: from luke.lon.corp.google.com ([2a00:79e0:d:210:5700:9128:3106:b389]) (user=qperret job=sendgmr) by 2002:a05:6214:1267:: with SMTP id r7mr9710216qvv.16.1633424553449; Tue, 05 Oct 2021 02:02:33 -0700 (PDT) Date: Tue, 5 Oct 2021 10:01:39 +0100 In-Reply-To: <20211005090155.734578-1-qperret@google.com> Message-Id: <20211005090155.734578-3-qperret@google.com> Mime-Version: 1.0 References: <20211005090155.734578-1-qperret@google.com> X-Mailer: git-send-email 2.33.0.800.g4c38ced690-goog Subject: [PATCH 2/2] KVM: arm64: Report corrupted refcount at EL2 From: Quentin Perret To: Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , Will Deacon , Quentin Perret , Fuad Tabba , David Brazdil , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org Cc: kernel-team@android.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211005_020235_923582_A9005B17 X-CRM114-Status: UNSURE ( 9.32 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Some of the refcount manipulation helpers used at EL2 are instrumented to catch a corrupt state, but not all of them are treated equally. Let's make things more consistent by instrumenting hyp_page_ref_dec_and_test() as well. Suggested-by: Will Deacon Signed-off-by: Quentin Perret --- arch/arm64/kvm/hyp/nvhe/page_alloc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kvm/hyp/nvhe/page_alloc.c b/arch/arm64/kvm/hyp/nvhe/page_alloc.c index a6e874e61a40..0bd7701ad1df 100644 --- a/arch/arm64/kvm/hyp/nvhe/page_alloc.c +++ b/arch/arm64/kvm/hyp/nvhe/page_alloc.c @@ -152,6 +152,7 @@ static inline void hyp_page_ref_inc(struct hyp_page *p) static inline int hyp_page_ref_dec_and_test(struct hyp_page *p) { + BUG_ON(!p->refcount); p->refcount--; return (p->refcount == 0); }