From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 324EABA2D for ; Tue, 4 Mar 2025 23:45:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741131960; cv=none; b=t6wxFsMwBHw/Ou6GcOaC1XBkLrxV4rTea9ZFS2vrUQIkzv27jhRYnAJenJFN/PLlkslckDgqZ1PPT+TFiS6wLEEU1OMtsJHYkvIQGmtJEnxz+M2buPhEFfxDPcRG8t2oTk0aT/vMGzWfksTjrzX7c2Ol+9euh35WrtZoJ0lTnWM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741131960; c=relaxed/simple; bh=Lef0MQKtiaqOzXYjRH2Nm9Cp4sRXRppVWKK2dDGvm/k=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=LcDiV+Z9z/JJIgdtPqRpDS009DC0+tIblEdae043Mo7lBijDuKD5EiowTgNhQtTPPpvMYr3I6voU4wYlXkeJGkBzf5MxBC/g48OaYVlZuJYWQxlOtKuyqXBaO8ceWI6NvUNaa9UJGcpRWs9/RYFw9i9baSvV+6JnnK7ZmEMhOt0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=D3lO9AcS; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="D3lO9AcS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741131958; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OP9ovaiE8W931ELBVF5NuIIs9fylqFyNkVXudwtC3tg=; b=D3lO9AcShb87PGEn5D2HW5BRoGt6qeLURM8PqffIy9Yw92JFA6FFKLgSf30Kua0x1yCdqm ZlXzCCKsMbNiygrDvAfcZv03KxEWSSEMzcYhR1SAHUMA1idB8xIYzVEfKieuj5EYEfDJO7 O5qpIsgjOdHRoSlDWs+b77mqR/r0xuQ= Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-491-_JTYTvGoMVCBowMzVO770Q-1; Tue, 04 Mar 2025 18:45:51 -0500 X-MC-Unique: _JTYTvGoMVCBowMzVO770Q-1 X-Mimecast-MFC-AGG-ID: _JTYTvGoMVCBowMzVO770Q_1741131950 Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-2fe86c01f5cso12020932a91.1 for ; Tue, 04 Mar 2025 15:45:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741131950; x=1741736750; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OP9ovaiE8W931ELBVF5NuIIs9fylqFyNkVXudwtC3tg=; b=Aeq9PEStrFgra+Qa7MMryuadRSdpPbpbf4/JMcehk/u7VEFoN6gnhYzctalIX0S3Hi WFQ/vB8qq/YvDfCXl9ViBEWlxURAIRa4iwf4wzY0SamQ5Kipv5yIiPVnChU08UGjTFrl tlqfvERGUV1PmHrrrSVEZdoNC3dNhaGVI1olbFM0on7B+xvmzrbUxZPlPtha8BXIOwWA 5rZUXMNosc4nE+FHwsVfI/LtgW1oTknSjFZWw6h11r3ppI3D4256mVQ33OynVU8PpYGv mjOay+GgTn1WfgrhptZWoQXAtAVol0gAO14mZlJ88kx9t8waKKqi+Zv41zArb9n3irF1 NjiQ== X-Forwarded-Encrypted: i=1; AJvYcCUoBEcdy73vvxv0/AWzTnO7qUSERSq4aSZk1NSQHKbMn1o6cF92jLdasux1mpV+5trCp4VFc9oTBvHONbU=@vger.kernel.org X-Gm-Message-State: AOJu0YxE1dT200XXld7T9U6DHikMn9EfqoiJIPjpKN5WEjiB0Dft+7Af DNMaW2aelZY/f+Yq6KIUMMcdz7kT94TFQO5HKSRq2Zsa3HYB/bUmZ3fNyHgQ9jSPbgAakmo4EEC g6r/Fd9QF3asvHFwShFKD5vvtF6d0QI3kYDLIbfHvqkbr1qwN81ZpebCeiq6QLQ== X-Gm-Gg: ASbGnctze/ZwDk+CcpaJgXvpKd4S+xGP3Xygdp2H3ufpMf9d1gGWy3epJA21LSe6W9u aIs1aBK9xU6DA8kFkJ4VSguS+ZTay7UAHGN3nMG7uK7hTcMpFc06eoHGx8oLvQF7B3ehG3Vj83z GvBrRntDtnrnOYbSWynMTCVHdSQ6aIZN00cR8ApfmcvhQ9DA15cv48/wMu/fVK1bnIT/UXb6iNn aFo+mVwiEiy1nl/3C7cQEBQWdl6ONN/LV6q+tm7XHSYadktJfA6KICdTC4QYbPkywKsbXu2a+oE 2I2QTBfsPPgf4TA= X-Received: by 2002:a05:6a20:7345:b0:1ee:d6a7:e341 with SMTP id adf61e73a8af0-1f34952e7f5mr2027009637.30.1741131950432; Tue, 04 Mar 2025 15:45:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IG6SHWUDr/wxtrgl8ODJO2LORkYE1xgQa8DpVJblqhw13356llhbnfpOxuEBTenhhAi0XuOnQ== X-Received: by 2002:a05:6a20:7345:b0:1ee:d6a7:e341 with SMTP id adf61e73a8af0-1f34952e7f5mr2026963637.30.1741131950083; Tue, 04 Mar 2025 15:45:50 -0800 (PST) Received: from [192.168.68.55] ([180.233.125.1]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-aee7de37fedsm9080597a12.42.2025.03.04.15.45.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 04 Mar 2025 15:45:49 -0800 (PST) Message-ID: Date: Wed, 5 Mar 2025 09:45:41 +1000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7 35/45] arm64: RME: Propagate number of breakpoints and watchpoints to userspace To: Steven Price , kvm@vger.kernel.org, kvmarm@lists.linux.dev Cc: Jean-Philippe Brucker , 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 , Shanker Donthineni , Alper Gun , "Aneesh Kumar K . V" References: <20250213161426.102987-1-steven.price@arm.com> <20250213161426.102987-36-steven.price@arm.com> Content-Language: en-US From: Gavin Shan In-Reply-To: <20250213161426.102987-36-steven.price@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/14/25 2:14 AM, Steven Price wrote: > From: Jean-Philippe Brucker > > The RMM describes the maximum number of BPs/WPs available to the guest > in the Feature Register 0. Propagate those numbers into ID_AA64DFR0_EL1, > which is visible to userspace. A VMM needs this information in order to > set up realm parameters. > > Signed-off-by: Jean-Philippe Brucker > Signed-off-by: Steven Price > --- > arch/arm64/include/asm/kvm_rme.h | 2 ++ > arch/arm64/kvm/rme.c | 22 ++++++++++++++++++++++ > arch/arm64/kvm/sys_regs.c | 2 +- > 3 files changed, 25 insertions(+), 1 deletion(-) > With the following one nitpick addressed: Reviewed-by: Gavin Shan > diff --git a/arch/arm64/include/asm/kvm_rme.h b/arch/arm64/include/asm/kvm_rme.h > index d684b30493f5..67ee38541a82 100644 > --- a/arch/arm64/include/asm/kvm_rme.h > +++ b/arch/arm64/include/asm/kvm_rme.h > @@ -85,6 +85,8 @@ void kvm_init_rme(void); > u32 kvm_realm_ipa_limit(void); > u32 kvm_realm_vgic_nr_lr(void); > > +u64 kvm_realm_reset_id_aa64dfr0_el1(const struct kvm_vcpu *vcpu, u64 val); > + > bool kvm_rme_supports_sve(void); > > int kvm_realm_enable_cap(struct kvm *kvm, struct kvm_enable_cap *cap); > diff --git a/arch/arm64/kvm/rme.c b/arch/arm64/kvm/rme.c > index f83f34358832..8c426f575728 100644 > --- a/arch/arm64/kvm/rme.c > +++ b/arch/arm64/kvm/rme.c > @@ -87,6 +87,28 @@ u32 kvm_realm_vgic_nr_lr(void) > return u64_get_bits(rmm_feat_reg0, RMI_FEATURE_REGISTER_0_GICV3_NUM_LRS); > } > > +u64 kvm_realm_reset_id_aa64dfr0_el1(const struct kvm_vcpu *vcpu, u64 val) > +{ > + u32 bps = u64_get_bits(rmm_feat_reg0, RMI_FEATURE_REGISTER_0_NUM_BPS); > + u32 wps = u64_get_bits(rmm_feat_reg0, RMI_FEATURE_REGISTER_0_NUM_WPS); > + u32 ctx_cmps; > + > + if (!kvm_is_realm(vcpu->kvm)) > + return val; > + > + /* Ensure CTX_CMPs is still valid */ > + ctx_cmps = FIELD_GET(ID_AA64DFR0_EL1_CTX_CMPs, val); > + ctx_cmps = min(bps, ctx_cmps); > + > + val &= ~(ID_AA64DFR0_EL1_BRPs_MASK | ID_AA64DFR0_EL1_WRPs_MASK | > + ID_AA64DFR0_EL1_CTX_CMPs); > + val |= FIELD_PREP(ID_AA64DFR0_EL1_BRPs_MASK, bps) | > + FIELD_PREP(ID_AA64DFR0_EL1_WRPs_MASK, wps) | > + FIELD_PREP(ID_AA64DFR0_EL1_CTX_CMPs, ctx_cmps); > + > + return val; > +} > + The chunk of code can be squeezed to sys_reg.c::sanitise_id_aa64dfr0_el1() since sys_reg.c has been plumbed for realm, no reason to keep a separate helper in rme.c because it's only called by sys_reg.c::sanitise_id_aa64dfr0_el1() > static int get_start_level(struct realm *realm) > { > return 4 - ((realm->ia_bits - 8) / (RMM_PAGE_SHIFT - 3)); > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c > index ed881725eb64..5618eff33155 100644 > --- a/arch/arm64/kvm/sys_regs.c > +++ b/arch/arm64/kvm/sys_regs.c > @@ -1820,7 +1820,7 @@ static u64 sanitise_id_aa64dfr0_el1(const struct kvm_vcpu *vcpu, u64 val) > /* Hide BRBE from guests */ > val &= ~ID_AA64DFR0_EL1_BRBE_MASK; > > - return val; > + return kvm_realm_reset_id_aa64dfr0_el1(vcpu, val); > } > > static int set_id_aa64dfr0_el1(struct kvm_vcpu *vcpu, Thanks, Gavin