sdp: fix some warning and bugs in porting to ofed 1.5

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 d03d6afa7d3f38e2e9a41aa362efe20468f98222..ec8dbe1acaa65e0a75811a3403e8207b9cfa96f0 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp.h
+++ b/drivers/infiniband/ulp/sdp/sdp.h
@@ -11,12 +11,15 @@
 #define SDPSTATS_ON
 /* #define SDP_PROFILING */
 
-#define _sdp_printk(func, line, level, sk, format, arg...)                \
+#define _sdp_printk(func, line, level, sk, format, arg...) do {               \
+       preempt_disable(); \
        printk(level "%s:%d sdp_sock(%5d:%d %d:%d): " format,             \
               func, line, \
               current->pid, smp_processor_id(), \
               (sk) ? inet_sk(sk)->num : -1,                 \
-              (sk) ? ntohs(inet_sk(sk)->dport) : -1, ## arg)
+              (sk) ? ntohs(inet_sk(sk)->dport) : -1, ## arg); \
+       preempt_enable(); \
+} while (0)
 #define sdp_printk(level, sk, format, arg...)                \
        _sdp_printk(__func__, __LINE__, level, sk, format, ## arg)
 #define sdp_warn(sk, format, arg...)                         \
@@ -71,6 +74,7 @@ static inline unsigned long long current_nsec(void)
 #define sdp_prf1(sk, s, format, arg...) ({ \
        struct sdpprf_log *l = \
                &sdpprf_log[sdpprf_log_count++ & (SDPPRF_LOG_SIZE - 1)]; \
+       preempt_disable(); \
        l->idx = sdpprf_log_count - 1; \
        l->pid = current->pid; \
        l->sk_num = (sk) ? inet_sk(sk)->num : -1;                 \
@@ -81,6 +85,7 @@ static inline unsigned long long current_nsec(void)
        l->time = current_nsec(); \
        l->func = __func__; \
        l->line = __LINE__; \
+       preempt_enable(); \
        1; \
 })
 #define sdp_prf(sk, s, format, arg...)

diff --git a/drivers/infiniband/ulp/sdp/sdp_cma.c b/drivers/infiniband/ulp/sdp/sdp_cma.c
index 2354fff381795d35ff9a5eab8d7340d08496dc7c..f8a730390e5585046134f89c8afa9da9620f5ce3 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_cma.c
+++ b/drivers/infiniband/ulp/sdp/sdp_cma.c
@@ -308,7 +308,7 @@ int sdp_cma_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)
                        -EINVAL : 0;
        }
 
-       lock_sock(sk);
+       lock_sock_nested(sk, SINGLE_DEPTH_NESTING);
        sdp_dbg(sk, "%s event %d id %p\n", __func__, event->event, id);
        if (!sdp_sk(sk)->id) {
                sdp_dbg(sk, "socket is being torn down\n");

diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c
index 48e43dc1f51db3ae0fcb612a37ef973d8cf0ee2b..ab4984636baaaa5ee1229d90babecc1df9e3ac91 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -181,7 +181,6 @@ static int sdp_get_port(struct sock *sk, unsigned short snum)
 static void sdp_destroy_qp(struct sdp_sock *ssk)
 {
        struct ib_pd *pd = NULL;
-       unsigned long flags;
 
 
        sdp_dbg(&ssk->isk.sk, "destroying qp\n");
@@ -189,7 +188,6 @@ static void sdp_destroy_qp(struct sdp_sock *ssk)
 
        del_timer(&ssk->tx_ring.timer);
 
-       rx_ring_lock(ssk, flags);
 
        sdp_rx_ring_destroy(ssk);
        sdp_tx_ring_destroy(ssk);
@@ -209,9 +207,6 @@ static void sdp_destroy_qp(struct sdp_sock *ssk)
                ib_dealloc_pd(pd);
 
        sdp_remove_large_sock(ssk);
-
-       rx_ring_unlock(ssk, flags);
-
 }
 
 static void sdp_reset_keepalive_timer(struct sock *sk, unsigned long len)
@@ -453,10 +448,6 @@ void sdp_reset_sk(struct sock *sk, int rc)
                sdp_set_error(sk, rc);
        }
 
-       sdp_destroy_qp(ssk);
-
-       memset((void *)&ssk->id, 0, sizeof(*ssk) - offsetof(typeof(*ssk), id));
-
        sk->sk_state_change(sk);
 
        /* Don't destroy socket before destroy work does its job */
@@ -976,6 +967,10 @@ void sdp_destroy_work(struct work_struct *work)
        struct sock *sk = &ssk->isk.sk;
        sdp_dbg(sk, "%s: refcnt %d\n", __func__, atomic_read(&sk->sk_refcnt));
 
+       sdp_destroy_qp(ssk);
+
+       memset((void *)&ssk->id, 0, sizeof(*ssk) - offsetof(typeof(*ssk), id));
+
        sdp_cancel_dreq_wait_timeout(ssk);
 
        if (sk->sk_state == TCP_TIME_WAIT)
@@ -2559,6 +2554,10 @@ static void __exit sdp_exit(void)
        sdp_proc_unregister();
 
        ib_unregister_client(&sdp_client);
+
+       percpu_counter_destroy(sockets_allocated);
+       percpu_counter_destroy(orphan_count);
+
        kfree(orphan_count);
        kfree(sockets_allocated);
 }

diff --git a/drivers/infiniband/ulp/sdp/sdp_rx.c b/drivers/infiniband/ulp/sdp/sdp_rx.c
index 749a83a2d732e455bbedebec7da075d041e93c4c..38417c4947222f2a852f6f018a4a405bb16ddaf7 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_rx.c
+++ b/drivers/infiniband/ulp/sdp/sdp_rx.c
@@ -447,12 +447,12 @@ static int sdp_process_rx_ctl_skb(struct sdp_sock *ssk, struct sk_buff *skb)
                break;
        case SDP_MID_CHRCVBUF:
                sdp_dbg_data(sk, "Handling RX CHRCVBUF\n");
-               sdp_handle_resize_request(ssk, (struct sdp_chrecvbuf *)h);
+               sdp_handle_resize_request(ssk, (struct sdp_chrecvbuf *)(h+1));
                __kfree_skb(skb);
                break;
        case SDP_MID_CHRCVBUF_ACK:
                sdp_dbg_data(sk, "Handling RX CHRCVBUF_ACK\n");
-               sdp_handle_resize_ack(ssk, (struct sdp_chrecvbuf *)h);
+               sdp_handle_resize_ack(ssk, (struct sdp_chrecvbuf *)(h+1));
                __kfree_skb(skb);
                break;
        default:
@@ -787,9 +787,6 @@ int sdp_rx_ring_create(struct sdp_sock *ssk, struct ib_device *device)
 {
        struct ib_cq *rx_cq;
        int rc = 0;
-       unsigned long flags;
-
-       rx_ring_lock(ssk, flags);
 
        atomic_set(&ssk->rx_ring.head, 1);
        atomic_set(&ssk->rx_ring.tail, 1);
@@ -797,12 +794,11 @@ int sdp_rx_ring_create(struct sdp_sock *ssk, struct ib_device *device)
        ssk->rx_ring.buffer = kmalloc(
                        sizeof *ssk->rx_ring.buffer * SDP_RX_SIZE, GFP_KERNEL);
        if (!ssk->rx_ring.buffer) {
-               rc = -ENOMEM;
                sdp_warn(&ssk->isk.sk,
                        "Unable to allocate RX Ring size %zd.\n",
                         sizeof(*ssk->rx_ring.buffer) * SDP_RX_SIZE);
 
-               goto out;
+               return -ENOMEM;
        }
 
        /* TODO: use vector=IB_CQ_VECTOR_LEAST_ATTACHED when implemented
@@ -822,13 +818,11 @@ int sdp_rx_ring_create(struct sdp_sock *ssk, struct ib_device *device)
 
        sdp_arm_rx_cq(&ssk->isk.sk);
 
-       goto out;
+       return 0;
 
 err_cq:
        kfree(ssk->rx_ring.buffer);
        ssk->rx_ring.buffer = NULL;
-out:
-       rx_ring_unlock(ssk, flags);
        return rc;
 }