From nobody Wed Dec 17 13:21:40 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E64E0CDB484 for ; Thu, 19 Oct 2023 14:41:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346147AbjJSOlt (ORCPT ); Thu, 19 Oct 2023 10:41:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346243AbjJSOlS (ORCPT ); Thu, 19 Oct 2023 10:41:18 -0400 Received: from mail-wm1-x349.google.com (mail-wm1-x349.google.com [IPv6:2a00:1450:4864:20::349]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CACE0D5A for ; Thu, 19 Oct 2023 07:41:07 -0700 (PDT) Received: by mail-wm1-x349.google.com with SMTP id 5b1f17b1804b1-402cd372b8bso61292325e9.2 for ; Thu, 19 Oct 2023 07:41:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1697726465; x=1698331265; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=CvJdm3IKmCA+/1ICly/hVREi8jIoDHSAqzssbPm75pQ=; b=dDAIq8h/+/3ho6ZC27ZoaLy0jU9a/H5HL5xtg5uQd3lRos/+61yuivhjWSBkH3TN4o pVOSkfITXJ0OD9aZZVhew2L77Y3kDWySsFTPPg2A9QLJP9l1UYQGfZPyHlDSOazuOhfl 8a6qk/jvsCWfSkOHCTOnqDhiRCc3qGqRZ7TbMtSoITeq2ziYcdtQ7UXjMSvGJEqzOwSJ B4FKWdjzHx3ldcQKxG0EBlTGx9J/tN5W2NUt5Olo0q7jqTHdZUYRzp8anOoq4G5GXdcI D7V+Ztn660SDAMB2CKrRmPhCAvvrtMdWjDSbpThrDRUFAf+sa7OuSBReUTRgMZ89g1pX 4TZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697726465; x=1698331265; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CvJdm3IKmCA+/1ICly/hVREi8jIoDHSAqzssbPm75pQ=; b=uHdchPccjsYF54WE+jbIxL+30iVZIK+J7pQAsLETL9hT8s5UdlqFhSpOAvrDetF134 xctEwY3tXnHJPugr3C+nUZ704ViADWENUeL31LHTfqnriOJuPCOPzSFhnPahRQuSrSPP 33ri/WIab0hy5BGeSNE0s2nR8am8vMHsEASmBVVWnmS1B2DvUDtwYc/RBkZviKiPl9+n 5berMbk0X/pKijWEuADdV23nOgpl3hVyGdi/PbzvN3sMJxN6rn26bzWq2Y242nsnuvcI s0WoTKlsLE6+yLyYi7dArRtCxPIPUwkur8ljI0Ry79QDNOF8sjXiiS8qVo4spXrYth2e nwZg== X-Gm-Message-State: AOJu0YyWuAbGtdNVANpBwh5OA6amvlXHnPKceTjTmIQ9CIL0aX4CtYjN oDMguEkxKeDz3cczvRCTSI7ZDGsNeSgEJ48NQWU= X-Google-Smtp-Source: AGHT+IHd3XOdzZVQWrUJjDNXs2PGDHCNNjcdi3ZWTk5PP9acOL/8DnwH2AUd6D9476w0yP3WM6aezjeueor84uThLIA= X-Received: from seb.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:31bd]) (user=sebastianene job=sendgmr) by 2002:a5d:69c8:0:b0:32d:8188:6221 with SMTP id s8-20020a5d69c8000000b0032d81886221mr22460wrw.0.1697726465577; Thu, 19 Oct 2023 07:41:05 -0700 (PDT) Date: Thu, 19 Oct 2023 14:40:31 +0000 In-Reply-To: <20231019144032.2943044-1-sebastianene@google.com> Mime-Version: 1.0 References: <20231019144032.2943044-1-sebastianene@google.com> X-Mailer: git-send-email 2.42.0.655.g421f12c284-goog Message-ID: <20231019144032.2943044-11-sebastianene@google.com> Subject: [PATCH v2 09/11] arm64: ptdump: Interpret memory attributes based on runtime configuration From: Sebastian Ene To: will@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, akpm@linux-foundation.org, maz@kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-team@android.com, vdonnefort@google.com, qperret@google.com, smostafa@google.com, Sebastian Ene Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When FWB is used the memory attributes stored in the descriptors have a different bitfield layout. Introduce two callbacks that verify the current runtime configuration before parsing the attribute fields. Add support for parsing the memory attribute fields from the page table descriptors. Signed-off-by: Sebastian Ene --- arch/arm64/mm/ptdump.c | 66 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/arch/arm64/mm/ptdump.c b/arch/arm64/mm/ptdump.c index 3ba4848272df..5f9a334b0f0c 100644 --- a/arch/arm64/mm/ptdump.c +++ b/arch/arm64/mm/ptdump.c @@ -85,13 +85,22 @@ struct pg_state { bool check_wx; unsigned long wx_pages; unsigned long uxn_pages; + struct ptdump_info *info; }; =20 +/* + * This callback checks the runtime configuration before interpreting the + * attributes defined in the prot_bits. + */ +typedef bool (*is_feature_cb)(const void *ctx); + struct prot_bits { u64 mask; u64 val; const char *set; const char *clear; + is_feature_cb feature_on; /* bit ignored if the callback returns false= */ + is_feature_cb feature_off; /* bit ignored if the callback returns true = */ }; =20 static const struct prot_bits pte_bits[] =3D { @@ -173,6 +182,34 @@ static const struct prot_bits pte_bits[] =3D { } }; =20 +static bool is_fwb_enabled(const void *ctx) +{ + const struct pg_state *st =3D ctx; + const struct ptdump_info *info =3D st->info; + struct kvm_pgtable_snapshot *snapshot =3D info->priv; + struct kvm_pgtable *pgtable =3D &snapshot->pgtable; + + bool fwb_enabled =3D false; + + if (cpus_have_const_cap(ARM64_HAS_STAGE2_FWB)) + fwb_enabled =3D !(pgtable->flags & KVM_PGTABLE_S2_NOFWB); + + return fwb_enabled; +} + +static bool is_table_bit_ignored(const void *ctx) +{ + const struct pg_state *st =3D ctx; + + if (!(st->current_prot & PTE_VALID)) + return true; + + if (st->level =3D=3D CONFIG_PGTABLE_LEVELS) + return true; + + return false; +} + static const struct prot_bits stage2_pte_bits[] =3D { { .mask =3D PTE_VALID, @@ -214,6 +251,27 @@ static const struct prot_bits stage2_pte_bits[] =3D { .val =3D PTE_TABLE_BIT, .set =3D " ", .clear =3D "BLK", + .feature_off =3D is_table_bit_ignored, + }, { + .mask =3D KVM_PTE_LEAF_ATTR_LO_S2_MEMATTR | PTE_VALID, + .val =3D PTE_S2_MEMATTR(MT_S2_DEVICE_nGnRE) | PTE_VALID, + .set =3D "DEVICE/nGnRE", + .feature_off =3D is_fwb_enabled, + }, { + .mask =3D KVM_PTE_LEAF_ATTR_LO_S2_MEMATTR | PTE_VALID, + .val =3D PTE_S2_MEMATTR(MT_S2_FWB_DEVICE_nGnRE) | PTE_VALID, + .set =3D "DEVICE/nGnRE FWB", + .feature_on =3D is_fwb_enabled, + }, { + .mask =3D KVM_PTE_LEAF_ATTR_LO_S2_MEMATTR | PTE_VALID, + .val =3D PTE_S2_MEMATTR(MT_S2_NORMAL) | PTE_VALID, + .set =3D "MEM/NORMAL", + .feature_off =3D is_fwb_enabled, + }, { + .mask =3D KVM_PTE_LEAF_ATTR_LO_S2_MEMATTR | PTE_VALID, + .val =3D PTE_S2_MEMATTR(MT_S2_FWB_NORMAL) | PTE_VALID, + .set =3D "MEM/NORMAL FWB", + .feature_on =3D is_fwb_enabled, }, { .mask =3D KVM_PGTABLE_PROT_SW0, .val =3D KVM_PGTABLE_PROT_SW0, @@ -285,13 +343,19 @@ static struct pg_level stage2_pg_level[] =3D { }; =20 static void dump_prot(struct pg_state *st, const struct prot_bits *bits, - size_t num) + size_t num) { unsigned i; =20 for (i =3D 0; i < num; i++, bits++) { const char *s; =20 + if (bits->feature_on && !bits->feature_on(st)) + continue; + + if (bits->feature_off && bits->feature_off(st)) + continue; + if ((st->current_prot & bits->mask) =3D=3D bits->val) s =3D bits->set; else --=20 2.42.0.655.g421f12c284-goog