From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 60212145355 for ; Tue, 17 Mar 2026 11:37:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773747434; cv=none; b=td88pC4VM00nx0YxdsGApAqq25VwJNb/0WfuoUQunGl2ogA32yakjJHNk5e9l3zm2FOZx1neZWEuEGWQbIN5XK6agm3TOXNaNnaOxVuVrsG/6bLIMr45yCj01RR+poBIH+RpyUuLoIZaQ430U8WDsSI28jTvUV3TBlIzEXuz4YE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773747434; c=relaxed/simple; bh=bpsb7tOMPprDUsAtRE+L3zL6cRYnSQXl9x4MzL6TgK4=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Con+vvZm/HtiKLz77+06pXDauP5lpfOwq6/osPmXZ69LmolqrW6mbYeTZO0cEHktrc0r9R5jM487L+RxK9HWK9DC7VY5a4HKqa0FAD0AvkIm76ssTT8j+DDKXbJQKnscxwqER3wOcAi7NQyVOJ7Y3sP+2wjIPRa7yHudburI0to= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TaBOAL3J; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TaBOAL3J" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7CAAEC4CEF7; Tue, 17 Mar 2026 11:37:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1773747433; bh=bpsb7tOMPprDUsAtRE+L3zL6cRYnSQXl9x4MzL6TgK4=; h=Subject:To:Cc:From:Date:From; b=TaBOAL3JeLEBA2PkyA5yIPAkaBefWX3bq+FlxwF3I3swhZPhT73qm7r5yZkCo4+WQ tdyGhA28aA9whT4xSqLKdO1lIKrv4HygtCOqE3CcJprNCx4N+4+ypEhejqJV7Sf6wJ GJBfwXrdjA1s3/4GYzDEx4BLsAktVsaEdIM1Ld80= Subject: FAILED: patch "[PATCH] ice: reintroduce retry mechanism for indirect AQ" failed to apply to 5.15-stable tree To: jakub.staniszewski@linux.intel.com,aleksandr.loktionov@intel.com,anthony.l.nguyen@intel.com,dawid.osuchowski@linux.intel.com,mschmidt@redhat.com,pmenzel@molgen.mpg.de,przemyslaw.kitszel@intel.com,sx.rinitha@intel.com Cc: From: Date: Tue, 17 Mar 2026 12:37:02 +0100 Message-ID: <2026031702-configure-decorator-0097@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x 326256c0a72d4877cec1d4df85357da106233128 # git commit -s git send-email --to '' --in-reply-to '2026031702-configure-decorator-0097@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 326256c0a72d4877cec1d4df85357da106233128 Mon Sep 17 00:00:00 2001 From: Jakub Staniszewski Date: Tue, 13 Jan 2026 20:38:16 +0100 Subject: [PATCH] ice: reintroduce retry mechanism for indirect AQ 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 Cc: stable@vger.kernel.org Fixes: 3056df93f7a8 ("ice: Re-send some AQ commands, as result of EBUSY AQ error") Signed-off-by: Jakub Staniszewski Co-developed-by: Dawid Osuchowski Signed-off-by: Dawid Osuchowski Reviewed-by: Aleksandr Loktionov Reviewed-by: Przemek Kitszel Reviewed-by: Paul Menzel Tested-by: Rinitha S (A Contingent worker at Intel) Signed-off-by: Tony Nguyen diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c index 74fe74225277..fd32c318d3f5 100644 --- a/drivers/net/ethernet/intel/ice/ice_common.c +++ b/drivers/net/ethernet/intel/ice/ice_common.c @@ -1841,6 +1841,7 @@ ice_sq_send_cmd_retry(struct ice_hw *hw, struct ice_ctl_q_info *cq, { struct libie_aq_desc desc_cpy; bool is_cmd_for_retry; + u8 *buf_cpy = NULL; u8 idx = 0; u16 opcode; int status; @@ -1850,8 +1851,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); + if (buf) { + buf_cpy = kmemdup(buf, buf_size, GFP_KERNEL); + if (!buf_cpy) + return -ENOMEM; + } memcpy(&desc_cpy, desc, sizeof(desc_cpy)); } @@ -1863,12 +1867,14 @@ ice_sq_send_cmd_retry(struct ice_hw *hw, struct ice_ctl_q_info *cq, hw->adminq.sq_last_status != LIBIE_AQ_RC_EBUSY) break; + if (buf_cpy) + memcpy(buf, buf_cpy, buf_size); memcpy(desc, &desc_cpy, sizeof(desc_cpy)); - msleep(ICE_SQ_SEND_DELAY_TIME_MS); } while (++idx < ICE_SQ_SEND_MAX_EXECUTE); + kfree(buf_cpy); return status; }