From patchwork Wed May 17 05:02:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Liu X-Patchwork-Id: 95056 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp889489vqo; Tue, 16 May 2023 22:23:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5dG1bPDeekb/unuRSflnvCxgpxVs4rgUsRb+cLLBBKwg9ofck+tlW/4kEygGw57ALecstW X-Received: by 2002:a17:902:d902:b0:1ac:482e:ed4d with SMTP id c2-20020a170902d90200b001ac482eed4dmr40367264plz.18.1684301028117; Tue, 16 May 2023 22:23:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684301028; cv=none; d=google.com; s=arc-20160816; b=bO8fdk7nKSCPQ45Ca8TDBbq6RldlKSrSsRaC+wWQhoeHCiottgUXL95Q7GsThMFiXe fA54gxiAQSReXoV57z6MaVeHj+ct2cPv853rxMdKs72vqPRm0i24cljVA24MfNpr24t1 V7XfZLz7d0JeXTpheTu/TBcYWi8ufHO6dPXEcec0t7Kfmpc6AM5kbW6ZlWjhB8p9FnLW 0r5nSylEKJw+7biZlXtBdQGdARiAeLLl0a5FnU7QNhYoP8V8rseWlvOkm1kCL41+5mJR g08QC3tRx8y+rx4fshCHjZczUWWWHQj9cfM3ttee3byeoXZPcjCWTMBxAFOTMfodham2 0Hbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=VOctQTVuB3UhvIIfY+jaT57+IaWf2TCrCaQIbla3yw4=; b=VJb8BbtpbL87LEHgfv02DaByUFo6xF2JrDUX0AuhsIdqcna6zY/TWDwKhZz274/rSo FC6NdO8q4PJYZ1ef+ngnxfjsliDe2WpPIggreRdLXmmaVUCXgtQuoXZTeQ30NGBy/iCC UsrYfye5T+JbMKP4aqox71r0knzqVqdikmCL1dRUGetEEu3ahxFu5P2VfhUu54PGu5Rq icjyD1U+jdF5Ryxf49FWkxPk0A1QX/iEBT08QI/kybAoBF6utBz+5Tj+OvMdl4UKjfIb KLhBWrVRbtO+7qYn9/C3rgUJoF53rYubafy3N9j7Ieoyer+z63/gbOZFKZ+GN7J/VRuh UtQw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e21-20020a170902d39500b001ac83d28c39si10896300pld.234.2023.05.16.22.23.33; Tue, 16 May 2023 22:23:48 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232009AbjEQFCx (ORCPT + 99 others); Wed, 17 May 2023 01:02:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229453AbjEQFCv (ORCPT ); Wed, 17 May 2023 01:02:51 -0400 Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FF2E2136 for ; Tue, 16 May 2023 22:02:49 -0700 (PDT) X-UUID: 97ba50cf53c147aaa6f2d5b5e43098f3-20230517 X-CID-O-RULE: Release_Ham X-CID-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.22,REQID:d2b87ce7-df4a-4b37-adae-eb666f7a01d2,IP:15, URL:0,TC:0,Content:-5,EDM:0,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACT ION:release,TS:-5 X-CID-INFO: VERSION:1.1.22,REQID:d2b87ce7-df4a-4b37-adae-eb666f7a01d2,IP:15,UR L:0,TC:0,Content:-5,EDM:0,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:-5 X-CID-META: VersionHash:120426c,CLOUDID:73f4116c-2f20-4998-991c-3b78627e4938,B ulkID:230517130233VKXSJLJ6,BulkQuantity:0,Recheck:0,SF:17|19|44|38|24|102, TC:nil,Content:0,EDM:-3,IP:-2,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 ,OSI:0,OSA:0,AV:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-UUID: 97ba50cf53c147aaa6f2d5b5e43098f3-20230517 X-User: liucong2@kylinos.cn Received: from localhost.localdomain [(116.128.244.169)] by mailgw (envelope-from ) (Generic MTA) with ESMTP id 247450098; Wed, 17 May 2023 13:02:31 +0800 From: Cong Liu To: liucong2@kylinos.cn, Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter 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> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230508085016.437836-1-liucong2@kylinos.cn> References: <20230508085016.437836-1-liucong2@kylinos.cn> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765316901852874857?= X-GMAIL-MSGID: =?utf-8?q?1766117634733597166?= Be sure to properly free the allocated memory before exiting the live_nop_switch function. Signed-off-by: Cong Liu Suggested-by: Rodrigo Vivi --- .../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;