-
Notifications
You must be signed in to change notification settings - Fork 283
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
Revamp module build script to make it work for 5.15 on Ubuntu 20.04 #720
Revamp module build script to make it work for 5.15 on Ubuntu 20.04 #720
Conversation
The current version of the script does not work at all when the host kernel is Azure's 5.15 kernel on Ubuntu 20.04. It does seem to work with the non-HWE kernel (version 5.4). Update the script to add support for building and loading the kernel modules for the 5.15 kernel, while keeping support for the non-HWE kernel. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
@xumia @qiluo-msft could you review this when you get a chance? |
echo CONFIG_MACSEC=m >> .config | ||
echo CONFIG_NET_VENDOR_MICROSOFT=y >> .config | ||
echo CONFIG_MICROSOFT_MANA=m >> .config | ||
echo CONFIG_SYSTEM_REVOCATION_LIST=n >> .config |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why removing?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ideally, when building kernel modules, the config used for building the kernel module must match the system's kernel config. This is especially true for config options that aren't for just building a module (i.e. options that may affect multiple parts of the kernel). If there's a difference, there a risk of structure sizes not matching, or function parameters not matching.
These kernel options, as far as I can tell, and based on the CI test run, don't have any functional impact.
…-for-azure-ubuntu
@xumia @liushilongbuaa Could you review this when you get a chance? |
LGTM, thanks for the fix. |
…720) * Revamp module build script to make it work for 5.15 on Ubuntu 20.04 The current version of the script does not work at all when the host kernel is Azure's 5.15 kernel on Ubuntu 20.04. It does seem to work with the non-HWE kernel (version 5.4). Update the script to add support for building and loading the kernel modules for the 5.15 kernel, while keeping support for the non-HWE kernel. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> * Print warning when building module for different version of kernel Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> * Fix up command names and reuse variable Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> --------- Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
…720) * Revamp module build script to make it work for 5.15 on Ubuntu 20.04 The current version of the script does not work at all when the host kernel is Azure's 5.15 kernel on Ubuntu 20.04. It does seem to work with the non-HWE kernel (version 5.4). Update the script to add support for building and loading the kernel modules for the 5.15 kernel, while keeping support for the non-HWE kernel. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> * Print warning when building module for different version of kernel Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> * Fix up command names and reuse variable Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> --------- Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
Update sonic-swss-common submodule pointer to include the following: * 6e4daf1 Revamp module build script to make it work for 5.15 on Ubuntu 20.04 (sonic-net/sonic-swss-common#720) * 7f40cde Non recursive automake and Debian packaging changes (sonic-net/sonic-swss-common#700) Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
Update sonic-swss-common submodule pointer to include the following: * 6e4daf1 Revamp module build script to make it work for 5.15 on Ubuntu 20.04 (sonic-net/sonic-swss-common#720) * 7f40cde Non recursive automake and Debian packaging changes (sonic-net/sonic-swss-common#700) Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
The current version of the script does not work at all when the host kernel is Azure's 5.15 kernel on Ubuntu 20.04. It does seem to work with the non-HWE kernel (version 5.4). Update the script to add support for building and loading the kernel modules for the 5.15 kernel, while keeping support for the non-HWE kernel. This is a cherry-pick of sonic-net/sonic-swss-common#720 Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com>
The current version of the script does not work at all when the host kernel is Azure's 5.15 kernel on Ubuntu 20.04. It does seem to work with the non-HWE kernel (version 5.4). Update the script to add support for building and loading the kernel modules for the 5.15 kernel, while keeping support for the non-HWE kernel. This is a cherry-pick of sonic-net/sonic-swss-common#720 Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com>
…3212) * Revamp module build script to make it work for 5.15 on Ubuntu 20.04 The current version of the script does not work at all when the host kernel is Azure's 5.15 kernel on Ubuntu 20.04. It does seem to work with the non-HWE kernel (version 5.4). Update the script to add support for building and loading the kernel modules for the 5.15 kernel, while keeping support for the non-HWE kernel. This is a cherry-pick of sonic-net/sonic-swss-common#720 Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com> * Remove libswsscommon dependencies from the script Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com> --------- Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com>
…onic-net#3212) * Revamp module build script to make it work for 5.15 on Ubuntu 20.04 The current version of the script does not work at all when the host kernel is Azure's 5.15 kernel on Ubuntu 20.04. It does seem to work with the non-HWE kernel (version 5.4). Update the script to add support for building and loading the kernel modules for the 5.15 kernel, while keeping support for the non-HWE kernel. This is a cherry-pick of sonic-net/sonic-swss-common#720 Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com> * Remove libswsscommon dependencies from the script Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com> --------- Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com>
…onic-net#3212) * Revamp module build script to make it work for 5.15 on Ubuntu 20.04 The current version of the script does not work at all when the host kernel is Azure's 5.15 kernel on Ubuntu 20.04. It does seem to work with the non-HWE kernel (version 5.4). Update the script to add support for building and loading the kernel modules for the 5.15 kernel, while keeping support for the non-HWE kernel. This is a cherry-pick of sonic-net/sonic-swss-common#720 Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com> * Remove libswsscommon dependencies from the script Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com> --------- Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com>
…3212) * Revamp module build script to make it work for 5.15 on Ubuntu 20.04 The current version of the script does not work at all when the host kernel is Azure's 5.15 kernel on Ubuntu 20.04. It does seem to work with the non-HWE kernel (version 5.4). Update the script to add support for building and loading the kernel modules for the 5.15 kernel, while keeping support for the non-HWE kernel. This is a cherry-pick of sonic-net/sonic-swss-common#720 Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com> * Remove libswsscommon dependencies from the script Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com> --------- Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com>
…onic-net#3212) * Revamp module build script to make it work for 5.15 on Ubuntu 20.04 The current version of the script does not work at all when the host kernel is Azure's 5.15 kernel on Ubuntu 20.04. It does seem to work with the non-HWE kernel (version 5.4). Update the script to add support for building and loading the kernel modules for the 5.15 kernel, while keeping support for the non-HWE kernel. This is a cherry-pick of sonic-net/sonic-swss-common#720 Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com> * Remove libswsscommon dependencies from the script Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com> --------- Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com>
…3212) * Revamp module build script to make it work for 5.15 on Ubuntu 20.04 The current version of the script does not work at all when the host kernel is Azure's 5.15 kernel on Ubuntu 20.04. It does seem to work with the non-HWE kernel (version 5.4). Update the script to add support for building and loading the kernel modules for the 5.15 kernel, while keeping support for the non-HWE kernel. This is a cherry-pick of sonic-net/sonic-swss-common#720 Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com> * Remove libswsscommon dependencies from the script Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com> --------- Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com>
…onic-net#3212) * Revamp module build script to make it work for 5.15 on Ubuntu 20.04 The current version of the script does not work at all when the host kernel is Azure's 5.15 kernel on Ubuntu 20.04. It does seem to work with the non-HWE kernel (version 5.4). Update the script to add support for building and loading the kernel modules for the 5.15 kernel, while keeping support for the non-HWE kernel. This is a cherry-pick of sonic-net/sonic-swss-common#720 Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com> * Remove libswsscommon dependencies from the script Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com> --------- Signed-off-by: Saikrishna Arcot <saiarcot895@gmail.com>
The current version of the script does not work at all when the host kernel is Azure's 5.15 kernel on Ubuntu 20.04. It does seem to work with 5.11 and older.
Update the script to add support for building and loading the kernel modules for the 5.15 kernel, while keeping support for the non-HWE kernel.
In addition, use a separate
updates/sonic
directory for the kernel modules we compile, to make it clear they were compiled separately and don't come from the official kernel build packages.Finally, add a warning if we're compiling a kernel module for a different version of the kernel than what is currently running.
Signed-off-by: Saikrishna Arcot sarcot@microsoft.com