From nobody Sun Jan 07 23:08:05 2024 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 4T7Xsy2b0Rz56FFH; Sun, 7 Jan 2024 23:08:06 +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 4T7Xsx72wpz4PDr; Sun, 7 Jan 2024 23:08:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704668886; 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=CQFeHeDp9TVuSF6U/Rya+9x0AhhdxERyrNurkQVr7Ug=; b=dqtDmNMRQHfLEXS0Zb7Ryb+gfakJImJws/6I7h5aVioqDbxhbVEuflRLHxHSZjMwspeZw9 uWwdp9xKy1LO7SNlSx8DPvfJkeCT7VGrGGmjuxuGQI6A8jU3+YBM5emCV/F8m1CVKcLYqu HiBNOAuEJumrJHmrCfFZE7CB9/3sqMzd71MQ+CxchU9wMuLpvhKUWr2HSx+w25fgGjP0ki S5Av27c/4W/YFlr2+wK7b0SneW4HI719CL7C2SWbUhRbwG8Dh1uFf0mbCg2Aje6a/LW7ti XXIylq0yHkA8wTvWftlDjcn+esoZVKiXQCc6nLUkjiolD801b2zwNKYtuygE3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704668886; 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=CQFeHeDp9TVuSF6U/Rya+9x0AhhdxERyrNurkQVr7Ug=; b=NzdcDofw+Xc11uQ+K853A8pz6WthxxT2ciAYdw/fgJYXrzmnHrxjcpssESBJSoXyEGIWsy daYfOeKucmK7h/PMoUmArNH5QIuD2xvemfxYPLkWzzfhHBA2IImWgKNjx2/coWNxi6SIPQ MDLIbQSP8C8kb/kC1fopbF1OBSQr42TJtQ8K2iLtvPVxbESSqHl9aSYyXlJ+m9LhkyRe6l OYuhxm3tr94uhFySbrmUuwQhWXMjD1Plho3lZldxqHVTr7EFV+z/XbA4FR5j/c4ZVhRyjf /nJxxNtMKCrWdFW/8+YuJ1rqS+gV8UbRWx/LLZ5LxMGH49Iu9NJHqo5DY/jPQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704668886; a=rsa-sha256; cv=none; b=bBOvP4IiyA9jAkVcYB17ki66x75c1wZxOnvZoMl4N4VgbQdorU8PAYkSFdzH7f6aZqen7o CiT3cmhabkZQksQohVTGKHwsqOuOyA37L3CMvr751Sql7zlB5RwtotEb8N0Kbr/09Rjmpt ZBnMFR+k3lqldWva2BEKE+9j/ABVsiEXi4JHUhvh+GyNSgYdn3dC8AdFB8Va/a5f1SqqWl H/2e2cUm1ldnl+vGCatBGPxU0EPK5c2Tr1JW1FULOgaeC5WYUNMBbDXix7ywATQMUsME76 ZS/Y5c4I6P6hOa1kMSDTao0XsChn9r0DfTrVQ6jRQDwcuaupFwdFme10qZdgPg== 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 4T7Xsx6273zjZ0; Sun, 7 Jan 2024 23:08:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 407N85Ha052886; Sun, 7 Jan 2024 23:08:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 407N85NC052883; Sun, 7 Jan 2024 23:08:05 GMT (envelope-from git) Date: Sun, 7 Jan 2024 23:08:05 GMT Message-Id: <202401072308.407N85NC052883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 104cc21de8d6 - stable/13 - lldb: dereference stoppcbs based on target kernel version 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 104cc21de8d688905d67f4a9150b2a0511243273 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=104cc21de8d688905d67f4a9150b2a0511243273 commit 104cc21de8d688905d67f4a9150b2a0511243273 Author: Ed Maste AuthorDate: 2023-05-02 20:24:46 +0000 Commit: Dimitry Andric CommitDate: 2024-01-07 23:04:33 +0000 lldb: dereference stoppcbs based on target kernel version As of 9fb6718d1b18 / __FreeBSD_version 1400089 stoppcbs is a pointer to the pcbs array. Dereference stoppcbs on sufficiently new kernels. Reviewed by: markj (earlier) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39939 (cherry picked from commit 0f2bb40bc7ddee7ba329d9b344623e2a186b4046) --- .../source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.cpp b/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.cpp index e3707365a9c3..30eace1ba94f 100644 --- a/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.cpp +++ b/contrib/llvm-project/lldb/source/Plugins/Process/FreeBSDKernel/ProcessFreeBSDKernel.cpp @@ -178,6 +178,11 @@ bool ProcessFreeBSDKernel::DoUpdateThreadList(ThreadList &old_thread_list, int32_t pcbsize = ReadSignedIntegerFromMemory(FindSymbol("pcb_size"), 4, -1, error); lldb::addr_t stoppcbs = FindSymbol("stoppcbs"); + // In later FreeBSD versions stoppcbs is a pointer to the array. + int32_t osreldate = + ReadSignedIntegerFromMemory(FindSymbol("osreldate"), 4, -1, error); + if (stoppcbs != LLDB_INVALID_ADDRESS && osreldate >= 1400089) + stoppcbs = ReadPointerFromMemory(stoppcbs, error); // from FreeBSD sys/param.h constexpr size_t fbsd_maxcomlen = 19;