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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B32E0C30653 for ; Mon, 1 Jul 2024 08:43:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=yEsoWTLxyHIlDQCb/ASp+ooXvx9TSwnTA36CC8StcRU=; b=BvtRJUNI4E8Q5FB5hJpD3Zywim NiCixgtALsBd7qvQgbQOwpfOy1o2TSIUYGIop7p2q1yJZUkS+24Z/EQvHNjiijlehkXyNHnFbBtyr azdZMOZUMN2q4+o5LVU8w7XAs9cyFoF3zYUS2qKtq2zOXBY6vRZ4Kcq506D4KCSbjNUgJDTmXovnj j1konYSLOwKYUrCZSvNHNvWPrTmS9fZ+Wp6e6f9FpplidfY0Jiu/265gIdBOdYNK3jTR6L+b8tA8A ofzkVt3e+UVGPTFcoUdMENSKY40tjyyoXJ5+ON5rpEl70JnXEgbQaHZ/UdrxfcBoTnRQK+aJw5TCF tVE2xtEQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOCcq-00000002HJL-1AGn; Mon, 01 Jul 2024 08:43:04 +0000 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOCcg-00000002HEI-0UaQ for linux-arm-kernel@lists.infradead.org; Mon, 01 Jul 2024 08:42:55 +0000 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-42565cdf99cso24487765e9.3 for ; Mon, 01 Jul 2024 01:42:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719823368; x=1720428168; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=yEsoWTLxyHIlDQCb/ASp+ooXvx9TSwnTA36CC8StcRU=; b=uMTf7RspZIzmHZIfS0bJKglhsJkYQ7DsYafaaFZ48P0dIjZYLZgVbtvtRKiUQ8Ng6K KPPjonrT2jE3ya4wkKSR0bPTgGmB5YSecROtHLb4Z0kgiOzGguGC926/LgZFJJ3Nt0Lt b8qX9pm/DNAS5pEqVsVsLsDkDj2a0gn2ri7Pc79kdjVnglMXcYvfFs8THzLp4TFuRufi KhAa2XGloVRGCPZyBV/peZuJdLeA7m+Zf4lN8QF7nWTtFn1FnMNgpT7ixK3cP1CgXD4w 38aNhHTl3ba1/wpMSFXwHt5PvtKgosXd+uyLYRGprkjwzqPz1zmk5umR5nwG1/Doy4rK P0+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719823368; x=1720428168; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yEsoWTLxyHIlDQCb/ASp+ooXvx9TSwnTA36CC8StcRU=; b=hI2nEe/ARhGCmu6nbhDalv+HaVc23WR30JiZng24hVs+A+2FcigvNpMCO5+DwkRQE+ kuCfSqE087NEns12F75z9zUPfknEuTcdkLr6DiO/in2LxSFtaBJvab1wy9Y3TKGr4XlI bp56wUriCIyfAwUADGRMsFfqI8r5rdlSI3mijcmbLvnmAaoW3NScgN7OESFS5/f9la7p oNQbkmWRvcss3NrW+jpC0vpM7z3rQddDHgZVZHiZoWgVIvDcdQCkpKbacQaGu9SLY4cE vHrML3Y9wIaLW+JNwbuwwWjzgmExWBdfxtAFj82nR9iPmW1xlal/BvQ9Hq/pL0QaBf1L Fzog== X-Forwarded-Encrypted: i=1; AJvYcCVOt1kk38b1/S/R+QrCkFNlrV9G9EpbUdfDrxaOEraEy+juYnAQP4x4I08N5qAicuse4Ul9KWihXm9aCpWnzHCBut9G8Wlbg6imuxutOqqAVqtjarI= X-Gm-Message-State: AOJu0Yz0kV9dHqTsZjx9mlTaoDIOZ7b75cx+LV4YgqBDfB/BtN9RGrm8 H7m5QPeprcy72ruYIJkzNTLpog1Ajm83xwIUztQJOZlX1HpAh+QtBFna8JEl+Q== X-Google-Smtp-Source: AGHT+IGawId0kUmiFiVE/6VBOwuMv0FSUu1ZKqIQ07gLRwDyzzNe0v1kfMUd7cCTWmMSeLhyZCJCRQ== X-Received: by 2002:a05:6000:18a7:b0:367:4d9d:56a1 with SMTP id ffacd0b85a97d-3677572496bmr3944444f8f.45.1719823367880; Mon, 01 Jul 2024 01:42:47 -0700 (PDT) Received: from google.com (247.165.79.34.bc.googleusercontent.com. [34.79.165.247]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3675a0cd778sm9536657f8f.5.2024.07.01.01.42.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jul 2024 01:42:47 -0700 (PDT) Date: Mon, 1 Jul 2024 09:42:43 +0100 From: Vincent Donnefort To: Sebastian Ene Cc: akpm@linux-foundation.org, alexghiti@rivosinc.com, ankita@nvidia.com, ardb@kernel.org, catalin.marinas@arm.com, christophe.leroy@csgroup.eu, james.morse@arm.com, mark.rutland@arm.com, maz@kernel.org, oliver.upton@linux.dev, rananta@google.com, ryan.roberts@arm.com, shahuang@redhat.com, suzuki.poulose@arm.com, will@kernel.org, yuzenghui@huawei.com, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com Subject: Re: [PATCH v7 5/6] KVM: arm64: Initialize the ptdump parser with stage-2 attributes Message-ID: References: <20240621123230.1085265-1-sebastianene@google.com> <20240621123230.1085265-6-sebastianene@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240621123230.1085265-6-sebastianene@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240701_014254_181094_ED5509E4 X-CRM114-Status: GOOD ( 20.96 ) 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 O Fri, Jun 21, 2024 at 12:32:29PM +0000, 'Sebastian Ene' via kernel-team wrote: > Define a set of attributes used by the ptdump parser to display the > properties of a guest memory region covered by a pagetable descriptor. > Build a description of the pagetable levels and initialize the parser > with this configuration. > > Signed-off-by: Sebastian Ene > --- > arch/arm64/kvm/ptdump.c | 143 ++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 137 insertions(+), 6 deletions(-) > > diff --git a/arch/arm64/kvm/ptdump.c b/arch/arm64/kvm/ptdump.c > index 36dc7662729f..cc1d4fdddc6e 100644 > --- a/arch/arm64/kvm/ptdump.c > +++ b/arch/arm64/kvm/ptdump.c > @@ -14,6 +14,61 @@ > #include > > > +#define MARKERS_LEN (2) > +#define KVM_PGTABLE_MAX_LEVELS (KVM_PGTABLE_LAST_LEVEL + 1) > + > +struct kvm_ptdump_guest_state { > + struct kvm *kvm; > + struct pg_state parser_state; > + struct addr_marker ipa_marker[MARKERS_LEN]; > + struct pg_level level[KVM_PGTABLE_MAX_LEVELS]; > + struct ptdump_range range[MARKERS_LEN]; > +}; > + > +static const struct prot_bits stage2_pte_bits[] = { > + { > + .mask = PTE_VALID, > + .val = PTE_VALID, > + .set = " ", > + .clear = "F", > + }, { > + .mask = KVM_PTE_LEAF_ATTR_HI_S2_XN | PTE_VALID, > + .val = KVM_PTE_LEAF_ATTR_HI_S2_XN | PTE_VALID, > + .set = "XN", > + .clear = " ", > + }, { > + .mask = KVM_PTE_LEAF_ATTR_LO_S2_S2AP_R | PTE_VALID, > + .val = KVM_PTE_LEAF_ATTR_LO_S2_S2AP_R | PTE_VALID, > + .set = "R", > + .clear = " ", > + }, { > + .mask = KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W | PTE_VALID, > + .val = KVM_PTE_LEAF_ATTR_LO_S2_S2AP_W | PTE_VALID, > + .set = "W", > + .clear = " ", > + }, { > + .mask = KVM_PTE_LEAF_ATTR_LO_S2_AF | PTE_VALID, > + .val = KVM_PTE_LEAF_ATTR_LO_S2_AF | PTE_VALID, > + .set = "AF", > + .clear = " ", > + }, { > + .mask = PTE_NG, > + .val = PTE_NG, > + .set = "FnXS", > + .clear = " ", > + }, { > + .mask = PTE_CONT | PTE_VALID, > + .val = PTE_CONT | PTE_VALID, > + .set = "CON", > + .clear = " ", > + }, { > + .mask = PTE_TABLE_BIT, > > + .val = PTE_TABLE_BIT, > + .set = " ", > + .clear = "BLK", > + }, When doing a kvm_pgtable_stage2_set_owner(), the walker will init a leaf which has both the table-bit and the valid-bit unset. I believe this would lead to spurious BLK annotations here. The following should fix this problem: .mask = PTE_TABLE_BIT | PTE_VALID, .val = PTE_VALID, .set = "BLK", .clear = " ", > +}; > + > static int kvm_ptdump_visitor(const struct kvm_pgtable_visit_ctx *ctx, > enum kvm_pgtable_walk_flags visit) > { > @@ -40,15 +95,79 @@ static int kvm_ptdump_show_common(struct seq_file *m, > return kvm_pgtable_walk(pgtable, 0, BIT(pgtable->ia_bits), &walker); > } > [...]