From nobody Tue Nov 26 12:42:33 2024 Received: from out-176.mta1.migadu.com (out-176.mta1.migadu.com [95.215.58.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 48BBE190055 for ; Thu, 17 Oct 2024 22:02:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729202562; cv=none; b=owaP4BDYO3bbryHZmt6C5yZOjXv0Q8eUtzax1B+S5x7dmAMGCKs7VCKHZV0b+8bPQM/9YVAydMQWzvqQRCGnDv8hF3Y9QbybYfKKfiNEEw3wE5nzyKW86O92l7q7j99YZyUU3HQdGMcnjAVSb6UBpYMy30Vbw42CeFblz0vKj84= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729202562; c=relaxed/simple; bh=yIanPkyAOg1wef17QNX+j0jpVkr0caNdGTp2+f7dlNY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ec215dfozQi2HhFR1zCpmnIJVT62IfPP2i5XzdO6EIXFKuzAd/6gqapYR9PsCDALmbOWChA+BeCxedyimuBf5x+J9bhZNX+t0hqb5U69PQrYR2QHJgWQP+tlwv5u4LnwWt9JDLJwk72dKxW6i41fL4wf7j0LTkQ//GU/a18amrI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=WxLjW9hC; arc=none smtp.client-ip=95.215.58.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="WxLjW9hC" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1729202554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=OD/68NBfbbONt3YfZ0HJOsx4tpq5vhse8++D0yg8nXs=; b=WxLjW9hCOLv83msXdtKv8MPvMr98meeVcCS57gkV8efVCAQlszg+KrIojF1e0M3+96SHQO qmRNAWrrQi5GDymjgkcQswLQvMMnc/kP007dFMKJyEhj9GdgrgNZoKhvqBXdSdayap1hf/ YcKEGbPLqFmHkSIKi5msUuRVmepsCNc= From: Thorsten Blum To: Satish Kharat , Sesidhar Baddela , Karan Tilak Kumar , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Thorsten Blum , Johannes Thumshirn , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH v3] scsi: fnic: Use vcalloc() instead of vmalloc() and memset(0) Date: Fri, 18 Oct 2024 00:01:52 +0200 Message-ID: <20241017220152.1342-2-thorsten.blum@linux.dev> 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 X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Use vcalloc() instead of vmalloc() followed by memset(0) to simplify the functions fnic_trace_buf_init() and fnic_fc_trace_init(). Compile-tested only. Reviewed-by: Johannes Thumshirn Signed-off-by: Thorsten Blum --- drivers/scsi/fnic/fnic_trace.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/scsi/fnic/fnic_trace.c b/drivers/scsi/fnic/fnic_trace.c index aaa4ea02fb7c..e5e0c0492f23 100644 --- a/drivers/scsi/fnic/fnic_trace.c +++ b/drivers/scsi/fnic/fnic_trace.c @@ -485,8 +485,7 @@ int fnic_trace_buf_init(void) } =20 fnic_trace_entries.page_offset =3D - vmalloc(array_size(fnic_max_trace_entries, - sizeof(unsigned long))); + vcalloc(fnic_max_trace_entries, sizeof(unsigned long)); if (!fnic_trace_entries.page_offset) { printk(KERN_ERR PFX "Failed to allocate memory for" " page_offset\n"); @@ -497,8 +496,6 @@ int fnic_trace_buf_init(void) err =3D -ENOMEM; goto err_fnic_trace_buf_init; } - memset((void *)fnic_trace_entries.page_offset, 0, - (fnic_max_trace_entries * sizeof(unsigned long))); fnic_trace_entries.wr_idx =3D fnic_trace_entries.rd_idx =3D 0; fnic_buf_head =3D fnic_trace_buf_p; =20 @@ -559,8 +556,7 @@ int fnic_fc_trace_init(void) fc_trace_max_entries =3D (fnic_fc_trace_max_pages * PAGE_SIZE)/ FC_TRC_SIZE_BYTES; fnic_fc_ctlr_trace_buf_p =3D - (unsigned long)vmalloc(array_size(PAGE_SIZE, - fnic_fc_trace_max_pages)); + (unsigned long)vcalloc(fnic_fc_trace_max_pages, PAGE_SIZE); if (!fnic_fc_ctlr_trace_buf_p) { pr_err("fnic: Failed to allocate memory for " "FC Control Trace Buf\n"); @@ -568,13 +564,9 @@ int fnic_fc_trace_init(void) goto err_fnic_fc_ctlr_trace_buf_init; } =20 - memset((void *)fnic_fc_ctlr_trace_buf_p, 0, - fnic_fc_trace_max_pages * PAGE_SIZE); - /* Allocate memory for page offset */ fc_trace_entries.page_offset =3D - vmalloc(array_size(fc_trace_max_entries, - sizeof(unsigned long))); + vcalloc(fc_trace_max_entries, sizeof(unsigned long)); if (!fc_trace_entries.page_offset) { pr_err("fnic:Failed to allocate memory for page_offset\n"); if (fnic_fc_ctlr_trace_buf_p) { @@ -585,8 +577,6 @@ int fnic_fc_trace_init(void) err =3D -ENOMEM; goto err_fnic_fc_ctlr_trace_buf_init; } - memset((void *)fc_trace_entries.page_offset, 0, - (fc_trace_max_entries * sizeof(unsigned long))); =20 fc_trace_entries.rd_idx =3D fc_trace_entries.wr_idx =3D 0; fc_trace_buf_head =3D fnic_fc_ctlr_trace_buf_p; --=20 2.47.0