From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (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 2147F3BA254 for ; Thu, 30 Apr 2026 21:37:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777585078; cv=none; b=KVfkAMzRX//YHgtV2g8LiGk6kGCwkRUtzxtzf2IRbEWwVjouT/hVx5sX+8LFJ0kI6ZvKn7Ubm9gzfBBrU2k1HmwQzKgTFBb9cbgFouvamflC2Afwfsh7Z+4jwn64kRhhIkU8ejobalUvqnuyZOlk7N/zpKm9ZrhQ6fS8LLHF88M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777585078; c=relaxed/simple; bh=MVraVFniajBUQIRJ+6h8gR2yGaiW60oRblMGC6lLPtE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GXDJIsbMObm0Zw4WLzlfbDvqf7t+Ys9CLTwGSpL4mS6i2sTYd9r4B9NHbqzsWXGZ8Y3LN/i9W+fuECKMRABGhHE0sHKyOXILqJBVsjkoUcrm8PHvPUv1o7aFA6qKwlPXrBCt3B+dFRuZZ1TfaQHssiIGmTDo3fhlQ0gIQTMnNdI= 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=D/ebH9vM; arc=none smtp.client-ip=209.85.222.169 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="D/ebH9vM" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-8d67a483d3eso152216585a.1 for ; Thu, 30 Apr 2026 14:37:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777585076; x=1778189876; 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=RVqn3dyVg4K8iMG+rfFnoKiLza2CoHq6O7x1qQbXIr4=; b=D/ebH9vMSmF0C00NasWmxOjjLEpcc1mLlDmMPmo/0gAEcuAGmy6IJzjjgt0mACJyMy 1pONbRzpv71y65SG0yWZOa1Rir03D19SJfdb6org0vGmmkiCpEGHSTPA24/0qbOQO/Cj 7FCcYMWt4uyPkp2XBtpsEdENJRYLoPNR1Et5RST5nDxNvoAl0A1XFIP40KblXrAEkKYq tIp6PeTzFj3/VI2WQ3MOoM0yk4ZZTsm9gkHRKWtWAvyE9lq2v9HItbcLqGH8YDXB+Qmt IhhAG/rayqnhll0qA58ZLS9YpCpyvCUkdKz++H06mvSY06BDE/5XzviwOclHOKvmCFt+ Wqhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777585076; x=1778189876; 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=RVqn3dyVg4K8iMG+rfFnoKiLza2CoHq6O7x1qQbXIr4=; b=TXkQo2/RHLQlIu80g3Rr0sUn67GygBKZ4pgvAD9HaBcZz4M9re+6IkVrZcLih2nkmc L82pVJNR8w5yIW6oNfj8WM0NIbFAvsBTbq3C9YKbvDg5crohnvJ+SxnYlgggM2ymKgYx S9PhLpmYNEifF7K+JLhlyGLqg/KNll4IU9rcElvatjMAnCwCyOhvcGWO2im30c9zzW6M qkmj77KL5clNcofQTHycUepdouWS250E2ETUDavXRWjVCZ0VwnEvUEE12vvGkF4ZEvhC KU54m/YLMgCJUEaeB1ofZUIziHTSF+kP/uYRHB7IjYrj50Lgh98CcgJlKjSbjgdUGChv Aatw== X-Forwarded-Encrypted: i=1; AFNElJ+L+AjhXanEspnmg9lySl+Tv+OE5qtsY2ge9VKUT9Kt8E4NzQfrXiwFoLn7aCVAzk9zQWoKKb1POBnwuj4=@vger.kernel.org X-Gm-Message-State: AOJu0YxVBYGlsHlhIf/ZwjvWh1UMqEGRYQJ+3vR2BS5mLe7AQoKX4yw5 ZWT8fehira5O3Am2CgZBfHZHyqXOSPiFj1DIyH1iiaCGWA1EAFsSLk7U X-Gm-Gg: AeBDietMkn/nFa5TxQui+7y0UoMmlFMITHzM77ckmHNYjPP9Ky6BxJOujhN2o597Ljm 1gNaf5pj5EF1ZxXv7WQ6SUQArETnsfupv8EU2LrT17xE0Ngw9qEGFkAMaqCZCOoPVFhhK69b4f8 Lj818oIaLUHh3UqUeWBnslnQ/s/0j23xzd60WkpcBbr0hKMnKdqsH6QSwcsq2net9WSeR8daAXD EMeMmPbpoVyl5IJiJPVPuhZFIuo3OgjGB9S2ReJjbj3qLhdoKYTFrgFDflXO5VjOzudpe93Yfe+ DDOvRNblEoi9QwtXe0LOd5ZfMGG1pkK1o4L0BWTaK+ELf3CGG3hDjj9YoO0VqYoy40iE7AO/YJF /Q1j1q/McQ4KfLDZHYYh75ap4UQDhNA/4V7t75chmM/G+lkIWRCEcM35VPZWLTD9rlfmP+xeKej QUoyGi241zK9nWiZEJOvrHnv8RGASyV/qjL3C42JDHUkfPnLBPgPMy7Ly2VN5/TPS/zvPBqfkJA 7WTj9s0t+21UjTB3tQwQnvGIp1c0QG2fKV2l0SQm7CNzg== X-Received: by 2002:a05:620a:46a6:b0:8ef:3312:a155 with SMTP id af79cd13be357-8faaf62dcfamr659147685a.11.1777585076072; Thu, 30 Apr 2026 14:37:56 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8fbf078618csm28281485a.8.2026.04.30.14.37.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Apr 2026 14:37:55 -0700 (PDT) From: Rosen Penev To: linux-scsi@vger.kernel.org Cc: Ketan Mukadam , "James E.J. Bottomley" , "Martin K. Petersen" , Kees Cook , "Gustavo A. R. Silva" , linux-kernel@vger.kernel.org (open list), linux-hardening@vger.kernel.org (open list:KERNEL HARDENING (not covered by other areas):Keyword:\b__counted_by(_le|_be)?\b) Subject: [PATCH 2/2] scsi: be2iscsi: simplify hwi_controller allocation Date: Thu, 30 Apr 2026 14:37:33 -0700 Message-ID: <20260430213733.54840-3-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260430213733.54840-1-rosenp@gmail.com> References: <20260430213733.54840-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 Use a flexible array member to allocate and free hwi_controller once using kzalloc_flex. Signed-off-by: Rosen Penev --- drivers/scsi/be2iscsi/be_main.c | 16 +--------------- drivers/scsi/be2iscsi/be_main.h | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index aa5320535c1f..799063000e77 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -2465,27 +2465,16 @@ static void beiscsi_find_mem_req(struct beiscsi_hba *phba) static int beiscsi_alloc_mem(struct beiscsi_hba *phba) { dma_addr_t bus_add; - struct hwi_controller *phwi_ctrlr; struct be_mem_descriptor *mem_descr; struct mem_array *mem_arr, *mem_arr_orig; unsigned int i, j, alloc_size, curr_alloc_size; - phba->phwi_ctrlr = kzalloc(phba->params.hwi_ws_sz, GFP_KERNEL); + phba->phwi_ctrlr = kzalloc_flex(*phba->phwi_ctrlr, wrb_context, phba->params.cxns_per_ctrl); if (!phba->phwi_ctrlr) return -ENOMEM; - /* Allocate memory for wrb_context */ - phwi_ctrlr = phba->phwi_ctrlr; - phwi_ctrlr->wrb_context = kzalloc_objs(struct hwi_wrb_context, - phba->params.cxns_per_ctrl); - if (!phwi_ctrlr->wrb_context) { - kfree(phba->phwi_ctrlr); - return -ENOMEM; - } - phba->init_mem = kzalloc_objs(*mem_descr, SE_MEM_MAX); if (!phba->init_mem) { - kfree(phwi_ctrlr->wrb_context); kfree(phba->phwi_ctrlr); return -ENOMEM; } @@ -2493,7 +2482,6 @@ static int beiscsi_alloc_mem(struct beiscsi_hba *phba) mem_arr_orig = kmalloc_objs(*mem_arr_orig, BEISCSI_MAX_FRAGS_INIT); if (!mem_arr_orig) { kfree(phba->init_mem); - kfree(phwi_ctrlr->wrb_context); kfree(phba->phwi_ctrlr); return -ENOMEM; } @@ -2568,7 +2556,6 @@ static int beiscsi_alloc_mem(struct beiscsi_hba *phba) } kfree(mem_arr_orig); kfree(phba->init_mem); - kfree(phba->phwi_ctrlr->wrb_context); kfree(phba->phwi_ctrlr); return -ENOMEM; } @@ -3874,7 +3861,6 @@ static void beiscsi_free_mem(struct beiscsi_hba *phba) mem_descr++; } kfree(phba->init_mem); - kfree(phba->phwi_ctrlr->wrb_context); kfree(phba->phwi_ctrlr); } diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h index b5f8e746deab..77c9b1a1a488 100644 --- a/drivers/scsi/be2iscsi/be_main.h +++ b/drivers/scsi/be2iscsi/be_main.h @@ -968,10 +968,10 @@ struct be_ring { }; struct hwi_controller { - struct hwi_wrb_context *wrb_context; struct be_ring default_pdu_hdr[BEISCSI_ULP_COUNT]; struct be_ring default_pdu_data[BEISCSI_ULP_COUNT]; struct hwi_context_memory *phwi_ctxt; + struct hwi_wrb_context wrb_context[]; }; enum hwh_type_enum { -- 2.54.0