summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2026-05-18 14:47:40 +0200
committerGitHub <noreply@github.com>2026-05-18 15:47:40 +0300
commit11a3b4bd380b0ecf757c71642ce4d0633faf3c3c (patch)
treeae7813420a357fc1a08cc02b24eb29bace530cc1 /scripts
parent82f47ed4be04f4ec0ff4f13c0a6d71688e93e14d (diff)
downloadvyos-build-11a3b4bd380b0ecf757c71642ce4d0633faf3c3c.tar.gz
vyos-build-11a3b4bd380b0ecf757c71642ce4d0633faf3c3c.zip
Kernel: T8879: add missing Hyper-V drivers after 6.18 upgrade (#1193)
* Kernel: T8846: consolidate config for CPU/Task time and stats accounting * Kernel: T8879: add config section for hypervisor Virtual Socket Protocol * Kernel: T8879: add missing Hyper-V drivers after 6.18 upgrade Add drivers for Hyper-V hypervisor which got lost in transition from 6.6 to 6.18 Kernel upgrade.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/package-build/linux-kernel/config/05-cpu-task-time-stats.config12
-rw-r--r--scripts/package-build/linux-kernel/config/11-net-vsockets.config9
-rw-r--r--scripts/package-build/linux-kernel/config/80-psi.config5
-rw-r--r--scripts/package-build/linux-kernel/config/arm64/vyos_defconfig14
-rw-r--r--scripts/package-build/linux-kernel/config/x86/vyos_defconfig31
5 files changed, 38 insertions, 33 deletions
diff --git a/scripts/package-build/linux-kernel/config/05-cpu-task-time-stats.config b/scripts/package-build/linux-kernel/config/05-cpu-task-time-stats.config
new file mode 100644
index 00000000..464b3dc5
--- /dev/null
+++ b/scripts/package-build/linux-kernel/config/05-cpu-task-time-stats.config
@@ -0,0 +1,12 @@
+#
+# CPU/Task time and stats accounting
+#
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+# end of CPU/Task time and stats accounting
diff --git a/scripts/package-build/linux-kernel/config/11-net-vsockets.config b/scripts/package-build/linux-kernel/config/11-net-vsockets.config
new file mode 100644
index 00000000..f3e53307
--- /dev/null
+++ b/scripts/package-build/linux-kernel/config/11-net-vsockets.config
@@ -0,0 +1,9 @@
+# Virtual Socket Protocol is a socket protocol similar to TCP/IP
+# allowing communication between Virtual Machines and hypervisor
+# or host.
+
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VSOCKETS_LOOPBACK=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
diff --git a/scripts/package-build/linux-kernel/config/80-psi.config b/scripts/package-build/linux-kernel/config/80-psi.config
deleted file mode 100644
index c5a51f0c..00000000
--- a/scripts/package-build/linux-kernel/config/80-psi.config
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Enable Pressure Stall Information (PSI) metrics
-#
-# See: https://docs.kernel.org/accounting/psi.html
-CONFIG_PSI=y
diff --git a/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig b/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig
index a4b03f3b..7dbb5d81 100644
--- a/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig
+++ b/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig
@@ -105,20 +105,6 @@ CONFIG_PREEMPTION=y
CONFIG_PREEMPT_DYNAMIC=y
# CONFIG_SCHED_CORE is not set
-#
-# CPU/Task time and stats accounting
-#
-# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
-# end of CPU/Task time and stats accounting
-
CONFIG_CPU_ISOLATION=y
#
diff --git a/scripts/package-build/linux-kernel/config/x86/vyos_defconfig b/scripts/package-build/linux-kernel/config/x86/vyos_defconfig
index 22eb3271..03b92814 100644
--- a/scripts/package-build/linux-kernel/config/x86/vyos_defconfig
+++ b/scripts/package-build/linux-kernel/config/x86/vyos_defconfig
@@ -121,19 +121,6 @@ CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_DYNAMIC is not set
# CONFIG_SCHED_CORE is not set
-#
-# CPU/Task time and stats accounting
-#
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-# CONFIG_PSI is not set
-# end of CPU/Task time and stats accounting
-
CONFIG_CPU_ISOLATION=y
#
@@ -988,6 +975,8 @@ CONFIG_SKB_EXTENSIONS=y
#
# CONFIG_BATMAN_ADV is not set
# CONFIG_OPENVSWITCH is not set
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_HYPERV_VSOCKETS=m
# CONFIG_QRTR is not set
# CONFIG_NET_NCSI is not set
@@ -1386,6 +1375,7 @@ CONFIG_SCSI_BUSLOGIC=m
# CONFIG_SCSI_MYRS is not set
CONFIG_VMWARE_PVSCSI=m
CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_HYPERV_STORAGE=m
CONFIG_LIBFC=m
CONFIG_LIBFCOE=m
CONFIG_FCOE=m
@@ -2220,6 +2210,7 @@ CONFIG_VMXNET3=m
CONFIG_USB4_NET=m
# CONFIG_NETDEVSIM is not set
CONFIG_NET_FAILOVER=m
+CONFIG_HYPERV_NET=m
# CONFIG_ISDN is not set
#
@@ -2323,6 +2314,7 @@ CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_ALTERA_PS2 is not set
# CONFIG_SERIO_PS2MULT is not set
# CONFIG_SERIO_ARC_PS2 is not set
+CONFIG_HYPERV_KEYBOARD=m
# CONFIG_SERIO_GPIO_PS2 is not set
# CONFIG_USERIO is not set
# CONFIG_GAMEPORT is not set
@@ -4115,6 +4107,16 @@ CONFIG_VHOST_VSOCK=m
CONFIG_VHOST_VDPA=m
# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=y
+CONFIG_HYPERV_VTL_MODE=y
+CONFIG_HYPERV_TIMER=y
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+CONFIG_HYPERV_VMBUS=m
+# end of Microsoft Hyper-V guest support
+
#
# Xen driver support
#
@@ -4261,7 +4263,8 @@ CONFIG_INTEL_IOMMU_SVM=y
CONFIG_INTEL_IOMMU_PERF_EVENTS=y
# CONFIG_IOMMUFD is not set
CONFIG_IRQ_REMAP=y
-# CONFIG_VIRTIO_IOMMU is not set
+CONFIG_HYPERV_IOMMU=y
+CONFIG_VIRTIO_IOMMU=y
#
# Remoteproc drivers