From owner-svn-src-head@FreeBSD.ORG Wed Oct 29 06:34:34 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AE21DE49 for ; Wed, 29 Oct 2014 06:34:34 +0000 (UTC) Received: from new1-smtp.messagingengine.com (new1-smtp.messagingengine.com [66.111.4.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7316881A for ; Wed, 29 Oct 2014 06:34:33 +0000 (UTC) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailnew.nyi.internal (Postfix) with ESMTP id 3B0D74497 for ; Wed, 29 Oct 2014 02:34:27 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute2.internal (MEProxy); Wed, 29 Oct 2014 02:34:27 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.fm; h= x-sasl-enc:in-reply-to:references:mime-version :content-transfer-encoding:content-type:subject:from:date:to :message-id; s=mesmtp; bh=XfbpDkTbkC3kPje9EhHBa8RAkbw=; b=Acok+g ON+eZA6X0v28OWC1aK5nCk3vjYUYxKDZN5Ziqktf7N389GcvDSIJ9YXC/cu/a/Hg zeCvY/ELIJBSEU19gDyp6bleC6psjzaP0ICcJckirK6A847irxXJffiI71SlWHF8 HvsGs6WN0jltyxyYGcutL2yUHGwoJNB4V1J+w= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=x-sasl-enc:in-reply-to:references :mime-version:content-transfer-encoding:content-type:subject :from:date:to:message-id; s=smtpout; bh=XfbpDkTbkC3kPje9EhHBa8RA kbw=; b=poR22f6akbFmsfwOG48lQ9i81vQLJgXgQ72/MNlqx/bQ8zK0YpnX6Jmv NG/IJE135+u+sdDXSfvs11BOTHaKiJR7+BqhMDTdOJy6tkTujmlOKs4kHiax2LDw 9ch2Bw/B1X0koTDOQbLomVXlq1O1laRiKt5u0gLthImeTuhM2R8= X-Sasl-enc: hEmVplrFijZBRo4P7NUPLmqOBExbxoTs1nHRlFAGo0y6 1414564466 Received: from [192.168.0.110] (unknown [174.24.231.159]) by mail.messagingengine.com (Postfix) with ESMTPA id C39416800A8; Wed, 29 Oct 2014 02:34:25 -0400 (EDT) User-Agent: K-9 Mail for Android In-Reply-To: <201410290624.s9T6OD1a038594@svn.freebsd.org> References: <201410290624.s9T6OD1a038594@svn.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Subject: Re: svn commit: r273811 - head/contrib/ofed/librdmacm/examples From: Anthony Cornehl Date: Tue, 28 Oct 2014 23:34:11 -0700 To: Navdeep Parhar , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Oct 2014 06:34:34 -0000 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. [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"