| Message ID | 20241017023223.74180-1-yuancan@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f7b4cf0306bbea500a613e4b618576452c1df4ba |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v2] mlxsw: spectrum_router: fix xa_store() error checking | expand |
Yuan Can <yuancan@huawei.com> writes: > It is meant to use xa_err() to extract the error encoded in the return > value of xa_store(). > > Fixes: 44c2fbebe18a ("mlxsw: spectrum_router: Share nexthop counters in resilient groups") > Signed-off-by: Yuan Can <yuancan@huawei.com> > Reviewed-by: Petr Machata <petrm@nvidia.com> > Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Tested-by: Petr Machata <petrm@nvidia.com>
Hello: This patch was applied to netdev/net.git (main) by Paolo Abeni <pabeni@redhat.com>: On Thu, 17 Oct 2024 10:32:23 +0800 you wrote: > It is meant to use xa_err() to extract the error encoded in the return > value of xa_store(). > > Fixes: 44c2fbebe18a ("mlxsw: spectrum_router: Share nexthop counters in resilient groups") > Signed-off-by: Yuan Can <yuancan@huawei.com> > Reviewed-by: Petr Machata <petrm@nvidia.com> > Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> > > [...] Here is the summary with links: - [net,v2] mlxsw: spectrum_router: fix xa_store() error checking https://git.kernel.org/netdev/net/c/f7b4cf0306bb You are awesome, thank you!
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index 800dfb64ec83..7d6d859cef3f 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -3197,7 +3197,6 @@ mlxsw_sp_nexthop_sh_counter_get(struct mlxsw_sp *mlxsw_sp, { struct mlxsw_sp_nexthop_group *nh_grp = nh->nhgi->nh_grp; struct mlxsw_sp_nexthop_counter *nhct; - void *ptr; int err; nhct = xa_load(&nh_grp->nhgi->nexthop_counters, nh->id); @@ -3210,12 +3209,10 @@ mlxsw_sp_nexthop_sh_counter_get(struct mlxsw_sp *mlxsw_sp, if (IS_ERR(nhct)) return nhct; - ptr = xa_store(&nh_grp->nhgi->nexthop_counters, nh->id, nhct, - GFP_KERNEL); - if (IS_ERR(ptr)) { - err = PTR_ERR(ptr); + err = xa_err(xa_store(&nh_grp->nhgi->nexthop_counters, nh->id, nhct, + GFP_KERNEL)); + if (err) goto err_store; - } return nhct;
It is meant to use xa_err() to extract the error encoded in the return value of xa_store(). Fixes: 44c2fbebe18a ("mlxsw: spectrum_router: Share nexthop counters in resilient groups") Signed-off-by: Yuan Can <yuancan@huawei.com> Reviewed-by: Petr Machata <petrm@nvidia.com> Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> --- Changes since v1: - Change target branch to net. --- drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)