From nobody Fri Dec 19 20:39:16 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) (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 AEDAE1DE8AD; Fri, 16 May 2025 14:58:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747407527; cv=none; b=E8LkLYRFG+BryMYqXjv8iio6Dx7uEAxPZXYBuC4Q+5xGRvGRrabOPiSf5jl8a+Xf59HMkw6HRLtpOKrDcHLZmo2PY4iOvJhJdG1vdsHpTE3wA14D6t9kcz2odcmwgHju8DzKScrqr4rz8BthNZ8gs4J8sEd/by9Beh67DOyEVu4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747407527; c=relaxed/simple; bh=9dzZPt2McHNB+lAA+rspaOyYpS5uTSMQtry3RSu+rVo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o/hBSm0tztwcb2aQmB8+TAaJGeLxZTpuZFlY/XascOmaQ2mYx/ImaHonyIcI/VCsqQqdaVXm5BPTjo7xV0ibFfgSk6R/nlbbv2UyuT3cOrbMRX+mOpdAzpGUNEkCvJS9jZCpuJo1gJTr+SUbL9D348dbCc6Y2s6xHQGoG7AtFfY= 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=IaOQaJHJ; arc=none smtp.client-ip=192.198.163.17 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="IaOQaJHJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1747407525; x=1778943525; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9dzZPt2McHNB+lAA+rspaOyYpS5uTSMQtry3RSu+rVo=; b=IaOQaJHJ0LMhimaI83zn9aQerI1thFKpSS+NgnlW8TE7fOurL0zdn9Hv 2xcL8AkEYlcaz2ZymEvoZ3657vXH+l0G7ej4py9BZIcScIqCC662Y923U TQ+bGDTTpUUblj2KDsWuLFE3YcOr4PnydEU3RlBv+1ng5iMfaGiX5wDp+ pcjw3iFM8ckgdHSo6CS2A6OwW9XflXQQG5Gqek2gUE+QoniIlWqKwY41I toJmJ2CSRhcT82WDvydAKoIJwWvDx12v+6d9lWepdC8Pp6Ay/GCq7rv/m JfEj1V/had+9LxwEsMHAkt3sSBMpzAtiqDT1xI4SqcWf89NX1k3BIZuYv w==; X-CSE-ConnectionGUID: f4A3HfwlT2Wd5Jf6xkpP+A== X-CSE-MsgGUID: ZV8WSqCGT6aoZVD8aHkRWw== X-IronPort-AV: E=McAfee;i="6700,10204,11435"; a="49308667" X-IronPort-AV: E=Sophos;i="6.15,294,1739865600"; d="scan'208";a="49308667" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2025 07:58:44 -0700 X-CSE-ConnectionGUID: lVJ8m0bNQLiI5Cr7HTFzkw== X-CSE-MsgGUID: SAulFrTzQ4COHP3ZyvXcAA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,294,1739865600"; d="scan'208";a="142717998" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by fmviesa003.fm.intel.com with ESMTP; 16 May 2025 07:58:38 -0700 Received: from mglak.igk.intel.com (mglak.igk.intel.com [10.237.112.146]) by irvmail002.ir.intel.com (Postfix) with ESMTP id 93CFD34324; Fri, 16 May 2025 15:58:36 +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 v4 10/15] idpf: make mbx_task queueing and cancelling more consistent Date: Fri, 16 May 2025 16:58:07 +0200 Message-ID: <20250516145814.5422-11-larysa.zaremba@intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250516145814.5422-1-larysa.zaremba@intel.com> References: <20250516145814.5422-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 Tested-by: Samuel Salin --- 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 ff69d920d7d3..e84881307b99 100644 --- a/drivers/net/ethernet/intel/idpf/idpf.h +++ b/drivers/net/ethernet/intel/idpf/idpf.h @@ -880,6 +880,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 500bff1091d9..f8a025cecac5 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 021fac3850ad..31c7e1984f6c 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