From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A5731FD88D6 for ; Wed, 11 Mar 2026 00:40:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1A1A010E7D1; Wed, 11 Mar 2026 00:40:40 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="A+j9fIkO"; dkim-atps=neutral Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2884610E7D0 for ; Wed, 11 Mar 2026 00:40:39 +0000 (UTC) Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-3598b95ad7dso7663881a91.2 for ; Tue, 10 Mar 2026 17:40:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773189638; x=1773794438; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Vdio8TET70UdKAaCnfSpq4a7Psjnynkywxj9Ex+iqzU=; b=A+j9fIkO/KrJJms+iUXHdzLaDgjUOU4mOu8QueOJLwkm/COjVNJp9abUaktcmC0Des Jx1SMboUDd2+HV5KJ2lZfX2lBh3eEVHY4lwkH0KbyX3DLPdNFAHdF1vLCWmyEAbU4tPI otgP0Jo0kljLGCIahBijlfPA8JPAkhj1cQdaFCFqxJkxAx1S+JN0lBwqoqnQy91Xy7A8 XLLA2lH8WagHx1aF5xssSqpw1SoqheGkk9j6Bu4ahQEvm0pEIFO6KYIXEFfB0UIjVmmH xhwlbsEb9FXhEP3rW+iENe8up59vtKaXqrFCz93b1LgElKCWeitHmyzoETCkpou55wrw PhnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773189638; x=1773794438; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Vdio8TET70UdKAaCnfSpq4a7Psjnynkywxj9Ex+iqzU=; b=FKd8B5GViO7t11onhVGGm6cldYKtOGDXF++F1xuinhs+mvH5ILc/2N9Pyo0PcfAA9F QGOszW2Ss4Cdhz5EnRbiaO3qkSCFttVL1jZMcjX3/i7ZS6BLLrfoQhvUyT15XSf4gXFi /4nvDiJrIVPJ9Te/zsWmAjOL5uvO+oBNb7zsoNnTTY/J8XWRB6NidXOQOGMYWkIZ9afR JIIlchdGjJG04/vQwe6pG/0oRbrHEwNgmgXLTDWJhD/cI/cngyGPTtyuJKDGaIoHwU85 43mD5TrDAdaeeSNWkaOWZWOAUnHbl+In2zp8zAflmEWycNkUEQh/8o2fhSq1lLzPsqSN fPcQ== X-Gm-Message-State: AOJu0Yz/sQRYIAKLuN0JtFFfoZy2XoP96r4YYo7T+zGvGRsrjX8S8k5j e6Sla0DA29aeisoobiwKMRdH/yCaRQ2/K0+ESQ1+b9H/7IDvU1W+JwrsU7tOgN9q X-Gm-Gg: ATEYQzyie6dgprmrnLRaEKw2IGD9n4KFP+R0y+hXCbv6/UhRGi2E8V/yOt1RbQwuCm8 VfNcWZPbmu1SYUmws3VdmH6PZ7UvhgMLWoRriGRyWPjs7c72A6vpL7P80bjuWAxs7w4ZLWd2uAY WfAAMTI/sB28kRlGvbqYv9QhLLQKN7JKRLvN6es3iwBhl34h2NRKF01wAFKHkx1tji+Bc0Ry/2u KiXaXM0VDFqW/AMsI5u/p79vCfFoFyjNtlsGPB8SNUf/VzbUuUoAnJmWO66lqBRDaFltqUdyY1S TLv0TvhfZmeI8tGT5DkcDRYuHOp3hjcAhav3ZK3r8KXMVci/kS4Jq2hG2x3Zf5TQ13vyC5t42iS i8Be5jfcWZSz8P1JYPdPHD7ErLoEBKy2wIG7oFeWt5v7/J2lltMO8uytk6w+BWaIbiIpysUeLIS j41aA1/3U5TyJzAG+vwKHE7UV/6T3hXqA9V5mkzYA1Zp7cZ+orEt9Q3A== X-Received: by 2002:a17:90b:3890:b0:34c:9cf7:60a0 with SMTP id 98e67ed59e1d1-35a01284f82mr738800a91.5.1773189638131; Tue, 10 Mar 2026 17:40:38 -0700 (PDT) Received: from ryzen ([2601:644:8000:56f5::8bd]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35a01b5b621sm188575a91.2.2026.03.10.17.40.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 17:40:37 -0700 (PDT) From: Rosen Penev To: dri-devel@lists.freedesktop.org Cc: Frank Binns , Matt Coster , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] drm/imagination: simplify pvr_fw_trace_seq_data Date: Tue, 10 Mar 2026 17:40:14 -0700 Message-ID: <20260311004014.32240-1-rosenp@gmail.com> X-Mailer: git-send-email 2.53.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" A flexible array member allows one allocation instead of two. Which means one less kfree to worry about. Signed-off-by: Rosen Penev --- drivers/gpu/drm/imagination/pvr_fw_trace.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/imagination/pvr_fw_trace.c b/drivers/gpu/drm/imagination/pvr_fw_trace.c index e154cb35f604..caf504f2bf85 100644 --- a/drivers/gpu/drm/imagination/pvr_fw_trace.c +++ b/drivers/gpu/drm/imagination/pvr_fw_trace.c @@ -241,9 +241,6 @@ update_logtype(struct pvr_device *pvr_dev, u32 group_mask) } struct pvr_fw_trace_seq_data { - /** @buffer: Pointer to copy of trace data. */ - u32 *buffer; - /** @start_offset: Starting offset in trace data, as reported by FW. */ u32 start_offset; @@ -252,6 +249,9 @@ struct pvr_fw_trace_seq_data { /** @assert_buf: Trace assert buffer, as reported by FW. */ struct rogue_fwif_file_info_buf assert_buf; + + /** @buffer: Pointer to copy of trace data. */ + u32 buffer[]; }; static u32 find_sfid(u32 id) @@ -455,17 +455,10 @@ static int fw_trace_open(struct inode *inode, struct file *file) struct pvr_fw_trace_seq_data *trace_seq_data; int err; - trace_seq_data = kzalloc_obj(*trace_seq_data); + trace_seq_data = kzalloc_flex(*trace_seq_data, buffer, ROGUE_FW_TRACE_BUF_DEFAULT_SIZE_IN_DWORDS); if (!trace_seq_data) return -ENOMEM; - trace_seq_data->buffer = kcalloc(ROGUE_FW_TRACE_BUF_DEFAULT_SIZE_IN_DWORDS, - sizeof(*trace_seq_data->buffer), GFP_KERNEL); - if (!trace_seq_data->buffer) { - err = -ENOMEM; - goto err_free_data; - } - /* * Take a local copy of the trace buffer, as firmware may still be * writing to it. This will exist as long as this file is open. @@ -478,15 +471,12 @@ static int fw_trace_open(struct inode *inode, struct file *file) err = seq_open(file, &pvr_fw_trace_seq_ops); if (err) - goto err_free_buffer; + goto err_free_data; ((struct seq_file *)file->private_data)->private = trace_seq_data; return 0; -err_free_buffer: - kfree(trace_seq_data->buffer); - err_free_data: kfree(trace_seq_data); @@ -499,7 +489,6 @@ static int fw_trace_release(struct inode *inode, struct file *file) ((struct seq_file *)file->private_data)->private; seq_release(inode, file); - kfree(trace_seq_data->buffer); kfree(trace_seq_data); return 0; -- 2.53.0