From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (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 B85953B0AF3 for ; Thu, 30 Apr 2026 21:03:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777582990; cv=none; b=hwMEMBX4MlLV1/v2/fNqgilnigvp6kJsirKv5hF/B04Cmv+M4jFiiglxFy49ddgZru7ZyoCDDUXggR6tlpiu69g0+UPBXc1HGRVHA+xMbL7zSui7625kce+wu2rUh3m7HHchdGxRK2qIp9ctbHGqRWnF2GcHVlVMO6/TRVvIDuI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777582990; c=relaxed/simple; bh=dKcQ9gofc1MkJSPdgtxtQwz2NADeQERcN6d2YDBtYD8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l+u6yaEu6cW8Xgxd+qrt8fzyihVcpDYq6jgsdRhQIxIS3IsRCZKtEhnuQGq0WNCx014kJb84zaJLkAKX9OFRzR9XduB8ZYLnLlq18G7ZvLpaY+qS2lOomVPWjSJJhsMZqNE8OQfFSlFKu3pnNC8Y+8Q6wGLbUegdkjYxN0dzXN8= 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=G+m1PWBo; arc=none smtp.client-ip=209.85.210.175 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="G+m1PWBo" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-82f69a286dbso979100b3a.2 for ; Thu, 30 Apr 2026 14:03:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777582988; x=1778187788; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1rtPqpREBagzBSxsaqoRtZ+VHKYl1bjv3s2ciLoIpvw=; b=G+m1PWBot3m8CpTFUgTkvAUJAZt0kNqxzUiULb8Lm+YJ85fydV/eYUMXPQ9u4GZQHe GgATFrZUnIlwcFT1N66vsT9w4vLY4um2CMdqnB4T2Ndyesn70oY7X7DWsx74zmi2MXUq qvqQARxyWTNnoV1k/odN7Uh1F+cSGyc+frr+V8rdQ6DBoGf9NV5hVIOaNLUmh45FGrq6 IBKzxLe9NkcCe6hmMY8eWGpnuOC48CcZzUFFbc/sKg4Qb3CDtZy1A/OWU6o86MzIcqKN qyxuUUMC/45kpv3vLPVPgsx7zopmIuH3UJxEU3WELl8sztugVKJamZAofcU4hIYsAGL/ OxlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777582988; x=1778187788; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=1rtPqpREBagzBSxsaqoRtZ+VHKYl1bjv3s2ciLoIpvw=; b=HIxH8hTrws3xr6PHyWStT+5vKS7bQP+HlAcyr8PHbS4yKfMUmkhKWwfJQJF/Qqdiwm XeJcnkgtOFHgrtSew2jEMaPC95RpxsNw4Gfi9r1bq1BwAxevis/egDDu07xdooGnAwhn luOXJXp5igBbAnDYz0waSzNXTNTzgbMqaVOlvsyZBmK1EplGH4CmMLCcWMDmq70+XQC/ Cf6uR8oe9uUurwyAXWnQ3LeaU3zc95jdnFFm555kxV30nvxWwruQ8INTbvjkn0izjTjL guAz8za+NyNQATuh4rxJuj9EXK7k8LHFlhopX49FVemgudfJmoBjLtbHPqB2b+cPsB2v J8hw== X-Forwarded-Encrypted: i=1; AFNElJ9xEITavQC+rgtK+ApWHFn/yBAfJfbjSeYa8XoB5AZs2t5Jo+tuEYIVtSl7smcqcxhVNwm+RXAbKRXsIWw=@vger.kernel.org X-Gm-Message-State: AOJu0YxtihYFPuke27mduRPSYSwYMWGgGcAwx+wc9o0nGuQkRnoEyLlR DAfXOrEqmZtjWSFIgCXJ+qgp2Fcsa7ou94+rFGhbvP02OVKlqI8wC5LJ X-Gm-Gg: AeBDievphzw0oDT1zchCEdAZ0jGoJqUjVvrIhw1YkTiHjx5oxx0kWswovVtxMKZIm1y HCle4Q1ZiPjn5zj/ZJZrYQgPIWm8QY8J9WAE5Wuuh75Af1KnnLwaOB+EhZnHB5XaikK0rCgka3P beXRDWih8oQjQEMI4vpyVOr+yuxuxKlru1ebD7PAoUF/rPzRArRHPUb1lzz0QDBnrTaCnWU+Bfz gXD9k7fO/160kHFXh3J77LFp/Os1P1hPh69c1AG4CPg8ePyywfoWckYMBrbH37C+nv1oLNxJNq9 MtckDbtFwfej6ngdMzyI2lVT9HquX/aIt6TPtzKeNUUezUx02m/APYdiTYUmZtAZrc+14gORJwR C+EQ/0goj3198Y8dYFQpjgTXJm8LBJTKSyeIbT1ScV6FbOZ/OnnJQ5rPKkNkqoHVYKQIpLViydb R/28znACAAYSfaLf88GFiAqaZsZyxCSY8oZMuH5acCabRtIjkO6Z5bagPasuT20M9NNYw1lv4P3 KDk5UWIEWKpnAfbVAawocSj/DkfgVcHfpZXGExu/uFaEg== X-Received: by 2002:a05:6a00:408c:b0:82f:5051:f024 with SMTP id d2e1a72fcca58-834fdbd91cbmr5717378b3a.27.1777582987982; Thu, 30 Apr 2026 14:03:07 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83515b4f7c1sm516809b3a.51.2026.04.30.14.03.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2026 14:03:07 -0700 (PDT) From: Rosen Penev To: linux-scsi@vger.kernel.org Cc: Saurav Kashyap , Javed Hasan , GR-QLogic-Storage-Upstream@marvell.com (maintainer:BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER), "James E.J. Bottomley" , "Martin K. Petersen" , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 3/3] scsi: bnx2fc: tgt_ofld_list to FAM Date: Thu, 30 Apr 2026 14:02:45 -0700 Message-ID: <20260430210245.29840-4-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260430210245.29840-1-rosenp@gmail.com> References: <20260430210245.29840-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Simplify allocation slightly by allocating tgt_ofld_list with hba. No need to kfree separately. Signed-off-by: Rosen Penev --- drivers/scsi/bnx2fc/bnx2fc.h | 6 +++--- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 14 ++------------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h index 9a5de1048542..31bb701cc5ea 100644 --- a/drivers/scsi/bnx2fc/bnx2fc.h +++ b/drivers/scsi/bnx2fc/bnx2fc.h @@ -224,9 +224,6 @@ struct bnx2fc_hba { char *dummy_buffer; dma_addr_t dummy_buf_dma; - /* Active list of offloaded sessions */ - struct bnx2fc_rport **tgt_ofld_list; - /* statistics */ struct bnx2fc_fw_stats bfw_stats; struct fcoe_statistics_params prev_stats; @@ -246,6 +243,9 @@ struct bnx2fc_hba { struct list_head vports; char chip_num[BCM_CHIP_LEN]; + + /* Active list of offloaded sessions */ + struct bnx2fc_rport *tgt_ofld_list[]; }; struct bnx2fc_interface { diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c index 26e0ff380860..7e740ac6bf1b 100644 --- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c +++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c @@ -1337,7 +1337,6 @@ static void bnx2fc_hba_destroy(struct bnx2fc_hba *hba) bnx2fc_cmd_mgr_free(hba->cmd_mgr); hba->cmd_mgr = NULL; } - kfree(hba->tgt_ofld_list); bnx2fc_unbind_pcidev(hba); kfree(hba); } @@ -1356,7 +1355,7 @@ static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic) struct fcoe_capabilities *fcoe_cap; int rc; - hba = kzalloc_obj(*hba); + hba = kzalloc_flex(*hba, tgt_ofld_list, BNX2FC_NUM_MAX_SESS); if (!hba) { printk(KERN_ERR PFX "Unable to allocate hba structure\n"); return NULL; @@ -1380,19 +1379,12 @@ static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic) hba->phys_dev = cnic->netdev; hba->next_conn_id = 0; - hba->tgt_ofld_list = - kzalloc_objs(struct bnx2fc_rport *, BNX2FC_NUM_MAX_SESS); - if (!hba->tgt_ofld_list) { - printk(KERN_ERR PFX "Unable to allocate tgt offload list\n"); - goto tgtofld_err; - } - hba->num_ofld_sess = 0; hba->cmd_mgr = bnx2fc_cmd_mgr_alloc(hba); if (!hba->cmd_mgr) { printk(KERN_ERR PFX "em_config:bnx2fc_cmd_mgr_alloc failed\n"); - goto cmgr_err; + goto tgtofld_err; } fcoe_cap = &hba->fcoe_cap; @@ -1416,8 +1408,6 @@ static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic) return hba; -cmgr_err: - kfree(hba->tgt_ofld_list); tgtofld_err: bnx2fc_unbind_pcidev(hba); bind_err: -- 2.54.0