Replacing get_zeroed_page/free_page/dma_map_single/dma_unmap_single()
with dma_alloc_coherent/dma_free_coherent() helps to reduce
code size, and simplify the code, and coherent DMA will not
clear the cache every time.
Signed-off-by: Cai Huoqing <[email protected]>
---
drivers/scsi/ibmvscsi/ibmvfc.c | 15 +++------------
drivers/scsi/ibmvscsi/ibmvscsi.c | 26 ++++++--------------------
2 files changed, 9 insertions(+), 32 deletions(-)
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 1f1586ad48fe..f65d1a78b272 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -869,8 +869,7 @@ static void ibmvfc_free_queue(struct ibmvfc_host *vhost,
{
struct device *dev = vhost->dev;
- dma_unmap_single(dev, queue->msg_token, PAGE_SIZE, DMA_BIDIRECTIONAL);
- free_page((unsigned long)queue->msgs.handle);
+ dma_free_coherent(dev, PAGE_SIZE, queue->msgs.handle, queue->msg_token);
queue->msgs.handle = NULL;
ibmvfc_free_event_pool(vhost, queue);
@@ -5663,19 +5662,11 @@ static int ibmvfc_alloc_queue(struct ibmvfc_host *vhost,
return -ENOMEM;
}
- queue->msgs.handle = (void *)get_zeroed_page(GFP_KERNEL);
+ queue->msgs.handle = dma_alloc_coherent(dev, PAGE_SIZE,
+ &queue->msg_token, GFP_KERNEL);
if (!queue->msgs.handle)
return -ENOMEM;
- queue->msg_token = dma_map_single(dev, queue->msgs.handle, PAGE_SIZE,
- DMA_BIDIRECTIONAL);
-
- if (dma_mapping_error(dev, queue->msg_token)) {
- free_page((unsigned long)queue->msgs.handle);
- queue->msgs.handle = NULL;
- return -ENOMEM;
- }
-
queue->cur = 0;
queue->fmt = fmt;
queue->size = PAGE_SIZE / fmt_size;
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index ea8e01f49cba..61b315d1edbc 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -151,10 +151,7 @@ static void ibmvscsi_release_crq_queue(struct crq_queue *queue,
msleep(100);
rc = plpar_hcall_norets(H_FREE_CRQ, vdev->unit_address);
} while ((rc == H_BUSY) || (H_IS_LONG_BUSY(rc)));
- dma_unmap_single(hostdata->dev,
- queue->msg_token,
- queue->size * sizeof(*queue->msgs), DMA_BIDIRECTIONAL);
- free_page((unsigned long)queue->msgs);
+ dma_free_coherent(hostdata->dev, PAGE_SIZE, queue->msgs, queue->msg_token);
}
/**
@@ -331,18 +328,11 @@ static int ibmvscsi_init_crq_queue(struct crq_queue *queue,
int retrc;
struct vio_dev *vdev = to_vio_dev(hostdata->dev);
- queue->msgs = (struct viosrp_crq *)get_zeroed_page(GFP_KERNEL);
-
- if (!queue->msgs)
- goto malloc_failed;
queue->size = PAGE_SIZE / sizeof(*queue->msgs);
-
- queue->msg_token = dma_map_single(hostdata->dev, queue->msgs,
- queue->size * sizeof(*queue->msgs),
- DMA_BIDIRECTIONAL);
-
- if (dma_mapping_error(hostdata->dev, queue->msg_token))
- goto map_failed;
+ queue->msgs = dma_alloc_coherent(hostdata->dev, PAGE_SIZE,
+ &queue->msg_token, GFP_KERNEL);
+ if (!queue->msg)
+ goto malloc_failed;
gather_partition_info();
set_adapter_info(hostdata);
@@ -395,11 +385,7 @@ static int ibmvscsi_init_crq_queue(struct crq_queue *queue,
rc = plpar_hcall_norets(H_FREE_CRQ, vdev->unit_address);
} while ((rc == H_BUSY) || (H_IS_LONG_BUSY(rc)));
reg_crq_failed:
- dma_unmap_single(hostdata->dev,
- queue->msg_token,
- queue->size * sizeof(*queue->msgs), DMA_BIDIRECTIONAL);
- map_failed:
- free_page((unsigned long)queue->msgs);
+ dma_free_coherent(hostdata->dev, PAGE_SIZE, queue->msg, queue->msg_token);
malloc_failed:
return -1;
}
--
2.25.1
Hi Cai,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on powerpc/next]
[also build test ERROR on v5.15-rc5 next-20211011]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Cai-Huoqing/scsi-ibmvscsi-Use-dma_alloc_coherent-instead-of-get_zeroed_page-dma_map_single/20211011-000515
base: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next
config: powerpc-allyesconfig (attached as .config)
compiler: powerpc64-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/a1533699f9b84980097fc59d047b5292c1abab1b
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Cai-Huoqing/scsi-ibmvscsi-Use-dma_alloc_coherent-instead-of-get_zeroed_page-dma_map_single/20211011-000515
git checkout a1533699f9b84980097fc59d047b5292c1abab1b
# save the attached .config to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=powerpc SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <[email protected]>
All errors (new ones prefixed by >>):
drivers/scsi/ibmvscsi/ibmvscsi.c: In function 'ibmvscsi_init_crq_queue':
>> drivers/scsi/ibmvscsi/ibmvscsi.c:334:21: error: 'struct crq_queue' has no member named 'msg'; did you mean 'msgs'?
334 | if (!queue->msg)
| ^~~
| msgs
drivers/scsi/ibmvscsi/ibmvscsi.c:388:60: error: 'struct crq_queue' has no member named 'msg'; did you mean 'msgs'?
388 | dma_free_coherent(hostdata->dev, PAGE_SIZE, queue->msg, queue->msg_token);
| ^~~
| msgs
vim +334 drivers/scsi/ibmvscsi/ibmvscsi.c
312
313 /**
314 * ibmvscsi_init_crq_queue() - Initializes and registers CRQ with hypervisor
315 * @queue: crq_queue to initialize and register
316 * @hostdata: ibmvscsi_host_data of host
317 * @max_requests: maximum requests (unused)
318 *
319 * Allocates a page for messages, maps it for dma, and registers
320 * the crq with the hypervisor.
321 * Returns zero on success.
322 */
323 static int ibmvscsi_init_crq_queue(struct crq_queue *queue,
324 struct ibmvscsi_host_data *hostdata,
325 int max_requests)
326 {
327 int rc;
328 int retrc;
329 struct vio_dev *vdev = to_vio_dev(hostdata->dev);
330
331 queue->size = PAGE_SIZE / sizeof(*queue->msgs);
332 queue->msgs = dma_alloc_coherent(hostdata->dev, PAGE_SIZE,
333 &queue->msg_token, GFP_KERNEL);
> 334 if (!queue->msg)
335 goto malloc_failed;
336
337 gather_partition_info();
338 set_adapter_info(hostdata);
339
340 retrc = rc = plpar_hcall_norets(H_REG_CRQ,
341 vdev->unit_address,
342 queue->msg_token, PAGE_SIZE);
343 if (rc == H_RESOURCE)
344 /* maybe kexecing and resource is busy. try a reset */
345 rc = ibmvscsi_reset_crq_queue(queue,
346 hostdata);
347
348 if (rc == H_CLOSED) {
349 /* Adapter is good, but other end is not ready */
350 dev_warn(hostdata->dev, "Partner adapter not ready\n");
351 retrc = 0;
352 } else if (rc != 0) {
353 dev_warn(hostdata->dev, "Error %d opening adapter\n", rc);
354 goto reg_crq_failed;
355 }
356
357 queue->cur = 0;
358 spin_lock_init(&queue->lock);
359
360 tasklet_init(&hostdata->srp_task, (void *)ibmvscsi_task,
361 (unsigned long)hostdata);
362
363 if (request_irq(vdev->irq,
364 ibmvscsi_handle_event,
365 0, "ibmvscsi", (void *)hostdata) != 0) {
366 dev_err(hostdata->dev, "couldn't register irq 0x%x\n",
367 vdev->irq);
368 goto req_irq_failed;
369 }
370
371 rc = vio_enable_interrupts(vdev);
372 if (rc != 0) {
373 dev_err(hostdata->dev, "Error %d enabling interrupts!!!\n", rc);
374 goto req_irq_failed;
375 }
376
377 return retrc;
378
379 req_irq_failed:
380 tasklet_kill(&hostdata->srp_task);
381 rc = 0;
382 do {
383 if (rc)
384 msleep(100);
385 rc = plpar_hcall_norets(H_FREE_CRQ, vdev->unit_address);
386 } while ((rc == H_BUSY) || (H_IS_LONG_BUSY(rc)));
387 reg_crq_failed:
388 dma_free_coherent(hostdata->dev, PAGE_SIZE, queue->msg, queue->msg_token);
389 malloc_failed:
390 return -1;
391 }
392
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]