1 files changed, 23 insertions, 18 deletions

diff --git a/drivers/gpu/nvgpu/os/linux/swap.h b/drivers/gpu/nvgpu/os/linux/swap.h
index f762ba81..1e986095 100644
--- a/drivers/gpu/nvgpu/os/linux/swap.h
+++ b/drivers/gpu/nvgpu/os/linux/swap.h
@@ -2,17 +2,23 @@
 #include <linux/bio.h>
 //#include <nvgpu/bug.h>
 
+// Callback for completion of the I/O chain
+static void complete_swap_io(struct bio *bio) {
+  struct nvgpu_mapped_buf *m = bio->bi_private;
+  bio_put(bio);
+  complete(&m->os_priv.swap_io_done);
+}
+
 // Queue a command to copy out an SGT to disk
 // TODO: Cache bdev
-// TODO: Asynchronous I/O
 // TODO: Don't hardcode sector 0
-int copy(struct sg_table *sgt, int op) {
+// TODO: Figure out if submit_bio() can fail, and what to do then
+int copy(struct sg_table *sgt, int op, struct nvgpu_mapped_buf *m) {
   unsigned int i;
   struct scatterlist *sg;
   struct bio *bio;
   int err = 0;
   int sg_cnt = sgt->nents;
-  struct bio *bio_orig;
   sector_t sector = 0; // XXX: For testing
   // Find and open the block device
   struct block_device *bdev = blkdev_get_by_path("/dev/nvme0n1", FMODE_READ | FMODE_WRITE, copy);
@@ -20,12 +26,15 @@ int copy(struct sg_table *sgt, int op) {
     printk(KERN_WARNING "Unabled to find `nvme0`, err %ld!\n", PTR_ERR(bdev));
     return -ENODEV;
   }
-  // Will never fail when allocating <= BIO_MAX_PAGES
+  // Reset the .done variable in the completion
+  reinit_completion(&m->os_priv.swap_io_done);
+  // bio_alloc() will never fail when allocating <= BIO_MAX_PAGES
   bio = bio_alloc(GFP_KERNEL, min(sg_cnt, BIO_MAX_PAGES));
-  bio_orig = bio;
   bio->bi_bdev = bdev; // Switch to bio_set_dev(bdev) in newer kernels
   bio->bi_iter.bi_sector = sector;
-  bio_set_op_attrs(bio, op, op == REQ_OP_WRITE ? WRITE_ODIRECT : 0);//REQ_SYNC); // XXX: Is REQ_SYNC necessary?
+  bio_set_op_attrs(bio, op, REQ_SYNC); // REQ_SYNC is identical to WRITE_ODIRECT
+  bio->bi_private = m;
+  bio->bi_end_io = complete_swap_io;
   // Copy the scatter-gather table (sgt) into a block I/O vector (bio vec)
   // bio_chain() approach borrowed from drivers/nvme/target/io-cmd.c:nvmet_execute_rw()
   for_each_sg(sgt->sgl, sg, sgt->nents, i) {
@@ -47,16 +56,12 @@ int copy(struct sg_table *sgt, int op) {
     sector += sg_dma_len(sg) >> 9;
     sg_cnt--;
   }
-  // Use blocking submit for now
-  // TODO: Switch to async via submit_bio(bio)
-  err = submit_bio_wait(bio);
 
-  if (bio->bi_error && bio->bi_error != err)
-    printk(KERN_WARNING "nvgpu: bio->bi_error %d != return val from submit_bio_wait() %d\n", bio->bi_error, err);
+  // Async submit. Caller should wait_for_completion_io(&m->os_priv.swap_io_done);
+  submit_bio(bio);
 
-//out:
-  bio_put(bio_orig); // TODO: Move to completion handler
-  blkdev_put(bdev, FMODE_WRITE|FMODE_READ);
+  // Release our block device handle
+  blkdev_put(bdev, FMODE_WRITE | FMODE_READ); // Is this safe?
   return err;
 }
 
@@ -107,11 +112,11 @@ int copy_all(struct vm_gk20a *vm) {
         return 0;
 }
 
-int copy_out(struct sg_table *sgt) {
-  return copy(sgt, REQ_OP_WRITE);
+int copy_out(struct sg_table *sgt, struct nvgpu_mapped_buf *m) {
+  return copy(sgt, REQ_OP_WRITE, m);
 }
 
-int copy_in(struct sg_table *sgt) {
-  return copy(sgt, REQ_OP_READ);
+int copy_in(struct sg_table *sgt, struct nvgpu_mapped_buf *m) {
+  return copy(sgt, REQ_OP_READ, m);
 }