drbd: remove tracing bits
They should be reimplemented in the current scheme.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
diff --git a/drivers/block/drbd/Kconfig b/drivers/block/drbd/Kconfig
index 4e6f90f..f4acd04 100644
--- a/drivers/block/drbd/Kconfig
+++ b/drivers/block/drbd/Kconfig
@@ -38,17 +38,6 @@
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
bool "DRBD fault injection"
depends on BLK_DEV_DRBD
diff --git a/drivers/block/drbd/Makefile b/drivers/block/drbd/Makefile
index 7d86ef8..0d3f337 100644
--- a/drivers/block/drbd/Makefile
+++ b/drivers/block/drbd/Makefile
@@ -2,7 +2,4 @@
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_trace-y := drbd_tracing.o
-
obj-$(CONFIG_BLK_DEV_DRBD) += drbd.o
-obj-$(CONFIG_DRBD_TRACE) += drbd_trace.o
diff --git a/drivers/block/drbd/drbd_actlog.c b/drivers/block/drbd/drbd_actlog.c
index 74b4835..17956ff 100644
--- a/drivers/block/drbd/drbd_actlog.c
+++ b/drivers/block/drbd/drbd_actlog.c
@@ -26,7 +26,6 @@
#include <linux/slab.h>
#include <linux/drbd.h>
#include "drbd_int.h"
-#include "drbd_tracing.h"
#include "drbd_wrappers.h"
/* We maintain a trivial check sum in our on disk activity log.
@@ -66,17 +65,6 @@
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,
struct drbd_backing_dev *bdev,
struct page *page, sector_t sector,
@@ -105,8 +93,6 @@
bio->bi_end_io = drbd_md_io_complete;
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))
bio_endio(bio, -EIO);
else
@@ -236,8 +222,6 @@
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)));
if (al_ext->lc_number != enr) {
@@ -270,8 +254,6 @@
struct lc_element *extent;
unsigned long flags;
- trace_drbd_actlog(mdev, sector, "al_complete_io");
-
spin_lock_irqsave(&mdev->al_lock, flags);
extent = lc_find(mdev->act_log, enr);
@@ -967,10 +949,6 @@
ebnr = BM_SECT_TO_BIT(esector - (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)
return;
@@ -1045,10 +1023,6 @@
sbnr = BM_SECT_TO_BIT(sector);
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...
* we count rs_{total,left} in bits, not sectors. */
spin_lock_irqsave(&mdev->al_lock, flags);
@@ -1143,10 +1117,6 @@
struct bm_extent *bm_ext;
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,
(bm_ext = _bme_get(mdev, enr)));
if (sig)
@@ -1192,9 +1162,6 @@
struct bm_extent *bm_ext;
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);
if (mdev->resync_wenr != LC_FREE && mdev->resync_wenr != enr) {
/* in case you have very heavy scattered io, it may
@@ -1210,11 +1177,6 @@
* the lc_put here...
* 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);
bm_ext = e ? lc_entry(e, struct bm_extent, lce) : NULL;
if (bm_ext) {
@@ -1242,21 +1204,14 @@
* but then could not set BME_LOCKED,
* so we tried again.
* drop the extra reference. */
- trace_drbd_resync(mdev, TRACE_LVL_ALL,
- "dropping extra reference on %u\n", enr);
-
bm_ext->lce.refcnt--;
D_ASSERT(bm_ext->lce.refcnt > 0);
}
goto check_al;
} else {
/* do we rather want to try later? */
- if (mdev->resync_locked > mdev->resync->nr_elements-3) {
- trace_drbd_resync(mdev, TRACE_LVL_ALL,
- "resync_locked = %u!\n", mdev->resync_locked);
-
+ if (mdev->resync_locked > mdev->resync->nr_elements-3)
goto try_again;
- }
/* Do or do not. There is no try. -- Yoda */
e = lc_get(mdev->resync, enr);
bm_ext = e ? lc_entry(e, struct bm_extent, lce) : NULL;
@@ -1281,8 +1236,6 @@
goto 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++) {
if (unlikely(al_enr+i == mdev->act_log->new_number))
goto try_again;
@@ -1296,7 +1249,6 @@
return 0;
try_again:
- trace_drbd_resync(mdev, TRACE_LVL_ALL, "need to try again for %u\n", enr);
if (bm_ext)
mdev->resync_wenr = enr;
spin_unlock_irq(&mdev->al_lock);
@@ -1310,10 +1262,6 @@
struct bm_extent *bm_ext;
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);
e = lc_find(mdev->resync, enr);
bm_ext = e ? lc_entry(e, struct bm_extent, lce) : NULL;
@@ -1348,8 +1296,6 @@
*/
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);
if (get_ldev_if_state(mdev, D_FAILED)) { /* Makes sure ->resync is there. */
@@ -1375,8 +1321,6 @@
struct bm_extent *bm_ext;
int i;
- trace_drbd_resync(mdev, TRACE_LVL_METRICS, "drbd_rs_del_all\n");
-
spin_lock_irq(&mdev->al_lock);
if (get_ldev_if_state(mdev, D_FAILED)) {
@@ -1429,10 +1373,6 @@
sector_t esector, nr_sectors;
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) {
dev_err(DEV, "drbd_rs_failed_io: sector=%llus size=%d nonsense!\n",
(unsigned long long)sector, size);
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 8da602e..4e62559 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -135,8 +135,6 @@
DRBD_FAULT_MAX,
};
-extern void trace_drbd_resync(struct drbd_conf *mdev, int level, const char *fmt, ...);
-
#ifdef CONFIG_DRBD_FAULT_INJECTION
extern unsigned int
_drbd_insert_fault(struct drbd_conf *mdev, unsigned int type);
@@ -712,11 +710,6 @@
EV_GOT_BARRIER_NR,
EV_BARRIER_DONE,
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 */
};
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 80273f2..11d8ff6 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -53,7 +53,6 @@
#include <linux/drbd_limits.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_vli.h"
@@ -80,18 +79,6 @@
static void md_sync_timer_fn(unsigned long data);
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>, "
"Lars Ellenberg <lars@linbit.com>");
MODULE_DESCRIPTION("drbd - Distributed Replicated Block Device v" REL_VERSION);
@@ -1576,7 +1563,6 @@
h->command = cpu_to_be16(cmd);
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);
ok = (sent == size);
@@ -1628,8 +1614,6 @@
if (!drbd_get_data_sock(mdev))
return 0;
- trace_drbd_packet(mdev, mdev->data.socket, 0, (void *)&h, __FILE__, __LINE__);
-
ok = (sizeof(h) ==
drbd_send(mdev, mdev->data.socket, &h, sizeof(h), 0));
ok = ok && (size ==
@@ -2359,7 +2343,6 @@
dp_flags |= DP_MAY_SET_IN_SYNC;
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);
ok = (sizeof(p) ==
drbd_send(mdev, mdev->data.socket, &p, sizeof(p), MSG_MORE));
@@ -2410,7 +2393,6 @@
if (!drbd_get_data_sock(mdev))
return 0;
- trace_drbd_packet(mdev, mdev->data.socket, 0, (void *)&p, __FILE__, __LINE__);
ok = sizeof(p) == drbd_send(mdev, mdev->data.socket, &p,
sizeof(p), MSG_MORE);
if (ok && dgs) {
@@ -2546,8 +2528,6 @@
{
struct drbd_conf *mdev = q->queuedata;
- trace_drbd_unplug(mdev, "got unplugged");
-
/* unplug FIRST */
spin_lock_irq(q->queue_lock);
blk_remove_plug(q);
@@ -3252,8 +3232,6 @@
if (!get_ldev_if_state(mdev, D_FAILED))
return;
- trace_drbd_md_io(mdev, WRITE, mdev->ldev);
-
mutex_lock(&mdev->md_io_mutex);
buffer = (struct meta_data_on_disk *)page_address(mdev->md_io_page);
memset(buffer, 0, 512);
@@ -3308,8 +3286,6 @@
if (!get_ldev_if_state(mdev, D_ATTACHING))
return ERR_IO_MD_DISK;
- trace_drbd_md_io(mdev, READ, bdev);
-
mutex_lock(&mdev->md_io_mutex);
buffer = (struct meta_data_on_disk *)page_address(mdev->md_io_page);
@@ -3388,11 +3364,8 @@
{
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];
-
- trace_drbd_uuid(mdev, i+1);
- }
}
void _drbd_uuid_set(struct drbd_conf *mdev, int idx, u64 val) __must_hold(local)
@@ -3407,7 +3380,6 @@
}
mdev->ldev->md.uuid[idx] = val;
- trace_drbd_uuid(mdev, idx);
drbd_md_mark_dirty(mdev);
}
@@ -3417,7 +3389,6 @@
if (mdev->ldev->md.uuid[idx]) {
drbd_uuid_move_history(mdev);
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);
}
@@ -3436,7 +3407,6 @@
dev_info(DEV, "Creating new current UUID\n");
D_ASSERT(mdev->ldev->md.uuid[UI_BITMAP] == 0);
mdev->ldev->md.uuid[UI_BITMAP] = mdev->ldev->md.uuid[UI_CURRENT];
- trace_drbd_uuid(mdev, UI_BITMAP);
get_random_bytes(&val, sizeof(u64));
_drbd_uuid_set(mdev, UI_CURRENT, val);
@@ -3451,8 +3421,6 @@
drbd_uuid_move_history(mdev);
mdev->ldev->md.uuid[UI_HISTORY_START] = mdev->ldev->md.uuid[UI_BITMAP];
mdev->ldev->md.uuid[UI_BITMAP] = 0;
- trace_drbd_uuid(mdev, UI_HISTORY_START);
- trace_drbd_uuid(mdev, UI_BITMAP);
} else {
if (mdev->ldev->md.uuid[UI_BITMAP])
dev_warn(DEV, "bm UUID already set");
@@ -3460,7 +3428,6 @@
mdev->ldev->md.uuid[UI_BITMAP] = val;
mdev->ldev->md.uuid[UI_BITMAP] &= ~((u64)1);
- trace_drbd_uuid(mdev, UI_BITMAP);
}
drbd_md_mark_dirty(mdev);
}
@@ -3727,7 +3694,6 @@
module_init(drbd_init)
module_exit(drbd_cleanup)
-/* For drbd_tracing: */
EXPORT_SYMBOL(drbd_conn_str);
EXPORT_SYMBOL(drbd_role_str);
EXPORT_SYMBOL(drbd_disk_str);
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index cfde310..73c55cc 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -33,7 +33,6 @@
#include <linux/blkpg.h>
#include <linux/cpumask.h>
#include "drbd_int.h"
-#include "drbd_tracing.h"
#include "drbd_wrappers.h"
#include <asm/unaligned.h>
#include <linux/drbd_tag_magic.h>
@@ -2024,8 +2023,6 @@
goto fail;
}
- trace_drbd_netlink(req, 1);
-
if (nlp->packet_type >= P_nl_after_last_packet) {
retcode = ERR_PACKET_NR;
goto fail;
@@ -2063,7 +2060,6 @@
cn_reply->len = sizeof(struct drbd_nl_cfg_reply) + rr;
cn_reply->flags = 0;
- trace_drbd_netlink(cn_reply, 0);
rr = cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_KERNEL);
if (rr && rr != -ESRCH)
printk(KERN_INFO "drbd: cn_netlink_send()=%d\n", rr);
@@ -2157,7 +2153,6 @@
reply->minor = mdev_to_minor(mdev);
reply->ret_code = NO_ERROR;
- trace_drbd_netlink(cn_reply, 0);
cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO);
}
@@ -2190,7 +2185,6 @@
reply->minor = mdev_to_minor(mdev);
reply->ret_code = NO_ERROR;
- trace_drbd_netlink(cn_reply, 0);
cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO);
}
@@ -2262,7 +2256,6 @@
reply->minor = mdev_to_minor(mdev);
reply->ret_code = NO_ERROR;
- trace_drbd_netlink(cn_reply, 0);
cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO);
kfree(cn_reply);
}
@@ -2302,7 +2295,6 @@
reply->minor = mdev_to_minor(mdev);
reply->ret_code = NO_ERROR;
- trace_drbd_netlink(cn_reply, 0);
cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO);
}
@@ -2356,7 +2348,6 @@
reply->minor = ((struct drbd_nl_cfg_req *)req->data)->drbd_minor;
reply->ret_code = ret_code;
- trace_drbd_netlink(cn_reply, 0);
rr = cn_netlink_send(cn_reply, CN_IDX_DRBD, GFP_NOIO);
if (rr && rr != -ESRCH)
printk(KERN_INFO "drbd: cn_netlink_send()=%d\n", rr);
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 2f81821..360baf6 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -47,7 +47,6 @@
#include <linux/string.h>
#include <linux/scatterlist.h>
#include "drbd_int.h"
-#include "drbd_tracing.h"
#include "drbd_req.h"
#include "drbd_vli.h"
@@ -350,8 +349,6 @@
e->epoch = NULL;
e->flags = 0;
- trace_drbd_ee(mdev, e, "allocated");
-
return e;
fail2:
@@ -366,7 +363,6 @@
void drbd_free_ee(struct drbd_conf *mdev, struct drbd_epoch_entry *e)
{
struct bio *bio = e->private_bio;
- trace_drbd_ee(mdev, e, "freed");
drbd_pp_free_bio_pages(mdev, bio);
bio_put(bio);
D_ASSERT(hlist_unhashed(&e->colision));
@@ -420,7 +416,6 @@
* all ignore the last argument.
*/
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 */
ok = e->w.cb(mdev, &e->w, !ok) && ok;
drbd_free_ee(mdev, e);
@@ -1021,8 +1016,6 @@
break;
}
- trace_drbd_epoch(mdev, epoch, ev);
-
if (epoch_size != 0 &&
atomic_read(&epoch->active) == 0 &&
test_bit(DE_HAVE_BARRIER_NUMBER, &epoch->flags) &&
@@ -1054,7 +1047,6 @@
list_del(&epoch->list);
ev = EV_BECAME_LAST | (ev & EV_CLEANUP);
mdev->epochs--;
- trace_drbd_epoch(mdev, epoch, EV_TRACE_FREE);
kfree(epoch);
if (rv == FE_STILL_LIVE)
@@ -1080,7 +1072,6 @@
struct flush_work *fw;
fw = kmalloc(sizeof(*fw), GFP_ATOMIC);
if (fw) {
- trace_drbd_epoch(mdev, epoch, EV_TRACE_FLUSH);
fw->w.cb = w_flush;
fw->epoch = epoch;
drbd_queue_work(&mdev->data.work, &fw->w);
@@ -1251,7 +1242,6 @@
list_add(&epoch->list, &mdev->current_epoch->list);
mdev->current_epoch = epoch;
mdev->epochs++;
- trace_drbd_epoch(mdev, epoch, EV_TRACE_ALLOC);
} else {
/* The current_epoch got recycled while we allocated this one... */
kfree(epoch);
@@ -1458,8 +1448,6 @@
list_add(&e->w.list, &mdev->sync_ee);
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);
/* accounting done in endio */
@@ -1721,16 +1709,13 @@
epoch = list_entry(e->epoch->list.prev, struct drbd_epoch, list);
if (epoch == e->epoch) {
set_bit(DE_CONTAINS_A_BARRIER, &e->epoch->flags);
- trace_drbd_epoch(mdev, e->epoch, EV_TRACE_ADD_BARRIER);
rw |= (1<<BIO_RW_BARRIER);
e->flags |= EE_IS_BARRIER;
} else {
if (atomic_read(&epoch->epoch_size) > 1 ||
!test_bit(DE_CONTAINS_A_BARRIER, &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);
- trace_drbd_epoch(mdev, e->epoch, EV_TRACE_ADD_BARRIER);
rw |= (1<<BIO_RW_BARRIER);
e->flags |= EE_IS_BARRIER;
}
@@ -1905,8 +1890,6 @@
}
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);
/* accounting done in endio */
@@ -2065,8 +2048,6 @@
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);
maybe_kick_lo(mdev);
@@ -3543,9 +3524,6 @@
drbd_force_state(mdev, NS(conn, C_PROTOCOL_ERROR));
break;
}
-
- trace_drbd_packet(mdev, mdev->data.socket, 2, &mdev->data.rbuf,
- __FILE__, __LINE__);
}
}
@@ -3825,9 +3803,6 @@
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_max = be32_to_cpu(p->protocol_max);
if (p->protocol_max == 0)
@@ -4420,14 +4395,11 @@
goto disconnect;
}
expect = cmd->pkt_size;
- ERR_IF(len != expect-sizeof(struct p_header)) {
- trace_drbd_packet(mdev, mdev->meta.socket, 1, (void *)h, __FILE__, __LINE__);
+ ERR_IF(len != expect-sizeof(struct p_header))
goto reconnect;
- }
}
if (received == expect) {
D_ASSERT(cmd != NULL);
- trace_drbd_packet(mdev, mdev->meta.socket, 1, (void *)h, __FILE__, __LINE__);
if (!cmd->process(mdev, h))
goto reconnect;
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 1aaa397..3678d3d 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -28,7 +28,6 @@
#include <linux/slab.h>
#include <linux/drbd.h>
#include "drbd_int.h"
-#include "drbd_tracing.h"
#include "drbd_req.h"
@@ -218,7 +217,6 @@
void complete_master_bio(struct drbd_conf *mdev,
struct bio_and_error *m)
{
- trace_drbd_bio(mdev, "Rq", m->bio, 1, NULL);
bio_endio(m->bio, m->error);
dec_ap_bio(mdev);
}
@@ -236,8 +234,6 @@
/* 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;
- trace_drbd_req(req, nothing, "_req_may_be_done");
-
/* we must not complete the master bio, while it is
* still being processed by _drbd_send_zc_bio (drbd_send_dblock)
* not yet acknowledged by the peer
@@ -415,8 +411,6 @@
struct drbd_conf *mdev = req->mdev;
m->bio = NULL;
- trace_drbd_req(req, what, NULL);
-
switch (what) {
default:
dev_err(DEV, "LOGIC BUG in %s:%u\n", __FILE__ , __LINE__);
@@ -666,7 +660,6 @@
* this is bad, because if the connection is lost now,
* we won't be able to clean them up... */
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);
}
D_ASSERT(req->rq_state & RQ_NET_SENT);
@@ -736,8 +729,6 @@
return 0;
}
- trace_drbd_bio(mdev, "Rq", bio, 0, req);
-
local = get_ldev(mdev);
if (!local) {
bio_put(req->private_bio); /* or we get a bio leak */
@@ -928,8 +919,6 @@
if (local) {
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
: rw == READ ? DRBD_FAULT_DT_RD
: DRBD_FAULT_DT_RA))
diff --git a/drivers/block/drbd/drbd_tracing.c b/drivers/block/drbd/drbd_tracing.c
deleted file mode 100644
index d18d4f7..0000000
--- a/drivers/block/drbd/drbd_tracing.c
+++ /dev/null
@@ -1,752 +0,0 @@
-/*
- 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);
diff --git a/drivers/block/drbd/drbd_tracing.h b/drivers/block/drbd/drbd_tracing.h
deleted file mode 100644
index c4531a1..0000000
--- a/drivers/block/drbd/drbd_tracing.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- 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
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 34a4b3e..ed8796f 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -40,7 +40,6 @@
#include "drbd_int.h"
#include "drbd_req.h"
-#include "drbd_tracing.h"
#define SLEEP_TIME (HZ/10)
@@ -82,8 +81,6 @@
md_io = (struct drbd_md_io *)bio->bi_private;
md_io->error = error;
- trace_drbd_bio(md_io->mdev, "Md", bio, 1, NULL);
-
complete(&md_io->event);
}
@@ -114,8 +111,6 @@
D_ASSERT(e->block_id != ID_VACANT);
- trace_drbd_bio(mdev, "Sec", bio, 1, NULL);
-
spin_lock_irqsave(&mdev->req_lock, flags);
mdev->read_cnt += e->size >> 9;
list_del(&e->w.list);
@@ -126,8 +121,6 @@
drbd_chk_io_error(mdev, error, FALSE);
drbd_queue_work(&mdev->data.work, &e->w);
put_ldev(mdev);
-
- trace_drbd_ee(mdev, e, "read completed");
}
/* writes on behalf of the partner, or resync writes,
@@ -176,8 +169,6 @@
D_ASSERT(e->block_id != ID_VACANT);
- trace_drbd_bio(mdev, "Sec", bio, 1, NULL);
-
spin_lock_irqsave(&mdev->req_lock, flags);
mdev->writ_cnt += e->size >> 9;
is_syncer_req = is_syncer_block_id(e->block_id);
@@ -192,8 +183,6 @@
list_del(&e->w.list); /* has been on active_ee or sync_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,
* neither did we wake possibly waiting conflicting requests.
* done from "drbd_process_done_ee" within the appropriate w.cb
@@ -244,8 +233,6 @@
error = -EIO;
}
- trace_drbd_bio(mdev, "Pri", bio, 1, NULL);
-
/* to avoid recursion in __req_mod */
if (unlikely(error)) {
what = (bio_data_dir(bio) == WRITE)
@@ -1321,9 +1308,6 @@
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. */
drbd_rs_cancel_all(mdev);
