From patchwork Thu Sep 5 08:55:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Line Holen X-Patchwork-Id: 2853978 X-Patchwork-Delegate: hal@mellanox.com Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ED169C0AB5 for ; Thu, 5 Sep 2013 08:55:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B198D202B4 for ; Thu, 5 Sep 2013 08:55:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69C1A20290 for ; Thu, 5 Sep 2013 08:55:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763482Ab3IEIzz (ORCPT ); Thu, 5 Sep 2013 04:55:55 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:43607 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762639Ab3IEIzx convert rfc822-to-8bit (ORCPT ); Thu, 5 Sep 2013 04:55:53 -0400 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r858tnD3001515 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 5 Sep 2013 08:55:51 GMT Received: from aserz7022.oracle.com (aserz7022.oracle.com [141.146.126.231]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r858tm5U007086 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 5 Sep 2013 08:55:49 GMT Received: from abhmt118.oracle.com (abhmt118.oracle.com [141.146.116.70]) by aserz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r858tmfK007080; Thu, 5 Sep 2013 08:55:48 GMT MIME-Version: 1.0 Message-ID: <5757eac9-e734-4f39-a828-03a9f95e6835@default> Date: Thu, 5 Sep 2013 01:55:48 -0700 (PDT) From: Line Holen To: Hal Cc: Linux-Rdma Subject: [PATCH] opensm: Clean up event subscriptions if a port goes away X-Mailer: Zimbra on Oracle Beehive Content-Disposition: inline X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-9.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 Event subscriptions needs to be cleaned up if a port goes away. If the port comes online again later it may no longer want to receive the events on the same QPN. If the "old" QPN is used for something else the SM forwarding events may cause QKey violations. Signed-off-by: Line Holen --- -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/opensm/osm_inform.h b/include/opensm/osm_inform.h index f737441..8cefc20 100644 --- a/include/opensm/osm_inform.h +++ b/include/opensm/osm_inform.h @@ -2,6 +2,7 @@ * Copyright (c) 2004-2009 Voltaire, Inc. All rights reserved. * Copyright (c) 2002-2005 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -200,6 +201,35 @@ void osm_infr_insert_to_db(IN osm_subn_t * p_subn, IN osm_log_t * p_log, void osm_infr_remove_from_db(IN osm_subn_t * p_subn, IN osm_log_t * p_log, IN osm_infr_t * p_infr); +/****f* OpenSM: Inform Record/osm_infr_remove_subscriptions +* NAME +* osm_infr_remove_subscriptions +* +* DESCRIPTION +* Remove all event subscriptions of a port +* +* SYNOPSIS +*/ +ib_api_status_t +osm_infr_remove_subscriptions(IN osm_subn_t * p_subn, IN osm_log_t * p_log, + IN ib_net64_t port_guid); +/* +* PARAMETERS +* p_subn +* [in] Pointer to the subnet object +* +* p_log +* [in] Pointer to the log object +* +* port_guid +* [in] PortGUID of the subscriber that should be removed +* +* RETURN +* CL_SUCCESS if port_guid had any subscriptions being removed +* CL_NOT_FOUND if port_guid did not have any active subscriptions +* SEE ALSO +*********/ + /****f* OpenSM: Inform Record/osm_report_notice * NAME * osm_report_notice diff --git a/opensm/osm_drop_mgr.c b/opensm/osm_drop_mgr.c index b309273..5f9181a 100644 --- a/opensm/osm_drop_mgr.c +++ b/opensm/osm_drop_mgr.c @@ -3,6 +3,7 @@ * Copyright (c) 2002-2012 Mellanox Technologies LTD. All rights reserved. * Copyright (c) 1996-2003 Intel Corporation. All rights reserved. * Copyright (c) 2008 Xsigo Systems Inc. All rights reserved. + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -276,6 +277,13 @@ static void drop_mgr_remove_port(osm_sm_t * sm, IN osm_port_t * p_port) drop_mgr_clean_physp(sm, p_port->p_physp); + /* Delete event forwarding subscriptions */ + if (osm_infr_remove_subscriptions(sm->p_subn, sm->p_log, port_guid) + == CL_SUCCESS) + OSM_LOG(sm->p_log, OSM_LOG_DEBUG, + "Removed event subscriptions for port 0x%016" PRIx64 "\n", + cl_ntoh64(port_guid)); + /* initialize the p_node - may need to get node_desc later */ p_node = p_port->p_node; diff --git a/opensm/osm_inform.c b/opensm/osm_inform.c index 804c414..6318700 100644 --- a/opensm/osm_inform.c +++ b/opensm/osm_inform.c @@ -282,6 +282,41 @@ void osm_infr_remove_from_db(IN osm_subn_t * p_subn, IN osm_log_t * p_log, OSM_LOG_EXIT(p_log); } +ib_api_status_t osm_infr_remove_subscriptions(IN osm_subn_t * p_subn, + IN osm_log_t * p_log, + IN ib_net64_t port_guid) +{ + ib_gid_t gid; + cl_list_item_t *p_list_item; + osm_infr_t *p_infr; + ib_api_status_t status = CL_NOT_FOUND; + + OSM_LOG_ENTER(p_log); + + gid.unicast.interface_id = port_guid; + gid.unicast.prefix = p_subn->opt.subnet_prefix; + + /* go over all inform info available at the subnet */ + /* match to the given GID and delete subscriptions if match */ + p_list_item = cl_qlist_head(&p_subn->sa_infr_list); + while (p_list_item != cl_qlist_end(&p_subn->sa_infr_list)) { + + p_infr = (osm_infr_t *)p_list_item; + p_list_item = cl_qlist_next(p_list_item); + + if (memcmp(&(p_infr->inform_record.subscriber_gid), &gid, sizeof(ib_gid_t))) + continue; + + /* Remove this event subscription */ + osm_infr_remove_from_db(p_subn, p_log, p_infr); + + status = CL_SUCCESS; + } + + OSM_LOG_EXIT(p_log); + return (status); +} + /********************************************************************** * Send a report: * Given a target address to send to and the notice.