From e23b5a711a40a6663d8afdcc938c76f7a7977a81 Mon Sep 17 00:00:00 2001 From: Ayush Ranjan Date: Mon, 8 Apr 2024 12:52:32 -0700 Subject: [PATCH] Add NV0000_CTRL_CMD_SYSTEM_GET_P2P_CAPS_V2 to nvproxy. Note that NV0000_CTRL_SYSTEM_GET_P2P_CAPS_V2_PARAMS changed in 550.40.07, but it was still "simple" and can be handled with `rmControlSimple`. So no special versioning logic needed. PiperOrigin-RevId: 622926672 --- pkg/abi/nvgpu/ctrl.go | 1 + pkg/sentry/devices/nvproxy/version.go | 1 + 2 files changed, 2 insertions(+) diff --git a/pkg/abi/nvgpu/ctrl.go b/pkg/abi/nvgpu/ctrl.go index 3c2adf241..3990ee917 100644 --- a/pkg/abi/nvgpu/ctrl.go +++ b/pkg/abi/nvgpu/ctrl.go @@ -65,6 +65,7 @@ const ( const ( NV0000_CTRL_CMD_SYSTEM_GET_BUILD_VERSION = 0x101 NV0000_CTRL_CMD_SYSTEM_GET_P2P_CAPS = 0x127 + NV0000_CTRL_CMD_SYSTEM_GET_P2P_CAPS_V2 = 0x12b NV0000_CTRL_CMD_SYSTEM_GET_FABRIC_STATUS = 0x136 NV0000_CTRL_CMD_SYSTEM_GET_P2P_CAPS_MATRIX = 0x13a NV0000_CTRL_CMD_SYSTEM_GET_FEATURES = 0x1f0 diff --git a/pkg/sentry/devices/nvproxy/version.go b/pkg/sentry/devices/nvproxy/version.go index a741234a3..226bc10a3 100644 --- a/pkg/sentry/devices/nvproxy/version.go +++ b/pkg/sentry/devices/nvproxy/version.go @@ -209,6 +209,7 @@ func Init() { nvgpu.NV0000_CTRL_CMD_GPU_GET_MEMOP_ENABLE: rmControlSimple, nvgpu.NV0000_CTRL_CMD_SYNC_GPU_BOOST_GROUP_INFO: rmControlSimple, nvgpu.NV0000_CTRL_CMD_SYSTEM_GET_P2P_CAPS: rmControlSimple, + nvgpu.NV0000_CTRL_CMD_SYSTEM_GET_P2P_CAPS_V2: rmControlSimple, nvgpu.NV0000_CTRL_CMD_SYSTEM_GET_FABRIC_STATUS: rmControlSimple, nvgpu.NV0000_CTRL_CMD_SYSTEM_GET_P2P_CAPS_MATRIX: rmControlSimple, nvgpu.NV0000_CTRL_CMD_SYSTEM_GET_FEATURES: rmControlSimple,