blk-iocost: restore inuse update tracepoints

Update and restore the inuse update tracepoints.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-iocost.c b/block/blk-iocost.c
index 0270a50..9366527 100644 (file)
--- a/block/blk-iocost.c
+++ b/block/blk-iocost.c
@@ -1919,6 +1919,12 @@ static void transfer_surpluses(struct list_head *surpluses, struct ioc_now *now)
                inuse = DIV64_U64_ROUND_UP(
                        parent->child_adjusted_sum * iocg->hweight_after_donation,
                        parent->hweight_inuse);
                inuse = DIV64_U64_ROUND_UP(
                        parent->child_adjusted_sum * iocg->hweight_after_donation,
                        parent->hweight_inuse);

+
+               TRACE_IOCG_PATH(inuse_transfer, iocg, now,
+                               iocg->inuse, inuse,
+                               iocg->hweight_inuse,
+                               iocg->hweight_after_donation);
+

                __propagate_weights(iocg, iocg->active, inuse, true, now);
        }
 
                __propagate_weights(iocg, iocg->active, inuse, true, now);
        }
 


@@ -2076,6 +2082,10 @@ static void ioc_timer_fn(struct timer_list *timer)
                                iocg->hweight_after_donation = new_hwi;
                                list_add(&iocg->surplus_list, &surpluses);
                        } else {
                                iocg->hweight_after_donation = new_hwi;
                                list_add(&iocg->surplus_list, &surpluses);
                        } else {

+                               TRACE_IOCG_PATH(inuse_shortage, iocg, &now,
+                                               iocg->inuse, iocg->active,
+                                               iocg->hweight_inuse, new_hwi);
+

                                __propagate_weights(iocg, iocg->active,
                                                    iocg->active, true, &now);
                                nr_shortages++;
                                __propagate_weights(iocg, iocg->active,
                                                    iocg->active, true, &now);
                                nr_shortages++;


@@ -2248,11 +2258,13 @@ static u64 adjust_inuse_and_calc_cost(struct ioc_gq *iocg, u64 vtime,
        struct ioc *ioc = iocg->ioc;
        struct ioc_margins *margins = &ioc->margins;
        u32 adj_step = DIV_ROUND_UP(iocg->active * INUSE_ADJ_STEP_PCT, 100);
        struct ioc *ioc = iocg->ioc;
        struct ioc_margins *margins = &ioc->margins;
        u32 adj_step = DIV_ROUND_UP(iocg->active * INUSE_ADJ_STEP_PCT, 100);

+       u32 __maybe_unused old_inuse = iocg->inuse, __maybe_unused old_hwi;

        u32 hwi;
        s64 margin;
        u64 cost, new_inuse;
 
        current_hweight(iocg, NULL, &hwi);
        u32 hwi;
        s64 margin;
        u64 cost, new_inuse;
 
        current_hweight(iocg, NULL, &hwi);

+       old_hwi = hwi;

        cost = abs_cost_to_cost(abs_cost, hwi);
        margin = now->vnow - vtime - cost;
 
        cost = abs_cost_to_cost(abs_cost, hwi);
        margin = now->vnow - vtime - cost;
 


@@ -2287,6 +2299,10 @@ static u64 adjust_inuse_and_calc_cost(struct ioc_gq *iocg, u64 vtime,
                 iocg->inuse != iocg->active);
 
        spin_unlock_irq(&ioc->lock);
                 iocg->inuse != iocg->active);
 
        spin_unlock_irq(&ioc->lock);

+
+       TRACE_IOCG_PATH(inuse_adjust, iocg, now,
+                       old_inuse, iocg->inuse, old_hwi, hwi);
+

        return cost;
 }
 
        return cost;
 }
 

diff --git a/include/trace/events/iocost.h b/include/trace/events/iocost.h
index ee024fe..b350860 100644 (file)
--- a/include/trace/events/iocost.h
+++ b/include/trace/events/iocost.h
@@ -95,7 +95,7 @@ DECLARE_EVENT_CLASS(iocg_inuse_update,
        )
 );
 
        )
 );
 

-DEFINE_EVENT(iocg_inuse_update, iocost_inuse_takeback,
+DEFINE_EVENT(iocg_inuse_update, iocost_inuse_shortage,

 
        TP_PROTO(struct ioc_gq *iocg, const char *path, struct ioc_now *now,
                u32 old_inuse, u32 new_inuse,
 
        TP_PROTO(struct ioc_gq *iocg, const char *path, struct ioc_now *now,
                u32 old_inuse, u32 new_inuse,


@@ -105,7 +105,7 @@ DEFINE_EVENT(iocg_inuse_update, iocost_inuse_takeback,
                old_hw_inuse, new_hw_inuse)
 );
 
                old_hw_inuse, new_hw_inuse)
 );
 

-DEFINE_EVENT(iocg_inuse_update, iocost_inuse_giveaway,
+DEFINE_EVENT(iocg_inuse_update, iocost_inuse_transfer,

 
        TP_PROTO(struct ioc_gq *iocg, const char *path, struct ioc_now *now,
                u32 old_inuse, u32 new_inuse,
 
        TP_PROTO(struct ioc_gq *iocg, const char *path, struct ioc_now *now,
                u32 old_inuse, u32 new_inuse,


@@ -115,7 +115,7 @@ DEFINE_EVENT(iocg_inuse_update, iocost_inuse_giveaway,
                old_hw_inuse, new_hw_inuse)
 );
 
                old_hw_inuse, new_hw_inuse)
 );
 

-DEFINE_EVENT(iocg_inuse_update, iocost_inuse_reset,
+DEFINE_EVENT(iocg_inuse_update, iocost_inuse_adjust,

 
        TP_PROTO(struct ioc_gq *iocg, const char *path, struct ioc_now *now,
                u32 old_inuse, u32 new_inuse,
 
        TP_PROTO(struct ioc_gq *iocg, const char *path, struct ioc_now *now,
                u32 old_inuse, u32 new_inuse,