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

Cleanup - disable_bpf_loader_instructions #35164

Merged

Conversation

Lichtso
Copy link
Contributor

@Lichtso Lichtso commented Feb 9, 2024

Problem

The feature was forced in v1.17.20 on MNB.

Summary of Changes

Removes it from master and v1.18 as well to stay in sync.

Feature Gate Issue: #34424

@Lichtso Lichtso force-pushed the cleanup/disable_bpf_loader_instructions branch 2 times, most recently from 3021fd4 to d90155c Compare February 9, 2024 17:09
@HaoranYi HaoranYi force-pushed the cleanup/disable_bpf_loader_instructions branch 2 times, most recently from 464141f to f3042ee Compare February 11, 2024 23:52
Copy link

codecov bot commented Feb 12, 2024

Codecov Report

Attention: 16 lines in your changes are missing coverage. Please review.

Comparison is base (897adb2) 81.6% compared to head (a01bdbd) 81.6%.
Report is 5 commits behind head on master.

❗ Current head a01bdbd differs from pull request most recent head 86b48a6. Consider uploading reports for the commit 86b48a6 to get more accurate results

Additional details and impacted files
@@            Coverage Diff            @@
##           master   #35164     +/-   ##
=========================================
- Coverage    81.6%    81.6%   -0.1%     
=========================================
  Files         833      833             
  Lines      224827   224744     -83     
=========================================
- Hits       183523   183435     -88     
- Misses      41304    41309      +5     

@HaoranYi HaoranYi requested a review from pgarg66 February 12, 2024 14:39
@HaoranYi
Copy link
Contributor

@Lichtso I pushed a few commits to update the test and bench. CI passed. I think this PR is ready. Can you take a look?

@pgarg66 pgarg66 requested a review from alessandrod February 12, 2024 21:16
@HaoranYi HaoranYi force-pushed the cleanup/disable_bpf_loader_instructions branch from 5f8e830 to c8709df Compare February 12, 2024 21:45
@HaoranYi HaoranYi force-pushed the cleanup/disable_bpf_loader_instructions branch 2 times, most recently from c6d9ca4 to a01bdbd Compare February 14, 2024 16:24
@alessandrod alessandrod force-pushed the cleanup/disable_bpf_loader_instructions branch from a01bdbd to 86b48a6 Compare February 15, 2024 05:36
@Lichtso Lichtso merged commit d472725 into solana-labs:master Feb 15, 2024
46 checks passed
@Lichtso Lichtso deleted the cleanup/disable_bpf_loader_instructions branch February 15, 2024 12:46
@Lichtso Lichtso added the v1.18 PRs that should be backported to v1.18 label Feb 15, 2024
Copy link
Contributor

mergify bot commented Feb 15, 2024

Backports to the beta branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. Exceptions include CI/metrics changes, CLI improvements and documentation updates on a case by case basis.

mergify bot pushed a commit that referenced this pull request Feb 15, 2024
* Cleans up disable_bpf_loader_instructions.

* fix test_program_sbf_disguised_as_sbf_loader

* remove bpf loader execute bench

* Revert "remove bpf loader execute bench"

This reverts commit f3042ee.

* move test utility functions out of test file

* update bench to loader v3

* clippy

* fix dev-context build

* fix dev-context import

* dev-context-util

* move dev-context-util attr to module level for loader_utils

---------

Co-authored-by: HaoranYi <[email protected]>
(cherry picked from commit d472725)

# Conflicts:
#	programs/bpf_loader/src/lib.rs
Lichtso added a commit that referenced this pull request Feb 15, 2024
* Cleans up disable_bpf_loader_instructions.

* fix test_program_sbf_disguised_as_sbf_loader

* remove bpf loader execute bench

* Revert "remove bpf loader execute bench"

This reverts commit f3042ee.

* move test utility functions out of test file

* update bench to loader v3

* clippy

* fix dev-context build

* fix dev-context import

* dev-context-util

* move dev-context-util attr to module level for loader_utils

---------

Co-authored-by: HaoranYi <[email protected]>
(cherry picked from commit d472725)
Lichtso added a commit that referenced this pull request Feb 16, 2024
… (#35209)

Cleanup - `disable_bpf_loader_instructions` (#35164)

* Cleans up disable_bpf_loader_instructions.

* fix test_program_sbf_disguised_as_sbf_loader

* remove bpf loader execute bench

* Revert "remove bpf loader execute bench"

This reverts commit f3042ee.

* move test utility functions out of test file

* update bench to loader v3

* clippy

* fix dev-context build

* fix dev-context import

* dev-context-util

* move dev-context-util attr to module level for loader_utils

---------

Co-authored-by: HaoranYi <[email protected]>
(cherry picked from commit d472725)

Co-authored-by: Alexander Meißner <[email protected]>
andreisilviudragnea added a commit to andreisilviudragnea/solana-test-framework that referenced this pull request Aug 14, 2024
andreisilviudragnea added a commit to andreisilviudragnea/solana-test-framework that referenced this pull request Aug 14, 2024
Replace bpf_loader::id() with bpf_loader_upgradeable::id()
andreisilviudragnea added a commit to andreisilviudragnea/solana-test-framework that referenced this pull request Aug 14, 2024
Replace bpf_loader::id() with bpf_loader_upgradeable::id()
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v1.18 PRs that should be backported to v1.18
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants