From e512eebccb79d8732bcc7ea461726be573b59bed Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 4 Feb 2013 16:49:27 -0800 Subject: [PATCH] refresh --- meta | 7 +++---- patches/kern-bug | 34 +++++++++++++++++++++++++--------- patches/refresh-temp | 38 -------------------------------------- 3 files changed, 28 insertions(+), 51 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index f077ec92..e98a5f47 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: b99e5468988877b9c174b751a7a2bbd5a4c284b4 -Head: b90b13775adf91f6c498e7a8da534342bbe34f60 +Previous: b71faf97d399b641599a77ae2276cbcba2e04718 +Head: e9d902d6e0b1da78a2bea53e7e3b537630034ad5 Applied: - kern-bug: c4de9a2fb65a041bec530d7eda0189562cfb1770 - refresh-temp: b90b13775adf91f6c498e7a8da534342bbe34f60 + kern-bug: e9d902d6e0b1da78a2bea53e7e3b537630034ad5 Unapplied: af-ib-conn: cf7b9e73d471477d4c7dff2592e5b0d3a7dea8ae addrtype: 23a84fed89ba3f6b0eb63e5f8b37c0df504d0d3e diff --git a/patches/kern-bug b/patches/kern-bug index dbc112fb..6c69ea12 100644 --- a/patches/kern-bug +++ b/patches/kern-bug @@ -1,5 +1,5 @@ Bottom: b6004c656a03f1cecd7bb483178086496ae46a69 -Top: 3a5e1771417c34940355c5d56136e2c805bc2e4f +Top: 1f293108ce283eca535112af13051a53881e8db9 Author: Sean Hefty Date: 2013-02-01 17:17:34 -0800 @@ -26,7 +26,7 @@ Signed-off-by: Sean Hefty --- diff --git a/src/cma.c b/src/cma.c -index ff9b426..7a9f6dc 100755 +index ff9b426..918592a 100755 --- a/src/cma.c +++ b/src/cma.c @@ -50,6 +50,7 @@ @@ -46,7 +46,15 @@ index ff9b426..7a9f6dc 100755 static void ucma_cleanup(void) { -@@ -214,6 +217,7 @@ int ucma_init(void) +@@ -135,6 +138,7 @@ static void ucma_cleanup(void) + ibv_close_device(cma_dev_array[cma_dev_cnt].verbs); + } + ++ fastlock_destroy(&idm_lock); + free(cma_dev_array); + cma_dev_cnt = 0; + } +@@ -214,6 +218,7 @@ int ucma_init(void) return 0; } @@ -54,7 +62,15 @@ index ff9b426..7a9f6dc 100755 ret = check_abi_version(); if (ret) goto err1; -@@ -376,8 +380,27 @@ static void ucma_put_device(struct cma_device *cma_dev) +@@ -275,6 +280,7 @@ err3: + err2: + ibv_free_device_list(dev_list); + err1: ++ fastlock_destroy(&idm_lock); + pthread_mutex_unlock(&mut); + return ret; + } +@@ -376,8 +382,27 @@ static void ucma_put_device(struct cma_device *cma_dev) pthread_mutex_unlock(&mut); } @@ -82,7 +98,7 @@ index ff9b426..7a9f6dc 100755 if (id_priv->cma_dev) ucma_put_device(id_priv->cma_dev); pthread_cond_destroy(&id_priv->cond); -@@ -406,6 +429,7 @@ static struct cma_id_private *ucma_alloc_id(struct rdma_event_channel *channel, +@@ -406,6 +431,7 @@ static struct cma_id_private *ucma_alloc_id(struct rdma_event_channel *channel, id_priv->id.context = context; id_priv->id.ps = ps; id_priv->id.qp_type = qp_type; @@ -90,7 +106,7 @@ index ff9b426..7a9f6dc 100755 if (!channel) { id_priv->id.channel = rdma_create_event_channel(); -@@ -455,6 +479,7 @@ static int rdma_create_id2(struct rdma_event_channel *channel, +@@ -455,6 +481,7 @@ static int rdma_create_id2(struct rdma_event_channel *channel, VALGRIND_MAKE_MEM_DEFINED(&resp, sizeof resp); id_priv->handle = resp.id; @@ -98,7 +114,7 @@ index ff9b426..7a9f6dc 100755 *id = &id_priv->id; return 0; -@@ -1785,6 +1810,7 @@ static int ucma_process_conn_req(struct cma_event *evt, +@@ -1785,6 +1812,7 @@ static int ucma_process_conn_req(struct cma_event *evt, evt->event.listen_id = &evt->id_priv->id; evt->event.id = &id_priv->id; id_priv->handle = handle; @@ -106,7 +122,7 @@ index ff9b426..7a9f6dc 100755 id_priv->initiator_depth = evt->event.param.conn.initiator_depth; id_priv->responder_resources = evt->event.param.conn.responder_resources; -@@ -1916,7 +1942,28 @@ retry: +@@ -1916,7 +1944,28 @@ retry: VALGRIND_MAKE_MEM_DEFINED(&resp, sizeof resp); evt->event.event = resp.event; @@ -124,7 +140,7 @@ index ff9b426..7a9f6dc 100755 + } else { + evt->id_priv = ucma_lookup_id(resp.id); + if (!evt->id_priv) { -+ fprintf(stderr, PFX "Warning: discarding unmatched " ++ syslog(LOG_WARNING, PFX "Warning: discarding unmatched " + "event - rdma_destroy_id may hang.\n"); + goto retry; + } diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index d20c3489..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,38 +0,0 @@ -Bottom: 3a5e1771417c34940355c5d56136e2c805bc2e4f -Top: 1f293108ce283eca535112af13051a53881e8db9 -Author: Sean Hefty -Date: 2013-02-04 16:49:26 -0800 - -Refresh of kern-bug - ---- - -diff --git a/src/cma.c b/src/cma.c -index 7a9f6dc..918592a 100755 ---- a/src/cma.c -+++ b/src/cma.c -@@ -138,6 +138,7 @@ static void ucma_cleanup(void) - ibv_close_device(cma_dev_array[cma_dev_cnt].verbs); - } - -+ fastlock_destroy(&idm_lock); - free(cma_dev_array); - cma_dev_cnt = 0; - } -@@ -279,6 +280,7 @@ err3: - err2: - ibv_free_device_list(dev_list); - err1: -+ fastlock_destroy(&idm_lock); - pthread_mutex_unlock(&mut); - return ret; - } -@@ -1955,7 +1957,7 @@ retry: - } else { - evt->id_priv = ucma_lookup_id(resp.id); - if (!evt->id_priv) { -- fprintf(stderr, PFX "Warning: discarding unmatched " -+ syslog(LOG_WARNING, PFX "Warning: discarding unmatched " - "event - rdma_destroy_id may hang.\n"); - goto retry; - } -- 2.46.0