From nobody Wed Apr 8 03:06:10 2026 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D60F5368269 for ; Wed, 11 Mar 2026 00:40:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773189642; cv=none; b=unAKMxwfH9m+nOUDBSsnN+yiCxsNjDZrDXrp5Aao+t1oe+YK/kWQaunK/tVVYJ+Y/Ob9QJcliXWP+Pmxt7Sy3eRbwJvPrSjwoeRroDqvK6X0esPW2aYpz7N96P5ByRrKen7rNDeuybLasxZZrfDC+GClvfmIdS8J9kosvxwzpR8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773189642; c=relaxed/simple; bh=ufJ74MDWl1uhyYZFStDyht4aRoDfidMaq8Gv5Muxw9g=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Ae9iFGa3Qn3BSS3Xa26PiEN9puL7YNO8xjYtH3edYcYaCLLSTjlJ0pffowYHGY6QLtR9mVNi2xJgfspBt33ToJVzV5781rFiPIWwaRmJ+9ZdUXYM50cH1mUAuBIMKiL+NIYp13r4so5Gb0bEL8x32cOW31csNlgUQZHeZ7JF4MA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JaIZywsJ; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JaIZywsJ" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-3598b95ad7dso7663876a91.2 for ; Tue, 10 Mar 2026 17:40:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773189638; x=1773794438; darn=vger.kernel.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=JaIZywsJHSv5T1pS/nM90Jyrx2oyV/vhIHohtrBaHHijAPfUQO1a8qVKW3w7lrKe0w TTvMJ6d2M3Z2U+JJF3+b7KQ10zRhGPD/UaXE9sa03nQH4VPgL/5UGzGBhc/fd78NBMdZ OwPziRGyYmxaHm+udH4MNj4OGG5XazWCdspdULggOCcK2gKJKvFYjHWgRstqYPKR47Uw 32Zzzveeejtg4oBSYHDbCao5Dag/m8d60q1oWPzuRNg2Ucg9X9NbMxOfAknSj9TG0GIi DGUXBrEFGWpID7hvwTZTUMXe0Az4e/BdHrepKvXVeWZFIBU/XTpoBIY3bJhRtjWpZQTK V+lQ== 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=F3Ol3ZOynRxIuz8RmL6U+aXda6KxZ71F3PL2BDR0iayTuMO6u7vQFKauNiY2zpMpuj trOYP5DdNJRwoJ89eC5og22bydcKXfeMsv2dS688fVUx7gPBW4jxZNWy/uuxdp43YuGj 1zX6bji3e1WM2FSnHubkO5ZzDFM7udvKKk6nFKHVHuYoxzh2PyUqeBGtC3TjR9+QnZA0 EK7PyOucm4dyzgIphsiYIJoUy0eEgF5T92no3s5jK0VSIU+F22vkF4lmkfabQgmbKNok XN7dI2Qbn059WC7c5aaMAoDCvlUISg+35J92XsVwtKQ2+dvnZzjvePu8eK8aP3N2lltg F8sA== X-Forwarded-Encrypted: i=1; AJvYcCXNA18JT0GW+Isw+cIVvDaq2bSdu8cZF4bo21VrECknpIu0LYJ/Ze6C1BnO1VdnCTlnFN8Ys+ahX/3jhWU=@vger.kernel.org X-Gm-Message-State: AOJu0YwCRuMxXopjBpL/NhE5Xl+bd58gLVXJkc+SNwS7CxTZoAF8MnbO YyELo8BKhSzI4oytmQETrfGmZFYi81QfoG4uLlsQS6867f2Rfzu3zYoODbraPV6u X-Gm-Gg: ATEYQzwkvVQJWGEpE/q9OF+itXDOhhkDGbTpyjrKKsuMz1+QhBq7OeIFWcDSPgM7ou5 DK9bnYPA8FxKJh2vePhBSyL3jRocKIkAWjchsF+uDrgp9U8KIa/QiLrBsQR9BOJaYOs44PU3P36 /OuDHSTU2P5+Onv9JA4Rdcb88oNglvUlP2NqnE8vsRyBpheUFf/NIKdUPD2XkzuK460AlfngXy0 WZwFUbuet6hDobK6vQJelt+Ln2szzO/Iw3hZWSmQoaJeMvc0rLrZPCUyyVxBTtzItzWNzpDvGrR va0DG8XTW6bpAXTmdQ1jOun7ishTor38HgbOVfflbj75GvI0Desi6B3kmmeigwyACk+ZsT3ItZz oe08AK9GTfuDami2RjOV726m4K4L1qIgkIz84DBQGy7UiTB6PYNdoTr+7Nhy/OEOw5WeQ/45v3j D+o1MDL+MkVoNMhBVN9++DVPybDmzdIbVjlA3La9sQy2wNfbjn6ApHmQ== 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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/i= magination/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_ma= sk) } =20 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; =20 @@ -252,6 +249,9 @@ struct pvr_fw_trace_seq_data { =20 /** @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[]; }; =20 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; =20 - trace_seq_data =3D kzalloc_obj(*trace_seq_data); + trace_seq_data =3D kzalloc_flex(*trace_seq_data, buffer, ROGUE_FW_TRACE_B= UF_DEFAULT_SIZE_IN_DWORDS); if (!trace_seq_data) return -ENOMEM; =20 - trace_seq_data->buffer =3D kcalloc(ROGUE_FW_TRACE_BUF_DEFAULT_SIZE_IN_DWO= RDS, - sizeof(*trace_seq_data->buffer), GFP_KERNEL); - if (!trace_seq_data->buffer) { - err =3D -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) =20 err =3D seq_open(file, &pvr_fw_trace_seq_ops); if (err) - goto err_free_buffer; + goto err_free_data; =20 ((struct seq_file *)file->private_data)->private =3D trace_seq_data; =20 return 0; =20 -err_free_buffer: - kfree(trace_seq_data->buffer); - err_free_data: kfree(trace_seq_data); =20 @@ -499,7 +489,6 @@ static int fw_trace_release(struct inode *inode, struct= file *file) ((struct seq_file *)file->private_data)->private; =20 seq_release(inode, file); - kfree(trace_seq_data->buffer); kfree(trace_seq_data); =20 return 0; --=20 2.53.0