From: Hal Rosenstock <hal-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
To: Alex Netes <alexne-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
Cc: "linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
<linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: [PATCH 2/4] opensm/osm_pkey_mgr.c: Detect pkey table overflow in pkey_mgr_update_port
Date: Tue, 24 May 2011 13:25:21 -0400 [thread overview]
Message-ID: <4DDBEA01.8010701@dev.mellanox.co.il> (raw)
Signed-off-by: Hal Rosenstock <hal-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
---
opensm/osm_pkey_mgr.c | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/opensm/osm_pkey_mgr.c b/opensm/osm_pkey_mgr.c
index 4c92c05..70471b0 100644
--- a/opensm/osm_pkey_mgr.c
+++ b/opensm/osm_pkey_mgr.c
@@ -343,17 +343,16 @@ static int pkey_mgr_update_port(osm_log_t * p_log, osm_sm_t * sm,
if (pkey_index >= IB_NUM_PKEY_ELEMENTS_IN_BLOCK) {
block_index++;
pkey_index -= IB_NUM_PKEY_ELEMENTS_IN_BLOCK;
- if (block_index * IB_NUM_PKEY_ELEMENTS_IN_BLOCK + pkey_index >= pkey_mgr_get_physp_max_pkeys(p_physp)) {
- OSM_LOG(p_log, OSM_LOG_ERROR,
- "ERR 0512: "
- "Failed to set PKey 0x%04x since Pkey table is full "
- "for node 0x%016" PRIx64 " port %u (%s)\n",
-
- cl_ntoh16(p_pending->pkey),
- cl_ntoh64(osm_node_get_node_guid(p_node)),
- osm_physp_get_port_num(p_physp),
- p_physp->p_node->print_desc);
- }
+ }
+ if (block_index * IB_NUM_PKEY_ELEMENTS_IN_BLOCK + pkey_index >= pkey_mgr_get_physp_max_pkeys(p_physp)) {
+ OSM_LOG(p_log, OSM_LOG_ERROR,
+ "ERR 0512: "
+ "Failed to set PKey 0x%04x because Pkey table is full "
+ "for node 0x%016" PRIx64 " port %u (%s)\n",
+ cl_ntoh16(p_pending->pkey),
+ cl_ntoh64(osm_node_get_node_guid(p_node)),
+ osm_physp_get_port_num(p_physp),
+ p_physp->p_node->print_desc);
} else
found = TRUE;
}
--
1.5.3
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
reply other threads:[~2011-05-24 17:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DDBEA01.8010701@dev.mellanox.co.il \
--to=hal-ldsdmyg8hgv8yrgs2mwiifqbs+8scbdb@public.gmane.org \
--cc=alexne-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org \
--cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.