Skip to content

Commit 106f457

Browse files
smirasmira
committed
feat: update Linux kernel with userfaultfd/VDPA
See: * siderolabs/pkgs#1360 * siderolabs/pkgs#1314 Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent 721a1e0 commit 106f457

File tree

5 files changed

+45
-15
lines changed

5 files changed

+45
-15
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ EMBED_TARGET ?= embed
2727
TOOLS_PREFIX ?= ghcr.io/siderolabs/tools
2828
TOOLS ?= v1.12.0-alpha.0-18-g44932c0
2929
PKGS_PREFIX ?= ghcr.io/siderolabs
30-
PKGS ?= v1.12.0-alpha.0-50-g4ae050a
30+
PKGS ?= v1.12.0-alpha.0-52-g1768ccf
3131
GENERATE_VEX_PREFIX ?= ghcr.io/siderolabs/generate-vex
3232
GENERATE_VEX ?= latest
3333

‎hack/modules-amd64.txt‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ kernel/drivers/message/fusion/mptspi.ko
9797
kernel/drivers/mfd/lpc_ich.ko
9898
kernel/drivers/mfd/mfd-core.ko
9999
kernel/drivers/misc/hpilo.ko
100+
kernel/drivers/mmc/host/sdhci_f_sdh30.ko
100101
kernel/drivers/mmc/host/sdhci-acpi.ko
101102
kernel/drivers/mmc/host/sdhci-pci.ko
102103
kernel/drivers/mmc/host/sdhci-pltfm.ko
103104
kernel/drivers/mmc/host/sdhci-uhs2.ko
104105
kernel/drivers/mmc/host/sdhci-xenon-driver.ko
105-
kernel/drivers/mmc/host/sdhci_f_sdh30.ko
106106
kernel/drivers/net/ethernet/amazon/ena/ena.ko
107107
kernel/drivers/net/ethernet/aquantia/atlantic/atlantic.ko
108108
kernel/drivers/net/ethernet/atheros/alx/alx.ko
@@ -126,8 +126,8 @@ kernel/drivers/net/ethernet/intel/igc/igc.ko
126126
kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
127127
kernel/drivers/net/ethernet/intel/ixgbevf/ixgbevf.ko
128128
kernel/drivers/net/ethernet/intel/libeth/libeth.ko
129-
kernel/drivers/net/ethernet/intel/libie/libie.ko
130129
kernel/drivers/net/ethernet/intel/libie/libie_adminq.ko
130+
kernel/drivers/net/ethernet/intel/libie/libie.ko
131131
kernel/drivers/net/ethernet/marvell/sky2.ko
132132
kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_core.ko
133133
kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko
@@ -166,8 +166,8 @@ kernel/drivers/nvme/target/nvmet-rdma.ko
166166
kernel/drivers/nvme/target/nvmet-tcp.ko
167167
kernel/drivers/nvme/target/nvmet.ko
168168
kernel/drivers/platform/x86/intel/intel-vsec.ko
169-
kernel/drivers/platform/x86/intel/pmc/intel_pmc_core.ko
170169
kernel/drivers/platform/x86/intel/pmc/intel_pmc_core_pltdrv.ko
170+
kernel/drivers/platform/x86/intel/pmc/intel_pmc_core.ko
171171
kernel/drivers/platform/x86/intel/pmc/intel_pmc_ssram_telemetry.ko
172172
kernel/drivers/platform/x86/intel/pmt/pmt_class.ko
173173
kernel/drivers/platform/x86/intel/pmt/pmt_discovery.ko
@@ -186,23 +186,36 @@ kernel/drivers/scsi/qedf/qedf.ko
186186
kernel/drivers/scsi/qla2xxx/qla2xxx.ko
187187
kernel/drivers/scsi/smartpqi/smartpqi.ko
188188
kernel/drivers/scsi/vmw_pvscsi.ko
189-
kernel/drivers/uio/uio.ko
190189
kernel/drivers/uio/uio_pci_generic.ko
190+
kernel/drivers/uio/uio.ko
191191
kernel/drivers/usb/serial/ch341.ko
192192
kernel/drivers/usb/serial/cp210x.ko
193193
kernel/drivers/usb/serial/ftdi_sio.ko
194194
kernel/drivers/usb/serial/pl2303.ko
195+
kernel/drivers/vdpa/alibaba/eni_vdpa.ko
196+
kernel/drivers/vdpa/mlx5/mlx5_vdpa.ko
197+
kernel/drivers/vdpa/octeon_ep/octep_vdpa.ko
198+
kernel/drivers/vdpa/solidrun/snet_vdpa.ko
199+
kernel/drivers/vdpa/vdpa_sim/vdpa_sim_blk.ko
200+
kernel/drivers/vdpa/vdpa_sim/vdpa_sim_net.ko
201+
kernel/drivers/vdpa/vdpa_sim/vdpa_sim.ko
202+
kernel/drivers/vdpa/vdpa_user/vduse.ko
203+
kernel/drivers/vdpa/vdpa.ko
204+
kernel/drivers/vdpa/virtio_pci/vp_vdpa.ko
195205
kernel/drivers/vfio/pci/vfio-pci-core.ko
196206
kernel/drivers/vfio/pci/vfio-pci.ko
197-
kernel/drivers/vfio/vfio.ko
198207
kernel/drivers/vfio/vfio_iommu_type1.ko
208+
kernel/drivers/vfio/vfio.ko
209+
kernel/drivers/vhost/vhost_vdpa.ko
210+
kernel/drivers/vhost/vringh.ko
199211
kernel/drivers/virt/coco/guest/tsm_report.ko
200212
kernel/drivers/virt/coco/sev-guest/sev-guest.ko
201213
kernel/drivers/virtio/virtio_balloon.ko
202214
kernel/drivers/virtio/virtio_mem.ko
203-
kernel/drivers/virtio/virtio_pci.ko
204215
kernel/drivers/virtio/virtio_pci_legacy_dev.ko
205216
kernel/drivers/virtio/virtio_pci_modern_dev.ko
217+
kernel/drivers/virtio/virtio_pci.ko
218+
kernel/drivers/virtio/virtio_vdpa.ko
206219
kernel/drivers/watchdog/f71808e_wdt.ko
207220
kernel/drivers/watchdog/i6300esb.ko
208221
kernel/drivers/watchdog/iTCO_vendor_support.ko
@@ -211,9 +224,9 @@ kernel/drivers/watchdog/sp5100_tco.ko
211224
kernel/drivers/watchdog/watchdog.ko
212225
kernel/drivers/watchdog/wdat_wdt.ko
213226
kernel/drivers/watchdog/xen_wdt.ko
227+
kernel/lib/crc/crc-t10dif.ko
214228
kernel/lib/crc/crc64.ko
215229
kernel/lib/crc/crc8.ko
216-
kernel/lib/crc/crc-t10dif.ko
217230
kernel/lib/objagg.ko
218231
kernel/lib/parman.ko
219232
kernel/lib/raid6/raid6_pq.ko

‎hack/modules-arm64.txt‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ kernel/drivers/md/dm-thin-pool.ko
7373
kernel/drivers/md/persistent-data/dm-persistent-data.ko
7474
kernel/drivers/md/raid456.ko
7575
kernel/drivers/misc/hpilo.ko
76+
kernel/drivers/mmc/host/sdhci_f_sdh30.ko
7677
kernel/drivers/mmc/host/sdhci-acpi.ko
7778
kernel/drivers/mmc/host/sdhci-brcmstb.ko
7879
kernel/drivers/mmc/host/sdhci-cadence.ko
@@ -86,7 +87,6 @@ kernel/drivers/mmc/host/sdhci-pltfm.ko
8687
kernel/drivers/mmc/host/sdhci-tegra.ko
8788
kernel/drivers/mmc/host/sdhci-uhs2.ko
8889
kernel/drivers/mmc/host/sdhci-xenon-driver.ko
89-
kernel/drivers/mmc/host/sdhci_f_sdh30.ko
9090
kernel/drivers/net/ethernet/amazon/ena/ena.ko
9191
kernel/drivers/net/ethernet/aquantia/atlantic/atlantic.ko
9292
kernel/drivers/net/ethernet/atheros/alx/alx.ko
@@ -100,6 +100,7 @@ kernel/drivers/net/ethernet/google/gve/gve.ko
100100
kernel/drivers/net/ethernet/hisilicon/hip04_eth.ko
101101
kernel/drivers/net/ethernet/hisilicon/hisi_femac.ko
102102
kernel/drivers/net/ethernet/hisilicon/hix5hd2_gmac.ko
103+
kernel/drivers/net/ethernet/hisilicon/hns_mdio.ko
103104
kernel/drivers/net/ethernet/hisilicon/hns/hnae.ko
104105
kernel/drivers/net/ethernet/hisilicon/hns/hns_dsaf.ko
105106
kernel/drivers/net/ethernet/hisilicon/hns/hns_enet_drv.ko
@@ -108,7 +109,6 @@ kernel/drivers/net/ethernet/hisilicon/hns3/hclge.ko
108109
kernel/drivers/net/ethernet/hisilicon/hns3/hclgevf.ko
109110
kernel/drivers/net/ethernet/hisilicon/hns3/hnae3.ko
110111
kernel/drivers/net/ethernet/hisilicon/hns3/hns3.ko
111-
kernel/drivers/net/ethernet/hisilicon/hns_mdio.ko
112112
kernel/drivers/net/ethernet/intel/e100.ko
113113
kernel/drivers/net/ethernet/intel/e1000/e1000.ko
114114
kernel/drivers/net/ethernet/intel/e1000e/e1000e.ko
@@ -121,8 +121,8 @@ kernel/drivers/net/ethernet/intel/igc/igc.ko
121121
kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
122122
kernel/drivers/net/ethernet/intel/ixgbevf/ixgbevf.ko
123123
kernel/drivers/net/ethernet/intel/libeth/libeth.ko
124-
kernel/drivers/net/ethernet/intel/libie/libie.ko
125124
kernel/drivers/net/ethernet/intel/libie/libie_adminq.ko
125+
kernel/drivers/net/ethernet/intel/libie/libie.ko
126126
kernel/drivers/net/ethernet/marvell/sky2.ko
127127
kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_core.ko
128128
kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko
@@ -193,22 +193,34 @@ kernel/drivers/scsi/mpt3sas/mpt3sas.ko
193193
kernel/drivers/scsi/qedf/qedf.ko
194194
kernel/drivers/scsi/qla2xxx/qla2xxx.ko
195195
kernel/drivers/scsi/smartpqi/smartpqi.ko
196-
kernel/drivers/uio/uio.ko
197196
kernel/drivers/uio/uio_pci_generic.ko
197+
kernel/drivers/uio/uio.ko
198198
kernel/drivers/usb/serial/ch341.ko
199199
kernel/drivers/usb/serial/cp210x.ko
200200
kernel/drivers/usb/serial/ftdi_sio.ko
201201
kernel/drivers/usb/serial/pl2303.ko
202+
kernel/drivers/vdpa/mlx5/mlx5_vdpa.ko
203+
kernel/drivers/vdpa/octeon_ep/octep_vdpa.ko
204+
kernel/drivers/vdpa/solidrun/snet_vdpa.ko
205+
kernel/drivers/vdpa/vdpa_sim/vdpa_sim_blk.ko
206+
kernel/drivers/vdpa/vdpa_sim/vdpa_sim_net.ko
207+
kernel/drivers/vdpa/vdpa_sim/vdpa_sim.ko
208+
kernel/drivers/vdpa/vdpa_user/vduse.ko
209+
kernel/drivers/vdpa/vdpa.ko
210+
kernel/drivers/vdpa/virtio_pci/vp_vdpa.ko
202211
kernel/drivers/vfio/pci/vfio-pci-core.ko
203212
kernel/drivers/vfio/pci/vfio-pci.ko
204-
kernel/drivers/vfio/vfio.ko
205213
kernel/drivers/vfio/vfio_iommu_type1.ko
214+
kernel/drivers/vfio/vfio.ko
215+
kernel/drivers/vhost/vhost_vdpa.ko
216+
kernel/drivers/vhost/vringh.ko
206217
kernel/drivers/virtio/virtio_balloon.ko
207218
kernel/drivers/virtio/virtio_input.ko
208219
kernel/drivers/virtio/virtio_mmio.ko
209-
kernel/drivers/virtio/virtio_pci.ko
210220
kernel/drivers/virtio/virtio_pci_legacy_dev.ko
211221
kernel/drivers/virtio/virtio_pci_modern_dev.ko
222+
kernel/drivers/virtio/virtio_pci.ko
223+
kernel/drivers/virtio/virtio_vdpa.ko
212224
kernel/drivers/watchdog/sbsa_gwdt.ko
213225
kernel/lib/objagg.ko
214226
kernel/lib/parman.ko

‎pkg/kernel/kspp/kspp.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,5 +112,10 @@ func GetKernelParams() []*kernel.Param {
112112
Key: "proc.sys.net.core.bpf_jit_harden",
113113
Value: "2",
114114
},
115+
{
116+
// Disable dangerous userfaultfd usage.
117+
Key: "proc.sys.vm.unprivileged_userfaultfd",
118+
Value: "0",
119+
},
115120
}
116121
}

‎pkg/machinery/gendata/data/pkgs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.12.0-alpha.0-50-g4ae050a
1+
v1.12.0-alpha.0-52-g1768ccf

0 commit comments

Comments
 (0)