| Message ID | ddc231a8-89c1-4ff4-8704-9198bcb41f8d@stanley.mountain (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0ce054f2b891afdd102c8bcc1fc57253c8964e40 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] ice: Fix a 32bit bug | expand |
From: Dan Carpenter <dan.carpenter@linaro.org> Date: Tue, 20 Aug 2024 16:43:46 +0300 > BIT() is unsigned long but ->pu.flg_msk and ->pu.flg_val are u64 type. > On 32 bit systems, unsigned long is a u32 and the mismatch between u32 > and u64 will break things for the high 32 bits. > > Fixes: 9a4c07aaa0f5 ("ice: add parser execution main loop") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com> > --- > drivers/net/ethernet/intel/ice/ice_parser_rt.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ice/ice_parser_rt.c b/drivers/net/ethernet/intel/ice/ice_parser_rt.c > index d5bcc266b01e..dedf5e854e4b 100644 > --- a/drivers/net/ethernet/intel/ice/ice_parser_rt.c > +++ b/drivers/net/ethernet/intel/ice/ice_parser_rt.c > @@ -377,11 +377,11 @@ static void ice_pg_exe(struct ice_parser_rt *rt) > > static void ice_flg_add(struct ice_parser_rt *rt, int idx, bool val) > { > - rt->pu.flg_msk |= BIT(idx); > + rt->pu.flg_msk |= BIT_ULL(idx); > if (val) > - rt->pu.flg_val |= BIT(idx); > + rt->pu.flg_val |= BIT_ULL(idx); > else > - rt->pu.flg_val &= ~BIT(idx); > + rt->pu.flg_val &= ~BIT_ULL(idx); > > ice_debug(rt->psr->hw, ICE_DBG_PARSER, "Pending update for flag %d value %d\n", > idx, val); Thanks, Olek
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Tue, 20 Aug 2024 16:43:46 +0300 you wrote: > BIT() is unsigned long but ->pu.flg_msk and ->pu.flg_val are u64 type. > On 32 bit systems, unsigned long is a u32 and the mismatch between u32 > and u64 will break things for the high 32 bits. > > Fixes: 9a4c07aaa0f5 ("ice: add parser execution main loop") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> > > [...] Here is the summary with links: - [net-next] ice: Fix a 32bit bug https://git.kernel.org/netdev/net-next/c/0ce054f2b891 You are awesome, thank you!
diff --git a/drivers/net/ethernet/intel/ice/ice_parser_rt.c b/drivers/net/ethernet/intel/ice/ice_parser_rt.c index d5bcc266b01e..dedf5e854e4b 100644 --- a/drivers/net/ethernet/intel/ice/ice_parser_rt.c +++ b/drivers/net/ethernet/intel/ice/ice_parser_rt.c @@ -377,11 +377,11 @@ static void ice_pg_exe(struct ice_parser_rt *rt) static void ice_flg_add(struct ice_parser_rt *rt, int idx, bool val) { - rt->pu.flg_msk |= BIT(idx); + rt->pu.flg_msk |= BIT_ULL(idx); if (val) - rt->pu.flg_val |= BIT(idx); + rt->pu.flg_val |= BIT_ULL(idx); else - rt->pu.flg_val &= ~BIT(idx); + rt->pu.flg_val &= ~BIT_ULL(idx); ice_debug(rt->psr->hw, ICE_DBG_PARSER, "Pending update for flag %d value %d\n", idx, val);
BIT() is unsigned long but ->pu.flg_msk and ->pu.flg_val are u64 type. On 32 bit systems, unsigned long is a u32 and the mismatch between u32 and u64 will break things for the high 32 bits. Fixes: 9a4c07aaa0f5 ("ice: add parser execution main loop") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- drivers/net/ethernet/intel/ice/ice_parser_rt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)