* [PATCH] opensm/osm_mcast_tbl.c: Fix multicast group removal
@ 2009-10-30 14:49 Hal Rosenstock
[not found] ` <20091030144919.GA26847-Wuw85uim5zDR7s880joybQ@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Hal Rosenstock @ 2009-10-30 14:49 UTC (permalink / raw)
To: sashak-smomgflXvOZWk0Htik3J/w; +Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA
Revert de3171043b3cbe078e410351a00e5756509bd514 and
some of 537d67b19a4b72d72341e529f611e4e30754f8fc
In osm_mcast_tbl_realloc, don't change max_mlid_ho when mlid_offset < p_tbl->mft_depth
Also, restore some checks when mlid_offset >= p_tbl->mft_depth
These changes are needed for proper group removal
Signed-off-by: Hal Rosenstock <hal.rosenstock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
diff --git a/opensm/opensm/osm_mcast_tbl.c b/opensm/opensm/osm_mcast_tbl.c
index 0a45904..da106c6 100644
--- a/opensm/opensm/osm_mcast_tbl.c
+++ b/opensm/opensm/osm_mcast_tbl.c
@@ -122,7 +122,7 @@ int osm_mcast_tbl_realloc(IN osm_mcast_tbl_t * p_tbl, IN uintn_t mlid_offset)
uint16_t (*p_mask_tbl)[][IB_MCAST_POSITION_MAX];
if (mlid_offset < p_tbl->mft_depth)
- goto done;
+ return 0;
/*
The number of bytes needed in the mask table is:
@@ -144,7 +144,6 @@ int osm_mcast_tbl_realloc(IN osm_mcast_tbl_t * p_tbl, IN uintn_t mlid_offset)
size - p_tbl->mft_depth * (IB_MCAST_POSITION_MAX + 1) * IB_MCAST_MASK_SIZE / 8);
p_tbl->p_mask_tbl = p_mask_tbl;
p_tbl->mft_depth = mft_depth;
-done:
p_tbl->max_mlid_ho = mlid_offset + IB_LID_MCAST_START_HO;
return 0;
}
@@ -167,6 +166,9 @@ boolean_t osm_mcast_tbl_is_port(IN const osm_mcast_tbl_t * p_tbl,
CL_ASSERT(mlid_ho <= p_tbl->max_mlid_ho);
mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
+ if (mlid_offset >= p_tbl->mft_depth)
+ return FALSE;
+
mask_offset = port_num / IB_MCAST_MASK_SIZE;
bit_mask = cl_ntoh16((uint16_t)
(1 << (port_num % IB_MCAST_MASK_SIZE)));
@@ -194,6 +196,8 @@ boolean_t osm_mcast_tbl_is_any_port(IN const osm_mcast_tbl_t * p_tbl,
CL_ASSERT(mlid_ho <= p_tbl->max_mlid_ho);
mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
+ if (mlid_offset >= p_tbl->mft_depth)
+ return FALSE;
for (position = 0; position <= p_tbl->max_position; position++)
result |= (*p_tbl->p_mask_tbl)[mlid_offset][position];
@@ -247,6 +251,8 @@ void osm_mcast_tbl_clear_mlid(IN osm_mcast_tbl_t * p_tbl, IN uint16_t mlid_ho)
if (p_tbl->p_mask_tbl && mlid_ho <= p_tbl->max_mlid_ho) {
mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
+ if (mlid_offset >= p_tbl->mft_depth)
+ return;
for (i = 0; i <= p_tbl->max_position; i++)
(*p_tbl->p_mask_tbl)[mlid_offset][i] = 0;
}
--
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] opensm/osm_mcast_tbl.c: Fix multicast group removal
[not found] ` <20091030144919.GA26847-Wuw85uim5zDR7s880joybQ@public.gmane.org>
@ 2009-10-30 17:26 ` Ira Weiny
[not found] ` <20091030102649.fa06e288.weiny2-i2BcT+NCU+M@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Ira Weiny @ 2009-10-30 17:26 UTC (permalink / raw)
To: Hal Rosenstock
Cc: sashak-smomgflXvOZWk0Htik3J/w, linux-rdma-u79uwXL29TY76Z2rM5mHXA
This patch causes this assert again...
OpenSM $ opensm: osm_mcast_tbl.c:104: osm_mcast_tbl_set: Assertion `mlid_ho <= p_tbl->max_mlid_ho' failed.
Aborted (core dumped)
I thought the -1 was required...
diff --git a/opensm/opensm/osm_mcast_tbl.c b/opensm/opensm/osm_mcast_tbl.c
index da106c6..67f083e 100644
--- a/opensm/opensm/osm_mcast_tbl.c
+++ b/opensm/opensm/osm_mcast_tbl.c
@@ -144,7 +144,7 @@ int osm_mcast_tbl_realloc(IN osm_mcast_tbl_t * p_tbl, IN uintn_t mlid_offset)
size - p_tbl->mft_depth * (IB_MCAST_POSITION_MAX + 1) * IB_MCAST_MASK_SIZE / 8);
p_tbl->p_mask_tbl = p_mask_tbl;
p_tbl->mft_depth = mft_depth;
- p_tbl->max_mlid_ho = mlid_offset + IB_LID_MCAST_START_HO;
+ p_tbl->max_mlid_ho = mlid_offset + IB_LID_MCAST_START_HO - 1;
return 0;
}
But this did not fix it... I would dig further but I am kind of busy today, sorry.
Ira
On Fri, 30 Oct 2009 09:49:19 -0500
Hal Rosenstock <hnrose-Wuw85uim5zDR7s880joybQ@public.gmane.org> wrote:
>
> Revert de3171043b3cbe078e410351a00e5756509bd514 and
> some of 537d67b19a4b72d72341e529f611e4e30754f8fc
>
> In osm_mcast_tbl_realloc, don't change max_mlid_ho when mlid_offset < p_tbl->mft_depth
> Also, restore some checks when mlid_offset >= p_tbl->mft_depth
> These changes are needed for proper group removal
>
> Signed-off-by: Hal Rosenstock <hal.rosenstock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
> diff --git a/opensm/opensm/osm_mcast_tbl.c b/opensm/opensm/osm_mcast_tbl.c
> index 0a45904..da106c6 100644
> --- a/opensm/opensm/osm_mcast_tbl.c
> +++ b/opensm/opensm/osm_mcast_tbl.c
> @@ -122,7 +122,7 @@ int osm_mcast_tbl_realloc(IN osm_mcast_tbl_t * p_tbl, IN uintn_t mlid_offset)
> uint16_t (*p_mask_tbl)[][IB_MCAST_POSITION_MAX];
>
> if (mlid_offset < p_tbl->mft_depth)
> - goto done;
> + return 0;
>
> /*
> The number of bytes needed in the mask table is:
> @@ -144,7 +144,6 @@ int osm_mcast_tbl_realloc(IN osm_mcast_tbl_t * p_tbl, IN uintn_t mlid_offset)
> size - p_tbl->mft_depth * (IB_MCAST_POSITION_MAX + 1) * IB_MCAST_MASK_SIZE / 8);
> p_tbl->p_mask_tbl = p_mask_tbl;
> p_tbl->mft_depth = mft_depth;
> -done:
> p_tbl->max_mlid_ho = mlid_offset + IB_LID_MCAST_START_HO;
> return 0;
> }
> @@ -167,6 +166,9 @@ boolean_t osm_mcast_tbl_is_port(IN const osm_mcast_tbl_t * p_tbl,
> CL_ASSERT(mlid_ho <= p_tbl->max_mlid_ho);
>
> mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
> + if (mlid_offset >= p_tbl->mft_depth)
> + return FALSE;
> +
> mask_offset = port_num / IB_MCAST_MASK_SIZE;
> bit_mask = cl_ntoh16((uint16_t)
> (1 << (port_num % IB_MCAST_MASK_SIZE)));
> @@ -194,6 +196,8 @@ boolean_t osm_mcast_tbl_is_any_port(IN const osm_mcast_tbl_t * p_tbl,
> CL_ASSERT(mlid_ho <= p_tbl->max_mlid_ho);
>
> mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
> + if (mlid_offset >= p_tbl->mft_depth)
> + return FALSE;
>
> for (position = 0; position <= p_tbl->max_position; position++)
> result |= (*p_tbl->p_mask_tbl)[mlid_offset][position];
> @@ -247,6 +251,8 @@ void osm_mcast_tbl_clear_mlid(IN osm_mcast_tbl_t * p_tbl, IN uint16_t mlid_ho)
>
> if (p_tbl->p_mask_tbl && mlid_ho <= p_tbl->max_mlid_ho) {
> mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
> + if (mlid_offset >= p_tbl->mft_depth)
> + return;
> for (i = 0; i <= p_tbl->max_position; i++)
> (*p_tbl->p_mask_tbl)[mlid_offset][i] = 0;
> }
> --
> 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
>
--
Ira Weiny
Math Programmer/Computer Scientist
Lawrence Livermore National Lab
925-423-8008
weiny2-i2BcT+NCU+M@public.gmane.org
--
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] opensm/osm_mcast_tbl.c: Fix multicast group removal
[not found] ` <20091030102649.fa06e288.weiny2-i2BcT+NCU+M@public.gmane.org>
@ 2009-10-30 17:28 ` Ira Weiny
2009-10-30 17:33 ` Hal Rosenstock
2009-10-30 20:36 ` Sasha Khapyorsky
2 siblings, 0 replies; 6+ messages in thread
From: Ira Weiny @ 2009-10-30 17:28 UTC (permalink / raw)
To: Ira Weiny
Cc: Hal Rosenstock, sashak-smomgflXvOZWk0Htik3J/w,
linux-rdma-u79uwXL29TY76Z2rM5mHXA
perhaps that should have been +1?
Not really thinking today either... ;-)
Ira
On Fri, 30 Oct 2009 10:26:49 -0700
Ira Weiny <weiny2-i2BcT+NCU+M@public.gmane.org> wrote:
> This patch causes this assert again...
>
> OpenSM $ opensm: osm_mcast_tbl.c:104: osm_mcast_tbl_set: Assertion `mlid_ho <= p_tbl->max_mlid_ho' failed.
> Aborted (core dumped)
>
> I thought the -1 was required...
>
> diff --git a/opensm/opensm/osm_mcast_tbl.c b/opensm/opensm/osm_mcast_tbl.c
> index da106c6..67f083e 100644
> --- a/opensm/opensm/osm_mcast_tbl.c
> +++ b/opensm/opensm/osm_mcast_tbl.c
> @@ -144,7 +144,7 @@ int osm_mcast_tbl_realloc(IN osm_mcast_tbl_t * p_tbl, IN uintn_t mlid_offset)
> size - p_tbl->mft_depth * (IB_MCAST_POSITION_MAX + 1) * IB_MCAST_MASK_SIZE / 8);
> p_tbl->p_mask_tbl = p_mask_tbl;
> p_tbl->mft_depth = mft_depth;
> - p_tbl->max_mlid_ho = mlid_offset + IB_LID_MCAST_START_HO;
> + p_tbl->max_mlid_ho = mlid_offset + IB_LID_MCAST_START_HO - 1;
> return 0;
> }
>
> But this did not fix it... I would dig further but I am kind of busy today, sorry.
>
> Ira
>
>
> On Fri, 30 Oct 2009 09:49:19 -0500
> Hal Rosenstock <hnrose-Wuw85uim5zDR7s880joybQ@public.gmane.org> wrote:
>
> >
> > Revert de3171043b3cbe078e410351a00e5756509bd514 and
> > some of 537d67b19a4b72d72341e529f611e4e30754f8fc
> >
> > In osm_mcast_tbl_realloc, don't change max_mlid_ho when mlid_offset < p_tbl->mft_depth
> > Also, restore some checks when mlid_offset >= p_tbl->mft_depth
> > These changes are needed for proper group removal
> >
> > Signed-off-by: Hal Rosenstock <hal.rosenstock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> > ---
> > diff --git a/opensm/opensm/osm_mcast_tbl.c b/opensm/opensm/osm_mcast_tbl.c
> > index 0a45904..da106c6 100644
> > --- a/opensm/opensm/osm_mcast_tbl.c
> > +++ b/opensm/opensm/osm_mcast_tbl.c
> > @@ -122,7 +122,7 @@ int osm_mcast_tbl_realloc(IN osm_mcast_tbl_t * p_tbl, IN uintn_t mlid_offset)
> > uint16_t (*p_mask_tbl)[][IB_MCAST_POSITION_MAX];
> >
> > if (mlid_offset < p_tbl->mft_depth)
> > - goto done;
> > + return 0;
> >
> > /*
> > The number of bytes needed in the mask table is:
> > @@ -144,7 +144,6 @@ int osm_mcast_tbl_realloc(IN osm_mcast_tbl_t * p_tbl, IN uintn_t mlid_offset)
> > size - p_tbl->mft_depth * (IB_MCAST_POSITION_MAX + 1) * IB_MCAST_MASK_SIZE / 8);
> > p_tbl->p_mask_tbl = p_mask_tbl;
> > p_tbl->mft_depth = mft_depth;
> > -done:
> > p_tbl->max_mlid_ho = mlid_offset + IB_LID_MCAST_START_HO;
> > return 0;
> > }
> > @@ -167,6 +166,9 @@ boolean_t osm_mcast_tbl_is_port(IN const osm_mcast_tbl_t * p_tbl,
> > CL_ASSERT(mlid_ho <= p_tbl->max_mlid_ho);
> >
> > mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
> > + if (mlid_offset >= p_tbl->mft_depth)
> > + return FALSE;
> > +
> > mask_offset = port_num / IB_MCAST_MASK_SIZE;
> > bit_mask = cl_ntoh16((uint16_t)
> > (1 << (port_num % IB_MCAST_MASK_SIZE)));
> > @@ -194,6 +196,8 @@ boolean_t osm_mcast_tbl_is_any_port(IN const osm_mcast_tbl_t * p_tbl,
> > CL_ASSERT(mlid_ho <= p_tbl->max_mlid_ho);
> >
> > mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
> > + if (mlid_offset >= p_tbl->mft_depth)
> > + return FALSE;
> >
> > for (position = 0; position <= p_tbl->max_position; position++)
> > result |= (*p_tbl->p_mask_tbl)[mlid_offset][position];
> > @@ -247,6 +251,8 @@ void osm_mcast_tbl_clear_mlid(IN osm_mcast_tbl_t * p_tbl, IN uint16_t mlid_ho)
> >
> > if (p_tbl->p_mask_tbl && mlid_ho <= p_tbl->max_mlid_ho) {
> > mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
> > + if (mlid_offset >= p_tbl->mft_depth)
> > + return;
> > for (i = 0; i <= p_tbl->max_position; i++)
> > (*p_tbl->p_mask_tbl)[mlid_offset][i] = 0;
> > }
> > --
> > 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
> >
>
>
> --
> Ira Weiny
> Math Programmer/Computer Scientist
> Lawrence Livermore National Lab
> 925-423-8008
> weiny2-i2BcT+NCU+M@public.gmane.org
--
Ira Weiny
Math Programmer/Computer Scientist
Lawrence Livermore National Lab
925-423-8008
weiny2-i2BcT+NCU+M@public.gmane.org
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] opensm/osm_mcast_tbl.c: Fix multicast group removal
[not found] ` <20091030102649.fa06e288.weiny2-i2BcT+NCU+M@public.gmane.org>
2009-10-30 17:28 ` Ira Weiny
@ 2009-10-30 17:33 ` Hal Rosenstock
[not found] ` <f0e08f230910301033w2814ef9dje6164d9652fb624a-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2009-10-30 20:36 ` Sasha Khapyorsky
2 siblings, 1 reply; 6+ messages in thread
From: Hal Rosenstock @ 2009-10-30 17:33 UTC (permalink / raw)
To: Ira Weiny
Cc: sashak-smomgflXvOZWk0Htik3J/w, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Fri, Oct 30, 2009 at 1:26 PM, Ira Weiny <weiny2-i2BcT+NCU+M@public.gmane.org> wrote:
> This patch causes this assert again...
>
> OpenSM $ opensm: osm_mcast_tbl.c:104: osm_mcast_tbl_set: Assertion `mlid_ho <= p_tbl->max_mlid_ho' failed.
> Aborted (core dumped)
>
> I thought the -1 was required...
I didn't mean to change that.. New version shortly...
>
> diff --git a/opensm/opensm/osm_mcast_tbl.c b/opensm/opensm/osm_mcast_tbl.c
> index da106c6..67f083e 100644
> --- a/opensm/opensm/osm_mcast_tbl.c
> +++ b/opensm/opensm/osm_mcast_tbl.c
> @@ -144,7 +144,7 @@ int osm_mcast_tbl_realloc(IN osm_mcast_tbl_t * p_tbl, IN uintn_t mlid_offset)
> size - p_tbl->mft_depth * (IB_MCAST_POSITION_MAX + 1) * IB_MCAST_MASK_SIZE / 8);
> p_tbl->p_mask_tbl = p_mask_tbl;
> p_tbl->mft_depth = mft_depth;
> - p_tbl->max_mlid_ho = mlid_offset + IB_LID_MCAST_START_HO;
> + p_tbl->max_mlid_ho = mlid_offset + IB_LID_MCAST_START_HO - 1;
> return 0;
> }
>
> But this did not fix it... I would dig further but I am kind of busy today, sorry.
>
> Ira
>
>
> On Fri, 30 Oct 2009 09:49:19 -0500
> Hal Rosenstock <hnrose-Wuw85uim5zDR7s880joybQ@public.gmane.org> wrote:
>
>>
>> Revert de3171043b3cbe078e410351a00e5756509bd514 and
>> some of 537d67b19a4b72d72341e529f611e4e30754f8fc
>>
>> In osm_mcast_tbl_realloc, don't change max_mlid_ho when mlid_offset < p_tbl->mft_depth
>> Also, restore some checks when mlid_offset >= p_tbl->mft_depth
>> These changes are needed for proper group removal
>>
>> Signed-off-by: Hal Rosenstock <hal.rosenstock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>> ---
>> diff --git a/opensm/opensm/osm_mcast_tbl.c b/opensm/opensm/osm_mcast_tbl.c
>> index 0a45904..da106c6 100644
>> --- a/opensm/opensm/osm_mcast_tbl.c
>> +++ b/opensm/opensm/osm_mcast_tbl.c
>> @@ -122,7 +122,7 @@ int osm_mcast_tbl_realloc(IN osm_mcast_tbl_t * p_tbl, IN uintn_t mlid_offset)
>> uint16_t (*p_mask_tbl)[][IB_MCAST_POSITION_MAX];
>>
>> if (mlid_offset < p_tbl->mft_depth)
>> - goto done;
>> + return 0;
>>
>> /*
>> The number of bytes needed in the mask table is:
>> @@ -144,7 +144,6 @@ int osm_mcast_tbl_realloc(IN osm_mcast_tbl_t * p_tbl, IN uintn_t mlid_offset)
>> size - p_tbl->mft_depth * (IB_MCAST_POSITION_MAX + 1) * IB_MCAST_MASK_SIZE / 8);
>> p_tbl->p_mask_tbl = p_mask_tbl;
>> p_tbl->mft_depth = mft_depth;
>> -done:
>> p_tbl->max_mlid_ho = mlid_offset + IB_LID_MCAST_START_HO;
>> return 0;
>> }
>> @@ -167,6 +166,9 @@ boolean_t osm_mcast_tbl_is_port(IN const osm_mcast_tbl_t * p_tbl,
>> CL_ASSERT(mlid_ho <= p_tbl->max_mlid_ho);
>>
>> mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
>> + if (mlid_offset >= p_tbl->mft_depth)
>> + return FALSE;
>> +
>> mask_offset = port_num / IB_MCAST_MASK_SIZE;
>> bit_mask = cl_ntoh16((uint16_t)
>> (1 << (port_num % IB_MCAST_MASK_SIZE)));
>> @@ -194,6 +196,8 @@ boolean_t osm_mcast_tbl_is_any_port(IN const osm_mcast_tbl_t * p_tbl,
>> CL_ASSERT(mlid_ho <= p_tbl->max_mlid_ho);
>>
>> mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
>> + if (mlid_offset >= p_tbl->mft_depth)
>> + return FALSE;
>>
>> for (position = 0; position <= p_tbl->max_position; position++)
>> result |= (*p_tbl->p_mask_tbl)[mlid_offset][position];
>> @@ -247,6 +251,8 @@ void osm_mcast_tbl_clear_mlid(IN osm_mcast_tbl_t * p_tbl, IN uint16_t mlid_ho)
>>
>> if (p_tbl->p_mask_tbl && mlid_ho <= p_tbl->max_mlid_ho) {
>> mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
>> + if (mlid_offset >= p_tbl->mft_depth)
>> + return;
>> for (i = 0; i <= p_tbl->max_position; i++)
>> (*p_tbl->p_mask_tbl)[mlid_offset][i] = 0;
>> }
>> --
>> 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
>>
>
>
> --
> Ira Weiny
> Math Programmer/Computer Scientist
> Lawrence Livermore National Lab
> 925-423-8008
> weiny2-i2BcT+NCU+M@public.gmane.org
> --
> 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
>
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] opensm/osm_mcast_tbl.c: Fix multicast group removal
[not found] ` <f0e08f230910301033w2814ef9dje6164d9652fb624a-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2009-10-30 17:45 ` Hal Rosenstock
0 siblings, 0 replies; 6+ messages in thread
From: Hal Rosenstock @ 2009-10-30 17:45 UTC (permalink / raw)
To: Ira Weiny
Cc: sashak-smomgflXvOZWk0Htik3J/w, linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Fri, Oct 30, 2009 at 1:33 PM, Hal Rosenstock
<hal.rosenstock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> On Fri, Oct 30, 2009 at 1:26 PM, Ira Weiny <weiny2-i2BcT+NCU+M@public.gmane.org> wrote:
>> This patch causes this assert again...
>>
>> OpenSM $ opensm: osm_mcast_tbl.c:104: osm_mcast_tbl_set: Assertion `mlid_ho <= p_tbl->max_mlid_ho' failed.
>> Aborted (core dumped)
>>
>> I thought the -1 was required...
>
> I didn't mean to change that..
I didn't change that. The -1 was eliminated by commit
52a1ce536a9054273c427ef0edd15a657beaa735
There's something else in terms of this patch which needs changing.
I'll run with the asserts to see...
-- Hal
>
>>
>> diff --git a/opensm/opensm/osm_mcast_tbl.c b/opensm/opensm/osm_mcast_tbl.c
>> index da106c6..67f083e 100644
>> --- a/opensm/opensm/osm_mcast_tbl.c
>> +++ b/opensm/opensm/osm_mcast_tbl.c
>> @@ -144,7 +144,7 @@ int osm_mcast_tbl_realloc(IN osm_mcast_tbl_t * p_tbl, IN uintn_t mlid_offset)
>> size - p_tbl->mft_depth * (IB_MCAST_POSITION_MAX + 1) * IB_MCAST_MASK_SIZE / 8);
>> p_tbl->p_mask_tbl = p_mask_tbl;
>> p_tbl->mft_depth = mft_depth;
>> - p_tbl->max_mlid_ho = mlid_offset + IB_LID_MCAST_START_HO;
>> + p_tbl->max_mlid_ho = mlid_offset + IB_LID_MCAST_START_HO - 1;
>> return 0;
>> }
>>
>> But this did not fix it... I would dig further but I am kind of busy today, sorry.
>>
>> Ira
>>
>>
>> On Fri, 30 Oct 2009 09:49:19 -0500
>> Hal Rosenstock <hnrose-Wuw85uim5zDR7s880joybQ@public.gmane.org> wrote:
>>
>>>
>>> Revert de3171043b3cbe078e410351a00e5756509bd514 and
>>> some of 537d67b19a4b72d72341e529f611e4e30754f8fc
>>>
>>> In osm_mcast_tbl_realloc, don't change max_mlid_ho when mlid_offset < p_tbl->mft_depth
>>> Also, restore some checks when mlid_offset >= p_tbl->mft_depth
>>> These changes are needed for proper group removal
>>>
>>> Signed-off-by: Hal Rosenstock <hal.rosenstock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>>> ---
>>> diff --git a/opensm/opensm/osm_mcast_tbl.c b/opensm/opensm/osm_mcast_tbl.c
>>> index 0a45904..da106c6 100644
>>> --- a/opensm/opensm/osm_mcast_tbl.c
>>> +++ b/opensm/opensm/osm_mcast_tbl.c
>>> @@ -122,7 +122,7 @@ int osm_mcast_tbl_realloc(IN osm_mcast_tbl_t * p_tbl, IN uintn_t mlid_offset)
>>> uint16_t (*p_mask_tbl)[][IB_MCAST_POSITION_MAX];
>>>
>>> if (mlid_offset < p_tbl->mft_depth)
>>> - goto done;
>>> + return 0;
>>>
>>> /*
>>> The number of bytes needed in the mask table is:
>>> @@ -144,7 +144,6 @@ int osm_mcast_tbl_realloc(IN osm_mcast_tbl_t * p_tbl, IN uintn_t mlid_offset)
>>> size - p_tbl->mft_depth * (IB_MCAST_POSITION_MAX + 1) * IB_MCAST_MASK_SIZE / 8);
>>> p_tbl->p_mask_tbl = p_mask_tbl;
>>> p_tbl->mft_depth = mft_depth;
>>> -done:
>>> p_tbl->max_mlid_ho = mlid_offset + IB_LID_MCAST_START_HO;
>>> return 0;
>>> }
>>> @@ -167,6 +166,9 @@ boolean_t osm_mcast_tbl_is_port(IN const osm_mcast_tbl_t * p_tbl,
>>> CL_ASSERT(mlid_ho <= p_tbl->max_mlid_ho);
>>>
>>> mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
>>> + if (mlid_offset >= p_tbl->mft_depth)
>>> + return FALSE;
>>> +
>>> mask_offset = port_num / IB_MCAST_MASK_SIZE;
>>> bit_mask = cl_ntoh16((uint16_t)
>>> (1 << (port_num % IB_MCAST_MASK_SIZE)));
>>> @@ -194,6 +196,8 @@ boolean_t osm_mcast_tbl_is_any_port(IN const osm_mcast_tbl_t * p_tbl,
>>> CL_ASSERT(mlid_ho <= p_tbl->max_mlid_ho);
>>>
>>> mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
>>> + if (mlid_offset >= p_tbl->mft_depth)
>>> + return FALSE;
>>>
>>> for (position = 0; position <= p_tbl->max_position; position++)
>>> result |= (*p_tbl->p_mask_tbl)[mlid_offset][position];
>>> @@ -247,6 +251,8 @@ void osm_mcast_tbl_clear_mlid(IN osm_mcast_tbl_t * p_tbl, IN uint16_t mlid_ho)
>>>
>>> if (p_tbl->p_mask_tbl && mlid_ho <= p_tbl->max_mlid_ho) {
>>> mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
>>> + if (mlid_offset >= p_tbl->mft_depth)
>>> + return;
>>> for (i = 0; i <= p_tbl->max_position; i++)
>>> (*p_tbl->p_mask_tbl)[mlid_offset][i] = 0;
>>> }
>>> --
>>> 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
>>>
>>
>>
>> --
>> Ira Weiny
>> Math Programmer/Computer Scientist
>> Lawrence Livermore National Lab
>> 925-423-8008
>> weiny2-i2BcT+NCU+M@public.gmane.org
>> --
>> 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
>>
>
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] opensm/osm_mcast_tbl.c: Fix multicast group removal
[not found] ` <20091030102649.fa06e288.weiny2-i2BcT+NCU+M@public.gmane.org>
2009-10-30 17:28 ` Ira Weiny
2009-10-30 17:33 ` Hal Rosenstock
@ 2009-10-30 20:36 ` Sasha Khapyorsky
2 siblings, 0 replies; 6+ messages in thread
From: Sasha Khapyorsky @ 2009-10-30 20:36 UTC (permalink / raw)
To: Ira Weiny, Hal Rosenstock; +Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA
On 10:26 Fri 30 Oct , Ira Weiny wrote:
> This patch causes this assert again...
>
> OpenSM $ opensm: osm_mcast_tbl.c:104: osm_mcast_tbl_set: Assertion `mlid_ho <= p_tbl->max_mlid_ho' failed.
> Aborted (core dumped)
>
> I thought the -1 was required...
The problem is different: when osm_mcast_tbl_realloc() is called twice
let's say with 'mlid_offset = 0' and later with 'mlid_offset = 1'
tbl->max_mlid_ho still have MLID_START value because its update is
skipped in this patch. Seems wrong to me.
Sasha
>
> diff --git a/opensm/opensm/osm_mcast_tbl.c b/opensm/opensm/osm_mcast_tbl.c
> index da106c6..67f083e 100644
> --- a/opensm/opensm/osm_mcast_tbl.c
> +++ b/opensm/opensm/osm_mcast_tbl.c
> @@ -144,7 +144,7 @@ int osm_mcast_tbl_realloc(IN osm_mcast_tbl_t * p_tbl, IN uintn_t mlid_offset)
> size - p_tbl->mft_depth * (IB_MCAST_POSITION_MAX + 1) * IB_MCAST_MASK_SIZE / 8);
> p_tbl->p_mask_tbl = p_mask_tbl;
> p_tbl->mft_depth = mft_depth;
> - p_tbl->max_mlid_ho = mlid_offset + IB_LID_MCAST_START_HO;
> + p_tbl->max_mlid_ho = mlid_offset + IB_LID_MCAST_START_HO - 1;
> return 0;
> }
>
> But this did not fix it... I would dig further but I am kind of busy today, sorry.
>
> Ira
>
>
> On Fri, 30 Oct 2009 09:49:19 -0500
> Hal Rosenstock <hnrose-Wuw85uim5zDR7s880joybQ@public.gmane.org> wrote:
>
> >
> > Revert de3171043b3cbe078e410351a00e5756509bd514 and
> > some of 537d67b19a4b72d72341e529f611e4e30754f8fc
> >
> > In osm_mcast_tbl_realloc, don't change max_mlid_ho when mlid_offset < p_tbl->mft_depth
> > Also, restore some checks when mlid_offset >= p_tbl->mft_depth
> > These changes are needed for proper group removal
> >
> > Signed-off-by: Hal Rosenstock <hal.rosenstock-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> > ---
> > diff --git a/opensm/opensm/osm_mcast_tbl.c b/opensm/opensm/osm_mcast_tbl.c
> > index 0a45904..da106c6 100644
> > --- a/opensm/opensm/osm_mcast_tbl.c
> > +++ b/opensm/opensm/osm_mcast_tbl.c
> > @@ -122,7 +122,7 @@ int osm_mcast_tbl_realloc(IN osm_mcast_tbl_t * p_tbl, IN uintn_t mlid_offset)
> > uint16_t (*p_mask_tbl)[][IB_MCAST_POSITION_MAX];
> >
> > if (mlid_offset < p_tbl->mft_depth)
> > - goto done;
> > + return 0;
> >
> > /*
> > The number of bytes needed in the mask table is:
> > @@ -144,7 +144,6 @@ int osm_mcast_tbl_realloc(IN osm_mcast_tbl_t * p_tbl, IN uintn_t mlid_offset)
> > size - p_tbl->mft_depth * (IB_MCAST_POSITION_MAX + 1) * IB_MCAST_MASK_SIZE / 8);
> > p_tbl->p_mask_tbl = p_mask_tbl;
> > p_tbl->mft_depth = mft_depth;
> > -done:
> > p_tbl->max_mlid_ho = mlid_offset + IB_LID_MCAST_START_HO;
> > return 0;
> > }
> > @@ -167,6 +166,9 @@ boolean_t osm_mcast_tbl_is_port(IN const osm_mcast_tbl_t * p_tbl,
> > CL_ASSERT(mlid_ho <= p_tbl->max_mlid_ho);
> >
> > mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
> > + if (mlid_offset >= p_tbl->mft_depth)
> > + return FALSE;
> > +
> > mask_offset = port_num / IB_MCAST_MASK_SIZE;
> > bit_mask = cl_ntoh16((uint16_t)
> > (1 << (port_num % IB_MCAST_MASK_SIZE)));
> > @@ -194,6 +196,8 @@ boolean_t osm_mcast_tbl_is_any_port(IN const osm_mcast_tbl_t * p_tbl,
> > CL_ASSERT(mlid_ho <= p_tbl->max_mlid_ho);
> >
> > mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
> > + if (mlid_offset >= p_tbl->mft_depth)
> > + return FALSE;
> >
> > for (position = 0; position <= p_tbl->max_position; position++)
> > result |= (*p_tbl->p_mask_tbl)[mlid_offset][position];
> > @@ -247,6 +251,8 @@ void osm_mcast_tbl_clear_mlid(IN osm_mcast_tbl_t * p_tbl, IN uint16_t mlid_ho)
> >
> > if (p_tbl->p_mask_tbl && mlid_ho <= p_tbl->max_mlid_ho) {
> > mlid_offset = mlid_ho - IB_LID_MCAST_START_HO;
> > + if (mlid_offset >= p_tbl->mft_depth)
> > + return;
> > for (i = 0; i <= p_tbl->max_position; i++)
> > (*p_tbl->p_mask_tbl)[mlid_offset][i] = 0;
> > }
> > --
> > 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
> >
>
>
> --
> Ira Weiny
> Math Programmer/Computer Scientist
> Lawrence Livermore National Lab
> 925-423-8008
> weiny2-i2BcT+NCU+M@public.gmane.org
> --
> 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
>
--
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-10-30 20:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-30 14:49 [PATCH] opensm/osm_mcast_tbl.c: Fix multicast group removal Hal Rosenstock
[not found] ` <20091030144919.GA26847-Wuw85uim5zDR7s880joybQ@public.gmane.org>
2009-10-30 17:26 ` Ira Weiny
[not found] ` <20091030102649.fa06e288.weiny2-i2BcT+NCU+M@public.gmane.org>
2009-10-30 17:28 ` Ira Weiny
2009-10-30 17:33 ` Hal Rosenstock
[not found] ` <f0e08f230910301033w2814ef9dje6164d9652fb624a-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2009-10-30 17:45 ` Hal Rosenstock
2009-10-30 20:36 ` Sasha Khapyorsky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox