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

kernel: add support for MegaRAID SAS #2133

Merged
merged 1 commit into from
May 16, 2022

Conversation

etungsten
Copy link
Contributor

@etungsten etungsten commented May 11, 2022

Issue number:
N/A

Description of changes:

    kernel-5.10: add kernel config to enable support for RAID
    
    This adds kernel configs to enable support for MegaRAID SAS RAID
    controllers.

Testing done:
I was able to boot Bottlerocket from RAID0 on a baremetal server.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

@bcressey
Copy link
Contributor

I'd tend to also want to change 5.4 as well, even though 5.4 is on its way out, just to minimize the delta.

Can you add a diff of the final config for x86_64 and aarch64? Just to give a complete picture of what's changed.

@etungsten
Copy link
Contributor Author

etungsten commented May 11, 2022

Can you add a diff of the final config for x86_64 and aarch64? Just to give a complete picture of what's changed.

$ git diff --no-index aarch64_without aarch64_with_new_conf
diff --git a/aarch64_without b/aarch64_with_new_conf
index fa8ddb4a..49173034 100644
--- a/aarch64_without
+++ b/aarch64_with_new_conf
@@ -2251,7 +2251,7 @@ CONFIG_SCSI_MVUMI=m
 # CONFIG_SCSI_ESAS2R is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
-CONFIG_MEGARAID_SAS=m
+CONFIG_MEGARAID_SAS=y
 CONFIG_SCSI_MPT3SAS=m
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 CONFIG_SCSI_MPT3SAS_MAX_SGE=128


$ git diff --no-index x86_without x86_with_new_conf
diff --git a/x86_without b/x86_with_new_conf
index fa7b6b1b..b39e1785 100644
--- a/x86_without
+++ b/x86_with_new_conf
@@ -2081,7 +2081,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
 # CONFIG_SCSI_ESAS2R is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
+CONFIG_MEGARAID_SAS=y
 CONFIG_SCSI_MPT3SAS=m
 CONFIG_SCSI_MPT2SAS_MAX_SGE=128
 CONFIG_SCSI_MPT3SAS_MAX_SGE=128

Interesting how CONFIG_SCSI=y isn't part of the diff. I guess it's =y by default?

@etungsten
Copy link
Contributor Author

Push above removes CONFIG_SCSI=y since it's already =y by default in the kernel config.

@zmrow
Copy link
Contributor

zmrow commented May 11, 2022

nit: Could we change the commit message to say something like Add Megaraid SAS modules? There are other RAID controllers and modules so saying we added support for RAID isn't pedantically accurate. :)

@etungsten etungsten changed the title kernel-5.10: add kernel config to enable support for RAID kernel add kernel config to enable support for RAID May 11, 2022
@etungsten etungsten changed the title kernel add kernel config to enable support for RAID kernel: add kernel config to enable support for RAID May 11, 2022
This adds kernel config to enable support for MegaRAID SAS RAID
controllers.
@etungsten etungsten changed the title kernel: add kernel config to enable support for RAID kernel: add support for MegaRAID SAS May 11, 2022
Copy link
Contributor

@foersleo foersleo left a comment

Choose a reason for hiding this comment

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

With enabling more hardware through including drivers like this one we might want to put all of these into a separate file like config-bottlerocket-hardware that lives co-located to the current config and then have that additional config added to the merge-config step in the spec file.

That would enable us in the future to easily make this configurable for potential separate variants with and without that hardware support (similar to the conditional addition of config-microcode on x86).

But we can also move these things around at a later point in a separate PR to not keep this one open for too long. If that makes sense to folks I can take care of that separate PR. Let me know what you think.

@zmrow
Copy link
Contributor

zmrow commented May 13, 2022

But we can also move these things around at a later point in a separate PR to not keep this one open for too long. If that makes sense to folks I can take care of that separate PR. Let me know what you think.

Sounds like a perfect idea!

@etungsten etungsten merged commit b8c553a into bottlerocket-os:develop May 16, 2022
@etungsten etungsten deleted the megaraid_sas branch May 16, 2022 19:33
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.

6 participants