| From 75228230b5986837e10b9047edd7b0b8677b10a1 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 5 Feb 2020 05:58:32 +0100 |
| Subject: i40e: Relax i40e_xsk_wakeup's return value when PF is busy |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Maciej Fijalkowski <maciej.fijalkowski@intel.com> |
| |
| [ Upstream commit c77e9f09143822623dd71a0fdc84331129e97c3a ] |
| |
| Return -EAGAIN instead of -ENETDOWN to provide a slightly milder |
| information to user space so that an application will know to retry the |
| syscall when __I40E_CONFIG_BUSY bit is set on pf->state. |
| |
| Fixes: b3873a5be757 ("net/i40e: Fix concurrency issues between config flow and XSK") |
| Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> |
| Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> |
| Acked-by: Björn Töpel <bjorn.topel@intel.com> |
| Link: https://lore.kernel.org/bpf/20200205045834.56795-2-maciej.fijalkowski@intel.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/intel/i40e/i40e_xsk.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c |
| index f73cd917c44f7..3156de786d955 100644 |
| --- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c |
| +++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c |
| @@ -791,7 +791,7 @@ int i40e_xsk_wakeup(struct net_device *dev, u32 queue_id, u32 flags) |
| struct i40e_ring *ring; |
| |
| if (test_bit(__I40E_CONFIG_BUSY, pf->state)) |
| - return -ENETDOWN; |
| + return -EAGAIN; |
| |
| if (test_bit(__I40E_VSI_DOWN, vsi->state)) |
| return -ENETDOWN; |
| -- |
| 2.20.1 |
| |
