From patchwork Fri Mar 28 05:50:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hefty, Sean" X-Patchwork-Id: 3900891 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 320639F2E8 for ; Fri, 28 Mar 2014 05:50:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 63BF3202F0 for ; Fri, 28 Mar 2014 05:50:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 83722202E6 for ; Fri, 28 Mar 2014 05:50:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751199AbaC1Fu2 (ORCPT ); Fri, 28 Mar 2014 01:50:28 -0400 Received: from mga01.intel.com ([192.55.52.88]:35279 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751247AbaC1FuU (ORCPT ); Fri, 28 Mar 2014 01:50:20 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 27 Mar 2014 22:50:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,748,1389772800"; d="scan'208";a="501476369" Received: from cst-linux.jf.intel.com ([10.23.221.72]) by fmsmga001.fm.intel.com with ESMTP; 27 Mar 2014 22:50:17 -0700 From: sean.hefty@intel.com To: linux-rdma@vger.kernel.org Cc: Ira Weiny Subject: [PATCH 10/16] ibacm: add locking around end point address arrays Date: Thu, 27 Mar 2014 22:50:04 -0700 Message-Id: <1395985810-23822-11-git-send-email-sean.hefty@intel.com> X-Mailer: git-send-email 1.7.3 In-Reply-To: <1395985810-23822-1-git-send-email-sean.hefty@intel.com> References: <1395985810-23822-1-git-send-email-sean.hefty@intel.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ira Weiny Signed-off-by: Ira Weiny --- src/acm.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/acm.c b/src/acm.c index c5da791..ebb48f4 100644 --- a/src/acm.c +++ b/src/acm.c @@ -92,7 +92,7 @@ enum acm_addr_preload { }; /* - * Nested locking order: dest -> ep, dest -> port + * Nested locking order: dest -> ep, dest -> port, port -> ep */ struct acm_dest { uint8_t address[ACM_MAX_ADDRESS]; /* keep first */ @@ -1830,8 +1830,12 @@ acm_get_port_ep(struct acm_port *port, struct acm_ep_addr_data *data) (!data->info.path.pkey || (ntohs(data->info.path.pkey) == ep->pkey))) return ep; - if (acm_addr_index(ep, data->info.addr, (uint8_t) data->type) >= 0) + lock_acquire(&ep->lock); + if (acm_addr_index(ep, data->info.addr, (uint8_t) data->type) >= 0) { + lock_release(&ep->lock); return ep; + } + lock_release(&ep->lock); } return NULL;