From nobody Sun Aug 16 02:46:23 2026 X-Original-To: dev-commits-src-branches@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 4hN0hv6qKPz6pGvw for ; Sun, 16 Aug 2026 02:46:23 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hN0hv4Mctz3d8L for ; Sun, 16 Aug 2026 02:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786848383; 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=S87y8EfjDvZzVQkIqoo3hwl+NFir+xf1H0m7BSxdS4I=; b=SrHBHB73tc35sQsvVupf56FrK8zXnZ+taxu2KW6uyWYBC93FqRKYrxCNXtdjp6cuDciYPf c7wHrp0mNChzcoW3IGlU22DYRIoohu425SA0znD3d0RPu8d9vaGfmmi4fdGSoPnU3sF7mB DWcdGy4X3sYQUPIbRc8hgE1HUb6QzsJ3ve5Y3G0ooA2M/4pRJmeXMd4YuC4WxUvpnlvzxE hYCFz1zU5w1Xh80YT9A0kVHSfqTV7LmrU0Ot5zUHntolrDq50xt7PaSmoNX1gvFOTm/w3H MLicA3dPuO5xsQaqzBWpPH+oyMK/urV62OoAb33+MyFq7rlR2It/CrDpkBLcQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786848383; a=rsa-sha256; cv=none; b=BmiDTt/7zAasUkpMolZikeyB39AWNgiKU3HpgZdGIB9O+NtsxsVAe3Iz35q9waSh4L3Zft 5bQZAAOOlwSQzm6kHYZIRh11g7nWmqiPu+ksgKsUW2QodqvpcWULIWKnPUa/lb8wm5PbIY pw1Uy2F+2cidDxkDl+UvxNEuoNd8shoqk/0HbmYPd1FqsOaUKXA+D+hCTtj/iUi8G943TE kWH72MpkYCmHKf3tmgtIVju7Tbao4FkcjtWorjVEagajQ+Fg2O2Ao7cQKamqr03CLWzifo bpPOfCFR4P/BKOxkKVJiL1gB6srMyzSaPRI+un5PQePAyFQ7W7az6Gslb8I2qQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786848383; 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=S87y8EfjDvZzVQkIqoo3hwl+NFir+xf1H0m7BSxdS4I=; b=qAXrHc50CAXrK4dw8CP+eFHrloxOpsL/Y0eCLYc4jLHraLxjIfZjqjonwEfN1mMtY9xNus x/fofbztEFsxFTal4eg5GZeUz845K8V7XfZzHPLx15UVZyK5vgoWFiPpCyfFJeO6ja9XvL FBFaeaB+ENzc05tuEyDAjhEMnqbm53FlwU7E2gTO6jayJ7r6OiCtn8hJmazQONXuSvBj36 P+KoWpsNiy6cScczFf/gM5WbS7IrysInHaCn+agTdFbUFb8JUkkbOXPHb7Q2819Ynf1jKa wChqfWdjqO6pVU4lDx9Xi3WTQXUU3rYi2gP9ST+4W9aGjWsO5tKPpVhLalMqaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hN0hv3Khbz17xd for ; Sun, 16 Aug 2026 02:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 423ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 16 Aug 2026 02:46:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ff2cddb26686 - stable/15 - linuxkpi: stop inlining accesses to curthread->td_lkpi_task List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ff2cddb26686e0097c09dfb37c7c447d29425f20 Auto-Submitted: auto-generated Date: Sun, 16 Aug 2026 02:46:23 +0000 Message-Id: <6a81247f.423ca.3847164d@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ff2cddb26686e0097c09dfb37c7c447d29425f20 commit ff2cddb26686e0097c09dfb37c7c447d29425f20 Author: Konstantin Belousov AuthorDate: 2026-08-08 19:01:20 +0000 Commit: Konstantin Belousov CommitDate: 2026-08-16 02:41:17 +0000 linuxkpi: stop inlining accesses to curthread->td_lkpi_task (cherry picked from commit 6747bf7e223e5400af1c434618b14debd8dca0cf) --- sys/compat/linuxkpi/common/include/linux/sched.h | 7 ++----- sys/compat/linuxkpi/common/src/linux_compat.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/sched.h b/sys/compat/linuxkpi/common/include/linux/sched.h index 3ad2f8e4ce8b..4e2a0f3676a9 100644 --- a/sys/compat/linuxkpi/common/include/linux/sched.h +++ b/sys/compat/linuxkpi/common/include/linux/sched.h @@ -92,11 +92,8 @@ struct task_struct { unsigned int fpu_ctx_level; }; -#define current ({ \ - struct thread *__td = curthread; \ - linux_set_current(__td); \ - ((struct task_struct *)__td->td_lkpi_task); \ -}) +struct task_struct *__lkpi_current(void); +#define current (__lkpi_current()) #define task_pid_group_leader(task) (task)->task_thread->td_proc->p_pid #define task_pid(task) ((task)->pid) diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index e93963428195..31fd80faac1d 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -170,6 +170,16 @@ const guid_t guid_null; enum system_states system_state = SYSTEM_RUNNING; +struct task_struct * +__lkpi_current(void) +{ + struct thread *td; + + td = curthread; + linux_set_current(td); + return ((struct task_struct *)td->td_lkpi_task); +} + int panic_cmp(struct rb_node *one, struct rb_node *two) {