From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (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 A683E1FBEBC for ; Tue, 12 May 2026 01:11:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778548265; cv=none; b=kdVpdfcT4yGzSFz/SF1uw5joK6NFrq1fkVbuVvIprELd07TDmwQeu9ZI9OnsPZQkCnBe1rc8/q0bSE6z8cP1fp9AsfUZ+R6RdceC5bfCFgXA2qTld5mlduJH5W/nB1JfKMaegdyiP7MexOiLKFadJC5s8enw+KqbpqxZWyEotK0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778548265; c=relaxed/simple; bh=mWcCfhFVZdMSk7hgl7IU/C8CT04KrAi09FJiS0JXTZY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=E7vzp/KQSBUIlbDM/ZfxBUin8gZg0QH1rKqiX1arOmciMTXXKbvE6SlwNz3d4jewf1OfA85qAdhXTgPYppSkrGEEakCdcT5ij0rQZ+4b8sB0AkhOawhVEgvEkdJPZn9cm4cIu1ysdtV7GRioF9hCt3g/pI1NSeyB+urpz5GRu14= 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=UqTjfYrT; arc=none smtp.client-ip=209.85.215.179 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="UqTjfYrT" Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-c80227c9572so2209017a12.2 for ; Mon, 11 May 2026 18:11:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778548264; x=1779153064; 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=PzneIhsJ+GqLAUgHEm1t+tJA3syS+ySdYEZpRXAWIxM=; b=UqTjfYrT2vhqyIrGpD9HF3NtRypT9jeflVetRpD7Zt5FXZZK6IbJQMb2+Tn9+EX6o4 TnstHjft/EIEnhzT/RmrERI5JW6gQBmlx2jUBbSDwWw4tQY+dBbSb6QsQdst+XlVapYQ KvUpits3ghs15Tj8v6kxtsQnIRwVtVj4kDX93jh5Fp3EiyUi7MnCWxKG3Vl2j0G/ifkG bGcNBMaKWQ6F1Br7RpVTvIn4pDuR5y/BHghO/ueYv8O6AopxuzHy8aPJh286b6RMPM+/ uoHeoaxzVwzX6bzr8Fa36hpTJtZFgKnEDYTi/8twFyihUwL51CmsB96CRpJ9QQ4/jC5E hVBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778548264; x=1779153064; 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=PzneIhsJ+GqLAUgHEm1t+tJA3syS+ySdYEZpRXAWIxM=; b=RgXf9pNoRQZQb47EqtdNNq/sIdZll9yIXnP42sMxBXO9C67JwwRyTWT4d8Txe0DZwz qJAO/t6YCt1Ecd+oL0SPtQclF2oO/64vEhB7B4azPfLuH/J2dG+oqul27i9pvtCShhuv 0c5eFgFda6sb8XKG+FI/JZ4VV30Eu8tQNRnQNPeKjtzv2T0NTWR2wXu5oiWXPWMJ/6Mw OijH26pq0eip6LiL6waQxu4GD9P6IOXfHvwVzO9Y+cN8aT6YWXclz3jtVb4SMU+NpzoB cqERtzwe2+cM5wsGIfots2wgOUuNu+HHDDkf5UHuSdvJOqKEPFzd1BbSs2Y/Bf370c+Z 5Pkg== X-Forwarded-Encrypted: i=1; AFNElJ/T29WQsXXiGCwg7vECL6YM3xJtJDUmOathuEKwzozDn5SD0o9F35QtLCjPGjphjY1LXL8FBty4/XftzEQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwbXIKSp8/ClUwW7n+wI7JvRlR3QHD+menHbz8UbajCt12l5w/v bLuKILXnagIP1y3mVm9naJbqv4Kc7e4YiHlJ6XuTRC+OPt3cyP9Ycmek X-Gm-Gg: Acq92OGOI8NPcqMaYYAkH9+XlsxNha4hfyGNaU3V/Yaj2gAsOC5rPfzxQtZR2MM6vJu OEZeMV9odrhw32pr60kkXZ0IpX+QXprwYaa2G63HGnvoukKzbA1XULY9YzEc2hlLuHiVOjbq1ui QUSzDHo3Pp7263a7zuvbrp5gEla6yM2AI/iwecdah9hNzwdkLaMAnGBZOHb9+Wd4LrQtfyCx2MN 6xxKO3OzXwQ/WYyQ5hHqLbfqwl8MOCKF4Pj9y8fPd9JzzRgyNkLUYxRyulRVXppDK90jj9OvI/R EfLNAbfvxDelfO6GQvsoC6/v5y/Binu+p0i7BOemwFMdrsQII67VKVvXyZU3s2WNjIX1elQZ7dK L/WDQprwTUP9ZSUoe5e3ZelVOZVLPEBiNAxW6GgX9RJiU+Rl9RXpkPkdV3tDc1UtFR6uXE7U6KU M4TfCBfHfRmnB5RahnAU7ODiA8K7pdkxRw0xMB8T9RAtWxDEORirLnl7EFVsQq7djy4EdPCgRbH GHO/+YYrl4RgPVKj7pGaBA6Af2CZPujPwM= X-Received: by 2002:a05:6a21:32a6:b0:3a2:e0d3:37d1 with SMTP id adf61e73a8af0-3aa5aa7857emr29011585637.41.1778548263838; Mon, 11 May 2026 18:11:03 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-839679c80e7sm26497848b3a.31.2026.05.11.18.11.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 18:11:03 -0700 (PDT) From: Rosen Penev To: linux-scsi@vger.kernel.org Cc: Nilesh Javali , GR-QLogic-Storage-Upstream@marvell.com (maintainer:QLOGIC QLA2XXX FC-SCSI DRIVER), "James E.J. Bottomley" , "Martin K. Petersen" , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] scsi: qla2xxx: Use flexible array for qpair hints Date: Mon, 11 May 2026 18:10:46 -0700 Message-ID: <20260512011046.41368-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Store the qpair hints as trailing storage in struct qla_tgt instead of allocating and freeing them separately. This keeps the hints tied to the target allocation and simplifies the error and release paths. Assisted-by: Codex:GPT-5.5 Signed-off-by: Rosen Penev --- drivers/scsi/qla2xxx/qla_target.c | 12 +----------- drivers/scsi/qla2xxx/qla_target.h | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index e47da45e93a0..8acbd45f96dc 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -1590,7 +1590,6 @@ static void qlt_release(struct qla_tgt *tgt) h->qpair = NULL; } } - kfree(tgt->qphints); mutex_lock(&qla_tgt_mutex); list_del(&vha->vha_tgt.qla_tgt->tgt_list_entry); mutex_unlock(&qla_tgt_mutex); @@ -7458,26 +7457,17 @@ int qlt_add_target(struct qla_hw_data *ha, struct scsi_qla_host *base_vha) BUG_ON(base_vha->vha_tgt.qla_tgt != NULL); - tgt = kzalloc_obj(struct qla_tgt); + tgt = kzalloc_flex(*tgt, qphints, ha->max_qpairs + 1); if (!tgt) { ql_dbg(ql_dbg_tgt, base_vha, 0xe066, "Unable to allocate struct qla_tgt\n"); return -ENOMEM; } - tgt->qphints = kzalloc_objs(struct qla_qpair_hint, ha->max_qpairs + 1); - if (!tgt->qphints) { - kfree(tgt); - ql_log(ql_log_warn, base_vha, 0x0197, - "Unable to allocate qpair hints.\n"); - return -ENOMEM; - } - qla2xxx_driver_template.supported_mode |= MODE_TARGET; rc = btree_init64(&tgt->lun_qpair_map); if (rc) { - kfree(tgt->qphints); kfree(tgt); ql_log(ql_log_info, base_vha, 0x0198, "Unable to initialize lun_qpair_map btree\n"); diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h index 61072fb41b29..575c10269a67 100644 --- a/drivers/scsi/qla2xxx/qla_target.h +++ b/drivers/scsi/qla2xxx/qla_target.h @@ -794,7 +794,6 @@ struct qla_tgt { struct scsi_qla_host *vha; struct qla_hw_data *ha; struct btree_head64 lun_qpair_map; - struct qla_qpair_hint *qphints; /* * To sync between IRQ handlers and qlt_target_release(). Needed, * because req_pkt() can drop/reaquire HW lock inside. Protected by @@ -834,6 +833,7 @@ struct qla_tgt { atomic_t tgt_global_resets_count; struct list_head tgt_list_entry; + struct qla_qpair_hint qphints[]; }; struct qla_tgt_sess_op { -- 2.54.0