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 5C5F2C48BF8 for ; Thu, 22 Feb 2024 15:19:45 +0000 (UTC) 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=9An543dZiU/HXp2/G+NBA1gSyAqK8ld2+5AVfR9U62A=; b=lrCIXutfgK0c7E P0pJfngSZERL4QUVvmHqOMdjA+hIoSxl86wJtjfn0nHBO/4gvNfu2JfwG0twAPmR8D7BN3bZewgdH 4mTHi1iyNssUE3ddJcjXv0doQUvqZ/DV+gtARxZyQq3hOAMBlWBOJMY4TE+l/hh/cW/zOfvL5HHAN vW6Wr8EFdwl9r2UptdQuZVAvBOv7WTqWvlUEpZ5WpbXIj2Vjd274U728pxWoZC3UwnmIXfsyfnfDi QW/zuiAlWB1V/WBqegQrjm5VhaFzT42yvo1P2juGEpcXb6v8uQ0A5VkTUjBJklvPjefd7Ty3nto1L HOt1N+Li0MAsXqpL1FdA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rdArD-00000005MA1-0hLp; Thu, 22 Feb 2024 15:19:31 +0000 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rdAr9-00000005M9W-2RFg for linux-arm-kernel@lists.infradead.org; Thu, 22 Feb 2024 15:19:28 +0000 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4120933b710so61895e9.0 for ; Thu, 22 Feb 2024 07:19:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708615166; x=1709219966; 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=wylv6vXEtUdi6Bcb5avU2yV6NCNR7pjMD098XS01Joc=; b=WNdVgLZIp3kNKQQBNoo40YG5zCgGLUR24Ezq4x6NnN6fD7EQzWK5LPOVGgrvF+YEsJ OR8Hlcn3iNRvZ81bNt4reECNFuacOMNnkOvZFosDhJGPxAVPnCALgPrVU2JbdYIk1J3m s7DsqVkLi8ZXu9JSFYReyPOIg1TDmki2v4csgS7UPuO+w1+UQtyaTPcptFBqvBC9aApF I2oX6FBQG48yFTpBOLS60fxN0Yg/sRQIqwtmEZUoVOu0tQFw++AgwJ3PjrNGDamXt9KO aNunJ8kWZp1mUUhYXeQ6QpfIoSDg0ncE04v/lCE1SjPNztRKDG4XtkjwSIH3PsFL0Jhs C39g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708615166; x=1709219966; 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=wylv6vXEtUdi6Bcb5avU2yV6NCNR7pjMD098XS01Joc=; b=WEH+mfPoYOaSJNM6zBTtmPEN3A7+Wvhl+v/b/Turq3n4kPVPsQdWPif875OeAlI1JA JnBLDiBvGoWoBwAgW69W9G5IhwJR4lzYuCDoXxFQLH0VtCu8gBA+IA5fKO2hsnwU+2qo N2shEK3ALjN+x72RBZiKVJzXmEru1JxR5d4+9328T+iia1OY6PZRw71dX7onSs1jg3jO i3AdkHXg4WMI6GCgazFCrOjwNcDA4Z6Fm6gR5CtbGbFC1y3fDWDbQ5tubluqsDetlUZb lNkrA0I+/bvazKsYVUgQ9A+0nmK+qBGjirBlXmM4X2FRhNo09zWufNDLJOwoN25X4ugm K5yA== X-Forwarded-Encrypted: i=1; AJvYcCVcbbtjH0oI0frrI0A17XAbFU4PkPNLAofCNwlC81hkiVw15OR6U2ae/R049YWEiEcFidoK5391dyFEHk4H6Y+YuNDxkT5YhWTuHpznr7li9s1XEME= X-Gm-Message-State: AOJu0YwSxS3L2io73ov5btaiMcA8DeBk5hv36bISycMvzMqWDJ5Fy4Qr 4/LmZaEb70J7mgxrfUM+5UwCwOKfkGmu/6sduaFzPfKG22g0H9dBA+/KmEV2Jw== X-Google-Smtp-Source: AGHT+IFAAaTEm3lXZegn3XxVb3u12ViYu3B/HVTEqaxNxbW8lSDpmbQNkCKoWLXbfgIjLhjZ5xHhGw== X-Received: by 2002:a05:600c:a017:b0:412:5616:d3d with SMTP id jg23-20020a05600ca01700b0041256160d3dmr385275wmb.7.1708615165506; Thu, 22 Feb 2024 07:19:25 -0800 (PST) Received: from google.com (161.126.77.34.bc.googleusercontent.com. [34.77.126.161]) by smtp.gmail.com with ESMTPSA id q4-20020adfab04000000b0033cf637eea2sm20823457wrc.29.2024.02.22.07.19.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 07:19:24 -0800 (PST) Date: Thu, 22 Feb 2024 15:19:23 +0000 From: Sebastian Ene To: catalin.marinas@arm.com, gshan@redhat.com, james.morse@arm.com, mark.rutland@arm.com, maz@kernel.org, oliver.upton@linux.dev, rananta@google.com, ricarkol@google.com, ryan.roberts@arm.com, shahuang@redhat.com, suzuki.poulose@arm.com, will@kernel.org, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com, vdonnefort@google.com Subject: Re: [PATCH v6 5/6] KVM: arm64: Initialize the ptdump parser with stage-2 attributes Message-ID: References: <20240220151035.327199-1-sebastianene@google.com> <20240220151035.327199-6-sebastianene@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240220151035.327199-6-sebastianene@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240222_071927_647382_99C4959D X-CRM114-Status: GOOD ( 26.54 ) 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 On Tue, Feb 20, 2024 at 03:10:34PM +0000, Sebastian Ene 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 | 146 ++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 139 insertions(+), 7 deletions(-) > > diff --git a/arch/arm64/kvm/ptdump.c b/arch/arm64/kvm/ptdump.c > index 9b04c24bb9be..2c4e0c122d23 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_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_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", > + }, > +}; > + > static int kvm_ptdump_visitor(const struct kvm_pgtable_visit_ctx *ctx, > enum kvm_pgtable_walk_flags visit) > { > @@ -37,15 +92,78 @@ static int kvm_ptdump_show_common(struct seq_file *m, > return kvm_pgtable_walk(pgtable, 0, BIT(pgtable->ia_bits), &walker); > } > > +static int kvm_ptdump_build_levels(struct pg_level *level, u32 start_lvl) > +{ > + static const char * const level_names[] = {"PGD", "PUD", "PMD", "PTE"}; > + u32 i = 0; > + u64 mask = 0; > + > + if (start_lvl > 2) { > + pr_err("invalid start_lvl %u\n", start_lvl); > + return -EINVAL; > + } > + > + for (i = 0; i < ARRAY_SIZE(stage2_pte_bits); i++) > + mask |= stage2_pte_bits[i].mask; > + > + for (i = start_lvl; i <= KVM_PGTABLE_LAST_LEVEL; i++) { > + level[i].name = level_names[i]; > + level[i].num = ARRAY_SIZE(stage2_pte_bits); > + level[i].bits = stage2_pte_bits; > + level[i].mask = mask; > + } > + > + if (start_lvl > 0) > + level[start_lvl].name = level_names[0]; > + > + return 0; > +} > + > +static struct kvm_ptdump_guest_state > +*kvm_ptdump_parser_init(struct kvm *kvm) > +{ > + struct kvm_ptdump_guest_state *st; > + struct kvm_s2_mmu *mmu = &kvm->arch.mmu; > + struct kvm_pgtable *pgtable = mmu->pgt; > + int ret; > + > + st = kzalloc(sizeof(struct kvm_ptdump_guest_state), GFP_KERNEL_ACCOUNT); > + if (!st) > + return NULL; > + > + ret = kvm_ptdump_build_levels(&st->level[0], pgtable->start_level); > + if (ret) > + goto free_with_state; > + > + st->ipa_marker[0].name = "Guest IPA"; > + st->ipa_marker[1].start_address = BIT(pgtable->ia_bits); > + st->range[0].end = BIT(pgtable->ia_bits); > + > + st->kvm = kvm; > + st->parser_state = (struct pg_state) { > + .marker = &st->ipa_marker[0], > + .level = -1, > + .pg_level = &st->level[0], > + .ptdump.range = &st->range[0], > + }; > + > + return st; > +free_with_state: > + kfree(st); > + return NULL; > +} > + > static int kvm_ptdump_guest_show(struct seq_file *m, void *) > { > - struct kvm *kvm = m->private; > + struct kvm_ptdump_guest_state *st = m->private; > + struct kvm *kvm = st->kvm; > struct kvm_s2_mmu *mmu = &kvm->arch.mmu; > - struct pg_state parser_state = {0}; > int ret; > > + st->parser_state.seq = m; > + > write_lock(&kvm->mmu_lock); > - ret = kvm_ptdump_show_common(m, mmu->pgt, &parser_state); > + ret = kvm_ptdump_show_common(m, mmu->pgt, &st->parser_state); > write_unlock(&kvm->mmu_lock); > > return ret; > @@ -54,22 +172,36 @@ static int kvm_ptdump_guest_show(struct seq_file *m, void *) > static int kvm_ptdump_guest_open(struct inode *m, struct file *file) > { > struct kvm *kvm = m->i_private; > + struct kvm_ptdump_guest_state *st; > int ret; > > - if (!kvm_get_kvm_safe(kvm)) > - return -ENOENT; FIXME: Keep kvm_get_kvm_safe before invoking kvm_ptdump_parser_init to avoid UAF if kvm gets destroyed. > + st = kvm_ptdump_parser_init(kvm); > + if (!st) > + return -ENOMEM; > > - ret = single_open(file, kvm_ptdump_guest_show, m->i_private); > + if (!kvm_get_kvm_safe(kvm)) { > + ret = -ENOENT; > + goto free_with_state; > + } > + > + ret = single_open(file, kvm_ptdump_guest_show, st); > if (ret < 0) > - kvm_put_kvm(kvm); > + goto free_with_kvm_ref; > > return ret; > +free_with_kvm_ref: > + kvm_put_kvm(kvm); > +free_with_state: > + kfree(st); > + return ret; > } > > static int kvm_ptdump_guest_close(struct inode *m, struct file *file) > { > struct kvm *kvm = m->i_private; > + void *st = ((struct seq_file *)file->private_data)->private; > > + kfree(st); > kvm_put_kvm(kvm); > return single_release(m, file); > } > -- > 2.44.0.rc0.258.g7320e95886-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel