From patchwork Fri May 22 19:22:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arlin Davis X-Patchwork-Id: 6467541 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B62B49F46A for ; Fri, 22 May 2015 19:23:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D95F92034E for ; Fri, 22 May 2015 19:23:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05A562045E for ; Fri, 22 May 2015 19:23:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756229AbbEVTWy (ORCPT ); Fri, 22 May 2015 15:22:54 -0400 Received: from mga02.intel.com ([134.134.136.20]:58696 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757293AbbEVTWw (ORCPT ); Fri, 22 May 2015 15:22:52 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP; 22 May 2015 12:22:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,477,1427785200"; d="scan'208";a="714399589" Received: from cst-linux.jf.intel.com ([10.23.221.40]) by fmsmga001.fm.intel.com with ESMTP; 22 May 2015 12:22:51 -0700 From: arlin.r.davis@intel.com To: linux-rdma@vger.kernel.org Cc: Arlin Davis Subject: [PATCH 6/7] dapl scm: remove use of msg.resv field for process id logging Date: Fri, 22 May 2015 12:22:46 -0700 Message-Id: <1432322567-9349-6-git-send-email-arlin.r.davis@intel.com> X-Mailer: git-send-email 1.7.3 In-Reply-To: <1432322567-9349-1-git-send-email-arlin.r.davis@intel.com> References: <1432322567-9349-1-git-send-email-arlin.r.davis@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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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: Arlin Davis Signed-off-by: Arlin Davis --- dapl/openib_scm/cm.c | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dapl/openib_scm/cm.c b/dapl/openib_scm/cm.c index 680d16b..ecc5418 100644 --- a/dapl/openib_scm/cm.c +++ b/dapl/openib_scm/cm.c @@ -42,7 +42,7 @@ * * $Id: $ * - * Copyright (c) 2005 Intel Corporation. All rights reserved. + * Copyright (c) 2005-2015 Intel Corporation. All rights reserved. * **************************************************************************/ @@ -737,13 +737,11 @@ static void dapli_socket_connect_rtu(dp_ib_cm_handle_t cm_ptr) int err = dapl_socket_errno(); dapl_log(DAPL_DBG_TYPE_CM_WARN, " CONN_REP_PENDING: sk %d ERR 0x%x, rcnt=%d, v=%d ->" - " %s PORT L-%x R-%x PID L-%x%x R-%x%x %d\n", + " %s PORT L-%x R-%x %d\n", cm_ptr->socket, err, len, ntohs(cm_ptr->msg.ver), inet_ntoa(((struct sockaddr_in *)&cm_ptr->addr)->sin_addr), ntohs(((struct sockaddr_in *)&cm_ptr->msg.daddr.so)->sin_port), ntohs(((struct sockaddr_in *)&cm_ptr->addr)->sin_port), - cm_ptr->msg.resv[1],cm_ptr->msg.resv[0], - cm_ptr->msg.resv[3],cm_ptr->msg.resv[2], cm_ptr->retry); /* Retry; corner case where server tcp stack resets under load */ @@ -1302,11 +1300,6 @@ dapli_socket_accept_usr(DAPL_EP * ep_ptr, sl = sizeof(local.daddr.so); getsockname(cm_ptr->socket, (struct sockaddr *)&local.daddr.so, &sl); -#ifdef DAPL_DBG - /* DBG: Active PID [0], PASSIVE PID [2] */ - *(uint16_t*)&cm_ptr->msg.resv[2] = htons((uint16_t)dapl_os_getpid()); - dapl_os_memcpy(local.resv, cm_ptr->msg.resv, 4); -#endif cm_ptr->hca = ia_ptr->hca_ptr; dapl_os_lock(&cm_ptr->lock); cm_ptr->state = DCM_ACCEPTED; @@ -1973,7 +1966,7 @@ void dapls_print_cm_list(IN DAPL_IA *ia_ptr) (DAPL_LLIST_ENTRY*)&cr->local_entry); printf( " CONN[%d]: sp %p ep %p sock %d %s %s %s %s %s %s " - " PORT L-%x R-%x PID L-%x%x R-%x%x\n", + " PORT L-%x R-%x \n", i, cr->sp, cr->ep, cr->socket, cr->msg.saddr.ib.qp_type == IBV_QPT_RC ? "RC" : "UD", dapl_cm_state_str(cr->state), dapl_cm_op_str(ntohs(cr->msg.op)), @@ -1991,10 +1984,7 @@ void dapls_print_cm_list(IN DAPL_IA *ia_ptr) ntohs(cr->msg.op) == DCM_REQ ? /* remote port */ ntohs(((struct sockaddr_in *)&cr->addr)->sin_port) : - ntohs(((struct sockaddr_in *)&cr->msg.daddr.so)->sin_port), - - cr->sp ? cr->msg.resv[3] : cr->msg.resv[1], cr->sp ? cr->msg.resv[2] : cr->msg.resv[0], - cr->sp ? cr->msg.resv[1] : cr->msg.resv[3], cr->sp ? cr->msg.resv[0] : cr->msg.resv[2]); + ntohs(((struct sockaddr_in *)&cr->msg.daddr.so)->sin_port) ); i++; } printf("\n");