Received: by 2002:a05:7208:9594:b0:7e:5202:c8b4 with SMTP id gs20csp1245443rbb; Mon, 26 Feb 2024 03:37:32 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVUR8GsJw6P3BVS8kl9U8lAMFUtfvaXXG+dRReFmlAYax2rB5NndBHGe6OQCaPk42EIMvzaylZX8p9FB5VUlKyz/2UVhqYZAYrET1yXeg== X-Google-Smtp-Source: AGHT+IHi1pR7Ljis7sJye+1AaXVswOcJPwu18YbmP93IZiangjE2y92HP99CGuLS+sYIBqna4Z8V X-Received: by 2002:aa7:c487:0:b0:565:9ad6:f338 with SMTP id m7-20020aa7c487000000b005659ad6f338mr3364218edq.11.1708947451683; Mon, 26 Feb 2024 03:37:31 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708947451; cv=pass; d=google.com; s=arc-20160816; b=ApqP9zeAfEJAMmgS/6Cv1CJJ7ISllVdx8+M2Io6gjNJX2OWliZGKnBMlXr6cF8Jea+ NB7dhMcNYXSnXp/nf0OWx5PS+9Q+vO+fmzZZ6oJxXkzF5x8Fu3AtEjVss/Q5yllDdj/R xs09ZVMpVsq/tlhTxlkRgypzPHiIrgKy8vkNnFVxpKfA14cR9AySrmjQS6QmS3kRBGfC UgxohtWlWAwmCtLTbxyCOuAzavuy6hD9CS9OTN/BsShmSpHfNCiKT8wX9LMdBZXl72XJ ecm4PuOwDrV4cegmiD+Zo4cjAA1874hZIhVsWoR0f4DRxOmgRS0YCVAxrvcJgwYNoAip QGUQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:message-id; bh=Oiu08oH6fpOhtq+U2hKdiRRaE6MhviY+BrhAVQn/fYI=; fh=Yu4A3gsdNSOyNapMlvSFLRezqXKpuU2Ao5KjPK7i5ro=; b=zEotow2f0mfYPXQl26ai0elprd5Ev6qKqYULTPU2kgHUPY1Kj2UEWjldprKb1u5CB2 d3ejMC51eNswAlm03fPRYCqBf7r7CTngQXbZKPZS9SBBmCIj25INgi2MJl1AZRjAh/1u 4fgDsKxuoeH2ZaO2oHI+4PPJlwzChdQtH1OyYnYpia5HOXFsyWtdosvw3aBw1N1cHhlp Ihp0Yy8PxEYOtDvJluLNRTbPB5eYRVVHLh43ERxANpk8HuNw9Aym9VK8mAxSabHi6bsK OFBdes8MJApg2r9iv3ZFMgDoQ745N47t5yYV+gJSxv3+cCpJjZpG23D3LAeJdQjbEB2m xt4g==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-81281-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-81281-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id dc6-20020a056402310600b005647dac5fbbsi1994402edb.375.2024.02.26.03.37.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 03:37:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-81281-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-81281-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-81281-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 48C611F264C2 for ; Mon, 26 Feb 2024 11:37:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C9BB038DD5; Mon, 26 Feb 2024 11:36:31 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6C3BF381BA for ; Mon, 26 Feb 2024 11:36:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708947391; cv=none; b=VNac8S1KQpg4PhJq/JTs/7BVnOLCpil5GtARaYSjNqNP7AlQuXmv7s0xSSuHjDe2NGEyODeZlSwgDXgUNlBYcgD9fq10ebiR3xkWhzWeR66+ogo1pEXwpB38NsfefkHVJP4xRyoFUA1wMSkaSbeKkBSYr0doQVKpMJmDepcj708= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708947391; c=relaxed/simple; bh=541BRO4/wZ6dwAolyK0ZZlVzB20RgVtdSPE1WZS4qJw=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Smszl5jzpCudJTLHAZPciASOnawhey9UoHnbjsSx8WQ5EpqN/aBgPDBUnE9w4M/8vbdOt+QvNaxBIyJlUgjRbJ9yyokr/X6Om4q3T2tHIc2T/u1o38L3EUVghpDbUog3H8co38oOhumbUpnDbOYCsPFfsfMFrhkyM0i1+qBG6ps= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 91531DA7; Mon, 26 Feb 2024 03:37:07 -0800 (PST) Received: from [192.168.1.100] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0E63C3F6C4; Mon, 26 Feb 2024 03:36:22 -0800 (PST) Message-ID: Date: Mon, 26 Feb 2024 11:36:21 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: [PATCH v5 5/7] arm64: KVM: Add interface to set guest value for TRFCR register Content-Language: en-US To: Suzuki K Poulose Cc: James Morse , Zenghui Yu , Catalin Marinas , Will Deacon , Mike Leach , Alexander Shishkin , Anshuman Khandual , Miguel Luis , Joey Gouly , Ard Biesheuvel , Greg Kroah-Hartman , Arnd Bergmann , Helge Deller , Andrew Walbran , Vincent Donnefort , Ryan Roberts , Fuad Tabba , Jing Zhang , linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, maz@kernel.org, acme@kernel.org, oliver.upton@linux.dev, broonie@kernel.org References: <20240220100924.2761706-1-james.clark@arm.com> <20240220100924.2761706-6-james.clark@arm.com> <9d3f9f70-0b34-7426-8b62-93dc173a0bb2@arm.com> <125fe2f0-bd21-462f-893a-fbf80813dfbf@arm.com> From: James Clark In-Reply-To: <125fe2f0-bd21-462f-893a-fbf80813dfbf@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 26/02/2024 09:52, Suzuki K Poulose wrote: > On 23/02/2024 16:39, James Clark wrote: >> >> >> On 23/02/2024 10:03, Suzuki K Poulose wrote: >>> On 20/02/2024 10:09, James Clark wrote: >>>> Add an interface for the Coresight driver to use to set the value of >>>> the >>>> TRFCR register for the guest. This register controls the exclude >>>> settings for trace at different exception levels, and is used to honor >>>> the exclude_host and exclude_guest parameters from the Perf session. >>>> This will be used to later write TRFCR_EL1 on nVHE at guest switch. For >>>> VHE, the host trace is controlled by TRFCR_EL2 and thus we can write to >>>> the TRFCR_EL1 immediately. Because guest writes to the register are >>>> trapped, the value will persist and can't be modified. >>>> >>>> Instead of adding a load of infrastructure to share the host's per-cpu >>>> offsets with the hypervisor, just define the new storage as a NR_CPUS >>>> array. >>>> >>>> Signed-off-by: James Clark >>>> --- >>>>    arch/arm64/include/asm/kvm_host.h |  3 +++ >>>>    arch/arm64/kernel/image-vars.h    |  1 + >>>>    arch/arm64/kvm/debug.c            | 26 ++++++++++++++++++++++++++ >>>>    3 files changed, 30 insertions(+) >>>> >>>> diff --git a/arch/arm64/include/asm/kvm_host.h >>>> b/arch/arm64/include/asm/kvm_host.h >>>> index 85b5477bd1b4..56b7f7eca195 100644 >>>> --- a/arch/arm64/include/asm/kvm_host.h >>>> +++ b/arch/arm64/include/asm/kvm_host.h >>>> @@ -509,6 +509,7 @@ struct kvm_host_psci_config { >>>>        bool psci_0_1_cpu_off_implemented; >>>>        bool psci_0_1_migrate_implemented; >>>>    }; >>>> +extern u64 ____cacheline_aligned kvm_guest_trfcr[NR_CPUS]; >>>>      extern struct kvm_host_psci_config >>>> kvm_nvhe_sym(kvm_host_psci_config); >>>>    #define kvm_host_psci_config CHOOSE_NVHE_SYM(kvm_host_psci_config) >>>> @@ -1174,6 +1175,7 @@ void kvm_arch_vcpu_put_debug_state_flags(struct >>>> kvm_vcpu *vcpu); >>>>    void kvm_set_pmu_events(u32 set, struct perf_event_attr *attr); >>>>    void kvm_clr_pmu_events(u32 clr); >>>>    bool kvm_set_pmuserenr(u64 val); >>>> +void kvm_etm_set_guest_trfcr(u64 trfcr_guest); >>>>    #else >>>>    static inline void kvm_set_pmu_events(u32 set, struct >>>> perf_event_attr *attr) {} >>>>    static inline void kvm_clr_pmu_events(u32 clr) {} >>>> @@ -1181,6 +1183,7 @@ static inline bool kvm_set_pmuserenr(u64 val) >>>>    { >>>>        return false; >>>>    } >>>> +static inline void kvm_etm_set_guest_trfcr(u64 trfcr_guest) {} >>>>    #endif >>>>      void kvm_vcpu_load_vhe(struct kvm_vcpu *vcpu); >>>> diff --git a/arch/arm64/kernel/image-vars.h >>>> b/arch/arm64/kernel/image-vars.h >>>> index 5e4dc72ab1bd..a451e4f10804 100644 >>>> --- a/arch/arm64/kernel/image-vars.h >>>> +++ b/arch/arm64/kernel/image-vars.h >>>> @@ -59,6 +59,7 @@ KVM_NVHE_ALIAS(alt_cb_patch_nops); >>>>      /* Global kernel state accessed by nVHE hyp code. */ >>>>    KVM_NVHE_ALIAS(kvm_vgic_global_state); >>>> +KVM_NVHE_ALIAS(kvm_guest_trfcr); >>>>      /* Kernel symbols used to call panic() from nVHE hyp code (via >>>> ERET). */ >>>>    KVM_NVHE_ALIAS(nvhe_hyp_panic_handler); >>>> diff --git a/arch/arm64/kvm/debug.c b/arch/arm64/kvm/debug.c >>>> index 49a13e72ddd2..c8d936ce6e2b 100644 >>>> --- a/arch/arm64/kvm/debug.c >>>> +++ b/arch/arm64/kvm/debug.c >>>> @@ -22,6 +22,7 @@ >>>>                    DBG_MDSCR_MDE) >>>>      static DEFINE_PER_CPU(u64, mdcr_el2); >>>> +u64 ____cacheline_aligned kvm_guest_trfcr[NR_CPUS]; >>>>      /* >>>>     * save/restore_guest_debug_regs >>>> @@ -359,3 +360,28 @@ void kvm_arch_vcpu_put_debug_state_flags(struct >>>> kvm_vcpu *vcpu) >>>>        vcpu_clear_flag(vcpu, DEBUG_STATE_SAVE_TRBE); >>>>        vcpu_clear_flag(vcpu, DEBUG_STATE_SAVE_TRFCR); >>>>    } >>>> + >>>> +/* >>>> + * Interface for the Coresight driver to use to set the value of the >>>> TRFCR >>>> + * register for the guest. This register controls the exclude >>>> settings for trace >>>> + * at different exception levels, and is used to honor the >>>> exclude_host and >>>> + * exclude_guest parameters from the Perf session. >>>> + * >>>> + * This will be used to later write TRFCR_EL1 on nVHE at guest >>>> switch. For VHE, >>>> + * the host trace is controlled by TRFCR_EL2 and thus we can write to >>>> the >>>> + * TRFCR_EL1 immediately. Because guest writes to the register are >>>> trapped, the >>>> + * value will persist and can't be modified. For pKVM, >>>> kvm_guest_trfcr can't >>>> + * be read by the hypervisor, so don't bother writing it. >>>> + */ >>>> +void kvm_etm_set_guest_trfcr(u64 trfcr_guest) >>>> +{ >>>> +    if >>>> (WARN_ON_ONCE(!cpuid_feature_extract_unsigned_field(read_sysreg(id_aa64dfr0_el1), >>>> +                                   ID_AA64DFR0_EL1_TraceFilt_SHIFT))) >>>> +        return; >>>> + >>>> +    if (has_vhe()) >>>> +        write_sysreg_s(trfcr_guest, SYS_TRFCR_EL12); >>>> +    else if (!is_protected_kvm_enabled()) >>>> +        kvm_guest_trfcr[smp_processor_id()] = trfcr_guest; >>> >>> smp_processor_id() could sleep in some configurations ? Should we switch >>> to raw_smp_processor_id() to be safer ? >>> >> >> I don't think so, it's #defined to raw_smp_processor_id() anyway. Unless >> DEBUG_PREEMPT is on, then it's still raw_smp_processor_id() but it >> validates that preemption is disabled so the value isn't stale. > >> We actually want that validation, so should leave it as > > This is actually what we want. i.e., We don't want the coresight drivers > to make this call from a non-premptible context. Relying on the > DEBUG_PREEMPT for detecting such erroneous uses is not a good idea, > production kernels may not do this and a comment doesn't go far. > So, I think we need a : > > WARN_ON(preemptible()) in here and use smp_processor_id() > Ok yeah that's easy enough to add. I was worried it would be redundant with DEBUG_PREEMPT but I suppose it doesn't really cost anything. >> smp_processor_id(). I can add a comment saying that this function should >> only be called with preemption disabled, but I wouldn't add any extra >> validation. Every smp_processor_id() call is already checked when >> DEBUG_PREEMPT is on and this one doesn't seem to be special in any way. >> >> I also checked that the warning isn't triggered with DEBUG_PREEMPT on, >> and there are also a lot of other smp_processor_id() calls on similar >> paths in the Coresight driver. > > Here, we are setting something for the KVM to program and if we set the > filters on the wrong Physical CPU, then we mess up the tracing. > > Suzuki > >> >>> Otherwise looks good to me. >>> >>> Suzuki >>> >>>> +} >>>> +EXPORT_SYMBOL_GPL(kvm_etm_set_guest_trfcr); >>> >