From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (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 019B43D75BE; Tue, 28 Apr 2026 08:27:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777364848; cv=none; b=Ph8uKfggq1ros7/aaHEGjOF8S7X08mN2WPP50OmKrC0mr40my0V3DevgKYw3kUwPMknhdQC+s96VscZO4oJfrlFfEbNT87KC6cKhs6Dp7/C+BfSoNXG0xlYj5VRTsWJO/trjxlGMbWi6NPBBmHZvS/Z7KYd/LYNEn+WrnYf9Fts= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777364848; c=relaxed/simple; bh=gs+XU4lEDRKpGO6/iLX0M4XyhCj8kQfrgtJ6/CvYqXI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DV1pLwxvgUz++p6PfgENDRm7NdOx60RZHScL1vCDlp3ql7dth3hsa4i/5sF+r62w7JVlLELzWEP/DFmFBP3PBDl6THUx6M8TLfYZJOpfROQ6BXDMk+GrfuDG8XcT7SJYo35A4pk3J04tPYozHzLTPWwd1lUPoCvl7qDZHOAXD8M= 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=Y39ZRlW/; arc=none smtp.client-ip=192.198.163.15 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="Y39ZRlW/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1777364847; x=1808900847; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gs+XU4lEDRKpGO6/iLX0M4XyhCj8kQfrgtJ6/CvYqXI=; b=Y39ZRlW/I1fQbTouTt+K/h7jK3/g5E/TK+BCsFER+wgty9Z3Ykg8wJRm aMMAA3p+FNPy3GhGiwCCxscBQzdwQlFfXjRjd9du94kv1Ulj/18qthSIo kF9ohnnYTXjozA9n9n5LkIuLqI6ehHrPLVDXjchd4cvmSp7DKqz0/dQqx wjUdHoiY3lQKPhkPKuPrUZvOrfulYXUS163xR6oB8iDHCa9rCw3kjp08E TIxi9R1VfYH8mpwaMR/T6m/zGHTtv9f2858JT8n/D5THquzeH03qLF0jy JHv4qA/ARX3fltfmt2WGRybdxsnt8OX2Vl8oRUzXjphN2cdNDFbN7rztz g==; X-CSE-ConnectionGUID: JbLSoSVbQw+ZsF9wMWn9FA== X-CSE-MsgGUID: 7CU/HyvzQC24JN63/tckNQ== X-IronPort-AV: E=McAfee;i="6800,10657,11769"; a="78376946" X-IronPort-AV: E=Sophos;i="6.23,203,1770624000"; d="scan'208";a="78376946" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Apr 2026 01:27:19 -0700 X-CSE-ConnectionGUID: TEQEgYFbSx2TAHngdxYPmA== X-CSE-MsgGUID: uO74OwSJSDmXWpDP6uKUXA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,203,1770624000"; d="scan'208";a="232881574" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by orviesa006.jf.intel.com with ESMTP; 28 Apr 2026 01:27:14 -0700 Received: from mglak.igk.intel.com (mglak.igk.intel.com [10.237.112.146]) by irvmail002.ir.intel.com (Postfix) with ESMTP id 2BF7727BA3; Tue, 28 Apr 2026 09:27:12 +0100 (IST) From: Larysa Zaremba To: intel-wired-lan@lists.osuosl.org, Tony Nguyen Cc: aleksander.lobakin@intel.com, sridhar.samudrala@intel.com, Michal Swiatkowski , Larysa Zaremba , "Fijalkowski, Maciej" , Emil Tantilov , Madhu Chittim , Josh Hay , "Keller, Jacob E" , jayaprakash.shanmugam@intel.com, Jiri Pirko , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jonathan Corbet , Richard Cochran , Przemek Kitszel , Andrew Lunn , netdev@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Samuel Salin Subject: [PATCH iwl-next v7 09/14] idpf: make mbx_task queueing and cancelling more consistent Date: Tue, 28 Apr 2026 10:26:43 +0200 Message-ID: <20260428082654.44364-10-larysa.zaremba@intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20260428082654.44364-1-larysa.zaremba@intel.com> References: <20260428082654.44364-1-larysa.zaremba@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: Emil Tantilov Reviewed-by: Michal Kubiak Signed-off-by: Larysa Zaremba Tested-by: Samuel Salin Signed-off-by: Tony Nguyen --- 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 679539a1b947..1d0e32e47e87 100644 --- a/drivers/net/ethernet/intel/idpf/idpf.h +++ b/drivers/net/ethernet/intel/idpf/idpf.h @@ -984,6 +984,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/ethernet/intel/idpf/idpf_lib.c index 0d131bf0993e..7988836fbae0 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_lib.c +++ b/drivers/net/ethernet/intel/idpf/idpf_lib.c @@ -68,9 +68,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); } @@ -1938,14 +1940,11 @@ static void idpf_init_hard_reset(struct idpf_adapter *adapter) goto unlock_mutex; } - queue_delayed_work(adapter->mbx_wq, &adapter->mbx_task, 0); - /* Initialize the state machine, also allocate memory and request * resources */ err = 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 13c8505d126f..8936c2a67ce0 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c +++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c @@ -2982,6 +2982,8 @@ int idpf_init_dflt_mbx(struct idpf_adapter *adapter) adapter->xnm = params.xnm; adapter->state = __IDPF_VER_CHECK; + queue_delayed_work(adapter->mbx_wq, &adapter->mbx_task, 0); + return 0; } @@ -2991,6 +2993,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, true); libie_ctlq_xn_deinit(adapter->xnm, &adapter->ctlq_ctx); @@ -3249,7 +3254,6 @@ void idpf_vc_core_deinit(struct idpf_adapter *adapter) idpf_deinit_dflt_mbx(adapter); cancel_delayed_work_sync(&adapter->serv_task); - cancel_delayed_work_sync(&adapter->mbx_task); idpf_vport_params_buf_rel(adapter); -- 2.47.0