From nobody Mon Feb 9 17:35:22 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (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 C6CD6237A4F; Thu, 24 Apr 2025 11:33:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745494396; cv=none; b=ZnyJWyXsw2il/zMRtXkTlN5apcx2079WQk9at3DnmvKaWpo/OCslbNOfRiyP2Xx10pl9cjCWOm1YsPvhhIZviBH9ofEY71TqsD9ulmnITczbVjE3nKgH0EcSsfSbXyX59COcYJIVFcN82xyUzQT8HDMNkNw3N4Xwz1m/HLHNgUE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745494396; c=relaxed/simple; bh=+B4DW6mkhs0cPei6W59d71W4bkzH7YgJU8sLNR1RW6g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZwfucGlq19JkOFOAljKXAH2goTuzmn3W+ZX57Ak2S4jEjdiM15vd3Nh/hMHGNuU4+OHocJL18o9MlsxT3kiZD4dC/dwOwXQ9rBhKgPCsOMIVOBMHaoWjdXGDOYLaMe6Xtmb81YpshL1BHgj5jv7PcO106m0AWl1qc04862XTdGo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=G5fEus3c; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="G5fEus3c" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1745494395; x=1777030395; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+B4DW6mkhs0cPei6W59d71W4bkzH7YgJU8sLNR1RW6g=; b=G5fEus3c60H+PzOx3AUx3TBZrg0tQXra5L9sA4puT7Vqj2kBKlEOIhFX C82GFeSJjL7P/k1HQaMRdXKm8GOITIiKoiNH+sF9e9mCq6LJkAcMJtowh IsED/vzQ7i3aIK3aPJIQlDYSWpAlsUlzGHTaPLGiPcPbXFh18NiArCfnc nW3aNzq2gOlpYHNW/TERGNVGJcd40HnSOz7GL6nVki+ODMTS6kr1oUMiw scbA6IGONfVzOEDXH9S1cXccY/CLEWBjKaG1YLhBHXJr90Fsc+JG6sbHq VjSqh2IgM1DDzOFDsW7P66HJqopWyJ+br676xUELARC7Zh6ErOE1dWnPy Q==; X-CSE-ConnectionGUID: /0nS9apwQGiR+S1HIMSVVA== X-CSE-MsgGUID: ma8MfxE0SgS7ZIO5VLSxcQ== X-IronPort-AV: E=McAfee;i="6700,10204,11412"; a="57771267" X-IronPort-AV: E=Sophos;i="6.15,235,1739865600"; d="scan'208";a="57771267" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2025 04:33:13 -0700 X-CSE-ConnectionGUID: rVM5iFf2QnmkoRouqjkV/Q== X-CSE-MsgGUID: AaIOB2UGSeq9+Dbq84n9UA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,235,1739865600"; d="scan'208";a="137389446" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by fmviesa005.fm.intel.com with ESMTP; 24 Apr 2025 04:33:07 -0700 Received: from mglak.igk.intel.com (mglak.igk.intel.com [10.237.112.146]) by irvmail002.ir.intel.com (Postfix) with ESMTP id 394E333EA2; Thu, 24 Apr 2025 12:33:04 +0100 (IST) From: Larysa Zaremba To: intel-wired-lan@lists.osuosl.org, Tony Nguyen Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jonathan Corbet , Przemek Kitszel , Jiri Pirko , Tatyana Nikolova , Andrew Lunn , Alexander Lobakin , Michael Ellerman , Maciej Fijalkowski , Lee Trager , Madhavan Srinivasan , Larysa Zaremba , Sridhar Samudrala , Jacob Keller , Michal Swiatkowski , Mateusz Polchlopek , Ahmed Zaki , netdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, "Karlsson, Magnus" , Emil Tantilov , Madhu Chittim , Josh Hay , Milena Olech , pavan.kumar.linga@intel.com, "Singhai, Anjali" , Michal Kubiak Subject: [PATCH iwl-next v2 09/14] idpf: make mbx_task queueing and cancelling more consistent Date: Thu, 24 Apr 2025 13:32:32 +0200 Message-ID: <20250424113241.10061-10-larysa.zaremba@intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250424113241.10061-1-larysa.zaremba@intel.com> References: <20250424113241.10061-1-larysa.zaremba@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" As a consequence of refactoring idpf code to use libie APIs, idpf_vc_xn_shutdown was merged with and replaced by idpf_deinit_dflt_mbx. This does not affect the Tx path, as it checked for a presence of an xn manager anyway. Rx processing is handled by the mbx_task that is not always cancelled before calling the new consolidated mailbox deinit function. Moreover, in the reset path idpf_intr_rel() reschedules it after the deinit is done. This leads to mbx_task referencing the freed mailbox and causing KASAN warnings. To remedy this, in the init path, do the first queueing of mbx_task in idpf_init_dflt_mbx(), in deinit and reset, always cancel the task in idpf_deinit_dflt_mbx() and in every flow first call idpf_mb_intr_rel_irq(). Reviewed-by: Michal Kubiak Signed-off-by: Larysa Zaremba --- drivers/net/ethernet/intel/idpf/idpf.h | 1 + drivers/net/ethernet/intel/idpf/idpf_lib.c | 9 ++++----- drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 6 +++++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/intel/idpf/idpf.h b/drivers/net/ethernet/= intel/idpf/idpf.h index b68362cf9a87..56c1c2f99ab3 100644 --- a/drivers/net/ethernet/intel/idpf/idpf.h +++ b/drivers/net/ethernet/intel/idpf/idpf.h @@ -850,6 +850,7 @@ void idpf_vc_event_task(struct work_struct *work); void idpf_dev_ops_init(struct idpf_adapter *adapter); void idpf_vf_dev_ops_init(struct idpf_adapter *adapter); int idpf_intr_req(struct idpf_adapter *adapter); +void idpf_mb_intr_rel_irq(struct idpf_adapter *adapter); void idpf_intr_rel(struct idpf_adapter *adapter); u16 idpf_get_max_tx_hdr_size(struct idpf_adapter *adapter); int idpf_initiate_soft_reset(struct idpf_vport *vport, diff --git a/drivers/net/ethernet/intel/idpf/idpf_lib.c b/drivers/net/ether= net/intel/idpf/idpf_lib.c index a9f8d5f79347..0562f74a4d61 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_lib.c +++ b/drivers/net/ethernet/intel/idpf/idpf_lib.c @@ -66,9 +66,11 @@ static void idpf_deinit_vector_stack(struct idpf_adapter= *adapter) * This will also disable interrupt mode and queue up mailbox task. Mailbox * task will reschedule itself if not in interrupt mode. */ -static void idpf_mb_intr_rel_irq(struct idpf_adapter *adapter) +void idpf_mb_intr_rel_irq(struct idpf_adapter *adapter) { - clear_bit(IDPF_MB_INTR_MODE, adapter->flags); + if (!test_and_clear_bit(IDPF_MB_INTR_MODE, adapter->flags)) + return; + kfree(free_irq(adapter->msix_entries[0].vector, adapter)); queue_delayed_work(adapter->mbx_wq, &adapter->mbx_task, 0); } @@ -1765,14 +1767,11 @@ static int idpf_init_hard_reset(struct idpf_adapter= *adapter) goto unlock_mutex; } =20 - queue_delayed_work(adapter->mbx_wq, &adapter->mbx_task, 0); - /* Initialize the state machine, also allocate memory and request * resources */ err =3D idpf_vc_core_init(adapter); if (err) { - cancel_delayed_work_sync(&adapter->mbx_task); idpf_deinit_dflt_mbx(adapter); goto unlock_mutex; } diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c b/drivers/net/= ethernet/intel/idpf/idpf_virtchnl.c index a8569227ee2c..6bc7068b613a 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c +++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c @@ -2336,6 +2336,8 @@ int idpf_init_dflt_mbx(struct idpf_adapter *adapter) adapter->xn_init_params.xnm =3D params.xnm; adapter->state =3D __IDPF_VER_CHECK; =20 + queue_delayed_work(adapter->mbx_wq, &adapter->mbx_task, 0); + return 0; } =20 @@ -2345,6 +2347,9 @@ int idpf_init_dflt_mbx(struct idpf_adapter *adapter) */ void idpf_deinit_dflt_mbx(struct idpf_adapter *adapter) { + idpf_mb_intr_rel_irq(adapter); + cancel_delayed_work_sync(&adapter->mbx_task); + if (adapter->arq && adapter->asq) { idpf_mb_clean(adapter); libie_ctlq_xn_deinit(adapter->xn_init_params.xnm, @@ -2574,7 +2579,6 @@ void idpf_vc_core_deinit(struct idpf_adapter *adapter) idpf_deinit_dflt_mbx(adapter); =20 cancel_delayed_work_sync(&adapter->serv_task); - cancel_delayed_work_sync(&adapter->mbx_task); =20 idpf_vport_params_buf_rel(adapter); =20 --=20 2.47.0