mlxsw: spectrum: Adjust headroom buffers for 8x ports
Subsystems (3)
Hello Ido Schimmel,
The patch 60833d54d56c: "mlxsw: spectrum: Adjust headroom buffers for 8x ports" from Jun 16, 2020, leads to the following static checker warning:
drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c:785 mlxsw_sp_span_port_buffer_update()
warn: passing casted pointer '&buffsize' to 'mlxsw_sp_port_headroom_8x_adjust()' 32 vs 16.
drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c
769 static int
770 mlxsw_sp_span_port_buffer_update(struct mlxsw_sp_port *mlxsw_sp_port, u16 mtu)
771 {
772 struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;
773 char sbib_pl[MLXSW_REG_SBIB_LEN];
774 u32 buffsize;
^^^^^^^^^^^^ 775 u32 speed;
776 int err;
777
778 err = mlxsw_sp_port_speed_get(mlxsw_sp_port, &speed);
779 if (err)
780 return err;
781 if (speed = SPEED_UNKNOWN)
782 speed = 0;
783
784 buffsize = mlxsw_sp_span_buffsize_get(mlxsw_sp, speed, mtu);
785 mlxsw_sp_port_headroom_8x_adjust(mlxsw_sp_port, (u16 *) &buffsize);
^^^^^^^^^^^^^^^^^This will work if 1) we are on a littel endian system and 2) "buffsize" is less than USHRT_MAX / 2 but it's super ugly... :/
786 mlxsw_reg_sbib_pack(sbib_pl, mlxsw_sp_port->local_port, buffsize); 787 return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(sbib), sbib_pl); 788 }
regards,
dan carpenter
Quoted 5 lines · Dan Carpenter
Hello Ido Schimmel,
The patch
60833d54d56c: "mlxsw: spectrum: Adjust headroom buffers for 8x ports" from Jun 16, 2020, leads to the following static checker warning:
Thanks for the report, Dan.
Colin already reported it to me and I have the below patch in my queue to address the issue. WDYT?
commit 7f3da2eeb1011ce4117ad75df91dc0b16b7b561b
Author: Ido Schimmel <[email protected]> Date: Thu Jun 18 18:14:04 2020 +0300
mlxsw: spectrum: Do not rely on machine endianness
The second commit cited below performed a cast of 'u32 buffsize' to '(u16 *)' when calling mlxsw_sp_port_headroom_8x_adjust():
mlxsw_sp_port_headroom_8x_adjust(mlxsw_sp_port, (u16 *) &buffsize);
Colin noted that this will behave differently on big endian architectures compared to little endian architectures.
Fix this by following Colin's suggestion and have the function accept and return 'u32' instead of passing the current size by reference.
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +2 -2
@@ -978,10 +978,10 @@ int __mlxsw_sp_port_headroom_set(struct mlxsw_sp_port *mlxsw_sp_port, int mtu, lossy = !(pfc || pause_en); thres_cells =mlxsw_sp_pg_buf_threshold_get (mlxsw_sp, mtu); -mlxsw_sp_port_headroom_8x_adjust (mlxsw_sp_port, &thres_cells); + thres_cells =mlxsw_sp_port_headroom_8x_adjust (mlxsw_sp_port, thres_cells); delay_cells =mlxsw_sp_pg_buf_delay_get (mlxsw_sp, mtu, delay, pfc, pause_en); -mlxsw_sp_port_headroom_8x_adjust (mlxsw_sp_port, &delay_cells); + delay_cells =mlxsw_sp_port_headroom_8x_adjust (mlxsw_sp_port, delay_cells); total_cells = thres_cells + delay_cells; taken_headroom_cells += total_cells;
drivers/net/ethernet/mellanox/mlxsw/spectrum.h +3 -5
@@ -374,17 +374,15 @@ mlxsw_sp_port_vlan_find_by_vid(const struct mlxsw_sp_port *mlxsw_sp_port,return NULL ; } -static inline void +static inline u32 mlxsw_sp_port_headroom_8x_adjust (const struct mlxsw_sp_port *mlxsw_sp_port, -u16 *p_size) +u32 size_cells) {/* Ports with eight lanes use two headroom buffers between which the * configured headroom size is split. Therefore, multiply the calculated * headroom size by two. */ -if (mlxsw_sp_port->mapping.width !=8 ) -return ; - *p_size *=2 ; +return mlxsw_sp_port->mapping.width =8 ?2 * size_cells : size_cells; }enum mlxsw_sp_flood_type {
drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c +1 -1
@@ -312,7 +312,7 @@ static int mlxsw_sp_port_pb_init(struct mlxsw_sp_port *mlxsw_sp_port)if (i =MLXSW_SP_PB_UNUSED )continue ; -mlxsw_sp_port_headroom_8x_adjust (mlxsw_sp_port, &size); + size =mlxsw_sp_port_headroom_8x_adjust (mlxsw_sp_port, size);mlxsw_reg_pbmc_lossy_buffer_pack (pbmc_pl, i, size); } mlxsw_reg_pbmc_lossy_buffer_pack(pbmc_pl,
drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c +1 -1
@@ -782,7 +782,7 @@ mlxsw_sp_span_port_buffer_update(struct mlxsw_sp_port *mlxsw_sp_port, u16 mtu) speed =0 ; buffsize =mlxsw_sp_span_buffsize_get (mlxsw_sp, speed, mtu); -mlxsw_sp_port_headroom_8x_adjust (mlxsw_sp_port, (u16 *) &buffsize); + buffsize =mlxsw_sp_port_headroom_8x_adjust (mlxsw_sp_port, buffsize);mlxsw_reg_sbib_pack (sbib_pl, mlxsw_sp_port->local_port, buffsize);return mlxsw_reg_write (mlxsw_sp->core,MLXSW_REG (sbib), sbib_pl); }
Quoted 11 lines · Ido Schimmel
Quoted 5 lines · Dan Carpenter
Hello Ido Schimmel,
The patch
60833d54d56c: "mlxsw: spectrum: Adjust headroom buffers for 8x ports" from Jun 16, 2020, leads to the following static checker warning:Thanks for the report, Dan.
Colin already reported it to me and I have the below patch in my queue to address the issue. WDYT?
Looks good. Thanks!
regards,
dan carpenter