Re: [PATCH 6.1.y 3/3] ice: reintroduce retry mechanism for indirect AQ

[Dawid Osuchowski <dawid.osuchowski@linux.intel.com>]

On 2026-03-18 1:09 AM, Sasha Levin wrote:
> From: Jakub Staniszewski <jakub.staniszewski@linux.intel.com>
> 
> [ Upstream commit 326256c0a72d4877cec1d4df85357da106233128 ]
> 
> Add retry mechanism for indirect Admin Queue (AQ) commands. To do so we
> need to keep the command buffer.
> 
> This technically reverts commit 43a630e37e25
> ("ice: remove unused buffer copy code in ice_sq_send_cmd_retry()"),
> but combines it with a fix in the logic by using a kmemdup() call,
> making it more robust and less likely to break in the future due to
> programmer error.
> 
> Cc: Michal Schmidt <mschmidt@redhat.com>
> Cc: stable@vger.kernel.org
> Fixes: 3056df93f7a8 ("ice: Re-send some AQ commands, as result of EBUSY AQ error")
> Signed-off-by: Jakub Staniszewski <jakub.staniszewski@linux.intel.com>
> Co-developed-by: Dawid Osuchowski <dawid.osuchowski@linux.intel.com>
> Signed-off-by: Dawid Osuchowski <dawid.osuchowski@linux.intel.com>
> Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
> Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
> Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de>
> Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel)
> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
> Signed-off-by: Sasha Levin <sashal@kernel.org>

Hey Sasha,

Thank you for trying to reapply this patch. Unfortunately for 
6.1.167-rc1 this will not work, we tried this with my colleague Jakub 
Staniszewski and got the following output:

# git am sasha_levin_ice_6_1_y.mbox
Applying: ice: reintroduce retry mechanism for indirect AQ
error: patch failed: drivers/net/ethernet/intel/ice/ice_common.c:1595
error: drivers/net/ethernet/intel/ice/ice_common.c: patch does not apply
Patch failed at 0001 ice: reintroduce retry mechanism for indirect AQ
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

> ---
>   drivers/net/ethernet/intel/ice/ice_common.c | 12 +++++++++---
>   1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
> index 780c847cd1ffb..7bce89ba0a6fc 100644
> --- a/drivers/net/ethernet/intel/ice/ice_common.c
> +++ b/drivers/net/ethernet/intel/ice/ice_common.c
> @@ -1595,6 +1595,7 @@ ice_sq_send_cmd_retry(struct ice_hw *hw, struct ice_ctl_q_info *cq,
>   {
>   	struct ice_aq_desc desc_cpy;
>   	bool is_cmd_for_retry;
> +	u8 *buf_cpy = NULL;
>   	u8 idx = 0;
>   	u16 opcode;
>   	int status;
> @@ -1604,8 +1605,11 @@ ice_sq_send_cmd_retry(struct ice_hw *hw, struct ice_ctl_q_info *cq,
>   	memset(&desc_cpy, 0, sizeof(desc_cpy));
>   
>   	if (is_cmd_for_retry) {
> -		/* All retryable cmds are direct, without buf. */
> -		WARN_ON(buf);

The above two lines do not exist in 6.1.y source, that's why the patch 
didn't apply in the first place.

For this change to be applicable you can take the modified / trimmed 
patch you sent for 5.15.y ("[PATCH 5.15.y 2/2] ice: reintroduce retry 
mechanism for indirect AQ") and apply the following diff to said patch:

diff --git a/drivers/net/ethernet/intel/ice/ice_common.c 
b/drivers/net/ethernet/intel/ice/ice_common.c
index a4d31e139..19d652d78 100644
--- a/drivers/net/ethernet/intel/ice/ice_common.c
+++ b/drivers/net/ethernet/intel/ice/ice_common.c
@@ -1425,7 +1425,7 @@ ice_sq_send_cmd_retry(struct ice_hw *hw, struct 
ice_ctl_q_info *cq,
                 if (buf) {
                         buf_cpy = kzalloc(buf_size, GFP_KERNEL);
                         if (!buf_cpy)
-                               return ICE_ERR_NO_MEMORY;
+                               return -ENOMEM;
                 }

                 memcpy(&desc_cpy, desc, sizeof(desc_cpy));

Do you want me to resend with this change applied or can you apply it 
yourself and resend?

Best regards
Dawid