Skip to content

UPSTREAM: tracing/kprobes: Skip boot setup without cmdline events - #1387

Open
Wenwen Fu (wenwfu) wants to merge 1 commit into
qualcomm-linux:qcom-6.18.yfrom
wenwfu:tracing-skip-empty-boot-kprobes
Open

Wenwen Fu (wenwfu) wants to merge 1 commit into
qualcomm-linux:qcom-6.18.yfrom
wenwfu:tracing-skip-empty-boot-kprobes

Conversation

@wenwfu

@wenwfu Wenwen Fu (wenwfu) commented Nov 3, 2026 •

Copy link
Copy Markdown

Backport upstream commit 2cdfe39
("tracing/kprobes: Skip setup_boot_kprobe_events() when no cmdline event")
to qcom-6.18.y, where this fix is currently missing.

A boot-time regression was observed on Qualcomm Robotics RB3 Gen2
(QCS6490), running Linux 6.18.52-g5b623976f245. When no kprobe_event=
parameter is supplied, setup_boot_kprobe_events() still calls
enable_boot_kprobe_events(), which takes event_mutex. This can contend
with asynchronous trace-event updates and delay kernel initialization.

On an affected boot, the following messages show a 480.014 ms interval:

[    0.119375] clocksource: Switched to clocksource arch_sys_counter
[    0.599389] VFS: Disk quotas dquot_6.6.0

The upstream fix returns from init_kprobe_trace() before calling
setup_boot_kprobe_events() when the boot-event buffer is empty.
Explicit kprobe_event= parameters continue to use the existing setup
path, and the mutex protection for trace-event updates is preserved.

The four-line code change is carried unchanged from upstream.
Original authorship and upstream trailers are preserved, with my
Signed-off-by added.

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

2 similar comments
@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

@qlijarvis

Copy link
Copy Markdown

PR #1387 — validate-patch

PR: #1387

Verdict Issues Detailed Report
❌ 0 Full report

Final Summary

  1. Lore link present: No — no lore.kernel.org link found in commit message or PR description
  2. Lore link matches PR commits: N/A — no lore link to compare against
  3. Upstream patch status: Unknown — cannot determine without lore link; commit lacks vendor prefix indicating status
  4. PR present in qcom-next/topics: Partial - 1/1 commit(s) only have partial integration evidence
Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #1387 - tracing: skip boot kprobe setup when no events were requested
Upstream commit: N/A (no lore link found)
Verdict: ❌ FAIL

Commit Message

Check Status Note
Subject matches upstream ❌ No upstream link to compare; missing vendor prefix
Body preserves rationale ⚠️ Well-written but cannot verify against upstream
Fixes tag present/correct ❌ No Fixes tag; references commit c3730b8 but not as Fixes
Authorship preserved ⚠️ Cannot verify without upstream source
Backport note (if applicable) N/A No prefix indicating backport

Diff

File Status Notes
kernel/trace/trace_kprobe.c ❌ Cannot validate without upstream source

Issues

Critical:

  1. No lore.kernel.org link — The commit message contains no Link: tag pointing to lore.kernel.org. This skill only validates patches against a lore.kernel.org source.

  2. Missing vendor prefix — The subject line lacks any prefix (UPSTREAM:, FROMLIST:, BACKPORT:, QCLINUX:, PENDING:, WORKAROUND:). All commits in this tree must have a prefix indicating their upstream status.

  3. Non-standard tag — Assisted-by: Codex:GPT-6 is not a recognized Linux kernel tag. Standard tags include: Signed-off-by, Reviewed-by, Acked-by, Tested-by, Reported-by, Suggested-by, Co-developed-by, Cc, Fixes. AI assistance should not be credited in commit messages per kernel conventions.

  4. Incomplete Fixes reference — The commit message references commit c3730b8373bb but does not use a proper Fixes: tag. If this commit fixes a regression introduced by c3730b8, it should include:

    Fixes: c3730b8373bb ("tracing: Fix race between update_event_fields and, event_define_fields")
    
  5. Integration presence partial — According to integration_presence_report.md, this commit shows only "partial" evidence in qcom-next/topics (subject or partial tree evidence found, but full change was not verified). This suggests the commit may not have landed cleanly or completely.

Verdict

Do not merge. This commit cannot be validated without a lore.kernel.org link and lacks the required vendor prefix. The commit must be corrected before merging:

  1. Add appropriate vendor prefix based on upstream status:

    • If posted to LKML → FROMLIST: + lore link
    • If merged upstream → UPSTREAM: + lore link or kernel.org commit
    • If vendor-only → QCLINUX: (no lore link needed)
    • If work-in-progress → PENDING: (no lore link needed)
  2. Remove the non-standard Assisted-by: Codex:GPT-6 tag

  3. Add proper Fixes: tag if this addresses a regression from c3730b8

  4. Verify why integration presence shows only "partial" evidence

Final Summary

  1. Lore link present: No — no lore.kernel.org link found in commit message or PR description
  2. Lore link matches PR commits: N/A — no lore link to compare against
  3. Upstream patch status: Unknown — cannot determine without lore link; commit lacks vendor prefix indicating status
  4. PR present in qcom-next/topics: Partial — only partial integration evidence found (subject or partial tree match, but full change not verified)

Deterministic Integration Presence

Integration Presence Report

This report is generated by Jarvis before validate-patch runs.
It is the authoritative source for whether PR changes are already present
in qcom-next or in the kernel topic branches.

Kernel repo: /local/mnt/workspace/sgaud/Qgenie/image_pipeline/kernel
qcom-next ref: 17bbb4b37bbc4fc5827b4667445a0c43967c0f48
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit Subject qcom-next topics Final
1/1 [PATCH] tracing: skip boot kprobe setup when no events were requested partial - subject or partial tree evidence found, but full change was not verified missing - no subject, patch-id, or full tree-content match found partial

Final Status

overall_status: PARTIAL
present_commits: 0/1
partial_commits: 1/1
missing_commits: 0/1
topics_checked_for_commits: 1/1
final_summary: PR present in qcom-next/topics: Partial - 1/1 commit(s) only have partial integration evidence

@qlijarvis

Copy link
Copy Markdown

PR #1387 — checker-log-analyzer

PR: #1387
Checker run: https://github.com/qualcomm-linux/kernel-config/actions/runs/41613514785

Checker Result Summary
Checker Result Summary
checkpatch ❌ 1 warning: Unknown commit id referenced in commit message
dt-binding-check ⏭️ No binding changes
dtb-check ⏭️ No DTS changes
sparse-check ✅ Passed
check-uapi-headers ✅ Passed
check-patch-compliance ❌ Missing required subject prefix
tag-check ❌ Subject prefix required for qcom-6.18.y branch

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1387 - tracing: skip boot kprobe setup when no events were requested
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/41613514785

Checker Result Summary
checkpatch ❌ 1 warning: Unknown commit id referenced in commit message
dt-binding-check ⏭️ No binding changes
dtb-check ⏭️ No DTS changes
sparse-check ✅ Passed
check-uapi-headers ✅ Passed
check-patch-compliance ❌ Missing required subject prefix
tag-check ❌ Subject prefix required for qcom-6.18.y branch

❌ checkpatch

Root cause: Commit message references an unknown commit SHA c3730b8373bb that is not present in the target branch.

Failure details:

WARNING: Unknown commit id 'c3730b8373bb', maybe rebased or not pulled?
#10: 
After commit c3730b8373bb ("tracing: Fix race between

75585ac75f25bb4eb2a4824323366014a314cdc0 total: 0 errors, 1 warnings, 0 checks, 9 lines checked

Fix:

The commit message references c3730b8373bb ("tracing: Fix race between update_event_fields and, event_define_fields") which doesn't exist in the qcom-6.18.y branch. You have two options:

  1. If this is an upstream commit: Find the correct commit SHA in the target branch and update the reference
  2. If this commit doesn't exist yet: Remove the specific commit reference and describe the issue more generally
git rebase -i 94124ba1e75d5856e99ec30cb6bf779ea0717b20
# mark commit as 'edit'
git commit --amend
# Update the commit message to either:
# - Use the correct commit SHA from qcom-6.18.y, or
# - Remove the commit reference and describe the race condition generically
git rebase --continue

Reproduce locally:

./scripts/checkpatch.pl --strict --ignore FILE_PATH_CHANGES --git 94124ba1e75d5856e99ec30cb6bf779ea0717b20..75585ac75f25bb4eb2a4824323366014a314cdc0

❌ check-patch-compliance

Root cause: Commit subject line does not start with a required prefix (FROMLIST:, FROMGIT:, UPSTREAM:, or BACKPORT:).

Failure details:

Checking commit: tracing: skip boot kprobe setup when no events were requested
Commit summary does not start with a required prefix

Fix:

The commit subject must start with one of the allowed prefixes. Based on the commit content and the Assisted-by: Codex:GPT-6 tag, this appears to be a new patch. Choose the appropriate prefix:

  • If this patch has been posted to lore.kernel.org → use FROMLIST:
  • If this is taken from a maintainer's git tree → use FROMGIT:
  • If this is merged into Linus's mainline → use UPSTREAM:
  • If this is a backport with modifications → use BACKPORT:
git rebase -i 94124ba1e75d5856e99ec30cb6bf779ea0717b20
# mark commit as 'edit'
git commit --amend -m "FROMLIST: tracing: skip boot kprobe setup when no events were requested"
# Keep the rest of the commit message body unchanged
git rebase --continue

If this patch has been posted upstream, also add a Link: tag pointing to the lore.kernel.org URL in the commit body.

Reproduce locally:

# Verify the commit subject has a valid prefix
git log --oneline 94124ba1e75d5856e99ec30cb6bf779ea0717b20..75585ac75f25bb4eb2a4824323366014a314cdc0

❌ tag-check

Root cause: Target branch qcom-6.18.y requires all commits to have a subject prefix, but this commit has none.

Failure details:

Commit 75585ac75f25 ("tracing: skip boot kprobe setup when no events were requested"): subject line does not start with a required prefix.

All branches except qcom-next and qcom-next-staging require one of:

  • FROMLIST: - Patch posted to mailing list (lore.kernel.org)
  • FROMGIT: - Patch taken from a maintainer git tree
  • UPSTREAM: - Patch merged into Linus's mainline tree
  • BACKPORT: - Upstream patch backported with modifications
  • QCLINUX: - Vendor-only change with no upstream equivalent
  • PENDING: - Work-in-progress, not yet posted upstream
  • WORKAROUND: - Temporary fix not suitable for upstream

Fix:

This is the same issue as check-patch-compliance above. Add the appropriate prefix to the commit subject:

git rebase -i 94124ba1e75d5856e99ec30cb6bf779ea0717b20
# mark commit as 'edit'
git commit --amend -m "FROMLIST: tracing: skip boot kprobe setup when no events were requested"
# (or use UPSTREAM:/FROMGIT:/BACKPORT: as appropriate)
git rebase --continue

Reproduce locally:

# Check all commit subjects in the PR
git log 94124ba1e75d5856e99ec30cb6bf779ea0717b20..75585ac75f25bb4eb2a4824323366014a314cdc0 --format="%H %s" | \
  grep -vE '^[a-f0-9]+ (FROMLIST|FROMGIT|UPSTREAM|BACKPORT|QCLINUX|PENDING|WORKAROUND):'

Verdict

3 blockers must be fixed before merge:

  1. checkpatch warning - Update or remove the unknown commit reference c3730b8373bb in the commit message
  2. check-patch-compliance failure - Add a required subject prefix (FROMLIST:, UPSTREAM:, etc.)
  3. tag-check failure - Same as Adding Email Checker  #2 - subject prefix is mandatory for qcom-6.18.y branch

All three issues can be resolved in a single git commit --amend by:

  • Adding the appropriate prefix to the subject line
  • Fixing the commit SHA reference in the commit body (or removing it)
  • Adding a Link: tag if the patch has been posted upstream

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CRs-Fixed: missing in PR description.
submit the patch upstream and bring it as FROMLIST. Add Link: tag to commit log pointing to valid lore link submitted upstream.

@wenwfu
Wenwen Fu (wenwfu) force-pushed the tracing-skip-empty-boot-kprobes branch from 75585ac to 6171e20 Compare November 6, 2026 02:43
@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

@qcomlnxci
qcomlnxci requested a review from a team November 6, 2026 02:45
@wenwfu Wenwen Fu (wenwfu) changed the title tracing: skip boot kprobe setup when no events were requested UPSTREAM: tracing/kprobes: Skip boot setup without cmdline events Nov 6, 2026
@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

@wenwfu

Copy link
Copy Markdown
Author

CRs-Fixed: missing in PR description. submit the patch upstream and bring it as FROMLIST. Add Link: tag to commit log pointing to valid lore link submitted upstream.

Thanks for the review. An equivalent fix is already merged into Linux mainline as commit 2cdfe39 ("tracing/kprobes: Skip setup_boot_kprobe_events() when no cmdline event").

I checked qcom-6.18.y and confirmed that this fix is missing. I have replaced my original patch with an unchanged backport of that upstream commit, preserving the original author and upstream Link trailer.

@wenwfu
Wenwen Fu (wenwfu) force-pushed the tracing-skip-empty-boot-kprobes branch from 6171e20 to fd4009f Compare November 6, 2026 03:09
@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

@wenwfu
Wenwen Fu (wenwfu) force-pushed the tracing-skip-empty-boot-kprobes branch from fd4009f to fd3af38 Compare November 6, 2026 03:12
@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Backport the following commit from qualcomm-linux/kernel to qcom-6.18.y:

2cdfe39
("tracing/kprobes: Skip setup_boot_kprobe_events() when no cmdline
event").

No need to add backport details , keep the original commit as it is. If you want to supplement with some details , do that towards end of commit log underbrackets
[user-name: ]

When the 'kprobe_event=' kernel command-line parameter is not provided,
there is no need to execute setup_boot_kprobe_events().

This change optimizes the initialization function init_kprobe_trace()
by skipping unnecessary work and effectively prevents potential blocking
that could arise from contention on the event_mutex lock in subsequent
operations.

Link: https://patch.msgid.link/20260204015401.163748-1-tianyaxiong@kylinos.cn
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Yaxiong Tian <tianyaxiong@kylinos.cn>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
[wenwfu: Backport to qcom-6.18.y from
qualcomm-linux/kernel@2cdfe39]
Signed-off-by: Wenwen Fu <wenwfu@qti.qualcomm.com>
@wenwfu
Wenwen Fu (wenwfu) force-pushed the tracing-skip-empty-boot-kprobes branch from fd3af38 to 70df46e Compare November 6, 2026 03:25
@qswat-orbit-external

Copy link
Copy Markdown

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

@qcomlnxci
qcomlnxci requested a review from a team November 6, 2026 03:26
@wenwfu

Copy link
Copy Markdown
Author

Backport the following commit from qualcomm-linux/kernel to qcom-6.18.y:
2cdfe39
("tracing/kprobes: Skip setup_boot_kprobe_events() when no cmdline
event").

No need to add backport details , keep the original commit as it is. If you want to supplement with some details , do that towards end of commit log underbrackets [user-name: ]

updated, Pls review again

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants