net/mlx5: Fix function calculation for page trees

danielj-mellanox · Saeed Mahameed · commit ed5e83a3c029 · 2021-02-01T23:02:01.000-08:00
The function calculation always results in a value of 0. This works generally, but when the release all pages feature is enabled it will result in crashes. Fixes: 0aa1284 ("net/mlx5: Maintain separate page trees for ECPF and PF functions") Signed-off-by: Daniel Jurgens <danielj@nvidia.com> Reported-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
@@ -76,7 +76,7 @@ enum {
 
 static u32 get_function(u16 func_id, bool ec_function)
 {
-	return func_id & (ec_function << 16);
+	return (u32)func_id | (ec_function << 16);
 }
 
 static struct rb_root *page_root_per_function(struct mlx5_core_dev *dev, u32 function)

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ enum {`
`76`	`76`
`77`	`77`	`static u32 get_function(u16 func_id, bool ec_function)`
`78`	`78`	`{`
`79`		`- return func_id & (ec_function << 16);`
	`79`	`+ return (u32)func_id \| (ec_function << 16);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`static struct rb_root page_root_per_function(struct mlx5_core_dev dev, u32 function)`