mirror of
https://github.com/netbirdio/gvisor.git
synced 2026-05-22 17:12:49 -07:00
nvproxy: Qualify NVIDIA driver version 560.35.03.
Successful run of the tests: https://buildkite.com/gvisor/pipeline/builds/33022 (This was with a version of `pipeline.yaml` that enables the COS GPU tests and the "All GPU drivers" test) Diff between `550.90.07` and `560.35.03`: ``` I1101 14:36:12.467749 1074191 run_differ.go:110] Parsing driver version 550.90.07 I1101 14:36:21.315552 1074191 run_differ.go:115] Parsing driver version 560.35.03 I1101 14:36:29.595380 1074191 run_differ.go:123] Comparing record definitions between 550.90.07 and 560.35.03 I1101 14:36:29.595479 1074191 run_differ.go:140] type NVC36F_CTRL_GET_CLASS_ENGINEID_PARAMS not found in second source file I1101 14:36:29.595485 1074191 run_differ.go:136] type NV2080_CTRL_BUS_PCIE_GPU_ATOMIC_OP_INFO not found in first source file I1101 14:36:29.595603 1074191 run_differ.go:147] --- A: /tmp/run_differ_2014218811/run_differ_3207981357/550.90.07/src/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h:1206:16 +++ B: /tmp/run_differ_2014218811/run_differ_1071705113/560.35.03/src/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h:1213:16 struct NV2080_CTRL_GPU_QUERY_ECC_STATUS_PARAMS size: 1024 -> 1264 (bytes) []parser.RecordField{ { Name: "units", Type: strings.Join({ "NV2080_CTRL_GPU_QUERY_ECC_UNIT_STATUS[", - "25", + "31", "]", }, ""), Offset: 0, }, { Name: "bFatalPoisonError", Type: "NvBool", - Offset: 1000, + Offset: 1240, }, { Name: "uncorrectableError", Type: "NvU8", - Offset: 1001, + Offset: 1241, }, { Name: "flags", Type: "NvU32", - Offset: 1004, + Offset: 1244, }, { Name: "grRouteInfo", Type: "NV2080_CTRL_GR_ROUTE_INFO", - Offset: 1008, + Offset: 1248, }, } I1101 14:36:29.595746 1074191 run_differ.go:147] --- A: /tmp/run_differ_2014218811/run_differ_3207981357/550.90.07/src/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080nvlink.h:264:16 +++ B: /tmp/run_differ_2014218811/run_differ_1071705113/560.35.03/src/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080nvlink.h:275:16 struct NV2080_CTRL_NVLINK_LINK_STATUS_INFO size: 184 -> 192 (bytes) []parser.RecordField{ ... // 24 identical elements {Name: "localLinkSid", Type: "NvU64", Offset: 72}, {Name: "laneRxdetStatusMask", Type: "NvU32", Offset: 80}, + s"NvU32 nvlinkMinL1Threshold", { - Name: "remoteDeviceInfo", + Name: "nvlinkMaxL1Threshold", - Type: "NV2080_CTRL_NVLINK_DEVICE_INFO", + Type: "NvU32", Offset: 88, }, + s"NvU32 nvlinkL1ThresholdUnits", { - Name: "localDeviceInfo", + Name: "remoteDeviceInfo", Type: "NV2080_CTRL_NVLINK_DEVICE_INFO", - Offset: 136, + Offset: 96, }, + s"NV2080_CTRL_NVLINK_DEVICE_INFO localDeviceInfo", } I1101 14:36:29.595784 1074191 run_differ.go:147] --- A: /tmp/run_differ_2014218811/run_differ_3207981357/550.90.07/src/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h:755:16 +++ B: /tmp/run_differ_2014218811/run_differ_1071705113/560.35.03/src/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080gpu.h:762:16 struct NV2080_CTRL_GPU_GET_ENGINES_V2_PARAMS size: 260 -> 340 (bytes) []parser.RecordField{ {Name: "engineCount", Type: "NvU32"}, { Name: "engineList", - Type: "NvU32[64]", + Type: "NvU32[84]", Offset: 4, }, } I1101 14:36:29.595806 1074191 run_differ.go:147] --- A: /tmp/run_differ_2014218811/run_differ_3207981357/550.90.07/src/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h:511:16 +++ B: /tmp/run_differ_2014218811/run_differ_1071705113/560.35.03/src/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h:512:16 struct NV0080_CTRL_GPU_GET_CLASSLIST_V2_PARAMS size: 700 -> 404 (bytes) []parser.RecordField{ {Name: "numClasses", Type: "NvU32"}, { Name: "classList", - Type: "NvU32[174]", + Type: "NvU32[100]", Offset: 4, }, } I1101 14:36:29.595829 1074191 run_differ.go:147] --- A: /tmp/run_differ_2014218811/run_differ_3207981357/550.90.07/src/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bus.h:1354:16 +++ B: /tmp/run_differ_2014218811/run_differ_1071705113/560.35.03/src/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080bus.h:1311:16 struct NV2080_CTRL_CMD_BUS_GET_PCIE_SUPPORTED_GPU_ATOMICS_PARAMS size: 104 -> 112 (bytes) []parser.RecordField{ { - Name: "atomicOp", + Name: "capType", - Type: "NV2080_CTRL_CMD_BUS_GET_PCIE_SUPPORTED_GPU_ATOMICS_PARAMS::atomicOp_t[13]", + Type: "NvU32", Offset: 0, }, + s"NvU32 dbdf", + s"NV2080_CTRL_BUS_PCIE_GPU_ATOMIC_OP_INFO[13] atomicOp", } I1101 14:36:29.595859 1074191 run_differ.go:147] --- A: /tmp/run_differ_2014218811/run_differ_3207981357/550.90.07/src/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h:423:16 +++ B: /tmp/run_differ_2014218811/run_differ_1071705113/560.35.03/src/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080fb.h:451:16 struct NV2080_CTRL_FB_GET_INFO_V2_PARAMS size: 444 -> 460 (bytes) []parser.RecordField{ {Name: "fbInfoListSize", Type: "NvU32"}, { Name: "fbInfoList", - Type: "NV2080_CTRL_FB_INFO[55]", + Type: "NV2080_CTRL_FB_INFO[57]", Offset: 4, }, } I1101 14:36:29.595883 1074191 run_differ.go:147] --- A: /tmp/run_differ_2014218811/run_differ_3207981357/550.90.07/src/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h:311:16 +++ B: /tmp/run_differ_2014218811/run_differ_1071705113/560.35.03/src/common/sdk/nvidia/inc/ctrl/ctrl0080/ctrl0080gpu.h:311:16 struct NV0080_CTRL_GPU_GET_VIRTUALIZATION_MODE_PARAMS size: 4 -> 8 (bytes) []parser.RecordField{ {Name: "virtualizationMode", Type: "NvU32"}, + s"NvBool isGridBuild", } I1101 14:36:29.595910 1074191 run_differ.go:147] --- A: /tmp/run_differ_2014218811/run_differ_3207981357/550.90.07/src/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080nvlink.h:399:16 +++ B: /tmp/run_differ_2014218811/run_differ_1071705113/560.35.03/src/common/sdk/nvidia/inc/ctrl/ctrl2080/ctrl2080nvlink.h:429:16 struct NV2080_CTRL_CMD_NVLINK_GET_NVLINK_STATUS_PARAMS size: 5896 -> 6152 (bytes) I1101 14:36:29.595915 1074191 run_differ.go:140] type NV2080_CTRL_CMD_BUS_GET_PCIE_SUPPORTED_GPU_ATOMICS_PARAMS::atomicOp_t not found in second source file I1101 14:36:29.595922 1074191 run_differ.go:151] Comparing type aliases between 550.90.07 and 560.35.03 ``` Fixes #11104 PiperOrigin-RevId: 693135325
This commit is contained in:
Etienne Perot
committed by
gVisor bot
gVisor bot
parent
892ba3d7f6
commit
2b2b33a9e5
@@ -655,7 +655,7 @@ func Init() {
|
||||
return abi
|
||||
}
|
||||
|
||||
v550_54_14 := func() *driverABI {
|
||||
v550_54_14 := addDriverABI(550, 54, 14, "8c497ff1cfc7c310fb875149bc30faa4fd26d2237b2cba6cd2e8b0780157cfe3", func() *driverABI {
|
||||
abi := v550_40_07()
|
||||
abi.uvmIoctl[nvgpu.UVM_ALLOC_SEMAPHORE_POOL] = uvmIoctlSimple[nvgpu.UVM_ALLOC_SEMAPHORE_POOL_PARAMS_V550]
|
||||
abi.uvmIoctl[nvgpu.UVM_MAP_EXTERNAL_ALLOCATION] = uvmIoctlHasFrontendFD[nvgpu.UVM_MAP_EXTERNAL_ALLOCATION_PARAMS_V550]
|
||||
@@ -670,12 +670,11 @@ func Init() {
|
||||
}
|
||||
|
||||
return abi
|
||||
}
|
||||
_ = addDriverABI(550, 54, 14, "8c497ff1cfc7c310fb875149bc30faa4fd26d2237b2cba6cd2e8b0780157cfe3", v550_54_14)
|
||||
})
|
||||
|
||||
v550_54_15 := addDriverABI(550, 54, 15, "2e859ae5f912a9a47aaa9b2d40a94a14f6f486b5d3b67c0ddf8b72c1c9650385", v550_54_14)
|
||||
|
||||
v550_90_07 := func() *driverABI {
|
||||
v550_90_07 := addDriverABI(550, 90, 07, "51acf579d5a9884f573a1d3f522e7fafa5e7841e22a9cec0b4bbeae31b0b9733", func() *driverABI {
|
||||
abi := v550_54_15()
|
||||
abi.controlCmd[nvgpu.NV_CONF_COMPUTE_CTRL_CMD_GPU_GET_KEY_ROTATION_STATE] = rmControlSimple
|
||||
|
||||
@@ -687,9 +686,25 @@ func Init() {
|
||||
return names
|
||||
}
|
||||
|
||||
return abi
|
||||
})
|
||||
|
||||
// 555.42.02 is an intermediate unqualified version.
|
||||
v555_42_02 := func() *driverABI {
|
||||
abi := v550_90_07()
|
||||
// NVC36F_CTRL_GET_CLASS_ENGINEID was deleted in 555.42.02:
|
||||
// https://github.com/NVIDIA/open-gpu-kernel-modules/commit/5a1c474040e1c3ed20760267510cc9d9332898f1
|
||||
delete(abi.controlCmd, nvgpu.NVC36F_CTRL_GET_CLASS_ENGINEID)
|
||||
prevNames := abi.getStructNames
|
||||
abi.getStructNames = func() *driverStructNames {
|
||||
names := prevNames()
|
||||
delete(names.controlNames, nvgpu.NVC36F_CTRL_GET_CLASS_ENGINEID)
|
||||
return names
|
||||
}
|
||||
return abi
|
||||
}
|
||||
_ = addDriverABI(550, 90, 07, "51acf579d5a9884f573a1d3f522e7fafa5e7841e22a9cec0b4bbeae31b0b9733", v550_90_07)
|
||||
|
||||
_ = addDriverABI(560, 35, 03, "f2932c92fadd43c5b2341be453fc4f73f0ad7185c26bb7a43fbde81ae29f1fe3", v555_42_02)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user