| Message ID | 20090925145045.GF26931@me (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Hi Sasha, On Fri, 2009-09-25 at 08:50 -0600, Sasha Khapyorsky wrote: > When LASH runs its switch structures cleanup OpenSM can rediscover a > subnet and 'p_sw' pointer may refer already freed memory, so don't touch > it, just free our own stuff. (Note also that for valids OpenSM switches > objects' 'priv' pointers are cleared on lash_cleanup()). This worked for me on the test case that generated my earlier report. Thanks -- Jim > > Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com> > --- > opensm/opensm/osm_ucast_lash.c | 5 +---- > 1 files changed, 1 insertions(+), 4 deletions(-) > > diff --git a/opensm/opensm/osm_ucast_lash.c b/opensm/opensm/osm_ucast_lash.c > index dbc6bcc..3c424cb 100644 > --- a/opensm/opensm/osm_ucast_lash.c > +++ b/opensm/opensm/osm_ucast_lash.c > @@ -628,8 +628,7 @@ static switch_t *switch_create(lash_t * p_lash, unsigned id, osm_switch_t * p_sw > } > > sw->p_sw = p_sw; > - if (p_sw) > - p_sw->priv = sw; > + p_sw->priv = sw; > > if (osm_mesh_node_create(p_lash, sw)) { > free(sw->dij_channels); > @@ -644,8 +643,6 @@ static void switch_delete(lash_t *p_lash, switch_t * sw) > { > if (sw->dij_channels) > free(sw->dij_channels); > - if (sw->p_sw) > - sw->p_sw->priv = NULL; > free(sw); > } > -- 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
On 9/25/09, Sasha Khapyorsky <sashak@voltaire.com> wrote: > > When LASH runs its switch structures cleanup OpenSM can rediscover a > subnet and 'p_sw' pointer may refer already freed memory, so don't touch > it, just free our own stuff. (Note also that for valids OpenSM switches > objects' 'priv' pointers are cleared on lash_cleanup()). > > Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com> Tested-by: Hal Rosenstock <hal.rosenstock@gmail.com> > --- > opensm/opensm/osm_ucast_lash.c | 5 +---- > 1 files changed, 1 insertions(+), 4 deletions(-) > > diff --git a/opensm/opensm/osm_ucast_lash.c b/opensm/opensm/osm_ucast_lash.c > index dbc6bcc..3c424cb 100644 > --- a/opensm/opensm/osm_ucast_lash.c > +++ b/opensm/opensm/osm_ucast_lash.c > @@ -628,8 +628,7 @@ static switch_t *switch_create(lash_t * p_lash, unsigned > id, osm_switch_t * p_sw > } > > sw->p_sw = p_sw; > - if (p_sw) > - p_sw->priv = sw; > + p_sw->priv = sw; > > if (osm_mesh_node_create(p_lash, sw)) { > free(sw->dij_channels); > @@ -644,8 +643,6 @@ static void switch_delete(lash_t *p_lash, switch_t * sw) > { > if (sw->dij_channels) > free(sw->dij_channels); > - if (sw->p_sw) > - sw->p_sw->priv = NULL; > free(sw); > } > > -- > 1.6.5.rc1 > > -- 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/opensm/opensm/osm_ucast_lash.c b/opensm/opensm/osm_ucast_lash.c index dbc6bcc..3c424cb 100644 --- a/opensm/opensm/osm_ucast_lash.c +++ b/opensm/opensm/osm_ucast_lash.c @@ -628,8 +628,7 @@ static switch_t *switch_create(lash_t * p_lash, unsigned id, osm_switch_t * p_sw } sw->p_sw = p_sw; - if (p_sw) - p_sw->priv = sw; + p_sw->priv = sw; if (osm_mesh_node_create(p_lash, sw)) { free(sw->dij_channels); @@ -644,8 +643,6 @@ static void switch_delete(lash_t *p_lash, switch_t * sw) { if (sw->dij_channels) free(sw->dij_channels); - if (sw->p_sw) - sw->p_sw->priv = NULL; free(sw); }
When LASH runs its switch structures cleanup OpenSM can rediscover a subnet and 'p_sw' pointer may refer already freed memory, so don't touch it, just free our own stuff. (Note also that for valids OpenSM switches objects' 'priv' pointers are cleared on lash_cleanup()). Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com> --- opensm/opensm/osm_ucast_lash.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)