From owner-svn-src-all@FreeBSD.ORG Wed Oct 29 06:38:08 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CB540FA6; Wed, 29 Oct 2014 06:38:08 +0000 (UTC) Received: from mail-pd0-x229.google.com (mail-pd0-x229.google.com [IPv6:2607:f8b0:400e:c02::229]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 92B01836; Wed, 29 Oct 2014 06:38:08 +0000 (UTC) Received: by mail-pd0-f169.google.com with SMTP id y10so2363567pdj.14 for ; Tue, 28 Oct 2014 23:38:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:mail-followup-to :references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=pR0/T+j/3v2iBKjCXWe2hzEfOfsyrELE2Nzo/ASNR+E=; b=qbPwQxKmJmXhslwUL4z2xgqE9G6czyQOh/fX7097Bru+C5Tc+YWZawdPrk7jklLwPB 7HuWPUTwiG/+yc5gKKh5CKOB8XMQIDp4J2WkvCxSKgTlXo7e9PF+YXGnPlG6ocN6iqzQ xz0ONczzWgyD2YdK+/T1hDil8yLo80PhHvXlo5f9PYKqtf/6/wsttqRbTdo+9GoxRhM2 jJwWPEc8l1KDOHcCo3iJmWC0PLtqbnFKLnThZZ25GLniY/DjnsK6CG1K5MeqADO9Bo4V Rm3Ir+82GnNyapDkgioo7A5BEmrnT0g17bfgOEvDfWzg380PFnyfMTbS3pK2r+BSsc1k aUMQ== X-Received: by 10.70.22.195 with SMTP id g3mr8423487pdf.37.1414564688218; Tue, 28 Oct 2014 23:38:08 -0700 (PDT) Received: from ox ([24.6.44.228]) by mx.google.com with ESMTPSA id z15sm3367299pdi.6.2014.10.28.23.38.05 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 28 Oct 2014 23:38:07 -0700 (PDT) Sender: Navdeep Parhar Date: Tue, 28 Oct 2014 23:38:01 -0700 From: Navdeep Parhar To: Anthony Cornehl Subject: Re: svn commit: r273811 - head/contrib/ofed/librdmacm/examples Message-ID: <20141029063729.GA7077@ox> Mail-Followup-To: Anthony Cornehl , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201410290624.s9T6OD1a038594@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Oct 2014 06:38:08 -0000 On Tue, Oct 28, 2014 at 11:34:11PM -0700, Anthony Cornehl wrote: > On October 28, 2014 11:24:13 PM PDT, Navdeep Parhar wrote: > >Author: np > >Date: Wed Oct 29 06:24:12 2014 > >New Revision: 273811 > >URL: https://svnweb.freebsd.org/changeset/base/273811 > > > >Log: > > rping: make sure that the CQ event thread can never poll a CQ after it > > has been destroyed. > > > > Submitted by: Hariprasad at Chelsio dot com > > Sponsored by: Chelsio Communications > > > > Is this change present upstream? We really should be tracking the originating > repositories when making changes in OFED packages, but the kernel and > userspace is several years out of date from what OFED is tracking currently. The patch was submitted upstream. I'm sure it'll get there eventually. Navdeep > > [1] http://git.openfabrics.org/?p=~shefty/librdmacm.git;a=summary > > >Modified: > > head/contrib/ofed/librdmacm/examples/rping.c > > > >Modified: head/contrib/ofed/librdmacm/examples/rping.c > >============================================================================== > >--- head/contrib/ofed/librdmacm/examples/rping.c Wed Oct 29 04:32:46 > >2014 (r273810) > >+++ head/contrib/ofed/librdmacm/examples/rping.c Wed Oct 29 06:24:12 > >2014 (r273811) > >@@ -40,7 +40,6 @@ > > #include > > #include > > #include > >-#include > > #include > > #include > > #include > >@@ -280,10 +279,10 @@ static int rping_cq_event_handler(struct > > ret = 0; > > > > if (wc.status) { > >- fprintf(stderr, "cq completion failed status %d\n", > >- wc.status); > > if (wc.status != IBV_WC_WR_FLUSH_ERR) > >- ret = -1; > >+ fprintf(stderr, "cq completion failed status %d\n", > >+ wc.status); > >+ ret = -1; > > goto error; > > } > > > >@@ -800,10 +799,9 @@ static void *rping_persistent_server_thr > > > > rping_test_server(cb); > > rdma_disconnect(cb->child_cm_id); > >+ pthread_join(cb->cqthread, NULL); > > rping_free_buffers(cb); > > rping_free_qp(cb); > >- pthread_cancel(cb->cqthread); > >- pthread_join(cb->cqthread, NULL); > > rdma_destroy_id(cb->child_cm_id); > > free_cb(cb); > > return NULL; > >@@ -888,6 +886,7 @@ static int rping_run_server(struct rping > > > > rping_test_server(cb); > > rdma_disconnect(cb->child_cm_id); > >+ pthread_join(cb->cqthread, NULL); > > rdma_destroy_id(cb->child_cm_id); > > err2: > > rping_free_buffers(cb); > >@@ -1053,9 +1052,16 @@ static int rping_run_client(struct rping > > goto err2; > > } > > > >- rping_test_client(cb); > >+ ret = rping_test_client(cb); > >+ if (ret) { > >+ fprintf(stderr, "rping client failed: %d\n", ret); > >+ goto err3; > >+ } > >+ ret = 0; > >+err3: > > rdma_disconnect(cb->cm_id); > > err2: > >+ pthread_join(cb->cqthread, NULL); > > rping_free_buffers(cb); > > err1: > > rping_free_qp(cb); > >_______________________________________________ > >svn-src-head@freebsd.org mailing list > >http://lists.freebsd.org/mailman/listinfo/svn-src-head > >To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" > > >