From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 44B3E3B71C6 for ; Mon, 13 Jul 2026 08:41:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783932068; cv=none; b=up/Cvo0CtVlo9gOO6MNXSPsC7Rz5vFNwLRQIsC2P/ULod7ks3bNbkyUi/zGhB5viKO4nBVcLKZmSi8Xc3TZILF8KA5GoIgkbusHaP1He6oFPi0k0wOmk7mrC8vVPrquZ6f4hstq02g3gqCk2epij8yiA5494i1ydKvx8qgh611M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783932068; c=relaxed/simple; bh=qDom30kDHQE1yKBRCtUYznzilrIa3QNyN3Dz2jBUzRw=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=md1phrcDshg2kD4W6yLq5dAaVUCvHFNZyjrkZFQcZ86Mig1K5Mc3Em+jzpZmuuBSlaiMYtic5HnN3zRmQuTXuPVhmwxJttLwjWmz2CP0+z3q6PujSb2L8LwAqrHbeK+N1yM7nmIG8eur0fZOKNWy7DRnyVjwj0Y+1hDJABlg3yc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=PhrY/VWW; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="PhrY/VWW" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-493c556ada3so81235e9.0 for ; Mon, 13 Jul 2026 01:41:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1783932063; x=1784536863; darn=vger.kernel.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=iyY6y6D9mzZJEerW/Rbo/gzzpD8ruopg3Z6AtyKjKbs=; b=PhrY/VWWRhf+LHmxiRPcgnsF4Gy1uGhJSJAEYkc5hgnrgxdtsgnjE9wFNkxzt1uJug 4f6jbB2hrvg/Gp2vjN4SFhvJf/S7ueQllsbfcjPyVFwPfCPkd8dqcP3aZxb5nlafnZBY mbaWlen1wOWOZBUW72vDJmpc7V4sUSluIGXO44YA+mdEK1oCvKh/fIV6zyRy1LnnBQMH 27kQD3/C5sXi69+Xg+2ITEcGZg6w7s4mChkMPkjsJd4F6mY3alHFFPx43P8CtWCU/gLe CxfiIT7TjRHtEV1gY1zB4KKn+sOG6li0GYeq2wgmSRhLNCId82RJHonKjU7fF9sBH+J+ 9brg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783932063; x=1784536863; h=in-reply-to:content-disposition:content-type: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 :content-type; bh=iyY6y6D9mzZJEerW/Rbo/gzzpD8ruopg3Z6AtyKjKbs=; b=EsJIGD65qsYv6fXj/Mymf99izOAkj+Q+1hH+kh1/rwhFI90NnnRrm4OC4/YBUcDMJ6 5YUill1bH0/vzuHYUL02u4/iM1B8zgOwf0ZRxhrOtb6IcrAsixXBM3f639uWiugvk0H0 1k4iyJ2wQdQaHSKXbb2NF4Hld49YO0tU4DYMdOCalsLPFAcDTi3B4gDZPrgIujAmVK/s qzy7AUQI0rS8wn8eI5jLhiRVu1Na4ybPBOZUecgZVgZfodZqRRF6s/lSIRT+Ey+oPeDt Gvt4jbDTLyiSNreAuEf9rcRlUqYlJXu1iEslH09DqsT2IkUze9o5nCuMYz0gUYCDy7rn WGtQ== X-Forwarded-Encrypted: i=1; AHgh+Rrd/qS8U11/BYnFGmp80tY+4Ii7QE/7FlEzKXuObegUPuI4P6MIb+/U+UOG/Biemy/FUD2kX0P50FRNzZE=@vger.kernel.org X-Gm-Message-State: AOJu0YwJ0frsdyg4/vCPPx8tsyui29Lc+IhaSROjtSI73K0VAD7YA1yD Qv+J1HmbbtrU67cauwi1YTCOndMjyxpiY018yLOSEa4HYGmeTBi4jSCbb7HyWbGW5g== X-Gm-Gg: AfdE7clG4W0VPpE4Qdpc8cmWQAxdx5JK6slFfCcANWI8ejb3LTU3QVK7DQgkHEAjo+r qefEVrdE5BDBOgEvEnXANUpeIO0GAvOi4+C7OAFEWgu4mj89IdUx/YUR6usyjhIwyWDPgdVRn0U eQrG2tDC4UslBTwaitZz/1Oi2MaYXuI0AwVSm0jJWn+ozEr4ABcE3z+Y5/ureAvc53+/NqTxuq7 +P/ioltmfKXfQupjwdW5zpsw5RZdXXIjOw5F1FVaT7LqtFy+MB0AiXwdyG3yc/LIjnzkzL3vOWH GVyOmWdWUYaUyhSSeckHZo7RMnj/Q1FYdV3B8jKVD6/YI5D8W2tBy6RDtUH0yZvOd0BZoTmwHQO cB4WYdg3egdwb0kvrPAqBliwl7x9YOXbvBuqt0t3MCLkxbwEn3v0MqA/grn9X7svwJOl7YRZ5Mh 53m0H0xtMln8h+MH0ZX7zIzp/R9FlZNE3EBidvMHyu+bvoYG4W X-Received: by 2002:a05:600c:6092:b0:490:b3cd:fc4d with SMTP id 5b1f17b1804b1-4946216ff53mr65255e9.9.1783932062990; Mon, 13 Jul 2026 01:41:02 -0700 (PDT) Received: from google.com (220.60.76.34.bc.googleusercontent.com. [34.76.60.220]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-493eb6f16cfsm349445955e9.12.2026.07.13.01.41.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2026 01:41:01 -0700 (PDT) Date: Mon, 13 Jul 2026 08:40:58 +0000 From: Mostafa Saleh To: Vincent Donnefort Cc: Fuad Tabba , linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, maz@kernel.org, oupton@kernel.org, seiden@linux.ibm.com, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org Subject: Re: [PATCH] KVM: arm64: Avoid naming collision in tracing Message-ID: References: <20260712153835.2264905-1-smostafa@google.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: On Mon, Jul 13, 2026 at 09:34:32AM +0100, Vincent Donnefort wrote: > On Mon, Jul 13, 2026 at 08:26:35AM +0000, Mostafa Saleh wrote: > > On Mon, Jul 13, 2026 at 09:11:27AM +0100, Vincent Donnefort wrote: > > > [...] > > > > > > > > > > > > > > > I did not add Fixes tag as this is currently dormant and not breaking > > > > > > > anything. > > > > > > > --- > > > > > > > arch/arm64/kvm/hyp/include/nvhe/clock.h | 8 ++++---- > > > > > > > arch/arm64/kvm/hyp/nvhe/clock.c | 4 ++-- > > > > > > > arch/arm64/kvm/hyp/nvhe/trace.c | 4 ++-- > > > > > > > 3 files changed, 8 insertions(+), 8 deletions(-) > > > > > > > > > > > > > > diff --git a/arch/arm64/kvm/hyp/include/nvhe/clock.h b/arch/arm64/kvm/hyp/include/nvhe/clock.h > > > > > > > index 9f429f5c0664..c2ccd0e8bf22 100644 > > > > > > > --- a/arch/arm64/kvm/hyp/include/nvhe/clock.h > > > > > > > +++ b/arch/arm64/kvm/hyp/include/nvhe/clock.h > > > > > > > @@ -6,11 +6,11 @@ > > > > > > > #include > > > > > > > > > > > > > > #ifdef CONFIG_NVHE_EL2_TRACING > > > > > > > -void trace_clock_update(u32 mult, u32 shift, u64 epoch_ns, u64 epoch_cyc); > > > > > > > -u64 trace_clock(void); > > > > > > > +void hyp_trace_clock_update(u32 mult, u32 shift, u64 epoch_ns, u64 epoch_cyc); > > > > > > > +u64 hyp_trace_clock(void); > > > > > > > > > > > > hyp_trace_clock overlaps the host side: arch/arm64/kvm/hyp_trace.c > > > > > > already has a struct hyp_trace_clock and static helpers > > > > > > hyp_trace_clock_enable() / hyp_trace_clock_show() for the debugfs view > > > > > > of the same clock. No actual collision, so this is only a readability > > > > > > point, but a reader grepping hyp_trace_clock now gets two unrelated > > > > > > things. Maybe you'd want to consider a different name, but naming is > > > > > > hard :) > > > > > > If we were to rename: the clock is a "hyp_clock" so probably trace_hyp_clock() > > > is the right thing here. > > > > > > while the "hyp_trace_" is the prefix for hyp_trace.c file content. > > > > > > Although I would like to see why we pull trace_clock() from the kernel into EL2. > > > That bit sounds wrong and if we have a way around perhaps that's better? > > > > Most include path look like this: > > In file included from ./include/linux/ftrace.h:11, > > from ./include/linux/kprobes.h:28, > > from ./include/linux/kgdb.h:17, > > from ./arch/arm64/include/asm/cacheflush.h:11, > > from ./include/linux/cacheflush.h:5, > > from ./include/linux/highmem.h:8, > > from ./include/linux/bvec.h:10, > > from ./include/linux/blk_types.h:10, > > from ./include/linux/writeback.h:13, > > from ./include/linux/memcontrol.h:23, > > from ./include/linux/resume_user_mode.h:8, > > from ./include/linux/entry-virt.h:6, > > from ./include/linux/kvm_host.h:5, > > > > Although, some files have ./arch/arm64/include/asm/cacheflush.h > > directly. > > Ha sad, no way around that... > > So about trace_hyp_clock() / trace_hyp_clock_update() ? > Makes sense, I will respin with that. Thanks, Mostafa