From: Haomai Wang <haomai@xsky.com>
Date: Thu, 7 Jan 2016 15:18:06 +0000 (+0800)
Subject: NVMEDevice: add perf counter
X-Git-Tag: v10.0.4~81^2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8e258ffb60402795250f77532abb1be161218549;p=ceph.git

NVMEDevice: add perf counter

Signed-off-by: Haomai Wang <haomai@xsky.com>
---

diff --git a/src/os/bluestore/NVMEDevice.cc b/src/os/bluestore/NVMEDevice.cc
index ac0ba2dc5e3a..81e4e55b1bd8 100644
--- a/src/os/bluestore/NVMEDevice.cc
+++ b/src/os/bluestore/NVMEDevice.cc
@@ -36,6 +36,7 @@
 #include "common/errno.h"
 #include "common/debug.h"
 #include "common/Initialize.h"
+#include "common/perf_counters.h"
 
 #include "NVMEDevice.h"
 
@@ -46,6 +47,14 @@
 rte_mempool *request_mempool = nullptr;
 rte_mempool *task_pool = nullptr;
 
+enum {
+  l_bluestore_nvmedevice_first = 632430,
+  l_bluestore_nvmedevice_aio_write_lat,
+  l_bluestore_nvmedevice_read_lat,
+  l_bluestore_nvmedevice_flush_lat,
+  l_bluestore_nvmedevice_last
+};
+
 static void io_complete(void *t, const struct nvme_completion *completion) {
   Task *task = static_cast<Task*>(t);
   IOContext *ctx = task->ctx;
@@ -65,6 +74,9 @@ static void io_complete(void *t, const struct nvme_completion *completion) {
         ctx->cond.Signal();
       }
     }
+    utime_t lat = ceph_clock_now(g_ceph_context);
+    lat -= task->start;
+    task->device->logger->tinc(l_bluestore_nvmedevice_aio_write_lat, lat);
     rte_free(task->buf);
     rte_mempool_put(task_pool, task);
   } else if (task->command == IOCommand::READ_COMMAND) {
@@ -74,8 +86,13 @@ static void io_complete(void *t, const struct nvme_completion *completion) {
       task->return_code = -1; // FIXME
     else
       task->return_code = 0;
-    Mutex::Locker l(ctx->lock);
-    ctx->cond.Signal();
+    {
+      Mutex::Locker l(ctx->lock);
+      ctx->cond.Signal();
+    }
+    utime_t lat = ceph_clock_now(g_ceph_context);
+    lat -= task->start;
+    task->device->logger->tinc(l_bluestore_nvmedevice_read_lat, lat);
   } else {
     assert(task->command == IOCommand::FLUSH_COMMAND);
     dout(20) << __func__ << " flush op successfully" << dendl;
@@ -83,8 +100,13 @@ static void io_complete(void *t, const struct nvme_completion *completion) {
       task->return_code = -1; // FIXME
     else
       task->return_code = 0;
-    Mutex::Locker l(ctx->lock);
-    ctx->cond.Signal();
+    {
+      Mutex::Locker l(ctx->lock);
+      ctx->cond.Signal();
+    }
+    utime_t lat = ceph_clock_now(g_ceph_context);
+    lat -= task->start;
+    task->device->logger->tinc(l_bluestore_nvmedevice_flush_lat, lat);
   }
 }
 
@@ -296,6 +318,7 @@ NVMEDevice::NVMEDevice(aio_callback_t cb, void *cbpriv)
 {
   zeros = buffer::create_page_aligned(1048576);
   zeros.zero();
+
 }
 
 
@@ -328,6 +351,13 @@ int NVMEDevice::open(string p)
           << " block_size " << block_size << " (" << pretty_si_t(block_size)
           << "B)" << dendl;
 
+  PerfCountersBuilder b(g_ceph_context, string("nvmedevice-") + name + "-" + std::to_string(this),
+                        l_bluestore_nvmedevice_first, l_bluestore_nvmedevice_last);
+  b.add_time_avg(l_bluestore_nvmedevice_aio_write_lat, "aio_write_lat", "Average journal
+  b.add_time_avg(l_bluestore_nvmedevice_read_lat, "read_lat", "Average read completing l
+  logger = b.create_perf_counters();
+  g_ceph_context->get_perfcounters_collection()->add(logger);
+
   return 0;
 }
 
@@ -342,6 +372,10 @@ void NVMEDevice::close()
   }
   aio_thread.join();
   aio_stop = false;
+
+  g_ceph_context->get_perfcounters_collection()->remove(logger);
+  delete logger;
+
   name.clear();
   driver_data.release(ctrlr);
   ctrlr = nullptr;
@@ -367,7 +401,8 @@ void NVMEDevice::_aio_thread()
         t = task_queue.front();
         task_queue.pop();
       }
-      queue_empty.inc();
+      if (!t)
+        queue_empty.inc();
     } else if (!inflight_ops.read()) {
       Mutex::Locker l(queue_lock);
       if (queue_empty.read())
@@ -452,6 +487,7 @@ int NVMEDevice::flush()
     return r;
   }
 
+  t->start = ceph_clock_now(g_ceph_context);
   IOContext ioc(nullptr);
   t->buf = nullptr;
   t->ctx = &ioc;
@@ -518,6 +554,7 @@ int NVMEDevice::aio_write(
 		derr << __func__ << " task_pool rte_mempool_get failed" << dendl;
     return r;
 	}
+  t->start = ceph_clock_now(g_ceph_context);
 
   t->buf = rte_malloc(NULL, len, block_size);
 	if (t->buf == NULL) {
@@ -588,6 +625,7 @@ int NVMEDevice::read(uint64_t off, uint64_t len, bufferlist *pbl,
     derr << __func__ << " task_pool rte_mempool_get failed" << dendl;
     return r;
   }
+  t->start = ceph_clock_now(g_ceph_context);
 
   bufferptr p = buffer::create_page_aligned(len);
   t->buf = rte_malloc(NULL, len, block_size);
diff --git a/src/os/bluestore/NVMEDevice.h b/src/os/bluestore/NVMEDevice.h
index c83fbaec8e0b..b7e365277688 100644
--- a/src/os/bluestore/NVMEDevice.h
+++ b/src/os/bluestore/NVMEDevice.h
@@ -35,6 +35,7 @@ extern "C" {
 #endif
 
 #include "include/atomic.h"
+#include "include/utime.h"
 #include "common/Mutex.h"
 #include "BlockDevice.h"
 
@@ -54,8 +55,11 @@ struct Task {
   void *buf;
   Task *next, *prev;
   int64_t return_code;
+  utime_t start;
 };
 
+class PerfCounters;
+
 class NVMEDevice : public BlockDevice {
   /**
    * points to pinned, physically contiguous memory region;
@@ -91,6 +95,7 @@ class NVMEDevice : public BlockDevice {
   static void init();
 
  public:
+  PerfCounters *logger;
   atomic_t inflight_ops;
   aio_callback_t aio_callback;
   void *aio_callback_priv;