From nobody Wed Apr 8 03:06:11 2026 Received: from mail-yx1-f46.google.com (mail-yx1-f46.google.com [74.125.224.46]) (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 44F531A6831 for ; Wed, 11 Mar 2026 00:45:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773189920; cv=none; b=S8enqrUx2UXOXaoil0CL7/UcQJIGN4gZki68C7CNqDvo4RrtYnGdg9QWeF2YvEGwJ85hRjt1s53nrxQJ6A6QNzCATksbve+GzyHngg3bPFBefHqahPxeqHJm8swh1C3CMyt8xcAuxGdyr6A1x+HzVYuEwdzAp8Qdlf2Ld91LzhE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773189920; c=relaxed/simple; bh=/HwBo7IUADcNN3QTHtw4YHO2GNi7PSy9WluByPgURA8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=CQAGkLIvJL/jbs0+ARZAXa3vn0QZQheRjT66VnKB7HP6V09CFV3BOt20i7unhl/zY0t9uPi8QGwAPxd3re1aAW9eUl9EOO2CxMi5vuhdZHUxnktDjEWfDCDc4pHacZGGinteQh+OvCYPZmYlTGL0NPGp9b2RAj67/lsIsyc/G5w= 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=TWeGi6qw; arc=none smtp.client-ip=74.125.224.46 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="TWeGi6qw" Received: by mail-yx1-f46.google.com with SMTP id 956f58d0204a3-64c9a398bc7so12447968d50.2 for ; Tue, 10 Mar 2026 17:45:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773189918; x=1773794718; 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=/HjYa2gOXaWM1arUomc63S1ckHjrnGQ1H+F6LEklrto=; b=TWeGi6qwXirlE/peQNSQ1haobkyilrad+suCCYcCih2R5Jbyd/7BF5KuevPphqKj5M i9tLTs3Tzswz1f+QD2smhaDS7f9btWWo9HFL22uenlCU8BzfAWU8L0Fh5IQTY2PmYtYl SqO7lMIDlHkyuyM8j8Om1OLTrF4hK25wIAapKoUwQVyGMeXi+P/akZitEpswIxERO/99 LfuXxtkRwwx9+ANXFkJisNAvPyA1Mnb33cDH/JMyHGFtSaDYprdAPjE/CXEOiiYfOdZ2 eULXEko1blToUFVCQDbtIRqH2Gt0G/H0Q/W7tdBf7ZITirBkYJIpWV20KNaMNEfLXtQC Kqjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773189918; x=1773794718; 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=/HjYa2gOXaWM1arUomc63S1ckHjrnGQ1H+F6LEklrto=; b=LgwQ8WI12nMw+4JzY4YydDcvV298S7SrEcRNeLmP5KhxfC8LJ1zHmb/BPlpNJewdAz xko/qhvmNKeiHPbOZveajBJOMJUu99f1BpX2LyYh9HV0UcXxR4FSIIaJNzgzS7mRncPx ktoPqSuUXOJnOaKrxALvR04fSZGXnHjUbQ6XXfOOtFyA0KygL7J24ZYCs4GeI9tgKfOE PFrkM9PQyLlacKdxUfgGa33T6WsTLEN9VCrabfHMb4ku9ZTdI/vvlwemOD+kMNKBH4FW yM0a6o1sgA7V3zOsgs+bGlA0/oD+xKee+HGIT7z1NkoFw3PP/eiRPSlWXH2PUE2AEMZc Puzw== X-Forwarded-Encrypted: i=1; AJvYcCXDJoLZV7GLUjlwSXwRWmH98x9mlC71Kuf73IudWg1MR4Fm1oXR/8Pu07vCbZfi91BfHj9LV5/Zdd3y4FM=@vger.kernel.org X-Gm-Message-State: AOJu0YxpDl7bqaet3w4MPo1dB2yabEOksyZDLzSapN40hNmIes8Gj5AA vt/JhFA2tYXJxK+JUOa9rbl/ZDF8zL6KgB5cvqwGOBOJylF6r51Ni8uSjMU+6D7b X-Gm-Gg: ATEYQzwuPwPrdW+mY2vkPpTlDE+TKFDGJNUa20S5vEEYwWFglZEopVvMtgeDy6RR7Mf qZxEAw4nE4vV5NzUoLkn1axSof+Z/FvzT3s55LiK9KnrkQiaSTQ/tiVvAWHsdPP0jxtJhbGOfQd O8koNZeEuASPqn4Po4+jxyTd073onwSBF7GjAURxNCmUaEO0HCa8vTU7z2PV5+B5BtJ6gGwCWYX enx+Qqvzzu2p9LDWDbX/i+7hLyaVXy/LYzsGyvIPVatMsVX7VRFnmwszniCygaycsOnW0XpoRna DiU/Z4MupAD4Y0ZSSDezsqjvcDrIAevk/vdaOzO+vsZkuI/lP0wG3+R/sJxbobZWyr7NDREwHK/ Q7F7g4yYMwl2hBw8E8JkzcAD5qzxFwCX3KB+rQLknvqqfARr+PzBk1+wSeaeWpa6nrTmJM1a+8h itz8HH/A7M80J3o6CyORh+lzcezroR48JOHYAG0wpAcJN1GKDNahKHEg== X-Received: by 2002:a05:690c:22c5:b0:798:798d:9a1b with SMTP id 00721157ae682-79917ff2032mr6016447b3.63.1773189917927; Tue, 10 Mar 2026 17:45:17 -0700 (PDT) Received: from ryzen ([2601:644:8000:56f5::8bd]) by smtp.gmail.com with ESMTPSA id 00721157ae682-79917ee4fc6sm3610357b3.29.2026.03.10.17.45.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 17:45:17 -0700 (PDT) From: Rosen Penev To: dri-devel@linux-kernel@vger.kernel.org Cc: Koby Elbaz , Konstantin Sinyuk , Oded Gabbay , dri-devel@lists.freedesktop.org (open list:HABANALABS PCI DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] accel/habanalabs: kzalloc + kcalloc to kzalloc_flex Date: Tue, 10 Mar 2026 17:44:59 -0700 Message-ID: <20260311004459.32567-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" Simplifies allocation by using a flexible array member. No need to free separately. Signed-off-by: Rosen Penev --- .../habanalabs/common/command_submission.c | 20 ++----------------- drivers/accel/habanalabs/common/habanalabs.h | 2 +- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/drivers/accel/habanalabs/common/command_submission.c b/drivers= /accel/habanalabs/common/command_submission.c index ba4257bda77b..ba99329eacbd 100644 --- a/drivers/accel/habanalabs/common/command_submission.c +++ b/drivers/accel/habanalabs/common/command_submission.c @@ -809,7 +809,6 @@ static void cs_do_release(struct kref *ref) hl_fence_put(cs->fence); - kfree(cs->jobs_in_queue_cnt); kfree(cs); } @@ -907,9 +906,9 @@ static int allocate_cs(struct hl_device *hdev, struct h= l_ctx *ctx, cntr =3D &hdev->aggregated_cs_counters; - cs =3D kzalloc_obj(*cs, GFP_ATOMIC); + cs =3D kzalloc_flex(*cs, jobs_in_queue_cnt, hdev->asic_prop.max_queues, G= FP_ATOMIC); if (!cs) - cs =3D kzalloc_obj(*cs); + cs =3D kzalloc_flex(*cs, jobs_in_queue_cnt, hdev->asic_prop.max_queues); if (!cs) { atomic64_inc(&ctx->cs_counters.out_of_mem_drop_cnt); @@ -947,19 +946,6 @@ static int allocate_cs(struct hl_device *hdev, struct = hl_ctx *ctx, goto free_cs; } - cs->jobs_in_queue_cnt =3D kcalloc(hdev->asic_prop.max_queues, - sizeof(*cs->jobs_in_queue_cnt), GFP_ATOMIC); - if (!cs->jobs_in_queue_cnt) - cs->jobs_in_queue_cnt =3D kcalloc(hdev->asic_prop.max_queues, - sizeof(*cs->jobs_in_queue_cnt), GFP_KERNEL); - - if (!cs->jobs_in_queue_cnt) { - atomic64_inc(&ctx->cs_counters.out_of_mem_drop_cnt); - atomic64_inc(&cntr->out_of_mem_drop_cnt); - rc =3D -ENOMEM; - goto free_cs_cmpl; - } - cs_cmpl->hdev =3D hdev; cs_cmpl->type =3D cs->type; spin_lock_init(&cs_cmpl->lock); @@ -1014,8 +1000,6 @@ static int allocate_cs(struct hl_device *hdev, struct= hl_ctx *ctx, free_fence: spin_unlock(&ctx->cs_lock); - kfree(cs->jobs_in_queue_cnt); -free_cs_cmpl: kfree(cs_cmpl); free_cs: kfree(cs); diff --git a/drivers/accel/habanalabs/common/habanalabs.h b/drivers/accel/h= abanalabs/common/habanalabs.h index d94c2ba22a6a..dc13c8a6f242 100644 --- a/drivers/accel/habanalabs/common/habanalabs.h +++ b/drivers/accel/habanalabs/common/habanalabs.h @@ -2046,7 +2046,6 @@ struct hl_userptr { * @encaps_signals: true if this CS has encaps reserved signals. */ struct hl_cs { - u16 *jobs_in_queue_cnt; struct hl_ctx *ctx; struct list_head job_list; spinlock_t job_lock; @@ -2080,6 +2079,7 @@ struct hl_cs { u8 staged_cs; u8 skip_reset_on_timeout; u8 encaps_signals; + u16 jobs_in_queue_cnt[]; }; /** -- 2.53.0