Skip to content

Commit b8dd649

Browse files
authored
Merge pull request #2676 from mrbojangles3/mlx5_offload_enable
Mlx5 offload enable
2 parents 39e3960 + a00813f commit b8dd649

File tree

3 files changed

+67
-4
lines changed

3 files changed

+67
-4
lines changed

ci-automation/ci-config.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ AWS_PARALLEL="${PARALLEL_TESTS:-8}"
148148

149149
# -- Azure --
150150
: ${AZURE_IMAGE_NAME:="flatcar_production_azure_image.vhd"}
151-
: ${AZURE_amd64_MACHINE_SIZE:="Standard_D2s_v4"}
152-
: ${AZURE_arm64_MACHINE_SIZE:="Standard_D2pls_v5"}
151+
: ${AZURE_amd64_MACHINE_SIZE:="Standard_D2s_v6"}
152+
: ${AZURE_arm64_MACHINE_SIZE:="Standard_D2pls_v6"}
153153
: ${AZURE_USE_GALLERY:=""}
154154
: ${AZURE_KOLA_VNET:=""}
155155
: ${AZURE_USE_PRIVATE_IPS:=true}

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ CONFIG_HW_RANDOM_INTEL=y
5656
CONFIG_HW_RANDOM_VIA=y
5757
CONFIG_HYPERVISOR_GUEST=y
5858
CONFIG_IA32_EMULATION=y
59+
CONFIG_IGC=m
5960
CONFIG_INFINIBAND_USER_ACCESS=m
6061
CONFIG_INFINIBAND_USNIC=m
6162
CONFIG_INT340X_THERMAL=m
@@ -71,7 +72,6 @@ CONFIG_ISCSI_IBFT=y
7172
CONFIG_ISCSI_IBFT_FIND=y
7273
CONFIG_ITCO_VENDOR_SUPPORT=y
7374
CONFIG_ITCO_WDT=m
74-
CONFIG_IGC=m
7575
CONFIG_KERNEL_ZSTD=y
7676
CONFIG_KEXEC_FILE=y
7777
CONFIG_KPROBES_ON_FTRACE=y
@@ -86,7 +86,6 @@ CONFIG_MMC_SDHCI_ACPI=m
8686
# CONFIG_MOUSE_PS2_LIFEBOOK is not set
8787
CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
8888
CONFIG_NET_DROP_MONITOR=m
89-
CONFIG_NET_SWITCHDEV=y
9089
CONFIG_NVRAM=m
9190
CONFIG_OPTPROBES=y
9291
CONFIG_PARAVIRT_SPINLOCKS=y
@@ -112,6 +111,7 @@ CONFIG_TCG_INFINEON=m
112111
CONFIG_TCG_NSC=m
113112
CONFIG_UPROBE_EVENTS=y
114113
CONFIG_USB_OHCI_HCD_SSB=y
114+
CONFIG_VFIO_PCI_IGD=y
115115
CONFIG_VFIO_PCI_VGA=y
116116
CONFIG_VHOST_VSOCK=m
117117
CONFIG_VMWARE_BALLOON=m

sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,21 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=m
124124
CONFIG_CPU_FREQ_GOV_USERSPACE=m
125125
CONFIG_CPU_FREQ_STAT=y
126126
# CONFIG_CROSS_MEMORY_ATTACH is not set
127+
CONFIG_CRYPTO_AES=m
128+
CONFIG_CRYPTO_CTR=m
127129
CONFIG_CRYPTO_CTS=m
128130
CONFIG_CRYPTO_DES=m
129131
CONFIG_CRYPTO_FIPS=y
130132
CONFIG_CRYPTO_GCM=m
133+
CONFIG_CRYPTO_GHASH=m
131134
CONFIG_CRYPTO_HMAC=y
135+
CONFIG_CRYPTO_LIB_AES=m
132136
CONFIG_CRYPTO_LIB_DES=m
137+
CONFIG_CRYPTO_LIB_GF128MUL=m
133138
CONFIG_CRYPTO_LZO=m
134139
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
140+
CONFIG_CRYPTO_NULL=m
141+
CONFIG_CRYPTO_NULL2=m
135142
CONFIG_CRYPTO_SHA1=y
136143
CONFIG_CRYPTO_USER_API_HASH=m
137144
CONFIG_CRYPTO_USER_API_SKCIPHER=m
@@ -163,6 +170,7 @@ CONFIG_DM_ZERO=m
163170
CONFIG_DNS_RESOLVER=y
164171
CONFIG_DRM=m
165172
CONFIG_DRM_VIRTIO_GPU=m
173+
CONFIG_DST_CACHE=y
166174
CONFIG_DUMMY=m
167175
CONFIG_DYNAMIC_DEBUG=y
168176
CONFIG_E100=m
@@ -211,6 +219,7 @@ CONFIG_GACT_PROB=y
211219
CONFIG_GENEVE=m
212220
CONFIG_GPIOLIB=y
213221
CONFIG_GPIO_SYSFS=y
222+
CONFIG_GRO_CELLS=y
214223
CONFIG_GTP=m
215224
CONFIG_HARDENED_USERCOPY=y
216225
CONFIG_HIDRAW=y
@@ -265,10 +274,12 @@ CONFIG_IMA_WRITE_POLICY=y
265274
CONFIG_INET=y
266275
CONFIG_INET6_AH=m
267276
CONFIG_INET6_ESP=m
277+
CONFIG_INET6_ESP_OFFLOAD=m
268278
CONFIG_INET6_IPCOMP=m
269279
CONFIG_INET_AH=m
270280
CONFIG_INET_DIAG=m
271281
CONFIG_INET_ESP=m
282+
CONFIG_INET_ESP_OFFLOAD=m
272283
CONFIG_INET_IPCOMP=m
273284
CONFIG_INET_UDP_DIAG=m
274285
CONFIG_INFINIBAND=m
@@ -407,6 +418,8 @@ CONFIG_ISCSI_TCP=m
407418
CONFIG_ISO9660_FS=m
408419
CONFIG_IXGBE=m
409420
CONFIG_IXGBEVF=m
421+
CONFIG_IXGBEVF_IPSEC=y
422+
CONFIG_IXGBE_IPSEC=y
410423
CONFIG_JME=m
411424
CONFIG_JOLIET=y
412425
CONFIG_JUMP_LABEL=y
@@ -430,6 +443,8 @@ CONFIG_LOG_BUF_SHIFT=18
430443
CONFIG_LOOPBACK_TARGET=m
431444
CONFIG_LSM="landlock,lockdown,yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
432445
CONFIG_LWTUNNEL=y
446+
CONFIG_LWTUNNEL_BPF=y
447+
CONFIG_MACSEC=m
433448
CONFIG_MACVLAN=m
434449
CONFIG_MACVTAP=m
435450
CONFIG_MAGIC_SYSRQ=y
@@ -449,10 +464,27 @@ CONFIG_MINIX_SUBPARTITION=y
449464
# CONFIG_MLX4_DEBUG is not set
450465
CONFIG_MLX4_EN=m
451466
CONFIG_MLX4_INFINIBAND=m
467+
CONFIG_MLX5_BRIDGE=y
468+
CONFIG_MLX5_CLS_ACT=y
452469
CONFIG_MLX5_CORE=m
453470
CONFIG_MLX5_CORE_EN=y
454471
CONFIG_MLX5_CORE_EN_DCB=y
472+
CONFIG_MLX5_EN_ARFS=y
473+
CONFIG_MLX5_EN_IPSEC=y
474+
CONFIG_MLX5_EN_RXNFC=y
475+
CONFIG_MLX5_EN_TLS=y
476+
CONFIG_MLX5_ESWITCH=y
455477
CONFIG_MLX5_INFINIBAND=m
478+
CONFIG_MLX5_MACSEC=y
479+
CONFIG_MLX5_MPFS=y
480+
CONFIG_MLX5_SF=y
481+
CONFIG_MLX5_SF_MANAGER=y
482+
CONFIG_MLX5_SW_STEERING=y
483+
CONFIG_MLX5_TC_CT=y
484+
CONFIG_MLX5_TC_SAMPLE=y
485+
CONFIG_MLX5_VDPA=y
486+
CONFIG_MLX5_VDPA_NET=m
487+
CONFIG_MLX5_VFIO_PCI=m
456488
CONFIG_MMC=m
457489
CONFIG_MMC_BLOCK=m
458490
CONFIG_MMC_BLOCK_MINORS=16
@@ -556,21 +588,33 @@ CONFIG_NET_9P=m
556588
# CONFIG_NET_9P_DEBUG is not set
557589
CONFIG_NET_9P_RDMA=m
558590
CONFIG_NET_9P_VIRTIO=m
591+
CONFIG_NET_ACT_BPF=m
592+
CONFIG_NET_ACT_CONNMARK=m
559593
CONFIG_NET_ACT_CSUM=m
594+
CONFIG_NET_ACT_CT=m
595+
CONFIG_NET_ACT_CTINFO=m
560596
CONFIG_NET_ACT_GACT=m
597+
CONFIG_NET_ACT_GATE=m
598+
CONFIG_NET_ACT_IFE=m
561599
CONFIG_NET_ACT_IPT=m
562600
CONFIG_NET_ACT_MIRRED=m
601+
CONFIG_NET_ACT_MPLS=m
563602
CONFIG_NET_ACT_NAT=m
564603
CONFIG_NET_ACT_PEDIT=m
565604
CONFIG_NET_ACT_POLICE=m
605+
CONFIG_NET_ACT_SAMPLE=m
606+
CONFIG_NET_ACT_SIMP=m
566607
CONFIG_NET_ACT_SKBEDIT=m
608+
CONFIG_NET_ACT_SKBMOD=m
609+
CONFIG_NET_ACT_TUNNEL_KEY=m
567610
CONFIG_NET_ACT_VLAN=m
568611
# CONFIG_NET_CADENCE is not set
569612
CONFIG_NET_CLS_ACT=y
570613
CONFIG_NET_CLS_BASIC=m
571614
CONFIG_NET_CLS_BPF=m
572615
CONFIG_NET_CLS_CGROUP=m
573616
CONFIG_NET_CLS_FLOW=m
617+
CONFIG_NET_CLS_FLOWER=m
574618
CONFIG_NET_CLS_FW=m
575619
CONFIG_NET_CLS_ROUTE4=m
576620
CONFIG_NET_CLS_U32=m
@@ -582,6 +626,7 @@ CONFIG_NET_EMATCH_NBYTE=m
582626
CONFIG_NET_EMATCH_TEXT=m
583627
CONFIG_NET_EMATCH_U32=m
584628
CONFIG_NET_FOU_IP_TUNNELS=y
629+
CONFIG_NET_IFE=m
585630
CONFIG_NET_IPGRE=m
586631
CONFIG_NET_IPGRE_BROADCAST=y
587632
CONFIG_NET_IPGRE_DEMUX=m
@@ -613,6 +658,8 @@ CONFIG_NET_SCH_SFB=m
613658
CONFIG_NET_SCH_SFQ=m
614659
CONFIG_NET_SCH_TBF=m
615660
CONFIG_NET_SCH_TEQL=m
661+
CONFIG_NET_SWITCHDEV=y
662+
CONFIG_NET_TC_SKB_EXT=y
616663
CONFIG_NET_TULIP=y
617664
# CONFIG_NET_VENDOR_3COM is not set
618665
# CONFIG_NET_VENDOR_ADAPTEC is not set
@@ -659,6 +706,7 @@ CONFIG_NFT_FIB_INET=m
659706
CONFIG_NFT_FIB_IPV4=m
660707
CONFIG_NFT_FIB_IPV6=m
661708
CONFIG_NFT_FIB_NETDEV=m
709+
CONFIG_NFT_FLOW_OFFLOAD=m
662710
CONFIG_NFT_FWD_NETDEV=m
663711
CONFIG_NFT_HASH=m
664712
CONFIG_NFT_LIMIT=m
@@ -670,6 +718,8 @@ CONFIG_NFT_QUEUE=m
670718
CONFIG_NFT_QUOTA=m
671719
CONFIG_NFT_REDIR=m
672720
CONFIG_NFT_REJECT=m
721+
CONFIG_NFT_TUNNEL=m
722+
CONFIG_NFT_XFRM=m
673723
CONFIG_NF_CONNTRACK=m
674724
CONFIG_NF_CONNTRACK_AMANDA=m
675725
CONFIG_NF_CONNTRACK_BRIDGE=m
@@ -692,6 +742,7 @@ CONFIG_NF_CT_NETLINK=m
692742
CONFIG_NF_CT_NETLINK_HELPER=m
693743
CONFIG_NF_CT_NETLINK_TIMEOUT=m
694744
CONFIG_NF_CT_PROTO_UDPLITE=y
745+
CONFIG_NF_FLOW_TABLE=m
695746
CONFIG_NF_LOG_ARP=m
696747
CONFIG_NF_SOCKET_IPV4=m
697748
CONFIG_NF_SOCKET_IPV6=m
@@ -753,6 +804,7 @@ CONFIG_PRINTK_TIME=y
753804
# CONFIG_PRINT_QUOTA_WARNING is not set
754805
CONFIG_PROC_KCORE=y
755806
CONFIG_PROFILING=y
807+
CONFIG_PSAMPLE=m
756808
CONFIG_PSI=y
757809
# CONFIG_PSI_DEFAULT_DISABLED is not set
758810
CONFIG_PTP_1588_CLOCK=m
@@ -850,6 +902,7 @@ CONFIG_SKY2=m
850902
CONFIG_SLAB_FREELIST_HARDENED=y
851903
CONFIG_SLAB_FREELIST_RANDOM=y
852904
CONFIG_SMP=y
905+
CONFIG_SOCK_VALIDATE_XMIT=y
853906
CONFIG_SOFTLOCKUP_DETECTOR=y
854907
CONFIG_SOFT_WATCHDOG=m
855908
CONFIG_SOLARIS_X86_PARTITION=y
@@ -890,6 +943,8 @@ CONFIG_TCP_CONG_HYBLA=m
890943
CONFIG_TCP_MD5SIG=y
891944
CONFIG_TIGON3=m
892945
CONFIG_TLS=m
946+
CONFIG_TLS_DEVICE=y
947+
CONFIG_TLS_TOE=y
893948
CONFIG_TMPFS=y
894949
CONFIG_TMPFS_POSIX_ACL=y
895950
CONFIG_TRANSPARENT_HUGEPAGE=y
@@ -923,11 +978,17 @@ CONFIG_USB_UHCI_HCD=m
923978
CONFIG_USB_USBNET=m
924979
CONFIG_USB_XHCI_HCD=m
925980
CONFIG_USER_NS=y
981+
CONFIG_VDPA=m
926982
CONFIG_VETH=m
927983
CONFIG_VFAT_FS=m
928984
CONFIG_VFIO=m
929985
CONFIG_VFIO_PCI=m
986+
CONFIG_VFIO_PCI_CORE=m
987+
CONFIG_VFIO_PCI_INTX=y
988+
CONFIG_VFIO_PCI_MMAP=y
989+
CONFIG_VHOST_IOTLB=m
930990
CONFIG_VHOST_NET=m
991+
CONFIG_VHOST_RING=m
931992
CONFIG_VIA_RHINE=m
932993
CONFIG_VIA_RHINE_MMIO=y
933994
CONFIG_VIRTIO_BALLOON=m
@@ -959,7 +1020,9 @@ CONFIG_XEN_NETDEV_BACKEND=m
9591020
CONFIG_XEN_NETDEV_FRONTEND=m
9601021
CONFIG_XEN_SCSI_FRONTEND=m
9611022
CONFIG_XEN_WDT=m
1023+
CONFIG_XFRM=y
9621024
CONFIG_XFRM_MIGRATE=y
1025+
CONFIG_XFRM_OFFLOAD=y
9631026
CONFIG_XFRM_STATISTICS=y
9641027
CONFIG_XFRM_SUB_POLICY=y
9651028
CONFIG_XFRM_USER=m

0 commit comments

Comments
 (0)