From nobody Tue Jun 13 12:46:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QgSxJ0ZFSz4dK33; Tue, 13 Jun 2023 12:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QgSxH6rMnz3m92; Tue, 13 Jun 2023 12:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686660420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wk+kFxtj+CjDs5UguoGWsWbvfOJ2TeKUGFqo3lZ0f0w=; b=IlPtnBBuwZ2JclpC+cBNo/LOk35Qrc2wBMIj7Bl0Gt107faQxrSYSWirE7Ghdhe2ZCFVAu FQXjBBQXZmpliaTqddSYM9fVsUjvN42Eq0I+MY5gHtq8r8xsn7QCSwhoZv2wOuXhKJU11T ytSAVJBE+a4La27bNxJNEfiq70LH28nynIUUsFtbrrzFHs+V8sEdpWqRAhusIcurKxxKj+ /CJ/y8DKXdwoy9piK2Kb/RlkdWx/Xuu10GkURAzsiyjDuTer/HaNf9boCgt0yp6sjyyczS EN9OYTSfHkR8AS4LJ29C6inzdNo2NxmdZhzUFhV2DezMfN9bAFbNya6SDyxgkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686660420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wk+kFxtj+CjDs5UguoGWsWbvfOJ2TeKUGFqo3lZ0f0w=; b=g0usjLZB8VCi9I891vmQscAtlguJvZiKKe3lZGu6U8cEaQZmdtoxsWH/9FIQ8gxlUAHEA8 KvTUI3Np4dlLsWjkxGmMEQ+x62eY9joGt1SXetKvdbqBeJsbQuBK7SObepZUfDaGGA66v+ xV3k+gkxy2AanbZJRK+3Tb96WttKBX0uAxuUM5ciWINvOExf8TnZ4PRAjIptD8j6jftjkJ uma4E0nMYGnPy1H2nnkSLc0WkDC/28yhNaBOXce/16LQk9wa/cZFSmw2iK26IRtiIuH1S/ kcwRtveAOS1pbrnaChI7DlzdKY4eS0xM9089NXIGlmDHCOxbSMYFZWoI0+Xaow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686660420; a=rsa-sha256; cv=none; b=xF9Q4/BnF29p3Uu9dU4h7ig2VpCR4YWdRDNO9ydlWAcr6GQvvJfdJlWUtPL+M0LXxeEO5R X9GpF9nI5ALpIUxAm6ipPksK+oZrMeAi7H2M991YqRp6LIfZCGzLBBViR75MX/A3lW1+KH SaOV8K2rmU04BHP9wR+/oE0+E5QcX6/lPRrAK8184XDQqbZ4ON8/He95Y4KCodLvDzUrVh hDEBPFvCRVcgY6Mctmxxq4x6okuw4yYk6Qr62y8VhynEvZ/pxxXzGLC0EsPqXfLpCBvW+O u7Y3E9cF+B3YJ6cWH1CaPNY+cITVn81kFVRW26su8vzzs5XSVoSbyvDSOq8YvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QgSxH5v2hzN9w; Tue, 13 Jun 2023 12:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35DCkxhf058802; Tue, 13 Jun 2023 12:46:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35DCkxMx058801; Tue, 13 Jun 2023 12:46:59 GMT (envelope-from git) Date: Tue, 13 Jun 2023 12:46:59 GMT Message-Id: <202306131246.35DCkxMx058801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 1aa486218701 - main - kinst: rename t_kinst to t_kinst_tramp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1aa48621870189d2865c3a4edf45267cc2d84aed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=1aa48621870189d2865c3a4edf45267cc2d84aed commit 1aa48621870189d2865c3a4edf45267cc2d84aed Author: Christos Margiolis AuthorDate: 2023-06-13 12:46:45 +0000 Commit: Christos Margiolis CommitDate: 2023-06-13 12:46:45 +0000 kinst: rename t_kinst to t_kinst_tramp The forthcoming RISC-V and ARM64 ports of kinst introduce a new field named "t_kinst_curprobe", so "t_kinst" (which points to a trampoline) becomes a misleading name. No functional change intended. Reviewed by: markj Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40507 --- sys/cddl/dev/dtrace/dtrace_cddl.h | 4 ++-- sys/cddl/dev/kinst/amd64/kinst_isa.c | 2 +- sys/cddl/dev/kinst/trampoline.c | 15 ++++++++------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/sys/cddl/dev/dtrace/dtrace_cddl.h b/sys/cddl/dev/dtrace/dtrace_cddl.h index b2397d621355..720c231bfca8 100644 --- a/sys/cddl/dev/dtrace/dtrace_cddl.h +++ b/sys/cddl/dev/dtrace/dtrace_cddl.h @@ -88,7 +88,7 @@ typedef struct kdtrace_thread { void *td_systrace_args; /* syscall probe arguments. */ uint64_t td_fasttrap_tp_gen; /* Tracepoint hash table gen. */ struct trapframe *td_dtrace_trapframe; /* Trap frame from invop. */ - void *td_kinst; + void *td_kinst_tramp; } kdtrace_thread_t; /* @@ -118,7 +118,7 @@ typedef struct kdtrace_thread { #define t_dtrace_systrace_args td_dtrace->td_systrace_args #define t_fasttrap_tp_gen td_dtrace->td_fasttrap_tp_gen #define t_dtrace_trapframe td_dtrace->td_dtrace_trapframe -#define t_kinst td_dtrace->td_kinst +#define t_kinst_tramp td_dtrace->td_kinst_tramp #define p_dtrace_helpers p_dtrace->p_dtrace_helpers #define p_dtrace_count p_dtrace->p_dtrace_count #define p_dtrace_probes p_dtrace->p_dtrace_probes diff --git a/sys/cddl/dev/kinst/amd64/kinst_isa.c b/sys/cddl/dev/kinst/amd64/kinst_isa.c index f8bfad8fae60..76b590f271bf 100644 --- a/sys/cddl/dev/kinst/amd64/kinst_isa.c +++ b/sys/cddl/dev/kinst/amd64/kinst_isa.c @@ -197,7 +197,7 @@ kinst_invop(uintptr_t addr, struct trapframe *frame, uintptr_t scratch) if ((frame->tf_rflags & PSL_I) == 0) tramp = DPCPU_GET(intr_tramp); else - tramp = curthread->t_kinst; + tramp = curthread->t_kinst_tramp; if (tramp == NULL) { /* * A trampoline allocation failed, so this probe is diff --git a/sys/cddl/dev/kinst/trampoline.c b/sys/cddl/dev/kinst/trampoline.c index 93eca6b7e6c8..babbf84f1d88 100644 --- a/sys/cddl/dev/kinst/trampoline.c +++ b/sys/cddl/dev/kinst/trampoline.c @@ -219,7 +219,7 @@ kinst_trampoline_dealloc(uint8_t *tramp) static void kinst_thread_ctor(void *arg __unused, struct thread *td) { - td->t_kinst = kinst_trampoline_alloc(M_WAITOK); + td->t_kinst_tramp = kinst_trampoline_alloc(M_WAITOK); } static void @@ -227,8 +227,8 @@ kinst_thread_dtor(void *arg __unused, struct thread *td) { void *tramp; - tramp = td->t_kinst; - td->t_kinst = NULL; + tramp = td->t_kinst_tramp; + td->t_kinst_tramp = NULL; /* * This assumes that the thread_dtor event permits sleeping, which @@ -259,7 +259,7 @@ kinst_trampoline_init(void) retry: PROC_LOCK(p); FOREACH_THREAD_IN_PROC(p, td) { - if (td->t_kinst != NULL) + if (td->t_kinst_tramp != NULL) continue; if (tramp == NULL) { /* @@ -284,7 +284,7 @@ retry: goto retry; } } - td->t_kinst = tramp; + td->t_kinst_tramp = tramp; tramp = NULL; } PROC_UNLOCK(p); @@ -310,8 +310,9 @@ kinst_trampoline_deinit(void) FOREACH_PROC_IN_SYSTEM(p) { PROC_LOCK(p); FOREACH_THREAD_IN_PROC(p, td) { - kinst_trampoline_dealloc_locked(td->t_kinst, false); - td->t_kinst = NULL; + kinst_trampoline_dealloc_locked(td->t_kinst_tramp, + false); + td->t_kinst_tramp = NULL; } PROC_UNLOCK(p); }