Skip to content

Conversation

@opsiff
Copy link
Member

@opsiff opsiff commented Mar 24, 2025

Revert "objtool: Ignore dangling jump table entries"

This reverts commit 8a69697.
It has a small context change need to be handle.

Reapply: objtool: Ignore dangling jump table entries

[ Upstream commit 3724062 ]

Clang sometimes leaves dangling unused jump table entries which point to
the end of the function. Ignore them.

Closes: https://lore.kernel.org/20250113235835.vqgvb7cdspksy5dn@jpoimboe
Reported-by: Klaus Kusche [email protected]
Signed-off-by: Josh Poimboeuf [email protected]
Signed-off-by: Peter Zijlstra (Intel) [email protected]
Link: https://lkml.kernel.org/r/ee25c0b7e80113e950bd1d4c208b671d35774ff4.1736891751.git.jpoimboe@kernel.org
Signed-off-by: Sasha Levin [email protected]
(cherry picked from commit 5b1c485)
Conflicts:
tools/objtool/check.c
[Handle 765ecc2:("objtool: Handle various symbol types of rodata")]
Signed-off-by: Wentao Guan [email protected]

Summary by Sourcery

Bug Fixes:

  • Fixes an issue where clang sometimes leaves dangling unused jump table entries.

opsiff and others added 2 commits March 24, 2025 12:56
This reverts commit 8a69697.
It has a small context change need to be handle.

Signed-off-by: Wentao Guan <[email protected]>
[ Upstream commit 3724062 ]

Clang sometimes leaves dangling unused jump table entries which point to
the end of the function.  Ignore them.

Closes: https://lore.kernel.org/20250113235835.vqgvb7cdspksy5dn@jpoimboe
Reported-by: Klaus Kusche <[email protected]>
Signed-off-by: Josh Poimboeuf <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Link: https://lkml.kernel.org/r/ee25c0b7e80113e950bd1d4c208b671d35774ff4.1736891751.git.jpoimboe@kernel.org
Signed-off-by: Sasha Levin <[email protected]>
(cherry picked from commit 5b1c485)
Conflicts:
	tools/objtool/check.c
[Handle 765ecc2:("objtool: Handle various symbol types of rodata")]
Signed-off-by: Wentao Guan <[email protected]>
@sourcery-ai
Copy link

sourcery-ai bot commented Mar 24, 2025

Reviewer's Guide by Sourcery

This pull request addresses an issue where Clang sometimes creates dangling, unused jump table entries that point to the end of a function. The change modifies the objtool to ignore these entries, preventing false positives during code analysis.

Updated class diagram for objtool check

classDiagram
  class objtool_file {
  }
  class instruction {
  }
  class reloc {
    sym
  }
  class symbol {
    sec
  }
  class section {
  }
  class func {
    sec
    offset
    len
  }

  objtool_file -- instruction : contains
  instruction -- reloc : uses
  reloc -- symbol : refers to
  symbol -- section : belongs to
  func -- section : belongs to

  note for reloc "reloc_addend(reloc) is replaced by offset"
Loading

File-Level Changes

Change Details Files
Ignore jump table entries that point to the end of the function.
  • Modified the condition to ignore jump table entries that point to the end of the function.
tools/objtool/check.c

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from opsiff. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@deepin-ci-robot
Copy link

deepin pr auto review

关键摘要:

  • 代码中的变量offset在函数add_jump_table中未定义,可能导致编译错误。
  • 代码中的reloc_addend(reloc)函数调用被替换为offset,但offset变量未在函数参数中定义,这可能是代码逻辑错误。

是否建议立即修改:

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @opsiff - I've reviewed your changes - here's some feedback:

Overall Comments:

  • Consider adding a comment explaining why offset is used instead of reloc_addend(reloc).
Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@opsiff opsiff merged commit 4536550 into deepin-community:linux-6.6.y Mar 24, 2025
6 of 7 checks passed
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