From nobody Mon Feb 9 15:08:47 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 6835E231A3B for ; Sun, 25 Jan 2026 16:41:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769359261; cv=none; b=lOVBFRNVrGUNjj7sQ1UTrO2LoqMyAgWssFtv1Gsw1Z7OnRP0dPj/baotCg+skjQ2pmYMQmB0zahDeRWTg94flXdk6TkcaIrTU4X1zerx02RrknH6aS0Ii62s5y09inE2ZBB24lJUmZ6FGZfZZgnv5h21Kznf6MHO4XRqEpPiR3I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769359261; c=relaxed/simple; bh=Lc+8jZ4lkosi43LA22RFTLs9fGSvCcCom44E3rq8ApQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FXbOJ9gcsWV4sqq9gNTxIE8XGAlIqshfYDvrSRxuP0EJ89McejPlqrDrXRI3pOpsDtdyRVpEcuOJWUeR3o0baShbzQUbuArsT2deeznKm+0Or6pxoyAPCeF/XV0ME6WUN1KL0Lh2mzSjedDNBcKgjJQACMN9Bu1UNOI05D8uPhc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=d+M8WQP1; arc=none smtp.client-ip=209.85.214.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="d+M8WQP1" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-29f102b013fso34587415ad.2 for ; Sun, 25 Jan 2026 08:41:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769359260; x=1769964060; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=g2RT5jnzXsR27IYjmO1J2u0D5FIBNDGHaUBVullIGaQ=; b=d+M8WQP1Fa/p70iTZRtVW4NQOQ60kC0LJ5AQVCrisqLziSAGBprPDLlKH9HCPocs6o x2TBAgpmD3z1oDTGlFOdkwNF3dj/azhgUdLp+gO+ayDhr62NjiUyp9dmMKvkF7Ap8pEC qEhdtznTFp7UQmqfQxHnM+mQnRyRFJuacy32VAAXrafoKKlHTytB5M8fkOCWj5CFWyRR WdVsYnUwVEMnWpwVtWTOtK65Xp23zKCyuC25fTOZXxkCMYD0e/S7aP9j0jTuJ8xw8MOW ilww4HWbTlBHtgDNTlVSM/3Vj9xJjDjLHXRnXVlgZgYvXVu/8VF5rDRFBMomqleGXGid pRCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769359260; x=1769964060; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=g2RT5jnzXsR27IYjmO1J2u0D5FIBNDGHaUBVullIGaQ=; b=vVGrn/kdw3RmAS+yPtKoKzkBYRU2bE9G6TINdcFb8zcQ8DA9oLSLkVw1VQoc2hFGtJ 3GxDpsJaNB0DCfUev26p/PreW9oFxnwHU8oZLf6Bbo1knPvP3bSb0Kxe+4HA8BEzOo8F 6gQ9HjQUAwhzyLw8IXmQxAgE+IsSSD2O1KMWo4JGSI8swKPuHRrVCHIaj/4dmBt+vVud 1fkV4T6iYOw9rCzrH/KsJ+1W0o3KszSWchKVrlLLqVwnm0MS+7sCITnvY/uCgEjmEhsE nIy6N1kP/XFSw0BcCDjivwhdavGOI3Coz/p+7QstRQJKYu/nOQeM1T0jYCLCKaiqBwB4 +B3Q== X-Forwarded-Encrypted: i=1; AJvYcCUDoQYp+LwuH125D7C2nSYVCaU1MLyEgp7ZV7azHRpY7/l11W8OntKjw0xC40aI/D3Otecb4gARVDsp/5c=@vger.kernel.org X-Gm-Message-State: AOJu0YwodUn5SE0gNNdk9/Q5+HJRVrffwjrK8i7cp9fI+76kuGWn5mwV hgoV9gZtucc3L7DYSe2MvRyn8qFqishXcxijB0K+roz9JRWtGf5zsFVT X-Gm-Gg: AZuq6aJkVmTvcpfFf0a4wlJk1Ue5XUmui+YEk7d7XAcvBxuJyI0fGIyuj2S2bII7r5e Ei9XmSZa+TYHLaXgzUxAc6Vn/1c5RIjn7IqIbUUH/2ZIHk7DU3gv1Po58rEpzoJysoxcIYaelXu 5H9bRLMlv+rurEQC9pYlBl6RvPsxo1tdvzwG+lRZiIKMlzbP8bzpskry/4iUUtDy77wSb7NqGIx KLvr4U1D5lxqHoph5Is1yCC5HHVOtii8uXjoVUdrHL+6JP8i0GY4TtV7G6WFtbJTx0yCLuX1EDw oHclLpMTgCS+j2NutTa6/1Pn4bOP+kA2EQ/vjl9P8Up6rpiOqoBt1BF9nJCi3oC1sAmsBD3qj6e LKBHVQ1rDWfJHmWgcNe9SWy7/aJ3PcUgwAyXFTl0qIsfczf/jkEeyFWri97UC5cQjWe3fjag9I5 f1t7UrVTLevPPFAKLigBBIraSqqPGPdto= X-Received: by 2002:a17:902:ef48:b0:2a7:afb2:ce1c with SMTP id d9443c01a7336-2a8453580d3mr16824805ad.61.1769359259546; Sun, 25 Jan 2026 08:40:59 -0800 (PST) Received: from DESKTOP-3LEPQG8.localdomain ([119.28.20.50]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a802f97667sm70633225ad.56.2026.01.25.08.40.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jan 2026 08:40:59 -0800 (PST) From: Xie Yuanbin To: linux@armlinux.org.uk, johannes@sipsolutions.net, masahiroy@kernel.org, jgross@suse.com, nsc@kernel.org, kees@kernel.org, tglx@kernel.org, mingo@kernel.org, frederic@kernel.org, paulmck@kernel.org, peterz@infradead.org, mathieu.desnoyers@efficios.com, luto@kernel.org, edumazet@google.com Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Xie Yuanbin Subject: [PATCH 2/9] ARM: entry: remove macros ct_user_enter() and ct_user_exit() Date: Mon, 26 Jan 2026 00:40:09 +0800 Message-ID: <20260125164016.331257-3-qq570070308@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260125164016.331257-1-qq570070308@gmail.com> References: <20260125164016.331257-1-qq570070308@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The macros ct_user_enter and ct_user_exit have only three calling points, and the 'save' argument is always 0. Expand the calling and delete the macros. Preparing for subsequent commits, nothing changes on vmlinux. Signed-off-by: Xie Yuanbin --- arch/arm/kernel/entry-armv.S | 4 +++- arch/arm/kernel/entry-common.S | 8 ++++++-- arch/arm/kernel/entry-header.S | 28 ---------------------------- 3 files changed, 9 insertions(+), 31 deletions(-) diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index ef6a657c8d13..7f8781666a44 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -406,7 +406,9 @@ ENDPROC(__fiq_abt) #ifdef CONFIG_TRACE_IRQFLAGS bl trace_hardirqs_off #endif - ct_user_exit save =3D 0 +#ifdef CONFIG_CONTEXT_TRACKING_USER + bl user_exit_callable +#endif .endif .endm =20 diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 88336a1292bb..f579770fab71 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -117,7 +117,9 @@ ENTRY(ret_to_user_from_irq) no_work_pending: asm_trace_hardirqs_on save =3D 0 =20 - ct_user_enter save =3D 0 +#ifdef CONFIG_CONTEXT_TRACKING_USER + bl user_enter_callable +#endif =20 #ifdef CONFIG_KSTACK_ERASE bl stackleak_erase_on_task_stack @@ -190,7 +192,9 @@ ENTRY(vector_swi) alignment_trap r10, ip, cr_alignment asm_trace_hardirqs_on save=3D0 enable_irq_notrace - ct_user_exit save=3D0 +#ifdef CONFIG_CONTEXT_TRACKING_USER + bl user_exit_callable +#endif =20 /* * Get the system call number. diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index 99411fa91350..fd62112e1e6e 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S @@ -361,34 +361,6 @@ ALT_UP_B(.L1_\@) #endif /* !CONFIG_THUMB2_KERNEL */ .endm =20 -/* - * Context tracking subsystem. Used to instrument transitions - * between user and kernel mode. - */ - .macro ct_user_exit, save =3D 1 -#ifdef CONFIG_CONTEXT_TRACKING_USER - .if \save - stmdb sp!, {r0-r3, ip, lr} - bl user_exit_callable - ldmia sp!, {r0-r3, ip, lr} - .else - bl user_exit_callable - .endif -#endif - .endm - - .macro ct_user_enter, save =3D 1 -#ifdef CONFIG_CONTEXT_TRACKING_USER - .if \save - stmdb sp!, {r0-r3, ip, lr} - bl user_enter_callable - ldmia sp!, {r0-r3, ip, lr} - .else - bl user_enter_callable - .endif -#endif - .endm - .macro invoke_syscall, table, nr, tmp, ret, reload=3D0 #ifdef CONFIG_CPU_SPECTRE mov \tmp, \nr --=20 2.51.0