From nobody Wed Dec 17 10:50:35 2025 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) (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 66E70294A1C; Fri, 9 May 2025 13:43:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746798233; cv=none; b=LltZjyK2Rz8YE5gL7ux4vEYM+vaCuoMsUfDomsAL9cWRP+iIjBosMR8vulLo0EXcWMRPcy0cssRgV2/WrsnLaJ0nwHzxjEhZ6fit6qZdHIUwtf81//zblrdE8Glhr9lgaeAwMVd4tQ6x9GBcAPQvsoGsXjr25A8DYDbXIQxOliI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746798233; c=relaxed/simple; bh=SI/QR+kLuOo0++INBAXGkcZPpecuw/n9M5rBU791iSM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Tc72Xr7aVxL9QftCwZUcBgC+ulJKI6pTp/j6a8cFtfo7/8aZYXOKynZk6IJIR/SAoLOk8DAs3ToAaqwQn2Fn1Rm3ObpU+i2Lxi1Q8uBJHHfc0j9qUHCW5EGSjqcyDlIoRd5/Tkb2vy3wFmV52aWCYSqaWcCmdVORf8Gy3l4sh+s= 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=N0HUQJZW; arc=none smtp.client-ip=198.175.65.21 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="N0HUQJZW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1746798231; x=1778334231; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SI/QR+kLuOo0++INBAXGkcZPpecuw/n9M5rBU791iSM=; b=N0HUQJZW+v4cGA/nfk9rtZE2fAtpE/K8+VPwsl2JDwXXEXZJsKNtSmND XCZ94uIwqRZHWf3Ud5pdBe4hQxqfV4kKwgu2fnNNiB689F955XF3FHqnR jwQzXRi7eZqgsfkyX4EgTwndNiicHsfY1PEpNcDLLafDrR8tQ9LMdrzgK 5s3sr2fAaHwJrXF+8aiZfHghgXTIoTPWLnO14f4+yfz1SRiCjCFMjIx9K LkCFkA+GrxIOxuYVabbrmIhKZmhrc9USDQXEp11nYxwxD2hr3wjIGcbir la1cY79BxilbPI5Y9UbJSFz3wxDq54OQntWruup6T6pVf+1q7Sg+THaX/ A==; X-CSE-ConnectionGUID: twepYvE8TT65r0hXMTwYGQ== X-CSE-MsgGUID: zuMuOcX7R56wH0MEGpiHTQ== X-IronPort-AV: E=McAfee;i="6700,10204,11427"; a="48532926" X-IronPort-AV: E=Sophos;i="6.15,275,1739865600"; d="scan'208";a="48532926" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 May 2025 06:43:50 -0700 X-CSE-ConnectionGUID: Rt3pAzvGTFiHPOUyEkaerg== X-CSE-MsgGUID: LXmOwDR3Sd6bd1ueIhpAHQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,275,1739865600"; d="scan'208";a="136323260" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by orviesa009.jf.intel.com with ESMTP; 09 May 2025 06:43:44 -0700 Received: from mglak.igk.intel.com (mglak.igk.intel.com [10.237.112.146]) by irvmail002.ir.intel.com (Postfix) with ESMTP id E63E034313; Fri, 9 May 2025 14:43:41 +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 v3 10/15] idpf: make mbx_task queueing and cancelling more consistent Date: Fri, 9 May 2025 15:43:07 +0200 Message-ID: <20250509134319.66631-11-larysa.zaremba@intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250509134319.66631-1-larysa.zaremba@intel.com> References: <20250509134319.66631-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 libeth 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 23cdb1b713ad..7fa6414a05ba 100644 --- a/drivers/net/ethernet/intel/idpf/idpf.h +++ b/drivers/net/ethernet/intel/idpf/idpf.h @@ -896,6 +896,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 6d2369e8a344..d0f1d19e8786 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); } @@ -1783,14 +1785,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 9f175b7c2007..03cb42bffe60 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c +++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c @@ -2357,6 +2357,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 @@ -2366,6 +2368,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, adapter->asq); libie_ctlq_xn_deinit(adapter->xn_init_params.xnm, @@ -2605,7 +2610,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