From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) (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 110DD1459F6 for ; Thu, 19 Mar 2026 15:50:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.10 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773935403; cv=none; b=i8Tr5uoDwik30CpeLtjyhpDWXatZSbWKXl34nwpwsGFILQxwGs5tx///r0D7uQ+RRp84Z6MIXphRahtbzfXaGW1A8DbhPgTG23tOeVdxOPENcve1ADFK7ZXP9SgK1gV8fLgoAmqVQ9NXWZnesqUQ3O+NNp8Tfwgz2gtwX4s8lOw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773935403; c=relaxed/simple; bh=8+l8lygZ5HSagAb7mvzKhj0hA8Fc+SE+P5udB07cg+M=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:References: In-Reply-To:Content-Type; b=CKSN/gX/G4f2fFT5coeN0QCOxvsW9cWwYHJaTUvpEgAuxPJMH/Rya3Yg6scMMfqUms3jJwpu0ywKXLKLNCF4J9PGACfy8qErMJgyd8YH6leS1BzpqcVgwNvZq9Q9eieti6Mer8g1IJfIMvsBHWfaCJZnilLafC2He5NPSbARTLg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=SZXCyEom; arc=none smtp.client-ip=192.198.163.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="SZXCyEom" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1773935402; x=1805471402; h=message-id:date:mime-version:from:subject:to:cc: references:in-reply-to:content-transfer-encoding; bh=8+l8lygZ5HSagAb7mvzKhj0hA8Fc+SE+P5udB07cg+M=; b=SZXCyEomVvJGNu/yub0W589fIkw6SU98T2ne93IsXCS7uxYAe2GM3zFn QeTOZncClQBJqaSEb+cu2v8utJJIqQLDd9X+nTud9k196kb+hg2ZCYAMZ C6hbtfH8RTjH3To5HtrTxJRoyshQXrmKi2112NbPBPCgnDFZTxATnC7De FdJ1A6i5SWg7FotoAX5k/0mmMohO3Ohf4hMR+Tub+wOuhsTji3wleaZTV C5hT5XvcPpDbaJeBsL6l76TFM4ADLOTZ/fucusU87MuKEhBi8vwuCX6hK wWADbDJxMWHFPfW1fCB5VVezz4BH2yvOHIWUZk0iMafwjs4YrkjebghhY Q==; X-CSE-ConnectionGUID: qqB5fkf+S8WT3Rwkje1SjA== X-CSE-MsgGUID: H9/0WrpnTQKMLHMhDHBnXw== X-IronPort-AV: E=McAfee;i="6800,10657,11734"; a="86373913" X-IronPort-AV: E=Sophos;i="6.23,129,1770624000"; d="scan'208";a="86373913" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Mar 2026 08:50:00 -0700 X-CSE-ConnectionGUID: eLJvHXUWSD62gdS03ZD1Dw== X-CSE-MsgGUID: VXNUs5TCSQq+Pm/U+8treg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,129,1770624000"; d="scan'208";a="218444429" Received: from soc-5cg4396xfb.clients.intel.com (HELO [172.28.180.189]) ([172.28.180.189]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Mar 2026 08:49:59 -0700 Message-ID: Date: Thu, 19 Mar 2026 16:49:56 +0100 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Dawid Osuchowski Subject: Re: [PATCH 6.1.y 3/3] ice: reintroduce retry mechanism for indirect AQ To: Sasha Levin , stable@vger.kernel.org Cc: Jakub Staniszewski , Michal Schmidt , Aleksandr Loktionov , Przemek Kitszel , Paul Menzel , Rinitha S , Tony Nguyen References: <2026031701-reapprove-dollar-1839@gregkh> <20260318000947.379271-1-sashal@kernel.org> <20260318000947.379271-3-sashal@kernel.org> Content-Language: pl, en-US Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316 In-Reply-To: <20260318000947.379271-3-sashal@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2026-03-18 1:09 AM, Sasha Levin wrote: > From: Jakub Staniszewski > > [ 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 > 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 > Signed-off-by: Sasha Levin 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