Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pacific: isa-l: incorporate fix for aarch64 text relocation #51314

Merged
merged 1 commit into from Jan 24, 2024

Conversation

rosinL
Copy link
Member

@rosinL rosinL commented May 2, 2023

Fixes: https://tracker.ceph.com/issues/48681
Fixes: https://tracker.ceph.com/issues/50384

Signed-off-by: luo rixin luorixin@huawei.com

Contribution Guidelines

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows

@github-actions github-actions bot added this to the pacific milestone May 2, 2023
@rosinL
Copy link
Member Author

rosinL commented May 5, 2023

@rzarzynski this a backport pr to pacific, to fix ceph-mon init failed on aarch64, please help to review.

@rosinL
Copy link
Member Author

rosinL commented May 25, 2023

@rzarzynski this a backport pr to pacific, to fix ceph-mon init failed on aarch64, please help to review.

1 similar comment
@rosinL
Copy link
Member Author

rosinL commented May 26, 2023

@rzarzynski this a backport pr to pacific, to fix ceph-mon init failed on aarch64, please help to review.

@rzarzynski
Copy link
Contributor

@rosinL: between 806b55ee578efd8158962b90121a4568eb1ecb66 and bee5180a1517f8b5e70b02fcd66790c623536c5d there is a lot of unrelated commits, which – as this is for pacific – makes a bit nervous. I'm not saying no but I want to know alternatives. What do you think about bringing the fix on top of 806b55ee578efd8158962b90121a4568eb1ecb66? We already have ceph/isa-l.git fork.

@rosinL
Copy link
Member Author

rosinL commented May 27, 2023

@rzarzynski: ceph/isa-l.git is just forked from intel/isa-l.git,

bringing the fix on top of 806b55ee578efd8158962b90121a4568eb1ecb66

It is ok for this case. But, if the upstream intel/isa-l.git have fixed some bugs or fulfilled some features or optimizations we need, we need to cherry pick all of this and get a huge amount of work.
So, I think it is a better choice that keep ceph/isa-l just following the upstream

@rosinL
Copy link
Member Author

rosinL commented Jul 10, 2023

@rzarzynski Hi, it has been suspended for a long time. If we just cherry pick bee5180a1517f8b5e70b02fcd66790c623536c5d to 806b55ee578efd8158962b90121a4568eb1ecb66, would you help to create a new branch (for pacific only) base from https://github.com/ceph/isa-l/tree/806b55ee578efd8158962b90121a4568eb1ecb66, and I will do the left work. Thank you.

@k0ste
Copy link
Contributor

k0ste commented Dec 26, 2023

Closed #53463 in favor to this PR

@ljflores
Copy link
Contributor

@rosinL @rzarzynski @k0ste If this is a must for 16.2.15, please add it to https://github.com/ceph/ceph/milestone/17 since Pacific is going EOL.

@rzarzynski
Copy link
Contributor

I'm happy to resurrect this backport but under assumption of taking only pin-pointed changes -- extra features, optimizations etc. seems too much for an old, stable release.

@rosinL
Copy link
Member Author

rosinL commented Jan 10, 2024

For pin-pointed changes, we need another isa-l branch to patch the fix. Would you create the isa-l branch, or is there other options? @rzarzynski

@rzarzynski
Copy link
Contributor

If it's missed, creating it will be the first thing I'm going to do in the morning.

@rosinL
Copy link
Member Author

rosinL commented Jan 10, 2024

OK, I will update the pr after you create the branch

@rzarzynski
Copy link
Contributor

@rosinL: at the moment created the pacific branch in my fork –  https://github.com/rzarzynski/isa-l/tree/pacific. Let's use this as the starting point.
In the meantime I will look for somebody with w+ rights to the ceph/isa-l.git repo.

@rzarzynski
Copy link
Contributor

@rosinL rosinL force-pushed the wip-backport-41306-to-pacific branch from 9e13374 to 00aab22 Compare January 11, 2024 02:36
@rosinL
Copy link
Member Author

rosinL commented Jan 11, 2024

@rzarzynski please merge the PR ceph/isa-l#3, after the merge, I will upadte this PR to ceph/isa-l:pacific branch

@rzarzynski
Copy link
Contributor

9c242d38321847acf04e9ccfc394ebf4506b239e is merged.

@rosinL rosinL force-pushed the wip-backport-41306-to-pacific branch from 00aab22 to 39ff26a Compare January 11, 2024 11:08
@Svelar Svelar modified the milestones: pacific, v16.2.15 Jan 11, 2024
@rosinL
Copy link
Member Author

rosinL commented Jan 11, 2024

@rzarzynski make check is passed, please review.

Copy link
Contributor

@rzarzynski rzarzynski left a comment

Choose a reason for hiding this comment

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

Looks good!

commit 4b36e413c9ac28b4757b297779470693b699aeae (origin/pacific)
Merge: 806b55e 9c242d3
Author: Radoslaw Zarzynski <radoslaw.zarzynski@gmail.com>
Date:   Thu Jan 11 10:31:23 2024 +0100

    Merge pull request #3 from rosinL/pacific
    
    erasure_code: Fix text relocation on aarch64
    
    Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

commit 9c242d38321847acf04e9ccfc394ebf4506b239e
Author: luo rixin <luorixin@huawei.com>
Date:   Fri Jan 8 16:16:02 2021 +0800

    erasure_code: Fix text relocation on aarch64
    
    Here is the bug report on ceph. https://tracker.ceph.com/issues/48681
    
    Change-Id: Ie1c60a71f28c1a169c8899a621be9bb455f5e244
    Signed-off-by: luo rixin <luorixin@huawei.com>
    (cherry picked from commit bee5180a1517f8b5e70b02fcd66790c623536c5d)

commit 806b55ee578efd8158962b90121a4568eb1ecb66 (HEAD -> pacific, rzarzynski/pacific, rzarzynski/master)
Author: Greg Tucker <greg.b.tucker@intel.com>
Date:   Wed Feb 26 17:40:37 2020 -0700

    build: Bump revision to 2.29
    
    Change-Id: I78cfa77864f3fd77c3b63199bc18fd1782fe3dc2
    Signed-off-by: Greg Tucker <greg.b.tucker@intel.com>

Copy link
Contributor

@pereman2 pereman2 left a comment

Choose a reason for hiding this comment

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

@yuriw yuriw merged commit fb8c403 into ceph:pacific Jan 24, 2024
7 of 8 checks passed
@rosinL rosinL deleted the wip-backport-41306-to-pacific branch January 25, 2024 00:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
7 participants