From mboxrd@z Thu Jan 1 00:00:00 1970 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 DEEAAC433EF for ; Wed, 6 Oct 2021 10:43:42 +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 9D6C26115A for ; Wed, 6 Oct 2021 10:43:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9D6C26115A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=EDg0T90NVYlqFJ+MV+babBLUdF0DRCytSJibmG3vEDo=; b=kiwK/OxREeqVTm Wyqtg5FjsRd5Dw79FPDucOYWi/mY94pwg49/5vj4ySHYCGabky3Rpvxr0H/vzs21UY5VZm6WKS2FN VKBkwsPb3nZqMB8lpgad2iw/VJZmIFWwOCLGe32V0VSow6FdFYvVaTNQfY/R0N/om+WQipN2hJ8bE owbJobV85ayU1/kf68eVM7fGskBM7Lno0Fks9jK/5LoPPTFq/lHJGvqhXF4+H7MGFbZTowXiPBC3I acBclMKwi4S6AewFyHd/H413UevmRgi01NeSFCKzxVL3zNCgWoYzEowA/HwTVVUhofhQf3wfRP7K/ vGi1nmp4yENT+JzST8vg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mY4Ms-00DrqF-Ak; Wed, 06 Oct 2021 10:41:46 +0000 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mY4Mo-00DrpR-Fl for linux-arm-kernel@lists.infradead.org; Wed, 06 Oct 2021 10:41:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633516896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pSbAB1FpLz0EqbTVsytH0ZxguGzlBKGJojYvPvVsolc=; b=e81kuzIUqAKjR7iNwtoMOLOAdhk45hSBsGNe0/upJ9SJa1q5La3ylfbXQdhroWphZl8ne5 uMo7YbfdWlCi3X7cg5jncD71x2q2B5YY/crwTTwOsZqoTCMoLr4YfkYzq2q6Pzh0tVvoEP wkC6YojxHX57VIQgSn2f+/qORxHpb78= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-517-imnjMo4CMAezcLKbmeDp8g-1; Wed, 06 Oct 2021 06:41:33 -0400 X-MC-Unique: imnjMo4CMAezcLKbmeDp8g-1 Received: by mail-ed1-f69.google.com with SMTP id x5-20020a50f185000000b003db0f796903so2199702edl.18 for ; Wed, 06 Oct 2021 03:41:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=pSbAB1FpLz0EqbTVsytH0ZxguGzlBKGJojYvPvVsolc=; b=2NPN02PO8cSvD0CK0FCTiP+2+NEq71r8YrfhkWSlNIiLExIJX3J4Upz5P+14pi7iWb MK8EPumUFwBLpEkXBxLiA8cL5McvXkv0aNBIBSFYvsOZyJQhTgHBLMd8YujYCrXssBYh B80/15GzCfFPAz+f8YW1SnGdUYEEaYWl1QiRWDVuRP/uOItmzR36qH7Y+Yrd6nwC5cZv zl42kK8IPbAbVjjum1sjCE4uZtRjrLAY3rumQ8PBTuwZ8PNrww9V3akwKDKVRclml2fi eqEmowUicF4bonlr2nYDM3xs3/HEECmWodaABow3ptxMTSyKXhrQv9s2+sawla2ptsPa bhuw== X-Gm-Message-State: AOAM532vxB8byDmvB2IHOiKb42g5Jm2vmGbN1ibjf054D0/37/NaEe7A xJgmLsEWFJZW6eq/1Nfe9KokZqZBBo/EODGIkor8eD3E03YRxbKQkCltCdxbkAljTdjkm1EetE/ kTjICp4xHYpu8JMMsBOHV9iwzWkwNxtZqzT0= X-Received: by 2002:a05:6402:1259:: with SMTP id l25mr9211092edw.344.1633516891970; Wed, 06 Oct 2021 03:41:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsOxOanoU2WsmUTn0+TJD/8wKuiodjYexDFyKIk7g9DkrwyVhAlxgYFvN9xA5V8tJSD+COsA== X-Received: by 2002:a05:6402:1259:: with SMTP id l25mr9211064edw.344.1633516891776; Wed, 06 Oct 2021 03:41:31 -0700 (PDT) Received: from gator.home (cst2-174-28.cust.vodafone.cz. [31.30.174.28]) by smtp.gmail.com with ESMTPSA id q18sm8991596ejc.84.2021.10.06.03.41.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Oct 2021 03:41:31 -0700 (PDT) Date: Wed, 6 Oct 2021 12:41:29 +0200 From: Andrew Jones To: Marc Zyngier Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, will@kernel.org, qperret@google.com, dbrazdil@google.com, Steven Price , Fuad Tabba , Srivatsa Vaddagiri , Shanker R Donthineni , James Morse , Suzuki K Poulose , Alexandru Elisei , kernel-team@android.com Subject: Re: [PATCH v2 02/16] KVM: arm64: Check for PTE valitity when checking for executable/cacheable Message-ID: <20211006104129.s5az46tpny2csfge@gator.home> References: <20211004174849.2831548-1-maz@kernel.org> <20211004174849.2831548-3-maz@kernel.org> MIME-Version: 1.0 In-Reply-To: <20211004174849.2831548-3-maz@kernel.org> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=drjones@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211006_034142_633541_E3286453 X-CRM114-Status: GOOD ( 19.85 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Marc, sed s/valitity/validity/ <<<"$SUBJECT" On Mon, Oct 04, 2021 at 06:48:35PM +0100, Marc Zyngier wrote: > Don't blindly assume that the PTE is valid when checking whether > it describes an executable or cacheable mapping. > > This makes sure that we don't issue CMOs for invalid mappings. > > Suggested-by: Will Deacon > Signed-off-by: Marc Zyngier > --- > arch/arm64/kvm/hyp/pgtable.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c > index f8ceebe4982e..6bbfd952f0c5 100644 > --- a/arch/arm64/kvm/hyp/pgtable.c > +++ b/arch/arm64/kvm/hyp/pgtable.c > @@ -638,12 +638,12 @@ static void stage2_put_pte(kvm_pte_t *ptep, struct kvm_s2_mmu *mmu, u64 addr, > static bool stage2_pte_cacheable(struct kvm_pgtable *pgt, kvm_pte_t pte) > { > u64 memattr = pte & KVM_PTE_LEAF_ATTR_LO_S2_MEMATTR; > - return memattr == KVM_S2_MEMATTR(pgt, NORMAL); > + return kvm_pte_valid(pte) && memattr == KVM_S2_MEMATTR(pgt, NORMAL); > } > > static bool stage2_pte_executable(kvm_pte_t pte) > { > - return !(pte & KVM_PTE_LEAF_ATTR_HI_S2_XN); > + return kvm_pte_valid(pte) && !(pte & KVM_PTE_LEAF_ATTR_HI_S2_XN); > } > > static bool stage2_leaf_mapping_allowed(u64 addr, u64 end, u32 level, > @@ -688,8 +688,7 @@ static int stage2_map_walker_try_leaf(u64 addr, u64 end, u32 level, > /* Perform CMOs before installation of the guest stage-2 PTE */ > if (mm_ops->dcache_clean_inval_poc && stage2_pte_cacheable(pgt, new)) > mm_ops->dcache_clean_inval_poc(kvm_pte_follow(new, mm_ops), > - granule); > - > + granule); > if (mm_ops->icache_inval_pou && stage2_pte_executable(new)) > mm_ops->icache_inval_pou(kvm_pte_follow(new, mm_ops), granule); > > @@ -1091,7 +1090,7 @@ static int stage2_flush_walker(u64 addr, u64 end, u32 level, kvm_pte_t *ptep, > kvm_pte_t pte = *ptep; > kvm_pte_t *pte_follow; > > - if (!kvm_pte_valid(pte) || !stage2_pte_cacheable(pgt, pte)) > + if (!stage2_pte_cacheable(pgt, pte)) > return 0; > > pte_follow = kvm_pte_follow(pte, mm_ops); > -- > 2.30.2 > Reviewed-by: Andrew Jones _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel