mirror of
https://github.com/kata-containers/kata-containers.git
synced 2026-05-04 04:00:07 +00:00
kernel: bake in Mellanox MLX5 Ethernet support
The MLX5 Ethernet driver is useful well beyond the DPU/SmartNIC use case (any guest sitting on top of a Mellanox/ConnectX NIC benefits from it), yet the existing config fragment lived under dpu/ and was only pulled in when the kernel was built with `-D nvidia`. Promote it to a first-class common fragment so every Kata kernel gets MLX5 Ethernet built in. Signed-off-by: Fabiano Fidêncio <ffidencio@nvidia.com>
This commit is contained in:
@@ -44,8 +44,6 @@ build_type=""
|
||||
force_setup_generate_config="false"
|
||||
#GPU kernel support
|
||||
gpu_vendor=""
|
||||
#DPU kernel support
|
||||
dpu_vendor=""
|
||||
#Confidential guest type
|
||||
conf_guest=""
|
||||
#
|
||||
@@ -101,7 +99,6 @@ Options:
|
||||
-a <arch> : Arch target to build the kernel, such as aarch64/ppc64le/riscv64/s390x/x86_64.
|
||||
-b <type> : Enable optional config type.
|
||||
-c <path> : Path to config file to build the kernel.
|
||||
-D <vendor> : DPU/SmartNIC vendor, only nvidia.
|
||||
-d : Enable bash debug.
|
||||
-e : Enable experimental kernel.
|
||||
-E : Enable arch-specific experimental kernel, arch info offered by "-a".
|
||||
@@ -239,7 +236,6 @@ get_kernel_frag_path() {
|
||||
local arch_path="$1"
|
||||
local common_path="${arch_path}/../common"
|
||||
local gpu_path="${arch_path}/../gpu"
|
||||
local dpu_path="${arch_path}/../dpu"
|
||||
|
||||
local kernel_path="$2"
|
||||
local arch="$3"
|
||||
@@ -300,12 +296,6 @@ get_kernel_frag_path() {
|
||||
all_configs="${all_configs} ${gpu_configs}"
|
||||
fi
|
||||
|
||||
if [[ "${dpu_vendor}" != "" ]]; then
|
||||
info "Add kernel config for DPU/SmartNIC due to '-n ${dpu_vendor}'"
|
||||
local dpu_configs="${dpu_path}/${dpu_vendor}.conf"
|
||||
all_configs="${all_configs} ${dpu_configs}"
|
||||
fi
|
||||
|
||||
if [[ "${measured_rootfs}" == "true" ]]; then
|
||||
info "Enabling config for confidential guest trust storage protection"
|
||||
local cryptsetup_configs
|
||||
@@ -649,7 +639,7 @@ install_kata() {
|
||||
}
|
||||
|
||||
main() {
|
||||
while getopts "a:b:c:dD:eEfg:hH:k:mp:r:st:u:v:x" opt; do
|
||||
while getopts "a:b:c:deEfg:hH:k:mp:r:st:u:v:x" opt; do
|
||||
case "${opt}" in
|
||||
a)
|
||||
arch_target="${OPTARG}"
|
||||
@@ -664,10 +654,6 @@ main() {
|
||||
PS4=' Line ${LINENO}: '
|
||||
set -x
|
||||
;;
|
||||
D)
|
||||
dpu_vendor="${OPTARG}"
|
||||
[[ "${dpu_vendor}" == "${VENDOR_NVIDIA}" ]] || die "DPU vendor only support nvidia"
|
||||
;;
|
||||
e)
|
||||
build_type="experimental"
|
||||
;;
|
||||
|
||||
@@ -1 +1 @@
|
||||
190
|
||||
191
|
||||
|
||||
Reference in New Issue
Block a user