Skip to content

L
linux
Commit 6a0afdf5 authored by Jens Axboe's avatar Jens Axboe
Browse files
Options

drbd: remove tracing bits 

They should be reimplemented in the current scheme.
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent ab8fafc2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1021 deletions
drivers/block/drbd/Kconfig
View file @ 6a0afdf5
...@@ -38,17 +38,6 @@ config BLK_DEV_DRBD ...@@ -38,17 +38,6 @@ config BLK_DEV_DRBD
If unsure, say N. If unsure, say N.
config DRBD_TRACE
tristate "DRBD tracing"
depends on BLK_DEV_DRBD
select TRACEPOINTS
default n
help
Say Y here if you want to be able to trace various events in DRBD.
If unsure, say N.
config DRBD_FAULT_INJECTION config DRBD_FAULT_INJECTION
bool "DRBD fault injection" bool "DRBD fault injection"
depends on BLK_DEV_DRBD depends on BLK_DEV_DRBD
......
drivers/block/drbd/Makefile
View file @ 6a0afdf5
...@@ -2,7 +2,4 @@ drbd-y := drbd_bitmap.o drbd_proc.o ...@@ -2,7 +2,4 @@ drbd-y := drbd_bitmap.o drbd_proc.o
drbd-y += drbd_worker.o drbd_receiver.o drbd_req.o drbd_actlog.o drbd-y += drbd_worker.o drbd_receiver.o drbd_req.o drbd_actlog.o
drbd-y += drbd_main.o drbd_strings.o drbd_nl.o drbd-y += drbd_main.o drbd_strings.o drbd_nl.o
drbd_trace-y := drbd_tracing.o
obj-$(CONFIG_BLK_DEV_DRBD) += drbd.o obj-$(CONFIG_BLK_DEV_DRBD) += drbd.o
obj-$(CONFIG_DRBD_TRACE) += drbd_trace.o
drivers/block/drbd/drbd_actlog.c
View file @ 6a0afdf5
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/drbd.h> #include <linux/drbd.h>
#include "drbd_int.h" #include "drbd_int.h"
#include "drbd_tracing.h"
#include "drbd_wrappers.h" #include "drbd_wrappers.h"
/* We maintain a trivial check sum in our on disk activity log. /* We maintain a trivial check sum in our on disk activity log.
...@@ -66,17 +65,6 @@ struct drbd_atodb_wait { ...@@ -66,17 +65,6 @@ struct drbd_atodb_wait {
int w_al_write_transaction(struct drbd_conf *, struct drbd_work *, int); int w_al_write_transaction(struct drbd_conf *, struct drbd_work *, int);
/* The actual tracepoint needs to have constant number of known arguments...
*/
void trace_drbd_resync(struct drbd_conf *mdev, int level, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
trace__drbd_resync(mdev, level, fmt, ap);
va_end(ap);
}
static int _drbd_md_sync_page_io(struct drbd_conf *mdev, static int _drbd_md_sync_page_io(struct drbd_conf *mdev,
struct drbd_backing_dev *bdev, struct drbd_backing_dev *bdev,
struct page *page, sector_t sector, struct page *page, sector_t sector,
...@@ -105,8 +93,6 @@ static int _drbd_md_sync_page_io(struct drbd_conf *mdev, ...@@ -105,8 +93,6 @@ static int _drbd_md_sync_page_io(struct drbd_conf *mdev,
bio->bi_end_io = drbd_md_io_complete; bio->bi_end_io = drbd_md_io_complete;
bio->bi_rw = rw; bio->bi_rw = rw;
trace_drbd_bio(mdev, "Md", bio, 0, NULL);
if (FAULT_ACTIVE(mdev, (rw & WRITE) ? DRBD_FAULT_MD_WR : DRBD_FAULT_MD_RD)) if (FAULT_ACTIVE(mdev, (rw & WRITE) ? DRBD_FAULT_MD_WR : DRBD_FAULT_MD_RD))
bio_endio(bio, -EIO); bio_endio(bio, -EIO);
else else
...@@ -236,8 +222,6 @@ void drbd_al_begin_io(struct drbd_conf *mdev, sector_t sector) ...@@ -236,8 +222,6 @@ void drbd_al_begin_io(struct drbd_conf *mdev, sector_t sector)
D_ASSERT(atomic_read(&mdev->local_cnt) > 0); D_ASSERT(atomic_read(&mdev->local_cnt) > 0);
trace_drbd_actlog(mdev, sector, "al_begin_io");
wait_event(mdev->al_wait, (al_ext = _al_get(mdev, enr))); wait_event(mdev->al_wait, (al_ext = _al_get(mdev, enr)));
if (al_ext->lc_number != enr) { if (al_ext->lc_number != enr) {
...@@ -270,8 +254,6 @@ void drbd_al_complete_io(struct drbd_conf *mdev, sector_t sector) ...@@ -270,8 +254,6 @@ void drbd_al_complete_io(struct drbd_conf *mdev, sector_t sector)
struct lc_element *extent; struct lc_element *extent;
unsigned long flags; unsigned long flags;
trace_drbd_actlog(mdev, sector, "al_complete_io");
spin_lock_irqsave(&mdev->al_lock, flags); spin_lock_irqsave(&mdev->al_lock, flags);
extent = lc_find(mdev->act_log, enr); extent = lc_find(mdev->act_log, enr);
...@@ -967,10 +949,6 @@ void __drbd_set_in_sync(struct drbd_conf *mdev, sector_t sector, int size, ...@@ -967,10 +949,6 @@ void __drbd_set_in_sync(struct drbd_conf *mdev, sector_t sector, int size,
ebnr = BM_SECT_TO_BIT(esector - (BM_SECT_PER_BIT-1)); ebnr = BM_SECT_TO_BIT(esector - (BM_SECT_PER_BIT-1));
sbnr = BM_SECT_TO_BIT(sector + BM_SECT_PER_BIT-1); sbnr = BM_SECT_TO_BIT(sector + BM_SECT_PER_BIT-1);
trace_drbd_resync(mdev, TRACE_LVL_METRICS,
"drbd_set_in_sync: sector=%llus size=%u sbnr=%lu ebnr=%lu\n",
(unsigned long long)sector, size, sbnr, ebnr);
if (sbnr > ebnr) if (sbnr > ebnr)
return; return;
...@@ -1045,10 +1023,6 @@ void __drbd_set_out_of_sync(struct drbd_conf *mdev, sector_t sector, int size, ...@@ -1045,10 +1023,6 @@ void __drbd_set_out_of_sync(struct drbd_conf *mdev, sector_t sector, int size,
sbnr = BM_SECT_TO_BIT(sector); sbnr = BM_SECT_TO_BIT(sector);
ebnr = BM_SECT_TO_BIT(esector); ebnr = BM_SECT_TO_BIT(esector);
trace_drbd_resync(mdev, TRACE_LVL_METRICS,
"drbd_set_out_of_sync: sector=%llus size=%u sbnr=%lu ebnr=%lu\n",
(unsigned long long)sector, size, sbnr, ebnr);
/* ok, (capacity & 7) != 0 sometimes, but who cares... /* ok, (capacity & 7) != 0 sometimes, but who cares...
* we count rs_{total,left} in bits, not sectors. */ * we count rs_{total,left} in bits, not sectors. */
spin_lock_irqsave(&mdev->al_lock, flags); spin_lock_irqsave(&mdev->al_lock, flags);
...@@ -1143,10 +1117,6 @@ int drbd_rs_begin_io(struct drbd_conf *mdev, sector_t sector) ...@@ -1143,10 +1117,6 @@ int drbd_rs_begin_io(struct drbd_conf *mdev, sector_t sector)
struct bm_extent *bm_ext; struct bm_extent *bm_ext;
int i, sig; int i, sig;
trace_drbd_resync(mdev, TRACE_LVL_ALL,
"drbd_rs_begin_io: sector=%llus (rs_end=%d)\n",
(unsigned long long)sector, enr);
sig = wait_event_interruptible(mdev->al_wait, sig = wait_event_interruptible(mdev->al_wait,
(bm_ext = _bme_get(mdev, enr))); (bm_ext = _bme_get(mdev, enr)));
if (sig) if (sig)
...@@ -1192,9 +1162,6 @@ int drbd_try_rs_begin_io(struct drbd_conf *mdev, sector_t sector) ...@@ -1192,9 +1162,6 @@ int drbd_try_rs_begin_io(struct drbd_conf *mdev, sector_t sector)
struct bm_extent *bm_ext; struct bm_extent *bm_ext;
int i; int i;
trace_drbd_resync(mdev, TRACE_LVL_ALL, "drbd_try_rs_begin_io: sector=%llus\n",
(unsigned long long)sector);
spin_lock_irq(&mdev->al_lock); spin_lock_irq(&mdev->al_lock);
if (mdev->resync_wenr != LC_FREE && mdev->resync_wenr != enr) { if (mdev->resync_wenr != LC_FREE && mdev->resync_wenr != enr) {
/* in case you have very heavy scattered io, it may /* in case you have very heavy scattered io, it may
...@@ -1210,11 +1177,6 @@ int drbd_try_rs_begin_io(struct drbd_conf *mdev, sector_t sector) ...@@ -1210,11 +1177,6 @@ int drbd_try_rs_begin_io(struct drbd_conf *mdev, sector_t sector)
* the lc_put here... * the lc_put here...
* we also have to wake_up * we also have to wake_up
*/ */
trace_drbd_resync(mdev, TRACE_LVL_ALL,
"dropping %u, apparently got 'synced' by application io\n",
mdev->resync_wenr);
e = lc_find(mdev->resync, mdev->resync_wenr); e = lc_find(mdev->resync, mdev->resync_wenr);
bm_ext = e ? lc_entry(e, struct bm_extent, lce) : NULL; bm_ext = e ? lc_entry(e, struct bm_extent, lce) : NULL;
if (bm_ext) { if (bm_ext) {
...@@ -1242,21 +1204,14 @@ int drbd_try_rs_begin_io(struct drbd_conf *mdev, sector_t sector) ...@@ -1242,21 +1204,14 @@ int drbd_try_rs_begin_io(struct drbd_conf *mdev, sector_t sector)
* but then could not set BME_LOCKED, * but then could not set BME_LOCKED,
* so we tried again. * so we tried again.
* drop the extra reference. */ * drop the extra reference. */
trace_drbd_resync(mdev, TRACE_LVL_ALL,
"dropping extra reference on %u\n", enr);
bm_ext->lce.refcnt--; bm_ext->lce.refcnt--;
D_ASSERT(bm_ext->lce.refcnt > 0); D_ASSERT(bm_ext->lce.refcnt > 0);
} }
goto check_al; goto check_al;
} else { } else {
/* do we rather want to try later? */ /* do we rather want to try later? */
if (mdev->resync_locked > mdev->resync->nr_elements-3) { if (mdev->resync_locked > mdev->resync->nr_elements-3)
trace_drbd_resync(mdev, TRACE_LVL_ALL,
"resync_locked = %u!\n", mdev->resync_locked);
goto try_again; goto try_again;
}
/* Do or do not. There is no try. -- Yoda */ /* Do or do not. There is no try. -- Yoda */
e = lc_get(mdev->resync, enr); e = lc_get(mdev->resync, enr);
bm_ext = e ? lc_entry(e, struct bm_extent, lce) : NULL; bm_ext = e ? lc_entry(e, struct bm_extent, lce) : NULL;
...@@ -1281,8 +1236,6 @@ int drbd_try_rs_begin_io(struct drbd_conf *mdev, sector_t sector) ...@@ -1281,8 +1236,6 @@ int drbd_try_rs_begin_io(struct drbd_conf *mdev, sector_t sector)
goto check_al; goto check_al;
} }
check_al: check_al:
trace_drbd_resync(mdev, TRACE_LVL_ALL, "checking al for %u\n", enr);
for (i = 0; i < AL_EXT_PER_BM_SECT; i++) { for (i = 0; i < AL_EXT_PER_BM_SECT; i++) {
if (unlikely(al_enr+i == mdev->act_log->new_number)) if (unlikely(al_enr+i == mdev->act_log->new_number))
goto try_again; goto try_again;
...@@ -1296,7 +1249,6 @@ int drbd_try_rs_begin_io(struct drbd_conf *mdev, sector_t sector) ...@@ -1296,7 +1249,6 @@ int drbd_try_rs_begin_io(struct drbd_conf *mdev, sector_t sector)
return 0; return 0;
try_again: try_again:
trace_drbd_resync(mdev, TRACE_LVL_ALL, "need to try again for %u\n", enr);
if (bm_ext) if (bm_ext)
mdev->resync_wenr = enr; mdev->resync_wenr = enr;
spin_unlock_irq(&mdev->al_lock); spin_unlock_irq(&mdev->al_lock);
...@@ -1310,10 +1262,6 @@ void drbd_rs_complete_io(struct drbd_conf *mdev, sector_t sector) ...@@ -1310,10 +1262,6 @@ void drbd_rs_complete_io(struct drbd_conf *mdev, sector_t sector)
struct bm_extent *bm_ext; struct bm_extent *bm_ext;
unsigned long flags; unsigned long flags;
trace_drbd_resync(mdev, TRACE_LVL_ALL,
"drbd_rs_complete_io: sector=%llus (rs_enr=%d)\n",
(long long)sector, enr);
spin_lock_irqsave(&mdev->al_lock, flags); spin_lock_irqsave(&mdev->al_lock, flags);
e = lc_find(mdev->resync, enr); e = lc_find(mdev->resync, enr);
bm_ext = e ? lc_entry(e, struct bm_extent, lce) : NULL; bm_ext = e ? lc_entry(e, struct bm_extent, lce) : NULL;
...@@ -1348,8 +1296,6 @@ void drbd_rs_complete_io(struct drbd_conf *mdev, sector_t sector) ...@@ -1348,8 +1296,6 @@ void drbd_rs_complete_io(struct drbd_conf *mdev, sector_t sector)
*/ */
void drbd_rs_cancel_all(struct drbd_conf *mdev) void drbd_rs_cancel_all(struct drbd_conf *mdev)
{ {
trace_drbd_resync(mdev, TRACE_LVL_METRICS, "drbd_rs_cancel_all\n");
spin_lock_irq(&mdev->al_lock); spin_lock_irq(&mdev->al_lock);
if (get_ldev_if_state(mdev, D_FAILED)) { /* Makes sure ->resync is there. */ if (get_ldev_if_state(mdev, D_FAILED)) { /* Makes sure ->resync is there. */
...@@ -1375,8 +1321,6 @@ int drbd_rs_del_all(struct drbd_conf *mdev) ...@@ -1375,8 +1321,6 @@ int drbd_rs_del_all(struct drbd_conf *mdev)
struct bm_extent *bm_ext; struct bm_extent *bm_ext;
int i; int i;
trace_drbd_resync(mdev, TRACE_LVL_METRICS, "drbd_rs_del_all\n");
spin_lock_irq(&mdev->al_lock); spin_lock_irq(&mdev->al_lock);
if (get_ldev_if_state(mdev, D_FAILED)) { if (get_ldev_if_state(mdev, D_FAILED)) {
...@@ -1429,10 +1373,6 @@ void drbd_rs_failed_io(struct drbd_conf *mdev, sector_t sector, int size) ...@@ -1429,10 +1373,6 @@ void drbd_rs_failed_io(struct drbd_conf *mdev, sector_t sector, int size)
sector_t esector, nr_sectors; sector_t esector, nr_sectors;
int wake_up = 0; int wake_up = 0;
trace_drbd_resync(mdev, TRACE_LVL_SUMMARY,
"drbd_rs_failed_io: sector=%llus, size=%u\n",
(unsigned long long)sector, size);
if (size <= 0 || (size & 0x1ff) != 0 || size > DRBD_MAX_SEGMENT_SIZE) { if (size <= 0 || (size & 0x1ff) != 0 || size > DRBD_MAX_SEGMENT_SIZE) {
dev_err(DEV, "drbd_rs_failed_io: sector=%llus size=%d nonsense!\n", dev_err(DEV, "drbd_rs_failed_io: sector=%llus size=%d nonsense!\n",
(unsigned long long)sector, size); (unsigned long long)sector, size);
......
drivers/block/drbd/drbd_int.h
View file @ 6a0afdf5
...@@ -135,8 +135,6 @@ enum { ...@@ -135,8 +135,6 @@ enum {
DRBD_FAULT_MAX, DRBD_FAULT_MAX,
}; };
extern void trace_drbd_resync(struct drbd_conf *mdev, int level, const char *fmt, ...);
#ifdef CONFIG_DRBD_FAULT_INJECTION #ifdef CONFIG_DRBD_FAULT_INJECTION
extern unsigned int extern unsigned int
_drbd_insert_fault(struct drbd_conf *mdev, unsigned int type); _drbd_insert_fault(struct drbd_conf *mdev, unsigned int type);
...@@ -712,11 +710,6 @@ enum epoch_event { ...@@ -712,11 +710,6 @@ enum epoch_event {
EV_GOT_BARRIER_NR, EV_GOT_BARRIER_NR,
EV_BARRIER_DONE, EV_BARRIER_DONE,
EV_BECAME_LAST, EV_BECAME_LAST,
EV_TRACE_FLUSH, /* TRACE_ are not real events, only used for tracing */
EV_TRACE_ADD_BARRIER, /* Doing the first write as a barrier write */
EV_TRACE_SETTING_BI, /* Barrier is expressed with the first write of the next epoch */
EV_TRACE_ALLOC,
EV_TRACE_FREE,
EV_CLEANUP = 32, /* used as flag */ EV_CLEANUP = 32, /* used as flag */
}; };
......
drivers/block/drbd/drbd_main.c
View file @ 6a0afdf5
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
#include <linux/drbd_limits.h> #include <linux/drbd_limits.h>
#include "drbd_int.h" #include "drbd_int.h"
#include "drbd_tracing.h"
#include "drbd_req.h" /* only for _req_mod in tl_release and tl_clear */ #include "drbd_req.h" /* only for _req_mod in tl_release and tl_clear */
#include "drbd_vli.h" #include "drbd_vli.h"
...@@ -80,18 +79,6 @@ static int w_md_sync(struct drbd_conf *mdev, struct drbd_work *w, int unused); ...@@ -80,18 +79,6 @@ static int w_md_sync(struct drbd_conf *mdev, struct drbd_work *w, int unused);
static void md_sync_timer_fn(unsigned long data); static void md_sync_timer_fn(unsigned long data);
static int w_bitmap_io(struct drbd_conf *mdev, struct drbd_work *w, int unused); static int w_bitmap_io(struct drbd_conf *mdev, struct drbd_work *w, int unused);
DEFINE_TRACE(drbd_unplug);
DEFINE_TRACE(drbd_uuid);
DEFINE_TRACE(drbd_ee);
DEFINE_TRACE(drbd_packet);
DEFINE_TRACE(drbd_md_io);
DEFINE_TRACE(drbd_epoch);
DEFINE_TRACE(drbd_netlink);
DEFINE_TRACE(drbd_actlog);
DEFINE_TRACE(drbd_bio);
DEFINE_TRACE(_drbd_resync);
DEFINE_TRACE(drbd_req);
MODULE_AUTHOR("Philipp Reisner <phil@linbit.com>, " MODULE_AUTHOR("Philipp Reisner <phil@linbit.com>, "
"Lars Ellenberg <lars@linbit.com>"); "Lars Ellenberg <lars@linbit.com>");
MODULE_DESCRIPTION("drbd - Distributed Replicated Block Device v" REL_VERSION); MODULE_DESCRIPTION("drbd - Distributed Replicated Block Device v" REL_VERSION);
...@@ -1576,7 +1563,6 @@ int _drbd_send_cmd(struct drbd_conf *mdev, struct socket *sock, ...@@ -1576,7 +1563,6 @@ int _drbd_send_cmd(struct drbd_conf *mdev, struct socket *sock,
h->command = cpu_to_be16(cmd); h->command = cpu_to_be16(cmd);
h->length = cpu_to_be16(size-sizeof(struct p_header)); h->length = cpu_to_be16(size-sizeof(struct p_header));
trace_drbd_packet(mdev, sock, 0, (void *)h, __FILE__, __LINE__);
sent = drbd_send(mdev, sock, h, size, msg_flags); sent = drbd_send(mdev, sock, h, size, msg_flags);
ok = (sent == size); ok = (sent == size);
...@@ -1628,8 +1614,6 @@ int drbd_send_cmd2(struct drbd_conf *mdev, enum drbd_packets cmd, char *data, ...@@ -1628,8 +1614,6 @@ int drbd_send_cmd2(struct drbd_conf *mdev, enum drbd_packets cmd, char *data,
if (!drbd_get_data_sock(mdev)) if (!drbd_get_data_sock(mdev))
return 0; return 0;
trace_drbd_packet(mdev, mdev->data.socket, 0, (void *)&h, __FILE__, __LINE__);
ok = (sizeof(h) == ok = (sizeof(h) ==
drbd_send(mdev, mdev->data.socket, &h, sizeof(h), 0)); drbd_send(mdev, mdev->data.socket, &h, sizeof(h), 0));
ok = ok && (size == ok = ok && (size ==
...@@ -2359,7 +2343,6 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req) ...@@ -2359,7 +2343,6 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
dp_flags |= DP_MAY_SET_IN_SYNC; dp_flags |= DP_MAY_SET_IN_SYNC;
p.dp_flags = cpu_to_be32(dp_flags); p.dp_flags = cpu_to_be32(dp_flags);
trace_drbd_packet(mdev, mdev->data.socket, 0, (void *)&p, __FILE__, __LINE__);
set_bit(UNPLUG_REMOTE, &mdev->flags); set_bit(UNPLUG_REMOTE, &mdev->flags);
ok = (sizeof(p) == ok = (sizeof(p) ==
drbd_send(mdev, mdev->data.socket, &p, sizeof(p), MSG_MORE)); drbd_send(mdev, mdev->data.socket, &p, sizeof(p), MSG_MORE));
...@@ -2410,7 +2393,6 @@ int drbd_send_block(struct drbd_conf *mdev, enum drbd_packets cmd, ...@@ -2410,7 +2393,6 @@ int drbd_send_block(struct drbd_conf *mdev, enum drbd_packets cmd,
if (!drbd_get_data_sock(mdev)) if (!drbd_get_data_sock(mdev))
return 0; return 0;
trace_drbd_packet(mdev, mdev->data.socket, 0, (void *)&p, __FILE__, __LINE__);
ok = sizeof(p) == drbd_send(mdev, mdev->data.socket, &p, ok = sizeof(p) == drbd_send(mdev, mdev->data.socket, &p,
sizeof(p), MSG_MORE); sizeof(p), MSG_MORE);
if (ok && dgs) { if (ok && dgs) {
...@@ -2546,8 +2528,6 @@ static void drbd_unplug_fn(struct request_queue *q) ...@@ -2546,8 +2528,6 @@ static void drbd_unplug_fn(struct request_queue *q)
{ {
struct drbd_conf *mdev = q->queuedata; struct drbd_conf *mdev = q->queuedata;
trace_drbd_unplug(mdev, "got unplugged");
/* unplug FIRST */ /* unplug FIRST */
spin_lock_irq(q->queue_lock); spin_lock_irq(q->queue_lock);
blk_remove_plug(q); blk_remove_plug(q);
...@@ -3252,8 +3232,6 @@ void drbd_md_sync(struct drbd_conf *mdev) ...@@ -3252,8 +3232,6 @@ void drbd_md_sync(struct drbd_conf *mdev)
if (!get_ldev_if_state(mdev, D_FAILED)) if (!get_ldev_if_state(mdev, D_FAILED))
return; return;
trace_drbd_md_io(mdev, WRITE, mdev->ldev);
mutex_lock(&mdev->md_io_mutex); mutex_lock(&mdev->md_io_mutex);
buffer = (struct meta_data_on_disk *)page_address(mdev->md_io_page); buffer = (struct meta_data_on_disk *)page_address(mdev->md_io_page);
memset(buffer, 0, 512); memset(buffer, 0, 512);
...@@ -3308,8 +3286,6 @@ int drbd_md_read(struct drbd_conf *mdev, struct drbd_backing_dev *bdev) ...@@ -3308,8 +3286,6 @@ int drbd_md_read(struct drbd_conf *mdev, struct drbd_backing_dev *bdev)
if (!get_ldev_if_state(mdev, D_ATTACHING)) if (!get_ldev_if_state(mdev, D_ATTACHING))
return ERR_IO_MD_DISK; return ERR_IO_MD_DISK;
trace_drbd_md_io(mdev, READ, bdev);
mutex_lock(&mdev->md_io_mutex); mutex_lock(&mdev->md_io_mutex);
buffer = (struct meta_data_on_disk *)page_address(mdev->md_io_page); buffer = (struct meta_data_on_disk *)page_address(mdev->md_io_page);
...@@ -3388,11 +3364,8 @@ static void drbd_uuid_move_history(struct drbd_conf *mdev) __must_hold(local) ...@@ -3388,11 +3364,8 @@ static void drbd_uuid_move_history(struct drbd_conf *mdev) __must_hold(local)
{ {
int i; int i;
for (i = UI_HISTORY_START; i < UI_HISTORY_END; i++) { for (i = UI_HISTORY_START; i < UI_HISTORY_END; i++)
mdev->ldev->md.uuid[i+1] = mdev->ldev->md.uuid[i]; mdev->ldev->md.uuid[i+1] = mdev->ldev->md.uuid[i];
trace_drbd_uuid(mdev, i+1);
}
} }
void _drbd_uuid_set(struct drbd_conf *mdev, int idx, u64 val) __must_hold(local) void _drbd_uuid_set(struct drbd_conf *mdev, int idx, u64 val) __must_hold(local)
...@@ -3407,7 +3380,6 @@ void _drbd_uuid_set(struct drbd_conf *mdev, int idx, u64 val) __must_hold(local) ...@@ -3407,7 +3380,6 @@ void _drbd_uuid_set(struct drbd_conf *mdev, int idx, u64 val) __must_hold(local)
} }
mdev->ldev->md.uuid[idx] = val; mdev->ldev->md.uuid[idx] = val;
trace_drbd_uuid(mdev, idx);
drbd_md_mark_dirty(mdev); drbd_md_mark_dirty(mdev);
} }
...@@ -3417,7 +3389,6 @@ void drbd_uuid_set(struct drbd_conf *mdev, int idx, u64 val) __must_hold(local) ...@@ -3417,7 +3389,6 @@ void drbd_uuid_set(struct drbd_conf *mdev, int idx, u64 val) __must_hold(local)
if (mdev->ldev->md.uuid[idx]) { if (mdev->ldev->md.uuid[idx]) {
drbd_uuid_move_history(mdev); drbd_uuid_move_history(mdev);
mdev->ldev->md.uuid[UI_HISTORY_START] = mdev->ldev->md.uuid[idx]; mdev->ldev->md.uuid[UI_HISTORY_START] = mdev->ldev->md.uuid[idx];
trace_drbd_uuid(mdev, UI_HISTORY_START);
} }
_drbd_uuid_set(mdev, idx, val); _drbd_uuid_set(mdev, idx, val);
} }
...@@ -3436,7 +3407,6 @@ void drbd_uuid_new_current(struct drbd_conf *mdev) __must_hold(local) ...@@ -3436,7 +3407,6 @@ void drbd_uuid_new_current(struct drbd_conf *mdev) __must_hold(local)
dev_info(DEV, "Creating new current UUID\n"); dev_info(DEV, "Creating new current UUID\n");
D_ASSERT(mdev->ldev->md.uuid[UI_BITMAP] == 0); D_ASSERT(mdev->ldev->md.uuid[UI_BITMAP] == 0);
mdev->ldev->md.uuid[UI_BITMAP] = mdev->ldev->md.uuid[UI_CURRENT]; mdev->ldev->md.uuid[UI_BITMAP] = mdev->ldev->md.uuid[UI_CURRENT];
trace_drbd_uuid(mdev, UI_BITMAP);
get_random_bytes(&val, sizeof(u64)); get_random_bytes(&val, sizeof(u64));
_drbd_uuid_set(mdev, UI_CURRENT, val); _drbd_uuid_set(mdev, UI_CURRENT, val);
...@@ -3451,8 +3421,6 @@ void drbd_uuid_set_bm(struct drbd_conf *mdev, u64 val) __must_hold(local) ...@@ -3451,8 +3421,6 @@ void drbd_uuid_set_bm(struct drbd_conf *mdev, u64 val) __must_hold(local)
drbd_uuid_move_history(mdev); drbd_uuid_move_history(mdev);
mdev->ldev->md.uuid[UI_HISTORY_START] = mdev->ldev->md.uuid[UI_BITMAP]; mdev->ldev->md.uuid[UI_HISTORY_START] = mdev->ldev->md.uuid[UI_BITMAP];
mdev->ldev->md.uuid[UI_BITMAP] = 0; mdev->ldev->md.uuid[UI_BITMAP] = 0;
trace_drbd_uuid(mdev, UI_HISTORY_START);
trace_drbd_uuid(mdev, UI_BITMAP);
} else { } else {
if (mdev->ldev->md.uuid[UI_BITMAP]) if (mdev->ldev->md.uuid[UI_BITMAP])
dev_warn(DEV, "bm UUID already set"); dev_warn(DEV, "bm UUID already set");
...@@ -3460,7 +3428,6 @@ void drbd_uuid_set_bm(struct drbd_conf *mdev, u64 val) __must_hold(local) ...@@ -3460,7 +3428,6 @@ void drbd_uuid_set_bm(struct drbd_conf *mdev, u64 val) __must_hold(local)
mdev->ldev->md.uuid[UI_BITMAP] = val; mdev->ldev->md.uuid[UI_BITMAP] = val;
mdev->ldev->md.uuid[UI_BITMAP] &= ~((u64)1); mdev->ldev->md.uuid[UI_BITMAP] &= ~((u64)1);
trace_drbd_uuid(mdev, UI_BITMAP);
} }
drbd_md_mark_dirty(mdev); drbd_md_mark_dirty(mdev);
} }
...@@ -3727,7 +3694,6 @@ const char *drbd_buildtag(void) ...@@ -3727,7 +3694,6 @@ const char *drbd_buildtag(void)
module_init(drbd_init) module_init(drbd_init)
module_exit(drbd_cleanup) module_exit(drbd_cleanup)
/* For drbd_tracing: */
EXPORT_SYMBOL(drbd_conn_str); EXPORT_SYMBOL(drbd_conn_str);
EXPORT_SYMBOL(drbd_role_str); EXPORT_SYMBOL(drbd_role_str);
EXPORT_SYMBOL(drbd_disk_str); EXPORT_SYMBOL(drbd_disk_str);
......
drivers/block/drbd/drbd_nl.c
View file @ 6a0afdf5
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <linux/blkpg.h> #include <linux/blkpg.h>
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include "drbd_int.h" #include "drbd_int.h"
#include "drbd_tracing.h"
#include "drbd_wrappers.h" #include "drbd_wrappers.h"
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include <linux/drbd_tag_magic.h> #include <linux/drbd_tag_magic.h>
...@@ -2024,8 +2023,6 @@ static void drbd_connector_callback(struct cn_msg *req) ...@@ -2024,8 +2023,6 @@ static void drbd_connector_callback(struct cn_msg *req)
goto fail; goto fail;
} }
trace_drbd_netlink(req, 1);
if (nlp->packet_type >= P_nl_after_last_packet) { if (nlp->packet_type >= P_nl_after_last_packet) {
retcode = ERR_PACKET_NR; retcode = ERR_PACKET_NR;
goto fail; goto fail;
...@@ -2063,7 +2060,6 @@ static void drbd_connector_callback(struct cn_msg *req) ...@@ -2063,7 +2060,6 @@ static void drbd_connector_callback(struct cn_msg *req)
cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + rr; cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + rr;
cn_reply->flags = 0; cn_reply->flags = 0;
trace_drbd_netlink(cn_reply, 0);
rr = cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_KERNEL); rr = cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_KERNEL);
if (rr && rr != -ESRCH) if (rr && rr != -ESRCH)
printk(KERN_INFO "drbd: cn_netlink_send()=%d\n", rr); printk(KERN_INFO "drbd: cn_netlink_send()=%d\n", rr);
...@@ -2157,7 +2153,6 @@ void drbd_bcast_state(struct drbd_conf *mdev, union drbd_state state) ...@@ -2157,7 +2153,6 @@ void drbd_bcast_state(struct drbd_conf *mdev, union drbd_state state)
reply->minor = mdev_to_minor(mdev); reply->minor = mdev_to_minor(mdev);
reply->ret_code = NO_ERROR; reply->ret_code = NO_ERROR;
trace_drbd_netlink(cn_reply, 0);
cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO); cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO);
} }
...@@ -2190,7 +2185,6 @@ void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name) ...@@ -2190,7 +2185,6 @@ void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name)
reply->minor = mdev_to_minor(mdev); reply->minor = mdev_to_minor(mdev);
reply->ret_code = NO_ERROR; reply->ret_code = NO_ERROR;
trace_drbd_netlink(cn_reply, 0);
cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO); cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO);
} }
...@@ -2262,7 +2256,6 @@ void drbd_bcast_ee(struct drbd_conf *mdev, ...@@ -2262,7 +2256,6 @@ void drbd_bcast_ee(struct drbd_conf *mdev,
reply->minor = mdev_to_minor(mdev); reply->minor = mdev_to_minor(mdev);
reply->ret_code = NO_ERROR; reply->ret_code = NO_ERROR;
trace_drbd_netlink(cn_reply, 0);
cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO); cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO);
kfree(cn_reply); kfree(cn_reply);
} }
...@@ -2302,7 +2295,6 @@ void drbd_bcast_sync_progress(struct drbd_conf *mdev) ...@@ -2302,7 +2295,6 @@ void drbd_bcast_sync_progress(struct drbd_conf *mdev)
reply->minor = mdev_to_minor(mdev); reply->minor = mdev_to_minor(mdev);
reply->ret_code = NO_ERROR; reply->ret_code = NO_ERROR;
trace_drbd_netlink(cn_reply, 0);
cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO); cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO);
} }
...@@ -2356,7 +2348,6 @@ void drbd_nl_send_reply(struct cn_msg *req, int ret_code) ...@@ -2356,7 +2348,6 @@ void drbd_nl_send_reply(struct cn_msg *req, int ret_code)
reply->minor = ((struct drbd_nl_cfg_req *)req->data)->drbd_minor; reply->minor = ((struct drbd_nl_cfg_req *)req->data)->drbd_minor;
reply->ret_code = ret_code; reply->ret_code = ret_code;
trace_drbd_netlink(cn_reply, 0);
rr = cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO); rr = cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO);
if (rr && rr != -ESRCH) if (rr && rr != -ESRCH)
printk(KERN_INFO "drbd: cn_netlink_send()=%d\n", rr); printk(KERN_INFO "drbd: cn_netlink_send()=%d\n", rr);
......
drivers/block/drbd/drbd_receiver.c
View file @ 6a0afdf5
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include "drbd_int.h" #include "drbd_int.h"
#include "drbd_tracing.h"
#include "drbd_req.h" #include "drbd_req.h"
#include "drbd_vli.h" #include "drbd_vli.h"
...@@ -350,8 +349,6 @@ struct drbd_epoch_entry *drbd_alloc_ee(struct drbd_conf *mdev, ...@@ -350,8 +349,6 @@ struct drbd_epoch_entry *drbd_alloc_ee(struct drbd_conf *mdev,
e->epoch = NULL; e->epoch = NULL;
e->flags = 0; e->flags = 0;
trace_drbd_ee(mdev, e, "allocated");
return e; return e;
fail2: fail2:
...@@ -366,7 +363,6 @@ struct drbd_epoch_entry *drbd_alloc_ee(struct drbd_conf *mdev, ...@@ -366,7 +363,6 @@ struct drbd_epoch_entry *drbd_alloc_ee(struct drbd_conf *mdev,
void drbd_free_ee(struct drbd_conf *mdev, struct drbd_epoch_entry *e) void drbd_free_ee(struct drbd_conf *mdev, struct drbd_epoch_entry *e)
{ {
struct bio *bio = e->private_bio; struct bio *bio = e->private_bio;
trace_drbd_ee(mdev, e, "freed");
drbd_pp_free_bio_pages(mdev, bio); drbd_pp_free_bio_pages(mdev, bio);
bio_put(bio); bio_put(bio);
D_ASSERT(hlist_unhashed(&e->colision)); D_ASSERT(hlist_unhashed(&e->colision));
...@@ -420,7 +416,6 @@ static int drbd_process_done_ee(struct drbd_conf *mdev) ...@@ -420,7 +416,6 @@ static int drbd_process_done_ee(struct drbd_conf *mdev)
* all ignore the last argument. * all ignore the last argument.
*/ */
list_for_each_entry_safe(e, t, &work_list, w.list) { list_for_each_entry_safe(e, t, &work_list, w.list) {
trace_drbd_ee(mdev, e, "process_done_ee");
/* list_del not necessary, next/prev members not touched */ /* list_del not necessary, next/prev members not touched */
ok = e->w.cb(mdev, &e->w, !ok) && ok; ok = e->w.cb(mdev, &e->w, !ok) && ok;
drbd_free_ee(mdev, e); drbd_free_ee(mdev, e);
...@@ -1021,8 +1016,6 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev, ...@@ -1021,8 +1016,6 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
break; break;
} }
trace_drbd_epoch(mdev, epoch, ev);
if (epoch_size != 0 && if (epoch_size != 0 &&
atomic_read(&epoch->active) == 0 && atomic_read(&epoch->active) == 0 &&
test_bit(DE_HAVE_BARRIER_NUMBER, &epoch->flags) && test_bit(DE_HAVE_BARRIER_NUMBER, &epoch->flags) &&
...@@ -1054,7 +1047,6 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev, ...@@ -1054,7 +1047,6 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
list_del(&epoch->list); list_del(&epoch->list);
ev = EV_BECAME_LAST | (ev & EV_CLEANUP); ev = EV_BECAME_LAST | (ev & EV_CLEANUP);
mdev->epochs--; mdev->epochs--;
trace_drbd_epoch(mdev, epoch, EV_TRACE_FREE);
kfree(epoch); kfree(epoch);
if (rv == FE_STILL_LIVE) if (rv == FE_STILL_LIVE)
...@@ -1080,7 +1072,6 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev, ...@@ -1080,7 +1072,6 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
struct flush_work *fw; struct flush_work *fw;
fw = kmalloc(sizeof(*fw), GFP_ATOMIC); fw = kmalloc(sizeof(*fw), GFP_ATOMIC);
if (fw) { if (fw) {
trace_drbd_epoch(mdev, epoch, EV_TRACE_FLUSH);
fw->w.cb = w_flush; fw->w.cb = w_flush;
fw->epoch = epoch; fw->epoch = epoch;
drbd_queue_work(&mdev->data.work, &fw->w); drbd_queue_work(&mdev->data.work, &fw->w);
...@@ -1251,7 +1242,6 @@ static int receive_Barrier(struct drbd_conf *mdev, struct p_header *h) ...@@ -1251,7 +1242,6 @@ static int receive_Barrier(struct drbd_conf *mdev, struct p_header *h)
list_add(&epoch->list, &mdev->current_epoch->list); list_add(&epoch->list, &mdev->current_epoch->list);
mdev->current_epoch = epoch; mdev->current_epoch = epoch;
mdev->epochs++; mdev->epochs++;
trace_drbd_epoch(mdev, epoch, EV_TRACE_ALLOC);
} else { } else {
/* The current_epoch got recycled while we allocated this one... */ /* The current_epoch got recycled while we allocated this one... */
kfree(epoch); kfree(epoch);
...@@ -1458,8 +1448,6 @@ static int recv_resync_read(struct drbd_conf *mdev, sector_t sector, int data_si ...@@ -1458,8 +1448,6 @@ static int recv_resync_read(struct drbd_conf *mdev, sector_t sector, int data_si
list_add(&e->w.list, &mdev->sync_ee); list_add(&e->w.list, &mdev->sync_ee);
spin_unlock_irq(&mdev->req_lock); spin_unlock_irq(&mdev->req_lock);
trace_drbd_ee(mdev, e, "submitting for (rs)write");
trace_drbd_bio(mdev, "Sec", e->private_bio, 0, NULL);
drbd_generic_make_request(mdev, DRBD_FAULT_RS_WR, e->private_bio); drbd_generic_make_request(mdev, DRBD_FAULT_RS_WR, e->private_bio);
/* accounting done in endio */ /* accounting done in endio */
...@@ -1721,16 +1709,13 @@ static int receive_Data(struct drbd_conf *mdev, struct p_header *h) ...@@ -1721,16 +1709,13 @@ static int receive_Data(struct drbd_conf *mdev, struct p_header *h)
epoch = list_entry(e->epoch->list.prev, struct drbd_epoch, list); epoch = list_entry(e->epoch->list.prev, struct drbd_epoch, list);
if (epoch == e->epoch) { if (epoch == e->epoch) {
set_bit(DE_CONTAINS_A_BARRIER, &e->epoch->flags); set_bit(DE_CONTAINS_A_BARRIER, &e->epoch->flags);
trace_drbd_epoch(mdev, e->epoch, EV_TRACE_ADD_BARRIER);
rw |= (1<<BIO_RW_BARRIER); rw |= (1<<BIO_RW_BARRIER);
e->flags |= EE_IS_BARRIER; e->flags |= EE_IS_BARRIER;
} else { } else {
if (atomic_read(&epoch->epoch_size) > 1 || if (atomic_read(&epoch->epoch_size) > 1 ||
!test_bit(DE_CONTAINS_A_BARRIER, &epoch->flags)) { !test_bit(DE_CONTAINS_A_BARRIER, &epoch->flags)) {
set_bit(DE_BARRIER_IN_NEXT_EPOCH_ISSUED, &epoch->flags); set_bit(DE_BARRIER_IN_NEXT_EPOCH_ISSUED, &epoch->flags);
trace_drbd_epoch(mdev, epoch, EV_TRACE_SETTING_BI);
set_bit(DE_CONTAINS_A_BARRIER, &e->epoch->flags); set_bit(DE_CONTAINS_A_BARRIER, &e->epoch->flags);
trace_drbd_epoch(mdev, e->epoch, EV_TRACE_ADD_BARRIER);
rw |= (1<<BIO_RW_BARRIER); rw |= (1<<BIO_RW_BARRIER);
e->flags |= EE_IS_BARRIER; e->flags |= EE_IS_BARRIER;
} }
...@@ -1905,8 +1890,6 @@ static int receive_Data(struct drbd_conf *mdev, struct p_header *h) ...@@ -1905,8 +1890,6 @@ static int receive_Data(struct drbd_conf *mdev, struct p_header *h)
} }
e->private_bio->bi_rw = rw; e->private_bio->bi_rw = rw;
trace_drbd_ee(mdev, e, "submitting for (data)write");
trace_drbd_bio(mdev, "Sec", e->private_bio, 0, NULL);
drbd_generic_make_request(mdev, DRBD_FAULT_DT_WR, e->private_bio); drbd_generic_make_request(mdev, DRBD_FAULT_DT_WR, e->private_bio);
/* accounting done in endio */ /* accounting done in endio */
...@@ -2065,8 +2048,6 @@ static int receive_DataRequest(struct drbd_conf *mdev, struct p_header *h) ...@@ -2065,8 +2048,6 @@ static int receive_DataRequest(struct drbd_conf *mdev, struct p_header *h)
inc_unacked(mdev); inc_unacked(mdev);
trace_drbd_ee(mdev, e, "submitting for read");
trace_drbd_bio(mdev, "Sec", e->private_bio, 0, NULL);
drbd_generic_make_request(mdev, fault_type, e->private_bio); drbd_generic_make_request(mdev, fault_type, e->private_bio);
maybe_kick_lo(mdev); maybe_kick_lo(mdev);
...@@ -3543,9 +3524,6 @@ static void drbdd(struct drbd_conf *mdev) ...@@ -3543,9 +3524,6 @@ static void drbdd(struct drbd_conf *mdev)
drbd_force_state(mdev, NS(conn, C_PROTOCOL_ERROR)); drbd_force_state(mdev, NS(conn, C_PROTOCOL_ERROR));
break; break;
} }
trace_drbd_packet(mdev, mdev->data.socket, 2, &mdev->data.rbuf,
__FILE__, __LINE__);
} }
} }
...@@ -3825,9 +3803,6 @@ static int drbd_do_handshake(struct drbd_conf *mdev) ...@@ -3825,9 +3803,6 @@ static int drbd_do_handshake(struct drbd_conf *mdev)
return 0; return 0;
} }
trace_drbd_packet(mdev, mdev->data.socket, 2, &mdev->data.rbuf,
__FILE__, __LINE__);
p->protocol_min = be32_to_cpu(p->protocol_min); p->protocol_min = be32_to_cpu(p->protocol_min);
p->protocol_max = be32_to_cpu(p->protocol_max); p->protocol_max = be32_to_cpu(p->protocol_max);
if (p->protocol_max == 0) if (p->protocol_max == 0)
...@@ -4420,14 +4395,11 @@ int drbd_asender(struct drbd_thread *thi) ...@@ -4420,14 +4395,11 @@ int drbd_asender(struct drbd_thread *thi)
goto disconnect; goto disconnect;
} }
expect = cmd->pkt_size; expect = cmd->pkt_size;
ERR_IF(len != expect-sizeof(struct p_header)) { ERR_IF(len != expect-sizeof(struct p_header))
trace_drbd_packet(mdev, mdev->meta.socket, 1, (void *)h, __FILE__, __LINE__);
goto reconnect; goto reconnect;
}
} }
if (received == expect) { if (received == expect) {
D_ASSERT(cmd != NULL); D_ASSERT(cmd != NULL);
trace_drbd_packet(mdev, mdev->meta.socket, 1, (void *)h, __FILE__, __LINE__);
if (!cmd->process(mdev, h)) if (!cmd->process(mdev, h))
goto reconnect; goto reconnect;
......
drivers/block/drbd/drbd_req.c
View file @ 6a0afdf5
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/drbd.h> #include <linux/drbd.h>
#include "drbd_int.h" #include "drbd_int.h"
#include "drbd_tracing.h"
#include "drbd_req.h" #include "drbd_req.h"
...@@ -218,7 +217,6 @@ static void _about_to_complete_local_write(struct drbd_conf *mdev, ...@@ -218,7 +217,6 @@ static void _about_to_complete_local_write(struct drbd_conf *mdev,
void complete_master_bio(struct drbd_conf *mdev, void complete_master_bio(struct drbd_conf *mdev,
struct bio_and_error *m) struct bio_and_error *m)
{ {
trace_drbd_bio(mdev, "Rq", m->bio, 1, NULL);
bio_endio(m->bio, m->error); bio_endio(m->bio, m->error);
dec_ap_bio(mdev); dec_ap_bio(mdev);
} }
...@@ -236,8 +234,6 @@ void _req_may_be_done(struct drbd_request *req, struct bio_and_error *m) ...@@ -236,8 +234,6 @@ void _req_may_be_done(struct drbd_request *req, struct bio_and_error *m)
/* only WRITES may end up here without a master bio (on barrier ack) */ /* only WRITES may end up here without a master bio (on barrier ack) */
int rw = req->master_bio ? bio_data_dir(req->master_bio) : WRITE; int rw = req->master_bio ? bio_data_dir(req->master_bio) : WRITE;
trace_drbd_req(req, nothing, "_req_may_be_done");
/* we must not complete the master bio, while it is /* we must not complete the master bio, while it is
* still being processed by _drbd_send_zc_bio (drbd_send_dblock) * still being processed by _drbd_send_zc_bio (drbd_send_dblock)
* not yet acknowledged by the peer * not yet acknowledged by the peer
...@@ -415,8 +411,6 @@ void __req_mod(struct drbd_request *req, enum drbd_req_event what, ...@@ -415,8 +411,6 @@ void __req_mod(struct drbd_request *req, enum drbd_req_event what,
struct drbd_conf *mdev = req->mdev; struct drbd_conf *mdev = req->mdev;
m->bio = NULL; m->bio = NULL;
trace_drbd_req(req, what, NULL);
switch (what) { switch (what) {
default: default:
dev_err(DEV, "LOGIC BUG in %s:%u\n", __FILE__ , __LINE__); dev_err(DEV, "LOGIC BUG in %s:%u\n", __FILE__ , __LINE__);
...@@ -666,7 +660,6 @@ void __req_mod(struct drbd_request *req, enum drbd_req_event what, ...@@ -666,7 +660,6 @@ void __req_mod(struct drbd_request *req, enum drbd_req_event what,
* this is bad, because if the connection is lost now, * this is bad, because if the connection is lost now,
* we won't be able to clean them up... */ * we won't be able to clean them up... */
dev_err(DEV, "FIXME (barrier_acked but pending)\n"); dev_err(DEV, "FIXME (barrier_acked but pending)\n");
trace_drbd_req(req, nothing, "FIXME (barrier_acked but pending)");
list_move(&req->tl_requests, &mdev->out_of_sequence_requests); list_move(&req->tl_requests, &mdev->out_of_sequence_requests);
} }
D_ASSERT(req->rq_state & RQ_NET_SENT); D_ASSERT(req->rq_state & RQ_NET_SENT);
...@@ -736,8 +729,6 @@ static int drbd_make_request_common(struct drbd_conf *mdev, struct bio *bio) ...@@ -736,8 +729,6 @@ static int drbd_make_request_common(struct drbd_conf *mdev, struct bio *bio)
return 0; return 0;
} }
trace_drbd_bio(mdev, "Rq", bio, 0, req);
local = get_ldev(mdev); local = get_ldev(mdev);
if (!local) { if (!local) {
bio_put(req->private_bio); /* or we get a bio leak */ bio_put(req->private_bio); /* or we get a bio leak */
...@@ -928,8 +919,6 @@ static int drbd_make_request_common(struct drbd_conf *mdev, struct bio *bio) ...@@ -928,8 +919,6 @@ static int drbd_make_request_common(struct drbd_conf *mdev, struct bio *bio)
if (local) { if (local) {
req->private_bio->bi_bdev = mdev->ldev->backing_bdev; req->private_bio->bi_bdev = mdev->ldev->backing_bdev;
trace_drbd_bio(mdev, "Pri", req->private_bio, 0, NULL);
if (FAULT_ACTIVE(mdev, rw == WRITE ? DRBD_FAULT_DT_WR if (FAULT_ACTIVE(mdev, rw == WRITE ? DRBD_FAULT_DT_WR
: rw == READ ? DRBD_FAULT_DT_RD : rw == READ ? DRBD_FAULT_DT_RD
: DRBD_FAULT_DT_RA)) : DRBD_FAULT_DT_RA))
......
drivers/block/drbd/drbd_tracing.c deleted 100644 → 0
View file @ ab8fafc2
/*
drbd_tracing.c
This file is part of DRBD by Philipp Reisner and Lars Ellenberg.
Copyright (C) 2003-2008, LINBIT Information Technologies GmbH.
Copyright (C) 2003-2008, Philipp Reisner <philipp.reisner@linbit.com>.
Copyright (C) 2003-2008, Lars Ellenberg <lars.ellenberg@linbit.com>.
drbd is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
drbd is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with drbd; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <linux/module.h>
#include <linux/drbd.h>
#include <linux/ctype.h>
#include "drbd_int.h"
#include "drbd_tracing.h"
#include <linux/drbd_tag_magic.h>
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Philipp Reisner, Lars Ellenberg");
MODULE_DESCRIPTION("DRBD tracepoint probes");
MODULE_PARM_DESC(trace_mask, "Bitmap of events to trace see drbd_tracing.c");
MODULE_PARM_DESC(trace_level, "Current tracing level (changeable in /sys)");
MODULE_PARM_DESC(trace_devs, "Bitmap of devices to trace (changeable in /sys)");
unsigned int trace_mask = 0; /* Bitmap of events to trace */
int trace_level; /* Current trace level */
int trace_devs; /* Bitmap of devices to trace */
module_param(trace_mask, uint, 0444);
module_param(trace_level, int, 0644);
module_param(trace_devs, int, 0644);
enum {
TRACE_PACKET = 0x0001,
TRACE_RQ = 0x0002,
TRACE_UUID = 0x0004,
TRACE_RESYNC = 0x0008,
TRACE_EE = 0x0010,
TRACE_UNPLUG = 0x0020,
TRACE_NL = 0x0040,
TRACE_AL_EXT = 0x0080,
TRACE_INT_RQ = 0x0100,
TRACE_MD_IO = 0x0200,
TRACE_EPOCH = 0x0400,
};
/* Buffer printing support
* dbg_print_flags: used for Flags arg to drbd_print_buffer
* - DBGPRINT_BUFFADDR; if set, each line starts with the
* virtual address of the line being output. If clear,
* each line starts with the offset from the beginning
* of the buffer. */
enum dbg_print_flags {
DBGPRINT_BUFFADDR = 0x0001,
};
/* Macro stuff */
static char *nl_packet_name(int packet_type)
{
/* Generate packet type strings */
#define NL_PACKET(name, number, fields) \
[P_ ## name] = # name,
#define NL_INTEGER Argh!
#define NL_BIT Argh!
#define NL_INT64 Argh!
#define NL_STRING Argh!
static char *nl_tag_name[P_nl_after_last_packet] = {
#include "linux/drbd_nl.h"
};
return (packet_type < sizeof(nl_tag_name)/sizeof(nl_tag_name[0])) ?
nl_tag_name[packet_type] : "*Unknown*";
}
/* /Macro stuff */
static inline int is_mdev_trace(struct drbd_conf *mdev, unsigned int level)
{
return trace_level >= level && ((1 << mdev_to_minor(mdev)) & trace_devs);
}
static void probe_drbd_unplug(struct drbd_conf *mdev, char *msg)
{
if (!is_mdev_trace(mdev, TRACE_LVL_ALWAYS))
return;
dev_info(DEV, "%s, ap_bio_count=%d\n", msg, atomic_read(&mdev->ap_bio_cnt));
}
static void probe_drbd_uuid(struct drbd_conf *mdev, enum drbd_uuid_index index)
{
static char *uuid_str[UI_EXTENDED_SIZE] = {
[UI_CURRENT] = "CURRENT",
[UI_BITMAP] = "BITMAP",
[UI_HISTORY_START] = "HISTORY_START",
[UI_HISTORY_END] = "HISTORY_END",
[UI_SIZE] = "SIZE",
[UI_FLAGS] = "FLAGS",
};
if (!is_mdev_trace(mdev, TRACE_LVL_ALWAYS))
return;
if (index >= UI_EXTENDED_SIZE) {
dev_warn(DEV, " uuid_index >= EXTENDED_SIZE\n");
return;
}
dev_info(DEV, " uuid[%s] now %016llX\n",
uuid_str[index],
(unsigned long long)mdev->ldev->md.uuid[index]);
}
static void probe_drbd_md_io(struct drbd_conf *mdev, int rw,
struct drbd_backing_dev *bdev)
{
if (!is_mdev_trace(mdev, TRACE_LVL_ALWAYS))
return;
dev_info(DEV, " %s metadata superblock now\n",
rw == READ ? "Reading" : "Writing");
}
static void probe_drbd_ee(struct drbd_conf *mdev, struct drbd_epoch_entry *e, char* msg)
{
if (!is_mdev_trace(mdev, TRACE_LVL_ALWAYS))
return;
dev_info(DEV, "EE %s sec=%llus size=%u e=%p\n",
msg, (unsigned long long)e->sector, e->size, e);
}
static void probe_drbd_epoch(struct drbd_conf *mdev, struct drbd_epoch *epoch,
enum epoch_event ev)
{
static char *epoch_event_str[] = {
[EV_PUT] = "put",
[EV_GOT_BARRIER_NR] = "got_barrier_nr",
[EV_BARRIER_DONE] = "barrier_done",
[EV_BECAME_LAST] = "became_last",
[EV_TRACE_FLUSH] = "issuing_flush",
[EV_TRACE_ADD_BARRIER] = "added_barrier",
[EV_TRACE_SETTING_BI] = "just set barrier_in_next_epoch",
};
if (!is_mdev_trace(mdev, TRACE_LVL_ALWAYS))
return;
ev &= ~EV_CLEANUP;
switch (ev) {
case EV_TRACE_ALLOC:
dev_info(DEV, "Allocate epoch %p/xxxx { } nr_epochs=%d\n", epoch, mdev->epochs);
break;
case EV_TRACE_FREE:
dev_info(DEV, "Freeing epoch %p/%d { size=%d } nr_epochs=%d\n",
epoch, epoch->barrier_nr, atomic_read(&epoch->epoch_size),
mdev->epochs);
break;
default:
dev_info(DEV, "Update epoch %p/%d { size=%d active=%d %c%c n%c%c } ev=%s\n",
epoch, epoch->barrier_nr, atomic_read(&epoch->epoch_size),
atomic_read(&epoch->active),
test_bit(DE_HAVE_BARRIER_NUMBER, &epoch->flags) ? 'n' : '-',
test_bit(DE_CONTAINS_A_BARRIER, &epoch->flags) ? 'b' : '-',
test_bit(DE_BARRIER_IN_NEXT_EPOCH_ISSUED, &epoch->flags) ? 'i' : '-',
test_bit(DE_BARRIER_IN_NEXT_EPOCH_DONE, &epoch->flags) ? 'd' : '-',
epoch_event_str[ev]);
}
}
static void probe_drbd_netlink(void *data, int is_req)
{
struct cn_msg *msg = data;
if (is_req) {
struct drbd_nl_cfg_req *nlp = (struct drbd_nl_cfg_req *)msg->data;
printk(KERN_INFO "drbd%d: "
"Netlink: << %s (%d) - seq: %x, ack: %x, len: %x\n",
nlp->drbd_minor,
nl_packet_name(nlp->packet_type),
nlp->packet_type,
msg->seq, msg->ack, msg->len);
} else {
struct drbd_nl_cfg_reply *nlp = (struct drbd_nl_cfg_reply *)msg->data;
printk(KERN_INFO "drbd%d: "
"Netlink: >> %s (%d) - seq: %x, ack: %x, len: %x\n",
nlp->minor,
nlp->packet_type == P_nl_after_last_packet ?
"Empty-Reply" : nl_packet_name(nlp->packet_type),
nlp->packet_type,
msg->seq, msg->ack, msg->len);
}
}
static void probe_drbd_actlog(struct drbd_conf *mdev, sector_t sector, char* msg)
{
unsigned int enr = (sector >> (AL_EXTENT_SHIFT-9));
if (!is_mdev_trace(mdev, TRACE_LVL_ALWAYS))
return;
dev_info(DEV, "%s (sec=%llus, al_enr=%u, rs_enr=%d)\n",
msg, (unsigned long long) sector, enr,
(int)BM_SECT_TO_EXT(sector));
}
/**
* drbd_print_buffer() - Hexdump arbitrary binary data into a buffer
* @prefix: String is output at the beginning of each line output.
* @flags: Currently only defined flag: DBGPRINT_BUFFADDR; if set, each
* line starts with the virtual address of the line being
* output. If clear, each line starts with the offset from the
* beginning of the buffer.
* @size: Indicates the size of each entry in the buffer. Supported
* values are sizeof(char), sizeof(short) and sizeof(int)
* @buffer: Start address of buffer
* @buffer_va: Virtual address of start of buffer (normally the same
* as Buffer, but having it separate allows it to hold
* file address for example)
* @length: length of buffer
*/
static void drbd_print_buffer(const char *prefix, unsigned int flags, int size,
const void *buffer, const void *buffer_va,
unsigned int length)
#define LINE_SIZE 16
#define LINE_ENTRIES (int)(LINE_SIZE/size)
{
const unsigned char *pstart;
const unsigned char *pstart_va;
const unsigned char *pend;
char bytes_str[LINE_SIZE*3+8], ascii_str[LINE_SIZE+8];
char *pbytes = bytes_str, *pascii = ascii_str;
int offset = 0;
long sizemask;
int field_width;
int index;
const unsigned char *pend_str;
const unsigned char *p;
int count;
/* verify size parameter */
if (size != sizeof(char) &&
size != sizeof(short) &&
size != sizeof(int)) {
printk(KERN_DEBUG "drbd_print_buffer: "
"ERROR invalid size %d\n", size);
return;
}
sizemask = size-1;
field_width = size*2;
/* Adjust start/end to be on appropriate boundary for size */
buffer = (const char *)((long)buffer & ~sizemask);
pend = (const unsigned char *)
(((long)buffer + length + sizemask) & ~sizemask);
if (flags & DBGPRINT_BUFFADDR) {
/* Move start back to nearest multiple of line size,
* if printing address. This results in nicely formatted output
* with addresses being on line size (16) byte boundaries */
pstart = (const unsigned char *)((long)buffer & ~(LINE_SIZE-1));
} else {
pstart = (const unsigned char *)buffer;
}
/* Set value of start VA to print if addresses asked for */
pstart_va = (const unsigned char *)buffer_va
- ((const unsigned char *)buffer-pstart);
/* Calculate end position to nicely align right hand side */
pend_str = pstart + (((pend-pstart) + LINE_SIZE-1) & ~(LINE_SIZE-1));
/* Init strings */
*pbytes = *pascii = '\0';
/* Start at beginning of first line */
p = pstart;
count = 0;
while (p < pend_str) {
if (p < (const unsigned char *)buffer || p >= pend) {
/* Before start of buffer or after end- print spaces */
pbytes += sprintf(pbytes, "%*c ", field_width, ' ');
pascii += sprintf(pascii, "%*c", size, ' ');
p += size;
} else {
/* Add hex and ascii to strings */
int val;
switch (size) {
default:
case 1:
val = *(unsigned char *)p;
break;
case 2:
val = *(unsigned short *)p;
break;
case 4:
val = *(unsigned int *)p;
break;
}
pbytes += sprintf(pbytes, "%0*x ", field_width, val);
for (index = size; index; index--) {
*pascii++ = isprint(*p) ? *p : '.';
p++;
}
}
count++;
if (count == LINE_ENTRIES || p >= pend_str) {
/* Null terminate and print record */
*pascii = '\0';
printk(KERN_DEBUG "%s%8.8lx: %*s|%*s|\n",
prefix,
(flags & DBGPRINT_BUFFADDR)
? (long)pstart_va:(long)offset,
LINE_ENTRIES*(field_width+1), bytes_str,
LINE_SIZE, ascii_str);
/* Move onto next line */
pstart_va += (p-pstart);
pstart = p;
count = 0;
offset += LINE_SIZE;
/* Re-init strings */
pbytes = bytes_str;
pascii = ascii_str;
*pbytes = *pascii = '\0';
}
}
}
static void probe_drbd_resync(struct drbd_conf *mdev, int level, const char *fmt, va_list args)
{
char str[256];
if (!is_mdev_trace(mdev, level))
return;
if (vsnprintf(str, 256, fmt, args) >= 256)
str[255] = 0;
printk(KERN_INFO "%s %s: %s", dev_driver_string(disk_to_dev(mdev->vdisk)),
dev_name(disk_to_dev(mdev->vdisk)), str);
}
static void probe_drbd_bio(struct drbd_conf *mdev, const char *pfx, struct bio *bio, int complete,
struct drbd_request *r)
{
#if defined(CONFIG_LBDAF) || defined(CONFIG_LBD)
#define SECTOR_FORMAT "%Lx"
#else
#define SECTOR_FORMAT "%lx"
#endif
#define SECTOR_SHIFT 9
unsigned long lowaddr = (unsigned long)(bio->bi_sector << SECTOR_SHIFT);
char *faddr = (char *)(lowaddr);
char rb[sizeof(void *)*2+6] = { 0, };
struct bio_vec *bvec;
int segno;
const int rw = bio->bi_rw;
const int biorw = (rw & (RW_MASK|RWA_MASK));
const int biobarrier = (rw & (1<<BIO_RW_BARRIER));
const int biosync = (rw & ((1<<BIO_RW_UNPLUG) | (1<<BIO_RW_SYNCIO)));
if (!is_mdev_trace(mdev, TRACE_LVL_ALWAYS))
return;
if (r)
sprintf(rb, "Req:%p ", r);
dev_info(DEV, "%s %s:%s%s%s Bio:%p %s- %soffset " SECTOR_FORMAT ", size %x\n",
complete ? "<<<" : ">>>",
pfx,
biorw == WRITE ? "Write" : "Read",
biobarrier ? " : B" : "",
biosync ? " : S" : "",
bio,
rb,
complete ? (bio_flagged(bio, BIO_UPTODATE) ? "Success, " : "Failed, ") : "",
bio->bi_sector << SECTOR_SHIFT,
bio->bi_size);
if (trace_level >= TRACE_LVL_METRICS &&
((biorw == WRITE) ^ complete)) {
printk(KERN_DEBUG " ind page offset length\n");
__bio_for_each_segment(bvec, bio, segno, 0) {
printk(KERN_DEBUG " [%d] %p %8.8x %8.8x\n", segno,
bvec->bv_page, bvec->bv_offset, bvec->bv_len);
if (trace_level >= TRACE_LVL_ALL) {
char *bvec_buf;
unsigned long flags;
bvec_buf = bvec_kmap_irq(bvec, &flags);
drbd_print_buffer(" ", DBGPRINT_BUFFADDR, 1,
bvec_buf,
faddr,
(bvec->bv_len <= 0x80)
? bvec->bv_len : 0x80);
bvec_kunmap_irq(bvec_buf, &flags);
if (bvec->bv_len > 0x40)
printk(KERN_DEBUG " ....\n");
faddr += bvec->bv_len;
}
}
}
}
static void probe_drbd_req(struct drbd_request *req, enum drbd_req_event what, char *msg)
{
static const char *rq_event_names[] = {
[created] = "created",
[to_be_send] = "to_be_send",
[to_be_submitted] = "to_be_submitted",
[queue_for_net_write] = "queue_for_net_write",
[queue_for_net_read] = "queue_for_net_read",
[send_canceled] = "send_canceled",
[send_failed] = "send_failed",
[handed_over_to_network] = "handed_over_to_network",
[connection_lost_while_pending] =
"connection_lost_while_pending",
[recv_acked_by_peer] = "recv_acked_by_peer",
[write_acked_by_peer] = "write_acked_by_peer",
[neg_acked] = "neg_acked",
[conflict_discarded_by_peer] = "conflict_discarded_by_peer",
[barrier_acked] = "barrier_acked",
[data_received] = "data_received",
[read_completed_with_error] = "read_completed_with_error",
[read_ahead_completed_with_error] = "reada_completed_with_error",
[write_completed_with_error] = "write_completed_with_error",
[completed_ok] = "completed_ok",
};
struct drbd_conf *mdev = req->mdev;
const int rw = (req->master_bio == NULL ||
bio_data_dir(req->master_bio) == WRITE) ?
'W' : 'R';
const unsigned long s = req->rq_state;
if (what != nothing) {
dev_info(DEV, "__req_mod(%p %c ,%s)\n", req, rw, rq_event_names[what]);
} else {
dev_info(DEV, "%s %p %c L%c%c%cN%c%c%c%c%c %u (%llus +%u) %s\n",
msg, req, rw,
s & RQ_LOCAL_PENDING ? 'p' : '-',
s & RQ_LOCAL_COMPLETED ? 'c' : '-',
s & RQ_LOCAL_OK ? 'o' : '-',
s & RQ_NET_PENDING ? 'p' : '-',
s & RQ_NET_QUEUED ? 'q' : '-',
s & RQ_NET_SENT ? 's' : '-',
s & RQ_NET_DONE ? 'd' : '-',
s & RQ_NET_OK ? 'o' : '-',
req->epoch,
(unsigned long long)req->sector,
req->size,
drbd_conn_str(mdev->state.conn));
}
}
#define drbd_peer_str drbd_role_str
#define drbd_pdsk_str drbd_disk_str
#define PSM(A) \
do { \
if (mask.A) { \
int i = snprintf(p, len, " " #A "( %s )", \
drbd_##A##_str(val.A)); \
if (i >= len) \
return op; \
p += i; \
len -= i; \
} \
} while (0)
static char *dump_st(char *p, int len, union drbd_state mask, union drbd_state val)
{
char *op = p;
*p = '\0';
PSM(role);
PSM(peer);
PSM(conn);
PSM(disk);
PSM(pdsk);
return op;
}
#define INFOP(fmt, args...) \
do { \
if (trace_level >= TRACE_LVL_ALL) { \
dev_info(DEV, "%s:%d: %s [%d] %s %s " fmt , \
file, line, current->comm, current->pid, \
sockname, recv ? "<<<" : ">>>" , \
## args); \
} else { \
dev_info(DEV, "%s %s " fmt, sockname, \
recv ? "<<<" : ">>>" , \
## args); \
} \
} while (0)
static char *_dump_block_id(u64 block_id, char *buff)
{
if (is_syncer_block_id(block_id))
strcpy(buff, "SyncerId");
else
sprintf(buff, "%llx", (unsigned long long)block_id);
return buff;
}
static void probe_drbd_packet(struct drbd_conf *mdev, struct socket *sock,
int recv, union p_polymorph *p, char *file, int line)
{
char *sockname = sock == mdev->meta.socket ? "meta" : "data";
int cmd = (recv == 2) ? p->header.command : be16_to_cpu(p->header.command);
char tmp[300];
union drbd_state m, v;
switch (cmd) {
case P_HAND_SHAKE:
INFOP("%s (protocol %u-%u)\n", cmdname(cmd),
be32_to_cpu(p->handshake.protocol_min),
be32_to_cpu(p->handshake.protocol_max));
break;
case P_BITMAP: /* don't report this */
case P_COMPRESSED_BITMAP: /* don't report this */
break;
case P_DATA:
INFOP("%s (sector %llus, id %s, seq %u, f %x)\n", cmdname(cmd),
(unsigned long long)be64_to_cpu(p->data.sector),
_dump_block_id(p->data.block_id, tmp),
be32_to_cpu(p->data.seq_num),
be32_to_cpu(p->data.dp_flags)
);
break;
case P_DATA_REPLY:
case P_RS_DATA_REPLY:
INFOP("%s (sector %llus, id %s)\n", cmdname(cmd),
(unsigned long long)be64_to_cpu(p->data.sector),
_dump_block_id(p->data.block_id, tmp)
);
break;
case P_RECV_ACK:
case P_WRITE_ACK:
case P_RS_WRITE_ACK:
case P_DISCARD_ACK:
case P_NEG_ACK:
case P_NEG_RS_DREPLY:
INFOP("%s (sector %llus, size %u, id %s, seq %u)\n",
cmdname(cmd),
(long long)be64_to_cpu(p->block_ack.sector),
be32_to_cpu(p->block_ack.blksize),
_dump_block_id(p->block_ack.block_id, tmp),
be32_to_cpu(p->block_ack.seq_num)
);
break;
case P_DATA_REQUEST:
case P_RS_DATA_REQUEST:
INFOP("%s (sector %llus, size %u, id %s)\n", cmdname(cmd),
(long long)be64_to_cpu(p->block_req.sector),
be32_to_cpu(p->block_req.blksize),
_dump_block_id(p->block_req.block_id, tmp)
);
break;
case P_BARRIER:
case P_BARRIER_ACK:
INFOP("%s (barrier %u)\n", cmdname(cmd), p->barrier.barrier);
break;
case P_SYNC_PARAM:
case P_SYNC_PARAM89:
INFOP("%s (rate %u, verify-alg \"%.64s\", csums-alg \"%.64s\")\n",
cmdname(cmd), be32_to_cpu(p->rs_param_89.rate),
p->rs_param_89.verify_alg, p->rs_param_89.csums_alg);
break;
case P_UUIDS:
INFOP("%s Curr:%016llX, Bitmap:%016llX, "
"HisSt:%016llX, HisEnd:%016llX\n",
cmdname(cmd),
(unsigned long long)be64_to_cpu(p->uuids.uuid[UI_CURRENT]),
(unsigned long long)be64_to_cpu(p->uuids.uuid[UI_BITMAP]),
(unsigned long long)be64_to_cpu(p->uuids.uuid[UI_HISTORY_START]),
(unsigned long long)be64_to_cpu(p->uuids.uuid[UI_HISTORY_END]));
break;
case P_SIZES:
INFOP("%s (d %lluMiB, u %lluMiB, c %lldMiB, "
"max bio %x, q order %x)\n",
cmdname(cmd),
(long long)(be64_to_cpu(p->sizes.d_size)>>(20-9)),
(long long)(be64_to_cpu(p->sizes.u_size)>>(20-9)),
(long long)(be64_to_cpu(p->sizes.c_size)>>(20-9)),
be32_to_cpu(p->sizes.max_segment_size),
be32_to_cpu(p->sizes.queue_order_type));
break;
case P_STATE:
v.i = be32_to_cpu(p->state.state);
m.i = 0xffffffff;
dump_st(tmp, sizeof(tmp), m, v);
INFOP("%s (s %x {%s})\n", cmdname(cmd), v.i, tmp);
break;
case P_STATE_CHG_REQ:
m.i = be32_to_cpu(p->req_state.mask);
v.i = be32_to_cpu(p->req_state.val);
dump_st(tmp, sizeof(tmp), m, v);
INFOP("%s (m %x v %x {%s})\n", cmdname(cmd), m.i, v.i, tmp);
break;
case P_STATE_CHG_REPLY:
INFOP("%s (ret %x)\n", cmdname(cmd),
be32_to_cpu(p->req_state_reply.retcode));
break;
case P_PING:
case P_PING_ACK:
/*
* Dont trace pings at summary level
*/
if (trace_level < TRACE_LVL_ALL)
break;
/* fall through... */
default:
INFOP("%s (%u)\n", cmdname(cmd), cmd);
break;
}
}
static int __init drbd_trace_init(void)
{
int ret;
if (trace_mask & TRACE_UNPLUG) {
ret = register_trace_drbd_unplug(probe_drbd_unplug);
WARN_ON(ret);
}
if (trace_mask & TRACE_UUID) {
ret = register_trace_drbd_uuid(probe_drbd_uuid);
WARN_ON(ret);
}
if (trace_mask & TRACE_EE) {
ret = register_trace_drbd_ee(probe_drbd_ee);
WARN_ON(ret);
}
if (trace_mask & TRACE_PACKET) {
ret = register_trace_drbd_packet(probe_drbd_packet);
WARN_ON(ret);
}
if (trace_mask & TRACE_MD_IO) {
ret = register_trace_drbd_md_io(probe_drbd_md_io);
WARN_ON(ret);
}
if (trace_mask & TRACE_EPOCH) {
ret = register_trace_drbd_epoch(probe_drbd_epoch);
WARN_ON(ret);
}
if (trace_mask & TRACE_NL) {
ret = register_trace_drbd_netlink(probe_drbd_netlink);
WARN_ON(ret);
}
if (trace_mask & TRACE_AL_EXT) {
ret = register_trace_drbd_actlog(probe_drbd_actlog);
WARN_ON(ret);
}
if (trace_mask & TRACE_RQ) {
ret = register_trace_drbd_bio(probe_drbd_bio);
WARN_ON(ret);
}
if (trace_mask & TRACE_INT_RQ) {
ret = register_trace_drbd_req(probe_drbd_req);
WARN_ON(ret);
}
if (trace_mask & TRACE_RESYNC) {
ret = register_trace__drbd_resync(probe_drbd_resync);
WARN_ON(ret);
}
return 0;
}
module_init(drbd_trace_init);
static void __exit drbd_trace_exit(void)
{
if (trace_mask & TRACE_UNPLUG)
unregister_trace_drbd_unplug(probe_drbd_unplug);
if (trace_mask & TRACE_UUID)
unregister_trace_drbd_uuid(probe_drbd_uuid);
if (trace_mask & TRACE_EE)
unregister_trace_drbd_ee(probe_drbd_ee);
if (trace_mask & TRACE_PACKET)
unregister_trace_drbd_packet(probe_drbd_packet);
if (trace_mask & TRACE_MD_IO)
unregister_trace_drbd_md_io(probe_drbd_md_io);
if (trace_mask & TRACE_EPOCH)
unregister_trace_drbd_epoch(probe_drbd_epoch);
if (trace_mask & TRACE_NL)
unregister_trace_drbd_netlink(probe_drbd_netlink);
if (trace_mask & TRACE_AL_EXT)
unregister_trace_drbd_actlog(probe_drbd_actlog);
if (trace_mask & TRACE_RQ)
unregister_trace_drbd_bio(probe_drbd_bio);
if (trace_mask & TRACE_INT_RQ)
unregister_trace_drbd_req(probe_drbd_req);
if (trace_mask & TRACE_RESYNC)
unregister_trace__drbd_resync(probe_drbd_resync);
tracepoint_synchronize_unregister();
}
module_exit(drbd_trace_exit);
drivers/block/drbd/drbd_tracing.h deleted 100644 → 0
View file @ ab8fafc2
/*
drbd_tracing.h
This file is part of DRBD by Philipp Reisner and Lars Ellenberg.
Copyright (C) 2003-2008, LINBIT Information Technologies GmbH.
Copyright (C) 2003-2008, Philipp Reisner <philipp.reisner@linbit.com>.
Copyright (C) 2003-2008, Lars Ellenberg <lars.ellenberg@linbit.com>.
drbd is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
drbd is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with drbd; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef DRBD_TRACING_H
#define DRBD_TRACING_H
#include <linux/tracepoint.h>
#include "drbd_int.h"
#include "drbd_req.h"
enum {
TRACE_LVL_ALWAYS = 0,
TRACE_LVL_SUMMARY,
TRACE_LVL_METRICS,
TRACE_LVL_ALL,
TRACE_LVL_MAX
};
DECLARE_TRACE(drbd_unplug,
TP_PROTO(struct drbd_conf *mdev, char* msg),
TP_ARGS(mdev, msg));
DECLARE_TRACE(drbd_uuid,
TP_PROTO(struct drbd_conf *mdev, enum drbd_uuid_index index),
TP_ARGS(mdev, index));
DECLARE_TRACE(drbd_ee,
TP_PROTO(struct drbd_conf *mdev, struct drbd_epoch_entry *e, char* msg),
TP_ARGS(mdev, e, msg));
DECLARE_TRACE(drbd_md_io,
TP_PROTO(struct drbd_conf *mdev, int rw, struct drbd_backing_dev *bdev),
TP_ARGS(mdev, rw, bdev));
DECLARE_TRACE(drbd_epoch,
TP_PROTO(struct drbd_conf *mdev, struct drbd_epoch *epoch, enum epoch_event ev),
TP_ARGS(mdev, epoch, ev));
DECLARE_TRACE(drbd_netlink,
TP_PROTO(void *data, int is_req),
TP_ARGS(data, is_req));
DECLARE_TRACE(drbd_actlog,
TP_PROTO(struct drbd_conf *mdev, sector_t sector, char* msg),
TP_ARGS(mdev, sector, msg));
DECLARE_TRACE(drbd_bio,
TP_PROTO(struct drbd_conf *mdev, const char *pfx, struct bio *bio, int complete,
struct drbd_request *r),
TP_ARGS(mdev, pfx, bio, complete, r));
DECLARE_TRACE(drbd_req,
TP_PROTO(struct drbd_request *req, enum drbd_req_event what, char *msg),
TP_ARGS(req, what, msg));
DECLARE_TRACE(drbd_packet,
TP_PROTO(struct drbd_conf *mdev, struct socket *sock,
int recv, union p_polymorph *p, char *file, int line),
TP_ARGS(mdev, sock, recv, p, file, line));
DECLARE_TRACE(_drbd_resync,
TP_PROTO(struct drbd_conf *mdev, int level, const char *fmt, va_list args),
TP_ARGS(mdev, level, fmt, args));
#endif
drivers/block/drbd/drbd_worker.c
View file @ 6a0afdf5
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#include "drbd_int.h" #include "drbd_int.h"
#include "drbd_req.h" #include "drbd_req.h"
#include "drbd_tracing.h"
#define SLEEP_TIME (HZ/10) #define SLEEP_TIME (HZ/10)
...@@ -82,8 +81,6 @@ void drbd_md_io_complete(struct bio *bio, int error) ...@@ -82,8 +81,6 @@ void drbd_md_io_complete(struct bio *bio, int error)
md_io = (struct drbd_md_io *)bio->bi_private; md_io = (struct drbd_md_io *)bio->bi_private;
md_io->error = error; md_io->error = error;
trace_drbd_bio(md_io->mdev, "Md", bio, 1, NULL);
complete(&md_io->event); complete(&md_io->event);
} }
...@@ -114,8 +111,6 @@ void drbd_endio_read_sec(struct bio *bio, int error) __releases(local) ...@@ -114,8 +111,6 @@ void drbd_endio_read_sec(struct bio *bio, int error) __releases(local)
D_ASSERT(e->block_id != ID_VACANT); D_ASSERT(e->block_id != ID_VACANT);
trace_drbd_bio(mdev, "Sec", bio, 1, NULL);
spin_lock_irqsave(&mdev->req_lock, flags); spin_lock_irqsave(&mdev->req_lock, flags);
mdev->read_cnt += e->size >> 9; mdev->read_cnt += e->size >> 9;
list_del(&e->w.list); list_del(&e->w.list);
...@@ -126,8 +121,6 @@ void drbd_endio_read_sec(struct bio *bio, int error) __releases(local) ...@@ -126,8 +121,6 @@ void drbd_endio_read_sec(struct bio *bio, int error) __releases(local)
drbd_chk_io_error(mdev, error, FALSE); drbd_chk_io_error(mdev, error, FALSE);
drbd_queue_work(&mdev->data.work, &e->w); drbd_queue_work(&mdev->data.work, &e->w);
put_ldev(mdev); put_ldev(mdev);
trace_drbd_ee(mdev, e, "read completed");
} }
/* writes on behalf of the partner, or resync writes, /* writes on behalf of the partner, or resync writes,
...@@ -176,8 +169,6 @@ void drbd_endio_write_sec(struct bio *bio, int error) __releases(local) ...@@ -176,8 +169,6 @@ void drbd_endio_write_sec(struct bio *bio, int error) __releases(local)
D_ASSERT(e->block_id != ID_VACANT); D_ASSERT(e->block_id != ID_VACANT);
trace_drbd_bio(mdev, "Sec", bio, 1, NULL);
spin_lock_irqsave(&mdev->req_lock, flags); spin_lock_irqsave(&mdev->req_lock, flags);
mdev->writ_cnt += e->size >> 9; mdev->writ_cnt += e->size >> 9;
is_syncer_req = is_syncer_block_id(e->block_id); is_syncer_req = is_syncer_block_id(e->block_id);
...@@ -192,8 +183,6 @@ void drbd_endio_write_sec(struct bio *bio, int error) __releases(local) ...@@ -192,8 +183,6 @@ void drbd_endio_write_sec(struct bio *bio, int error) __releases(local)
list_del(&e->w.list); /* has been on active_ee or sync_ee */ list_del(&e->w.list); /* has been on active_ee or sync_ee */
list_add_tail(&e->w.list, &mdev->done_ee); list_add_tail(&e->w.list, &mdev->done_ee);
trace_drbd_ee(mdev, e, "write completed");
/* No hlist_del_init(&e->colision) here, we did not send the Ack yet, /* No hlist_del_init(&e->colision) here, we did not send the Ack yet,
* neither did we wake possibly waiting conflicting requests. * neither did we wake possibly waiting conflicting requests.
* done from "drbd_process_done_ee" within the appropriate w.cb * done from "drbd_process_done_ee" within the appropriate w.cb
...@@ -244,8 +233,6 @@ void drbd_endio_pri(struct bio *bio, int error) ...@@ -244,8 +233,6 @@ void drbd_endio_pri(struct bio *bio, int error)
error = -EIO; error = -EIO;
} }
trace_drbd_bio(mdev, "Pri", bio, 1, NULL);
/* to avoid recursion in __req_mod */ /* to avoid recursion in __req_mod */
if (unlikely(error)) { if (unlikely(error)) {
what = (bio_data_dir(bio) == WRITE) what = (bio_data_dir(bio) == WRITE)
...@@ -1321,9 +1308,6 @@ void drbd_start_resync(struct drbd_conf *mdev, enum drbd_conns side) ...@@ -1321,9 +1308,6 @@ void drbd_start_resync(struct drbd_conf *mdev, enum drbd_conns side)
return; return;
} }
trace_drbd_resync(mdev, TRACE_LVL_SUMMARY, "Resync starting: side=%s\n",
side == C_SYNC_TARGET ? "SyncTarget" : "SyncSource");
/* In case a previous resync run was aborted by an IO error/detach on the peer. */ /* In case a previous resync run was aborted by an IO error/detach on the peer. */
drbd_rs_cancel_all(mdev); drbd_rs_cancel_all(mdev);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7