Skip to content

Conversation

@TroyMitchell911
Copy link
Contributor

@TroyMitchell911 TroyMitchell911 commented Nov 10, 2025

Previously, freelist_init() used
payload_buffer = size + sizeof(btl_sm_frag_t),
but what we actually need is
size + sizeof(btl_sm_hdr_t).

More details can be found in issue(#13404) [1].

Link: #13404 [1]

bot:notacherrypick

@github-actions github-actions bot added this to the v5.0.8 milestone Nov 10, 2025
@github-actions
Copy link

Hello! The Git Commit Checker CI bot found a few problems with this PR:

b7cf4ce: btl/sm: fix wrong payload_buffer size during freel...

  • check_cherry_pick: does not include a cherry pick message (did you need to bot:notacherrypick?)

Please fix these problems and, if necessary, force-push new commits back up to the PR branch. Thanks!

@github-actions
Copy link

Hello! The Git Commit Checker CI bot found a few problems with this PR:

406dbc7: btl/sm: fix wrong payload_buffer size during freel...

  • check_cherry_pick: does not include a cherry pick message (did you need to bot:notacherrypick?)

Please fix these problems and, if necessary, force-push new commits back up to the PR branch. Thanks!

@TroyMitchell911
Copy link
Contributor Author

I’ve already added bot:notacherrypick to my commit message, but the CI still fails. Any idea why?

@jsquyres jsquyres changed the title btl/sm: fix wrong payload_buffer size during freelist_init btl/sm: fix wrong payload_buffer size during freelist_init (v5.0.x) Nov 14, 2025
@jsquyres
Copy link
Member

I’ve already added bot:notacherrypick to my commit message, but the CI still fails. Any idea why?

It needs to be in the PR description, not the commit message. I updated the PR description, and CI passes now.

@jsquyres
Copy link
Member

That being said, isn't this effectively a cherry pick of f25ff21?

@TroyMitchell911
Copy link
Contributor Author

That being said, isn't this effectively a cherry pick of f25ff21?

I believe yes, bcs directly using the cherry-pick would result in three conflicts, and the modification only requires three lines, I modified it manually.

@jsquyres
Copy link
Member

I believe yes, bcs directly using the cherry-pick would result in three conflicts, and the modification only requires three lines, I modified it manually.

Gotcha; fair enough. Can you modify your commit message to put the cherry-pick message anyway? Or at least mention that it's effectively a cherry pick (with conflicts resolved)? I ask because we harvest those cherry-pick messages in the commit messages to help track what has come over from master and what was missed, etc.

Previously, freelist_init() used
    payload_buffer = size + sizeof(btl_sm_frag_t),
but what we actually need is
    size + sizeof(btl_sm_hdr_t).

More details can be found in issue(open-mpi#13404) [1].

(cherry picked from commit f25ff21,
with conflicts resolved)

Link: open-mpi#13404 [1]

Signed-off-by: Troy Mitchell <troy.mitchell@linux.dev>
@TroyMitchell911
Copy link
Contributor Author

I believe yes, bcs directly using the cherry-pick would result in three conflicts, and the modification only requires three lines, I modified it manually.

Gotcha; fair enough. Can you modify your commit message to put the cherry-pick message anyway? Or at least mention that it's effectively a cherry pick (with conflicts resolved)? I ask because we harvest those cherry-pick messages in the commit messages to help track what has come over from master and what was missed, etc.

I've already forced push.
And I've kept the entire hash code. Is there a problem?

Copy link
Member

@jsquyres jsquyres left a comment

Choose a reason for hiding this comment

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

Perfect; thanks!

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants