From: zhong jiang <zhongjiang@huawei.com> To: <jejb@linux.vnet.ibm.com>, <martin.petersen@oracle.com>, <aacraid@microsemi.com> Cc: <andy.shevchenko@gmail.com>, <joe@perches.com>, <linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org> Subject: [PATCH v2 1/4] driver/scsi/fnic/fnic_trace: Use kvcalloc instead of vmalloc+memset Date: Thu, 2 Aug 2018 19:28:31 +0800 [thread overview] Message-ID: <1533209314-1074-2-git-send-email-zhongjiang@huawei.com> (raw) In-Reply-To: <1533209314-1074-1-git-send-email-zhongjiang@huawei.com> The kvcalloc is better than vmalloc() + memset(), So replace them to make the code concise. Signed-off-by: zhong jiang <zhongjiang@huawei.com> --- drivers/scsi/fnic/fnic_trace.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/fnic/fnic_trace.c b/drivers/scsi/fnic/fnic_trace.c index 8271785..57f67af 100644 --- a/drivers/scsi/fnic/fnic_trace.c +++ b/drivers/scsi/fnic/fnic_trace.c @@ -468,14 +468,13 @@ int fnic_trace_buf_init(void) fnic_max_trace_entries = (trace_max_pages * PAGE_SIZE)/ FNIC_ENTRY_SIZE_BYTES; - fnic_trace_buf_p = (unsigned long)vmalloc((trace_max_pages * PAGE_SIZE)); + fnic_trace_buf_p = (unsigned long)kvcalloc(trace_max_pages, PAGE_SIZE, GFP_KERNEL); if (!fnic_trace_buf_p) { printk(KERN_ERR PFX "Failed to allocate memory " "for fnic_trace_buf_p\n"); err = -ENOMEM; goto err_fnic_trace_buf_init; } - memset((void *)fnic_trace_buf_p, 0, (trace_max_pages * PAGE_SIZE)); fnic_trace_entries.page_offset = vmalloc(array_size(fnic_max_trace_entries, @@ -484,7 +483,7 @@ int fnic_trace_buf_init(void) printk(KERN_ERR PFX "Failed to allocate memory for" " page_offset\n"); if (fnic_trace_buf_p) { - vfree((void *)fnic_trace_buf_p); + kvfree((void *)fnic_trace_buf_p); fnic_trace_buf_p = 0; } err = -ENOMEM; @@ -529,7 +528,7 @@ void fnic_trace_free(void) fnic_trace_entries.page_offset = NULL; } if (fnic_trace_buf_p) { - vfree((void *)fnic_trace_buf_p); + kvfree((void *)fnic_trace_buf_p); fnic_trace_buf_p = 0; } printk(KERN_INFO PFX "Successfully Freed Trace Buffer\n"); -- 1.7.12.4
WARNING: multiple messages have this Message-ID (diff)
From: zhong jiang <zhongjiang@huawei.com> To: jejb@linux.vnet.ibm.com, martin.petersen@oracle.com, aacraid@microsemi.com Cc: andy.shevchenko@gmail.com, joe@perches.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/4] driver/scsi/fnic/fnic_trace: Use kvcalloc instead of vmalloc+memset Date: Thu, 2 Aug 2018 19:28:31 +0800 [thread overview] Message-ID: <1533209314-1074-2-git-send-email-zhongjiang@huawei.com> (raw) In-Reply-To: <1533209314-1074-1-git-send-email-zhongjiang@huawei.com> The kvcalloc is better than vmalloc() + memset(), So replace them to make the code concise. Signed-off-by: zhong jiang <zhongjiang@huawei.com> --- drivers/scsi/fnic/fnic_trace.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/fnic/fnic_trace.c b/drivers/scsi/fnic/fnic_trace.c index 8271785..57f67af 100644 --- a/drivers/scsi/fnic/fnic_trace.c +++ b/drivers/scsi/fnic/fnic_trace.c @@ -468,14 +468,13 @@ int fnic_trace_buf_init(void) fnic_max_trace_entries = (trace_max_pages * PAGE_SIZE)/ FNIC_ENTRY_SIZE_BYTES; - fnic_trace_buf_p = (unsigned long)vmalloc((trace_max_pages * PAGE_SIZE)); + fnic_trace_buf_p = (unsigned long)kvcalloc(trace_max_pages, PAGE_SIZE, GFP_KERNEL); if (!fnic_trace_buf_p) { printk(KERN_ERR PFX "Failed to allocate memory " "for fnic_trace_buf_p\n"); err = -ENOMEM; goto err_fnic_trace_buf_init; } - memset((void *)fnic_trace_buf_p, 0, (trace_max_pages * PAGE_SIZE)); fnic_trace_entries.page_offset = vmalloc(array_size(fnic_max_trace_entries, @@ -484,7 +483,7 @@ int fnic_trace_buf_init(void) printk(KERN_ERR PFX "Failed to allocate memory for" " page_offset\n"); if (fnic_trace_buf_p) { - vfree((void *)fnic_trace_buf_p); + kvfree((void *)fnic_trace_buf_p); fnic_trace_buf_p = 0; } err = -ENOMEM; @@ -529,7 +528,7 @@ void fnic_trace_free(void) fnic_trace_entries.page_offset = NULL; } if (fnic_trace_buf_p) { - vfree((void *)fnic_trace_buf_p); + kvfree((void *)fnic_trace_buf_p); fnic_trace_buf_p = 0; } printk(KERN_INFO PFX "Successfully Freed Trace Buffer\n"); -- 1.7.12.4
next prev parent reply other threads:[~2018-08-02 11:40 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-08-02 11:28 [PATCH v2 0/4] Use dma_zalloc_coherent and kvcalloc to replace open code zhong jiang 2018-08-02 11:28 ` zhong jiang 2018-08-02 11:28 ` zhong jiang [this message] 2018-08-02 11:28 ` [PATCH v2 1/4] driver/scsi/fnic/fnic_trace: Use kvcalloc instead of vmalloc+memset zhong jiang 2018-08-02 11:28 ` [PATCH v2 2/4] drivers/scsi/dpt_i2o: Use dma_zalloc_coherent to repalce dma_alloc_coherent+memset zhong jiang 2018-08-02 11:28 ` zhong jiang 2018-08-02 11:28 ` [PATCH v2 3/4] drivers/scsi/snic/snic_trc: Use kvcalloc instead of vmalloc+memset zhong jiang 2018-08-02 11:28 ` zhong jiang 2018-08-02 11:28 ` [PATCH v2 4/4] drivers/scsi/mvsas/mv_init: Use dma_zalloc_coherent to replace dma_alloc_coherent+memset zhong jiang 2018-08-02 11:28 ` zhong jiang 2018-08-23 11:25 ` [PATCH v2 0/4] Use dma_zalloc_coherent and kvcalloc to replace open code zhong jiang 2018-08-23 11:25 ` zhong jiang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1533209314-1074-2-git-send-email-zhongjiang@huawei.com \ --to=zhongjiang@huawei.com \ --cc=aacraid@microsemi.com \ --cc=andy.shevchenko@gmail.com \ --cc=jejb@linux.vnet.ibm.com \ --cc=joe@perches.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-scsi@vger.kernel.org \ --cc=martin.petersen@oracle.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.