From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 711AD39B964 for ; Mon, 30 Mar 2026 20:58:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774904318; cv=none; b=Vw6AgXENyumtqf+rB+ZAIL1xRFlhz/Vtbl/PMFeGTZqRiA74UQ+OvL3NQObhn8+ftlOQKcRAuQDf+4iNNJO1MfBO9IjA7rtlhs7TswMtYKYE/18ssxO/8rbFiVUTm5oDj6ilwWVsNzNzOFwFUR3c3dqLWETIV6XtPe720cRoj4Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774904318; c=relaxed/simple; bh=CRmFwhZ9DgLfZWDSog6+tG2wzgNWOv5/Op/t2/OxVlY=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=kFPByWN1qkhF6ChtHPVEdXivV9lUMdBXX7yy36Kfiau1m0mXqT08vcGlh6V2Itobg+KY7oEoq+vqVAdya8ibgb7cJwE+j3HzR4yOrmu93wdrrc7D6ptfXthu4aNi5Mm1aeF7irooRHU5R/2jZp5kLfryTm8a+1YReYhhA+TsMP4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=NXWOxth0; arc=none smtp.client-ip=209.85.210.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="NXWOxth0" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-82a7539851fso2242934b3a.1 for ; Mon, 30 Mar 2026 13:58:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774904317; x=1775509117; darn=vger.kernel.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=frztTOmTf3SkuLYaPWUosPvcRTJGFbSFXLD1W9fYAwY=; b=NXWOxth0zvJlPpxsURCLlnxILRJU2NlMLS/wLN59br3HM1f1TPGQd+7xGY+jTD/tVr XALAX9I51ygb8BbBs4EpuwfNdInCMKjPREZioFFZoZGd+Y/Hasdl42eXsxiw0u3GWNNV UwuZir0gSKT7cj9KGD8tw7M6sIOkAkZM/9dCDleqn6A83+t+0YItQlDxKzFc6MpRxDnZ d4BTzoFzs8IzE0zLdCsH/FaM977RHgqvJ8VoH+i7srDVKZQywPBECgfiL8tqKOtgl6ez DLCVGIaZnnybZaxfYVMQRqxH2CID8lmoW1D6Oz5yu2whzjGSPMjwuHalD/iOU0TST7Ae 2V3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774904317; x=1775509117; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=frztTOmTf3SkuLYaPWUosPvcRTJGFbSFXLD1W9fYAwY=; b=d/r2pnapY73L0WpCFbG89EQE7EyTNAiSlVs/530DINoZHs5qlyKY3kyAIM8Qlv9jfY /0xk/eU2tqBv3fFbByFD0OkbH7TbKQhOJa68Tka+pUTSoPYqhdHQvC+h1AMiVyGSI5ia ZKfJT/m7eP3KIVMGrpZnF/HkNQy4Xin8OD1jDXcCR3m2E8hTlwalVQF3lUvuYsMsjnsB RK23U3AcRVdzT3vCJUVE4KWSZ1TiIIfCezyc9lDImOSzZ+cZHRlT/a5ic7RAlvDEow8V dCSKOqilmdW7QU8uhqb45X8XgjU7wmau1wDZ+/4IcatznRGCMF5/4pV4RwGMZVbRAaOM +D8Q== X-Forwarded-Encrypted: i=1; AJvYcCXYep5o8w7MyrlBcnLzcCa3Va+2f6rM5CjTSpgoyDhZOPH2FU239X483jH7AJeMJ72K9fxef82P9hw9ujA=@vger.kernel.org X-Gm-Message-State: AOJu0YyF2TiEndrzeSnOE+njk765JZohw6TIR5drrjR2Sa36UbAEZeLK U9uNZpiVy3h2bX5BqbX1kYgSRGBd0+c3hfMlawFxhe0NX3+FN/8tkDLEig8eyfhvzp8= X-Gm-Gg: ATEYQzyVP5+LQm9OXib2HsZw0Q+DxzMivexc6elBggWGcZPr6558RohlEU4ckVgrc5x LlYssj6IKipj6bdY2UaBdvJWN1PL57H21aIGP1Bkjtvy8VEip1O2+pJTgpL0nneJRwKs7vtb9rd S//3PuO3oHRgEgAGDSXvUUedcB0sdtQFtSZHdyTOURXQKs3su1P5lcirTvyZ+JErWYT31epOD3J z1eZ3RHldAMKpVGYPMf4shYZK6Zit6anAiuOAM8tcNG8fN6D9lnryAF0IwMgz3UBfGENbKbGjCC 5xzk16WZopY7mDyL+vYsmQpWigep0oE7SNntYyQUGxQOLnwglHkrjGXzvueXgX0PJqdy875xGIm f6ITkoUBoi6Rs036k3pb7m2jNCXOVbxQGlHZf+c8Hg7emy6r6KHvTI864AMt/ao6NJVZsy2B/Eb Sp+7qUxgaCspymdr0/L38uCykNSZo= X-Received: by 2002:a05:6a00:ad88:b0:82a:6d9d:3f84 with SMTP id d2e1a72fcca58-82c96002905mr13353400b3a.33.1774904316640; Mon, 30 Mar 2026 13:58:36 -0700 (PDT) Received: from p14s ([2604:3d09:148c:c800:e8c9:5e1e:f42a:2b73]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82ca85fc6c8sm7426575b3a.45.2026.03.30.13.58.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2026 13:58:36 -0700 (PDT) Date: Mon, 30 Mar 2026 14:58:33 -0600 From: Mathieu Poirier To: Steven Price Cc: kvm@vger.kernel.org, kvmarm@lists.linux.dev, Catalin Marinas , Marc Zyngier , Will Deacon , James Morse , Oliver Upton , Suzuki K Poulose , Zenghui Yu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Joey Gouly , Alexandru Elisei , Christoffer Dall , Fuad Tabba , linux-coco@lists.linux.dev, Ganapatrao Kulkarni , Gavin Shan , Shanker Donthineni , Alper Gun , "Aneesh Kumar K . V" , Emi Kisanuki , Vishal Annapurve Subject: Re: [PATCH v13 10/48] arm64: RMI: Ensure that the RMM has GPT entries for memory Message-ID: References: <20260318155413.793430-1-steven.price@arm.com> <20260318155413.793430-11-steven.price@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260318155413.793430-11-steven.price@arm.com> Hi, On Wed, Mar 18, 2026 at 03:53:34PM +0000, Steven Price wrote: > The RMM may not be tracking all the memory of the system at boot. Create > the necessary tracking state and GPTs within the RMM so that all boot > memory can be delegated to the RMM as needed during runtime. > > Note: support is currently missing for SROs which means that if the RMM > needs memory donating this will fail (and render CCA unusable in Linux). > > Signed-off-by: Steven Price > --- > New patch for v13 > --- > arch/arm64/kvm/rmi.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 89 insertions(+) > > diff --git a/arch/arm64/kvm/rmi.c b/arch/arm64/kvm/rmi.c > index 9590dff9a2c1..80aedc85e94a 100644 > --- a/arch/arm64/kvm/rmi.c > +++ b/arch/arm64/kvm/rmi.c > @@ -4,6 +4,7 @@ > */ > > #include > +#include > > #include > #include > @@ -56,6 +57,18 @@ static int rmi_check_version(void) > return 0; > } > > +/* > + * These are the 'default' sizes when passing 0 as the tracking_region_size. > + * TODO: Support other granule sizes > + */ > +#ifdef CONFIG_PAGE_SIZE_4KB > +#define RMM_GRANULE_TRACKING_SIZE SZ_1G > +#elif defined(CONFIG_PAGE_SIZE_16KB) > +#define RMM_GRANULE_TRACKING_SIZE SZ_32M > +#elif defined(CONFIG_PAGE_SIZE_64KB) > +#define RMM_GRANULE_TRACKING_SIZE SZ_512M > +#endif > + > static int rmi_configure(void) > { > struct rmm_config *config __free(free_page) = NULL; > @@ -95,6 +108,80 @@ static int rmi_configure(void) > return 0; > } > > +static int rmi_verify_memory_tracking(phys_addr_t start, phys_addr_t end) > +{ > + start = ALIGN_DOWN(start, RMM_GRANULE_TRACKING_SIZE); This will produce an error on systems where the start of system memory is not aligned to RMM_GRANULE_TRACKING_SIZE. For instance, on QEMU-SBSA the system memory starts at 0x100_4300_0000. With the above and RMM_GRANULE_TRACKING_SIZE set to SZ_1G, @start becomes 0x100_4000_0000, which falls outside the memory map known to the TF-A. I fixed it with these modifications: LINUX: diff --git a/arch/arm64/kvm/rmi.c b/arch/arm64/kvm/rmi.c index 10ff1c3bddaf..21bfbbe2f047 100644 --- a/arch/arm64/kvm/rmi.c +++ b/arch/arm64/kvm/rmi.c @@ -424,7 +424,9 @@ static int rmi_configure(void) static int rmi_verify_memory_tracking(phys_addr_t start, phys_addr_t end) { - start = ALIGN_DOWN(start, RMM_GRANULE_TRACKING_SIZE); + phys_addr_t offset; + + offset = start - ALIGN_DOWN(start, RMM_GRANULE_TRACKING_SIZE); end = ALIGN(end, RMM_GRANULE_TRACKING_SIZE); while (start < end) { @@ -439,7 +441,13 @@ static int rmi_verify_memory_tracking(phys_addr_t start, phys_addr_t end) start); return -ENODEV; } - start += RMM_GRANULE_TRACKING_SIZE; + + if (offset) { + start += (RMM_GRANULE_TRACKING_SIZE - offset); + offset = 0; + } else { + start += RMM_GRANULE_TRACKING_SIZE; + } } return 0; RMM: diff --git a/runtime/rmi/granule.c b/runtime/rmi/granule.c index cef521fc0869..60358d9ee81e 100644 --- a/runtime/rmi/granule.c +++ b/runtime/rmi/granule.c @@ -209,9 +209,11 @@ void smc_granule_tracking_get(unsigned long addr, return; } +#if 0 if (!ALIGNED(addr, RMM_INTERNAL_TRACKING_REGION_SIZE)) { return; } +#endif g = find_granule(addr); if (g != NULL) { This is likely not the right fix but hopefully provides some guidance. Send me your patches when you have an idea and I'll test them. Thanks, Mathieu > + end = ALIGN(end, RMM_GRANULE_TRACKING_SIZE); > + > + while (start < end) { > + unsigned long ret, category, state; > + > + ret = rmi_granule_tracking_get(start, &category, &state); > + if (ret != RMI_SUCCESS || > + state != RMI_TRACKING_FINE || > + category != RMI_MEM_CATEGORY_CONVENTIONAL) { > + /* TODO: Set granule tracking in this case */ > + kvm_err("Granule tracking for region isn't fine/conventional: %llx", > + start); > + return -ENODEV; > + } > + start += RMM_GRANULE_TRACKING_SIZE; > + } > + > + return 0; > +} > + > +static unsigned long rmi_l0gpt_size(void) > +{ > + return 1UL << (30 + FIELD_GET(RMI_FEATURE_REGISTER_1_L0GPTSZ, > + rmm_feat_reg1)); > +} > + > +static int rmi_create_gpts(phys_addr_t start, phys_addr_t end) > +{ > + unsigned long l0gpt_sz = rmi_l0gpt_size(); > + > + start = ALIGN_DOWN(start, l0gpt_sz); > + end = ALIGN(end, l0gpt_sz); > + > + while (start < end) { > + int ret = rmi_gpt_l1_create(start); > + > + if (ret && ret != RMI_ERROR_GPT) { > + /* > + * FIXME: Handle SRO so that memory can be donated for > + * the tables. > + */ > + kvm_err("GPT Level1 table missing for %llx\n", start); > + return -ENOMEM; > + } > + start += l0gpt_sz; > + } > + > + return 0; > +} > + > +static int rmi_init_metadata(void) > +{ > + phys_addr_t start, end; > + const struct memblock_region *r; > + > + for_each_mem_region(r) { > + int ret; > + > + start = memblock_region_memory_base_pfn(r) << PAGE_SHIFT; > + end = memblock_region_memory_end_pfn(r) << PAGE_SHIFT; > + ret = rmi_verify_memory_tracking(start, end); > + if (ret) > + return ret; > + ret = rmi_create_gpts(start, end); > + if (ret) > + return ret; > + } > + > + return 0; > +} > + > static int rmm_check_features(void) > { > if (kvm_lpa2_is_enabled() && !rmi_has_feature(RMI_FEATURE_REGISTER_0_LPA2)) { > @@ -120,6 +207,8 @@ void kvm_init_rmi(void) > return; > if (rmi_configure()) > return; > + if (rmi_init_metadata()) > + return; > > /* Future patch will enable static branch kvm_rmi_is_available */ > } > -- > 2.43.0 > >