diff mbox series

[v2] drm/i915: Fix memory leaks in function live_nop_switch

Message ID	20230517050204.4111874-1-liucong2@kylinos.cn
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Cong Liu <liucong2@kylinos.cn> To: liucong2@kylinos.cn, Jani Nikula <jani.nikula@linux.intel.com>, Joonas Lahtinen <joonas.lahtinen@linux.intel.com>, Rodrigo Vivi <rodrigo.vivi@intel.com>, Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch> Cc: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] drm/i915: Fix memory leaks in function live_nop_switch Date: Wed, 17 May 2023 13:02:03 +0800 Message-Id: <20230517050204.4111874-1-liucong2@kylinos.cn> In-Reply-To: <20230508085016.437836-1-liucong2@kylinos.cn> References: <20230508085016.437836-1-liucong2@kylinos.cn> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[v2] drm/i915: Fix memory leaks in function live_nop_switch \| [v2] drm/i915: Fix memory leaks in function live_nop_switch

Commit Message

Cong Liu May 17, 2023, 5:02 a.m. UTC

  Be sure to properly free the allocated memory before exiting
the live_nop_switch function.

Signed-off-by: Cong Liu <liucong2@kylinos.cn>
Suggested-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 .../gpu/drm/i915/gem/selftests/i915_gem_context.c  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Comments

Rodrigo Vivi May 19, 2023, 9:09 p.m. UTC | #1

On Wed, May 17, 2023 at 01:02:03PM +0800, Cong Liu wrote:
> Be sure to properly free the allocated memory before exiting
> the live_nop_switch function.
> 
> Signed-off-by: Cong Liu <liucong2@kylinos.cn>
> Suggested-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

pushed, thanks for the patch

> ---
>  .../gpu/drm/i915/gem/selftests/i915_gem_context.c  | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
> index a81fa6a20f5a..2fb125d0cb5e 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
> @@ -66,7 +66,7 @@ static int live_nop_switch(void *arg)
>  		ctx[n] = live_context(i915, file);
>  		if (IS_ERR(ctx[n])) {
>  			err = PTR_ERR(ctx[n]);
> -			goto out_file;
> +			goto out_ctx;
>  		}
>  	}
>  
> @@ -82,7 +82,7 @@ static int live_nop_switch(void *arg)
>  			this = igt_request_alloc(ctx[n], engine);
>  			if (IS_ERR(this)) {
>  				err = PTR_ERR(this);
> -				goto out_file;
> +				goto out_ctx;
>  			}
>  			if (rq) {
>  				i915_request_await_dma_fence(this, &rq->fence);
> @@ -96,7 +96,7 @@ static int live_nop_switch(void *arg)
>  			intel_gt_set_wedged(to_gt(i915));
>  			i915_request_put(rq);
>  			err = -EIO;
> -			goto out_file;
> +			goto out_ctx;
>  		}
>  		i915_request_put(rq);
>  
> @@ -107,7 +107,7 @@ static int live_nop_switch(void *arg)
>  
>  		err = igt_live_test_begin(&t, i915, __func__, engine->name);
>  		if (err)
> -			goto out_file;
> +			goto out_ctx;
>  
>  		end_time = jiffies + i915_selftest.timeout_jiffies;
>  		for_each_prime_number_from(prime, 2, 8192) {
> @@ -120,7 +120,7 @@ static int live_nop_switch(void *arg)
>  				this = igt_request_alloc(ctx[n % nctx], engine);
>  				if (IS_ERR(this)) {
>  					err = PTR_ERR(this);
> -					goto out_file;
> +					goto out_ctx;
>  				}
>  
>  				if (rq) { /* Force submission order */
> @@ -165,7 +165,7 @@ static int live_nop_switch(void *arg)
>  
>  		err = igt_live_test_end(&t);
>  		if (err)
> -			goto out_file;
> +			goto out_ctx;
>  
>  		pr_info("Switch latencies on %s: 1 = %lluns, %lu = %lluns\n",
>  			engine->name,
> @@ -173,6 +173,8 @@ static int live_nop_switch(void *arg)
>  			prime - 1, div64_u64(ktime_to_ns(times[1]), prime - 1));
>  	}
>  
> +out_ctx:
> +	kfree(ctx);
>  out_file:
>  	fput(file);
>  	return err;
> -- 
> 2.34.1
> 
> 
> No virus found
> 		Checked by Hillstone Network AntiVirus

diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
index a81fa6a20f5a..2fb125d0cb5e 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
@@ -66,7 +66,7 @@  static int live_nop_switch(void *arg)
 		ctx[n] = live_context(i915, file);
 		if (IS_ERR(ctx[n])) {
 			err = PTR_ERR(ctx[n]);
-			goto out_file;
+			goto out_ctx;
 		}
 	}
 
@@ -82,7 +82,7 @@  static int live_nop_switch(void *arg)
 			this = igt_request_alloc(ctx[n], engine);
 			if (IS_ERR(this)) {
 				err = PTR_ERR(this);
-				goto out_file;
+				goto out_ctx;
 			}
 			if (rq) {
 				i915_request_await_dma_fence(this, &rq->fence);
@@ -96,7 +96,7 @@  static int live_nop_switch(void *arg)
 			intel_gt_set_wedged(to_gt(i915));
 			i915_request_put(rq);
 			err = -EIO;
-			goto out_file;
+			goto out_ctx;
 		}
 		i915_request_put(rq);
 
@@ -107,7 +107,7 @@  static int live_nop_switch(void *arg)
 
 		err = igt_live_test_begin(&t, i915, __func__, engine->name);
 		if (err)
-			goto out_file;
+			goto out_ctx;
 
 		end_time = jiffies + i915_selftest.timeout_jiffies;
 		for_each_prime_number_from(prime, 2, 8192) {
@@ -120,7 +120,7 @@  static int live_nop_switch(void *arg)
 				this = igt_request_alloc(ctx[n % nctx], engine);
 				if (IS_ERR(this)) {
 					err = PTR_ERR(this);
-					goto out_file;
+					goto out_ctx;
 				}
 
 				if (rq) { /* Force submission order */
@@ -165,7 +165,7 @@  static int live_nop_switch(void *arg)
 
 		err = igt_live_test_end(&t);
 		if (err)
-			goto out_file;
+			goto out_ctx;
 
 		pr_info("Switch latencies on %s: 1 = %lluns, %lu = %lluns\n",
 			engine->name,
@@ -173,6 +173,8 @@  static int live_nop_switch(void *arg)
 			prime - 1, div64_u64(ktime_to_ns(times[1]), prime - 1));
 	}
 
+out_ctx:
+	kfree(ctx);
 out_file:
 	fput(file);
 	return err;