nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 02:22:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: check default and valid preemption modes

Browse Source 
APIs to set preemption modes right now have config based code to set
default preemption modes or to check if given preemption mode is valid
or not. This makes code unreadable and complex.

Rework nvgpu_gr_obj_ctx_init_ctxsw_preemption_mode() so that it checks
for initial preemption modes in the beginning. If no preemption mode is
passed while allocating context, get default preemption modes with
gops.gr.init.get_default_preemption_modes() and use them.

Rework nvgpu_gr_ctx_check_valid_preemption_mode() so that it is more
readable. Use gops.gr.init.get_supported_preemption_modes() to validate
incoming preemption modes against supported preemption modes.

Log preemption modes getting set in
nvgpu_gr_obj_ctx_set_ctxsw_preemption_mode().

Disable failing unit test. It will need rework according to new code.

Jira NVGPU-5648

Change-Id: Ie1a3e1aeae7826a123e104d9d016f181bea3b271
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2419034
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: Lakshmanan M <lm@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Deepak Nibade
2020-09-24 13:13:15 +05:30
committed by Alex Waterman
parent 807fbd3654
commit c8b2bd7a03
5 changed files with 73 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
drivers/gpu/nvgpu/common/gr/ctx.c
View File

@@ -614,52 +614,51 @@ u32 nvgpu_gr_ctx_get_compute_preemption_mode(struct nvgpu_gr_ctx *gr_ctx)
return gr_ctx->compute_preempt_mode;
}
bool nvgpu_gr_ctx_check_valid_preemption_mode(struct nvgpu_gr_ctx *gr_ctx,
bool nvgpu_gr_ctx_check_valid_preemption_mode(struct gk20a *g,
struct nvgpu_gr_ctx *gr_ctx,
u32 graphics_preempt_mode, u32 compute_preempt_mode)
{
#ifdef CONFIG_NVGPU_GRAPHICS
u32 supported_graphics_preempt_mode = 0U;
u32 supported_compute_preempt_mode = 0U;
if ((graphics_preempt_mode == 0U) && (compute_preempt_mode == 0U)) {
return false;
}
#else
if (graphics_preempt_mode != 0U) {
return false;
}
#endif
#ifdef CONFIG_NVGPU_CILP
if (compute_preempt_mode > NVGPU_PREEMPTION_MODE_COMPUTE_CILP) {
g->ops.gr.init.get_supported__preemption_modes(
&supported_graphics_preempt_mode,
&supported_compute_preempt_mode);
if (graphics_preempt_mode != 0U) {
if ((graphics_preempt_mode & supported_graphics_preempt_mode) == 0U) {
return false;
}
#else
if (compute_preempt_mode > NVGPU_PREEMPTION_MODE_COMPUTE_CTA) {
/* Do not allow lower preemption modes than current ones */
if (graphics_preempt_mode < gr_ctx->graphics_preempt_mode) {
return false;
}
#endif
}
if (compute_preempt_mode != 0U) {
if ((compute_preempt_mode & supported_compute_preempt_mode) == 0U) {
return false;
}
/* Do not allow lower preemption modes than current ones */
if (compute_preempt_mode < gr_ctx->compute_preempt_mode) {
return false;
}
}
#if defined(CONFIG_NVGPU_CILP) && defined(CONFIG_NVGPU_GRAPHICS)
/* Invalid combination */
if ((graphics_preempt_mode == NVGPU_PREEMPTION_MODE_GRAPHICS_GFXP) &&
(compute_preempt_mode == NVGPU_PREEMPTION_MODE_COMPUTE_CILP)) {
return false;
}
#endif
#ifdef CONFIG_NVGPU_GRAPHICS
/* Do not allow lower preemption modes than current ones */
if ((graphics_preempt_mode != 0U) &&
(graphics_preempt_mode < gr_ctx->graphics_preempt_mode)) {
return false;
}
#endif
if (
#ifdef CONFIG_NVGPU_GRAPHICS
(compute_preempt_mode != 0U) &&
#endif
(compute_preempt_mode < gr_ctx->compute_preempt_mode)) {
return false;
}
return true;
}

59
drivers/gpu/nvgpu/common/gr/obj_ctx.c
View File

@@ -76,30 +76,51 @@ static int nvgpu_gr_obj_ctx_init_ctxsw_preemption_mode(struct gk20a *g,
int err;
u32 graphics_preempt_mode = 0U;
u32 compute_preempt_mode = 0U;
u32 default_graphics_preempt_mode = 0U;
u32 default_compute_preempt_mode = 0U;
nvgpu_log(g, gpu_dbg_fn | gpu_dbg_gr, " ");
#ifdef CONFIG_NVGPU_GRAPHICS
if (!nvgpu_is_enabled(g, NVGPU_SUPPORT_PREEMPTION_GFXP)) {
if (g->ops.gpu_class.is_valid_compute(class_num)) {
nvgpu_gr_ctx_init_compute_preemption_mode(gr_ctx,
NVGPU_PREEMPTION_MODE_COMPUTE_CTA);
}
/* Skip for engines other than GR */
if (!g->ops.gpu_class.is_valid_compute(class_num) &&
!g->ops.gpu_class.is_valid_gfx(class_num)) {
return 0;
}
g->ops.gr.init.get_default_preemption_modes(
&default_graphics_preempt_mode,
&default_compute_preempt_mode);
#ifdef CONFIG_NVGPU_GRAPHICS
if ((flags & NVGPU_OBJ_CTX_FLAGS_SUPPORT_GFXP) != 0U) {
graphics_preempt_mode = NVGPU_PREEMPTION_MODE_GRAPHICS_GFXP;
}
if (g->ops.gpu_class.is_valid_gfx(class_num) &&
nvgpu_gr_ctx_desc_force_preemption_gfxp(gr_ctx_desc)) {
graphics_preempt_mode = NVGPU_PREEMPTION_MODE_GRAPHICS_GFXP;
}
if (graphics_preempt_mode == 0U) {
graphics_preempt_mode = default_graphics_preempt_mode;
}
#endif
#ifdef CONFIG_NVGPU_CILP
if ((flags & NVGPU_OBJ_CTX_FLAGS_SUPPORT_CILP) != 0U) {
compute_preempt_mode = NVGPU_PREEMPTION_MODE_COMPUTE_CILP;
}
if (g->ops.gpu_class.is_valid_compute(class_num) &&
nvgpu_gr_ctx_desc_force_preemption_cilp(gr_ctx_desc)) {
compute_preempt_mode = NVGPU_PREEMPTION_MODE_COMPUTE_CILP;
}
#endif
if ((graphics_preempt_mode != 0U) || (compute_preempt_mode != 0U)) {
if (compute_preempt_mode == 0U) {
compute_preempt_mode = default_compute_preempt_mode;
}
err = nvgpu_gr_obj_ctx_set_ctxsw_preemption_mode(g, config,
gr_ctx_desc, gr_ctx, vm, class_num, graphics_preempt_mode,
compute_preempt_mode);
@@ -107,7 +128,6 @@ static int nvgpu_gr_obj_ctx_init_ctxsw_preemption_mode(struct gk20a *g,
nvgpu_err(g, "set_ctxsw_preemption_mode failed");
return err;
}
}
nvgpu_log(g, gpu_dbg_fn | gpu_dbg_gr, "done");
@@ -206,31 +226,16 @@ int nvgpu_gr_obj_ctx_set_ctxsw_preemption_mode(struct gk20a *g,
{
int err = 0;
#ifdef CONFIG_NVGPU_GRAPHICS
if (!nvgpu_is_enabled(g, NVGPU_SUPPORT_PREEMPTION_GFXP)) {
return 0;
}
if (g->ops.gpu_class.is_valid_gfx(class_num) &&
nvgpu_gr_ctx_desc_force_preemption_gfxp(gr_ctx_desc)) {
graphics_preempt_mode = NVGPU_PREEMPTION_MODE_GRAPHICS_GFXP;
}
#endif
#ifdef CONFIG_NVGPU_CILP
if (g->ops.gpu_class.is_valid_compute(class_num) &&
nvgpu_gr_ctx_desc_force_preemption_cilp(gr_ctx_desc)) {
compute_preempt_mode = NVGPU_PREEMPTION_MODE_COMPUTE_CILP;
}
#endif
/* check for invalid combinations */
if (nvgpu_gr_ctx_check_valid_preemption_mode(gr_ctx,
if (nvgpu_gr_ctx_check_valid_preemption_mode(g, gr_ctx,
graphics_preempt_mode, compute_preempt_mode) == false) {
err = -EINVAL;
goto fail;
}
nvgpu_log(g, gpu_dbg_gr, "graphics_preempt_mode=%u compute_preempt_mode=%u",
graphics_preempt_mode, compute_preempt_mode);
#ifdef CONFIG_NVGPU_GRAPHICS
err = nvgpu_gr_obj_ctx_set_graphics_preemption_mode(g, config,
gr_ctx_desc, gr_ctx, vm, graphics_preempt_mode);

4
drivers/gpu/nvgpu/include/nvgpu/gr/ctx.h
View File

@@ -437,6 +437,7 @@ u32 nvgpu_gr_ctx_get_compute_preemption_mode(struct nvgpu_gr_ctx *gr_ctx);
/**
* @brief Check if given preemption modes are valid.
*
* @param g [in] Pointer to GPU driver struct.
* @param gr_ctx [in] Pointer to graphics context struct.
* @param graphics_preempt_mode Requested graphics preemption mode.
* @param compute_preempt_mode Requested compute preemption mode.
@@ -455,7 +456,8 @@ u32 nvgpu_gr_ctx_get_compute_preemption_mode(struct nvgpu_gr_ctx *gr_ctx);
*
* @return true if requested preemption modes are valid, false otherwise.
*/
bool nvgpu_gr_ctx_check_valid_preemption_mode(struct nvgpu_gr_ctx *gr_ctx,
bool nvgpu_gr_ctx_check_valid_preemption_mode(struct gk20a *g,
struct nvgpu_gr_ctx *gr_ctx,
u32 graphics_preempt_mode, u32 compute_preempt_mode);
/**

2
userspace/required_tests.ini
View File

@@ -670,7 +670,7 @@ test_gr_init_setup_ready.gr_setup_setup=0
test_gr_setup_alloc_obj_ctx.gr_setup_alloc_obj_ctx=0
test_gr_setup_alloc_obj_ctx_error_injections.gr_setup_alloc_obj_ctx_error_injections=0
test_gr_setup_free_obj_ctx.gr_setup_free_obj_ctx=0
test_gr_setup_preemption_mode_errors.gr_setup_preemption_mode_errors=0
test_gr_setup_preemption_mode_errors.gr_setup_preemption_mode_errors=2
test_gr_setup_set_preemption_mode.gr_setup_set_preemption_mode=0
[nvgpu_mem]

2
userspace/units/gr/setup/nvgpu-gr-setup.c
View File

@@ -691,7 +691,7 @@ struct unit_module_test nvgpu_gr_setup_tests[] = {
UNIT_TEST(gr_setup_set_preemption_mode,
test_gr_setup_set_preemption_mode, NULL, 0),
UNIT_TEST(gr_setup_preemption_mode_errors,
test_gr_setup_preemption_mode_errors, NULL, 0),
test_gr_setup_preemption_mode_errors, NULL, 2),
UNIT_TEST(gr_setup_free_obj_ctx, test_gr_setup_free_obj_ctx, NULL, 0),
UNIT_TEST(gr_setup_alloc_obj_ctx_error_injections,
test_gr_setup_alloc_obj_ctx_error_injections, NULL, 0),