From 44633287ca35e227a0644e880a9bddfb14c6b6c4 Mon Sep 17 00:00:00 2001 From: Ayush Ranjan Date: Tue, 3 Oct 2023 10:22:28 -0700 Subject: [PATCH] Automated rollback of changelist 549837326 PiperOrigin-RevId: 570426281 --- pkg/abi/nvgpu/classes.go | 10 ---------- pkg/abi/nvgpu/ctrl.go | 1 - pkg/sentry/devices/nvproxy/frontend.go | 9 ++++----- pkg/sentry/devices/nvproxy/nvproxy.go | 2 +- 4 files changed, 5 insertions(+), 17 deletions(-) diff --git a/pkg/abi/nvgpu/classes.go b/pkg/abi/nvgpu/classes.go index da6a15935..eabe12683 100644 --- a/pkg/abi/nvgpu/classes.go +++ b/pkg/abi/nvgpu/classes.go @@ -31,8 +31,6 @@ const ( FERMI_CONTEXT_SHARE_A = 0x00009067 FERMI_VASPACE_A = 0x000090f1 KEPLER_CHANNEL_GROUP_A = 0x0000a06c - VOLTA_USERMODE_A = 0x0000c361 - VOLTA_CHANNEL_GPFIFO_A = 0x0000c36f TURING_USERMODE_A = 0x0000c461 TURING_CHANNEL_GPFIFO_A = 0x0000c46f AMPERE_CHANNEL_GPFIFO_A = 0x0000c56f @@ -48,14 +46,6 @@ const ( HOPPER_COMPUTE_A = 0x0000cbc0 ) -// Class handles for older generations that are not supported by the open source -// driver. Volta was the last such generation. These are defined in files under -// src/common/sdk/nvidia/inc/class/. -const ( - VOLTA_COMPUTE_A = 0x0000c3c0 - VOLTA_DMA_COPY_A = 0x0000c3b5 -) - // NV0005_ALLOC_PARAMETERS is the alloc params type for NV01_EVENT_OS_EVENT, // from src/common/sdk/nvidia/inc/class/cl0005.h. // diff --git a/pkg/abi/nvgpu/ctrl.go b/pkg/abi/nvgpu/ctrl.go index 47f2a7635..02187b640 100644 --- a/pkg/abi/nvgpu/ctrl.go +++ b/pkg/abi/nvgpu/ctrl.go @@ -244,7 +244,6 @@ const ( // From src/common/sdk/nvidia/inc/ctrl/ctrl90e6.h: const ( - NV90E6_CTRL_CMD_MASTER_GET_ERROR_INTR_OFFSET_MASK = 0x90e60101 NV90E6_CTRL_CMD_MASTER_GET_VIRTUAL_FUNCTION_ERROR_CONT_INTR_MASK = 0x90e60102 ) diff --git a/pkg/sentry/devices/nvproxy/frontend.go b/pkg/sentry/devices/nvproxy/frontend.go index 66497a69f..36be253a7 100644 --- a/pkg/sentry/devices/nvproxy/frontend.go +++ b/pkg/sentry/devices/nvproxy/frontend.go @@ -597,7 +597,6 @@ func rmControl(fi *frontendIoctlState) (uintptr, error) { nvgpu.NV83DE_CTRL_CMD_DEBUG_READ_ALL_SM_ERROR_STATES, nvgpu.NV83DE_CTRL_CMD_DEBUG_CLEAR_ALL_SM_ERROR_STATES, nvgpu.NV906F_CTRL_CMD_RESET_CHANNEL, - nvgpu.NV90E6_CTRL_CMD_MASTER_GET_ERROR_INTR_OFFSET_MASK, nvgpu.NV90E6_CTRL_CMD_MASTER_GET_VIRTUAL_FUNCTION_ERROR_CONT_INTR_MASK, nvgpu.NVC36F_CTRL_GET_CLASS_ENGINEID, nvgpu.NVC36F_CTRL_CMD_GPFIFO_GET_WORK_SUBMIT_TOKEN, @@ -772,15 +771,15 @@ func rmAlloc(fi *frontendIoctlState) (uintptr, error) { return rmAllocSimple[nvgpu.NV_VASPACE_ALLOCATION_PARAMETERS](fi, &ioctlParams, isNVOS64) case nvgpu.KEPLER_CHANNEL_GROUP_A: return rmAllocSimple[nvgpu.NV_CHANNEL_GROUP_ALLOCATION_PARAMETERS](fi, &ioctlParams, isNVOS64) - case nvgpu.VOLTA_CHANNEL_GPFIFO_A, nvgpu.TURING_CHANNEL_GPFIFO_A, nvgpu.AMPERE_CHANNEL_GPFIFO_A: + case nvgpu.TURING_CHANNEL_GPFIFO_A, nvgpu.AMPERE_CHANNEL_GPFIFO_A: return rmAllocSimple[nvgpu.NV_CHANNEL_ALLOC_PARAMS](fi, &ioctlParams, isNVOS64) - case nvgpu.VOLTA_DMA_COPY_A, nvgpu.TURING_DMA_COPY_A, nvgpu.AMPERE_DMA_COPY_A, nvgpu.AMPERE_DMA_COPY_B, nvgpu.HOPPER_DMA_COPY_A: + case nvgpu.TURING_DMA_COPY_A, nvgpu.AMPERE_DMA_COPY_A, nvgpu.AMPERE_DMA_COPY_B, nvgpu.HOPPER_DMA_COPY_A: return rmAllocSimple[nvgpu.NVB0B5_ALLOCATION_PARAMETERS](fi, &ioctlParams, isNVOS64) - case nvgpu.VOLTA_COMPUTE_A, nvgpu.TURING_COMPUTE_A, nvgpu.AMPERE_COMPUTE_A, nvgpu.AMPERE_COMPUTE_B, nvgpu.ADA_COMPUTE_A, nvgpu.HOPPER_COMPUTE_A: + case nvgpu.TURING_COMPUTE_A, nvgpu.AMPERE_COMPUTE_A, nvgpu.AMPERE_COMPUTE_B, nvgpu.ADA_COMPUTE_A, nvgpu.HOPPER_COMPUTE_A: return rmAllocSimple[nvgpu.NV_GR_ALLOCATION_PARAMETERS](fi, &ioctlParams, isNVOS64) case nvgpu.HOPPER_USERMODE_A: return rmAllocSimple[nvgpu.NV_HOPPER_USERMODE_A_PARAMS](fi, &ioctlParams, isNVOS64) - case nvgpu.GF100_SUBDEVICE_MASTER, nvgpu.VOLTA_USERMODE_A, nvgpu.TURING_USERMODE_A: + case nvgpu.GF100_SUBDEVICE_MASTER, nvgpu.TURING_USERMODE_A: return rmAllocNoParams(fi, &ioctlParams, isNVOS64) case nvgpu.NV_MEMORY_FABRIC: return rmAllocSimple[nvgpu.NV00F8_ALLOCATION_PARAMETERS](fi, &ioctlParams, isNVOS64) diff --git a/pkg/sentry/devices/nvproxy/nvproxy.go b/pkg/sentry/devices/nvproxy/nvproxy.go index 1dd78d465..7903165e1 100644 --- a/pkg/sentry/devices/nvproxy/nvproxy.go +++ b/pkg/sentry/devices/nvproxy/nvproxy.go @@ -15,7 +15,7 @@ // Package nvproxy implements proxying for the Nvidia GPU Linux kernel driver: // https://github.com/NVIDIA/open-gpu-kernel-modules. // -// Supported Nvidia GPUs: T4, L4, A100, A10G, V100 and H100. +// Supported Nvidia GPUs: T4, L4, A100, A10G and H100. package nvproxy import (