sdp: removed unnecessary statistics that caused compilation errors on powerpc

Signed-off-by: Amir Vadai <amirv@mellanox.co.il>

diff --git a/drivers/infiniband/ulp/sdp/sdp.h b/drivers/infiniband/ulp/sdp/sdp.h
index ec8dbe1acaa65e0a75811a3403e8207b9cfa96f0..ed05c0e571ee50aa4e0f78745aeb62842fbb0358 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp.h
+++ b/drivers/infiniband/ulp/sdp/sdp.h
@@ -172,11 +172,6 @@ struct sdpstats {
        u32 memcpy_count;
        u32 credits_before_update[64];
        u32 send_interval[25];
-
-       u32 bz_clean_sum;
-       u32 bz_setup_sum;
-       u32 tx_copy_sum;
-       u32 sendmsg_sum;
 };
 extern struct sdpstats sdpstats;
 

diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c
index ab4984636baaaa5ee1229d90babecc1df9e3ac91..9c5a8ed9b2e4e95d6991dd2601321d55f07f85b3 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -1713,14 +1713,10 @@ static int sdp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
        int err, copied;
        long timeo;
        struct bzcopy_state *bz = NULL;
-       unsigned long long a, b, c;
-       unsigned long long start, end;
        SDPSTATS_COUNTER_INC(sendmsg);
        lock_sock(sk);
        sdp_dbg_data(sk, "%s\n", __func__);
 
-       rdtscll(start);
-
        posts_handler_get(ssk);
 
        flags = msg->msg_flags;
@@ -1757,14 +1753,9 @@ static int sdp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 
                SDPSTATS_HIST(sendmsg_seglen, seglen);
 
-               rdtscll(a);
                if (bz)
                        sdp_bz_cleanup(bz);
-               rdtscll(b);
                bz = sdp_bz_setup(ssk, from, seglen, size_goal);
-               rdtscll(c);
-               SDPSTATS_COUNTER_ADD(bz_clean_sum, b - a);
-               SDPSTATS_COUNTER_ADD(bz_setup_sum, c - b);
                if (IS_ERR(bz)) {
                        bz = NULL;
                        err = PTR_ERR(bz);
@@ -1831,12 +1822,8 @@ new_segment:
                                goto new_segment;
                        }
 
-                       rdtscll(a);
                        copy = (bz) ? sdp_bzcopy_get(sk, skb, from, copy, bz) :
                                      sdp_bcopy_get(sk, skb, from, copy);
-                       rdtscll(b);
-                       if (copy > 0)
-                               SDPSTATS_COUNTER_ADD(tx_copy_sum, b - a);
                        if (unlikely(copy < 0)) {
                                if (!++copy)
                                        goto wait_for_memory;
@@ -1905,8 +1892,6 @@ out:
 
        sdp_auto_moderation(ssk);
 
-       rdtscll(end);
-       SDPSTATS_COUNTER_ADD(sendmsg_sum, end - start);
        release_sock(sk);
        return copied;
 

diff --git a/drivers/infiniband/ulp/sdp/sdp_proc.c b/drivers/infiniband/ulp/sdp/sdp_proc.c
index 924e2ee8acd23236937f7b71ceb155edf2c914de..939a143ceede5b4de3cd183bcdf5273e59196858 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_proc.c
+++ b/drivers/infiniband/ulp/sdp/sdp_proc.c
@@ -279,15 +279,6 @@ static int sdpstats_seq_show(struct seq_file *seq, void *v)
        seq_printf(seq, "CQ stats:\n");
        seq_printf(seq, "- RX interrupts\t\t: %d\n", sdpstats.rx_int_count);
        seq_printf(seq, "- TX interrupts\t\t: %d\n", sdpstats.tx_int_count);
-
-       seq_printf(seq, "bz_clean       \t\t: %d\n", sdpstats.sendmsg ?
-               sdpstats.bz_clean_sum / sdpstats.sendmsg : 0);
-       seq_printf(seq, "bz_setup       \t\t: %d\n", sdpstats.sendmsg ?
-               sdpstats.bz_setup_sum / sdpstats.sendmsg : 0);
-       seq_printf(seq, "tx_copy        \t\t: %d\n", sdpstats.sendmsg ?
-               sdpstats.tx_copy_sum / sdpstats.sendmsg : 0);
-       seq_printf(seq, "sendmsg        \t\t: %d\n", sdpstats.sendmsg ?
-               sdpstats.sendmsg_sum / sdpstats.sendmsg : 0);
        return 0;
 }