From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) (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 C70F3328B62; Thu, 14 May 2026 16:36:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.12 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776599; cv=none; b=XdEq1kKPCME8uE/MtV3LiYVKFRjghoO1N9qiYOGcsw49URcU75MngSonYI3jIiWoitJVjC5TBKme37UJNNoZQKdUix+obT5JfymK4i/iYvbemgRGeK0ShHUtOynYkG64Ue+di3bDyTlH/C68lTbyCi9N4LLWdPn9oPivxbk+EB8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778776599; c=relaxed/simple; bh=xvMjBVD9bF7j6Jvu6C0AEGRWhLophh/wkX/EWmhJxko=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Pg/p2vMhNe7pI8HxtcZLt1M9DafFKBmbsj6b5MFRlvw+jFv2GdhwIzNlP7fqu0UKVVkjo4zOnFqpJ5YrlTOue9gxhJ7TkDVHmvX9BYhDcS6dWUDCjA8qkC2SjKaeKckE54K1a2nukVLpxj8VmWn0RRWdOhrSaNDvf1L4YQvN5EU= 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=djwtObqb; arc=none smtp.client-ip=192.198.163.12 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="djwtObqb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1778776597; x=1810312597; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=xvMjBVD9bF7j6Jvu6C0AEGRWhLophh/wkX/EWmhJxko=; b=djwtObqbWEmhud77PFXB0jy0xgd+S63gBJd/IUUkN6JhOBzUxNpJws2A QLjAgcoSkL8uUg9R1/t8uuzM0eNY+XTEZeXJ2LdsrhAw5xavUGOZPxiQ9 hTPW9FDQDUqIK3eNE2wLxTXN9/EANCz0eKAEqV74iTlGHGFWKfFtM1VUN b25JtuJSLno5tWOQEgQEFUmey3e6aYYnvkBsmaYd/Wwg2v3C3A5SN1jvL scPH2MPJJAxUnyV/OPzMJKBJ8SSec85F2KlvKJQUGXs06sgwe/gQVSpyH IXCy3U3frVtrhJpxWrwIvW41T12R0qw00PbcL7yai0jEhDZaJ8mLlxLgF g==; X-CSE-ConnectionGUID: 7oYiCVbvQEefaEPMEOLFqQ== X-CSE-MsgGUID: wr9yrlKvQxCTrBK8s7Nl/Q== X-IronPort-AV: E=McAfee;i="6800,10657,11786"; a="83574036" X-IronPort-AV: E=Sophos;i="6.23,234,1770624000"; d="scan'208";a="83574036" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 May 2026 09:36:36 -0700 X-CSE-ConnectionGUID: Y9u0RyhmRUKIFcLUDmyAEQ== X-CSE-MsgGUID: cpxKfWT+S6y9wKY7jbF8MQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,234,1770624000"; d="scan'208";a="243404131" Received: from fmerten-mobl.ger.corp.intel.com (HELO soc-5CG4396XFB.clients.intel.com) ([10.245.112.119]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 May 2026 09:36:32 -0700 From: Dawid Osuchowski To: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, Dawid Osuchowski , stable@vger.kernel.org, Vladimir Medvedkin , Aleksandr Loktionov Subject: [PATCH iwl-net] ice: fix VF interrupts cleanup Date: Thu, 14 May 2026 18:35:55 +0200 Message-ID: <20260514163555.8243-1-dawid.osuchowski@linux.intel.com> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316 Content-Transfer-Encoding: 8bit When a virtual function sends an IRQ map command, the PF will set up interrupts according to that request. However, because these interrupts are never reset, the next time Virtual Function initializes, the interrupts are still enabled for a given VF, which leads to performance degradation in certain cases (e.g. Data Plane Development Kit) due to interrupts being unexpectedly enabled and thus causing interrupt floods. Cc: stable@vger.kernel.org Fixes: 1071a8358a28 ("ice: Implement virtchnl commands for AVF support") Suggested-by: Vladimir Medvedkin Reviewed-by: Aleksandr Loktionov Signed-off-by: Dawid Osuchowski --- drivers/net/ethernet/intel/ice/ice_vf_lib.c | 31 +++++++++++++++++++ .../ethernet/intel/ice/ice_vf_lib_private.h | 1 + drivers/net/ethernet/intel/ice/virt/queues.c | 21 +++++++++++++ 3 files changed, 53 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.c b/drivers/net/ethernet/intel/ice/ice_vf_lib.c index 27e4acb1620f..bfd84193a105 100644 --- a/drivers/net/ethernet/intel/ice/ice_vf_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.c @@ -847,6 +847,34 @@ static void ice_notify_vf_reset(struct ice_vf *vf) NULL); } +/** + * ice_reset_interrupts - clear all queue interrupt configuration for a VSI + * @vsi: the VSI whose interrupt registers should be cleared + * + * Zero the QINT_RQCTL and QINT_TQCTL registers for all allocated queues + * in the VSI. This clears the entire register including MSIX_INDX, ITR_INDX, + * CAUSE_ENA and NEXTQ fields, unlike ice_vf_dis_rxq_interrupt() which only + * clears the CAUSE_ENA bit. + * + * This is used during VF reset to ensure no stale interrupt configuration + * persists when the VF is re-bound to a different driver (e.g. vfio-pci + * for Data Plane Development Kit). + */ +void ice_reset_interrupts(struct ice_vsi *vsi) +{ + struct ice_pf *pf = vsi->back; + struct ice_hw *hw = &pf->hw; + int i; + + ice_for_each_alloc_rxq(vsi, i) + wr32(hw, QINT_RQCTL(vsi->rxq_map[i]), 0); + + ice_for_each_alloc_txq(vsi, i) + wr32(hw, QINT_TQCTL(vsi->txq_map[i]), 0); + + ice_flush(hw); +} + /** * ice_reset_vf - Reset a particular VF * @vf: pointer to the VF structure @@ -918,6 +946,9 @@ int ice_reset_vf(struct ice_vf *vf, u32 flags) ice_dis_vf_qs(vf); + /* cleanup interrupt registers */ + ice_reset_interrupts(vsi); + /* Call Disable LAN Tx queue AQ whether or not queues are * enabled. This is needed for successful completion of VFR. */ diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib_private.h b/drivers/net/ethernet/intel/ice/ice_vf_lib_private.h index 5392b0404986..321d29c25b7c 100644 --- a/drivers/net/ethernet/intel/ice/ice_vf_lib_private.h +++ b/drivers/net/ethernet/intel/ice/ice_vf_lib_private.h @@ -26,6 +26,7 @@ void ice_initialize_vf_entry(struct ice_vf *vf); void ice_deinitialize_vf_entry(struct ice_vf *vf); void ice_dis_vf_qs(struct ice_vf *vf); +void ice_reset_interrupts(struct ice_vsi *vsi); int ice_check_vf_init(struct ice_vf *vf); enum virtchnl_status_code ice_err_to_virt_err(int err); struct ice_port_info *ice_vf_get_port_info(struct ice_vf *vf); diff --git a/drivers/net/ethernet/intel/ice/virt/queues.c b/drivers/net/ethernet/intel/ice/virt/queues.c index 31be2f76181c..431c9c546b04 100644 --- a/drivers/net/ethernet/intel/ice/virt/queues.c +++ b/drivers/net/ethernet/intel/ice/virt/queues.c @@ -224,6 +224,24 @@ void ice_vf_ena_rxq_interrupt(struct ice_vsi *vsi, u32 q_idx) wr32(hw, QINT_RQCTL(pfq), reg | QINT_RQCTL_CAUSE_ENA_M); } +/** + * ice_vf_dis_rxq_interrupt - disable Rx queue interrupt via QINT_RQCTL + * @vsi: VSI of the VF to configure + * @q_idx: VF queue index used to determine the queue in the PF's space + */ +static void ice_vf_dis_rxq_interrupt(struct ice_vsi *vsi, u32 q_idx) +{ + struct ice_hw *hw = &vsi->back->hw; + u32 pfq = vsi->rxq_map[q_idx]; + u32 reg; + + reg = rd32(hw, QINT_RQCTL(pfq)); + reg &= ~QINT_RQCTL_CAUSE_ENA_M; + wr32(hw, QINT_RQCTL(pfq), reg); + + ice_flush(hw); +} + /** * ice_vc_ena_qs_msg * @vf: pointer to the VF info @@ -416,6 +434,8 @@ int ice_vc_dis_qs_msg(struct ice_vf *vf, u8 *msg) goto error_param; } + for_each_set_bit(vf_q_id, &q_map, ICE_MAX_RSS_QS_PER_VF) + ice_vf_dis_rxq_interrupt(vsi, vf_q_id); bitmap_zero(vf->rxq_ena, ICE_MAX_RSS_QS_PER_VF); } else if (q_map) { for_each_set_bit(vf_q_id, &q_map, ICE_MAX_RSS_QS_PER_VF) { @@ -436,6 +456,7 @@ int ice_vc_dis_qs_msg(struct ice_vf *vf, u8 *msg) goto error_param; } + ice_vf_dis_rxq_interrupt(vsi, vf_q_id); /* Clear enabled queues flag */ clear_bit(vf_q_id, vf->rxq_ena); } base-commit: 24459e26fb49a0067ae93ae1bbb37abb2a42f6f2 -- 2.52.0