From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) (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 229FD3CF68C; Fri, 15 May 2026 22:45:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.13 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778885115; cv=none; b=AOhvcuwqNmiXIGU8oiYbHtUKslNzFka3OstpUpbjvRAWh/v5nJoV+A/HJa8kh0JCi9YNCw0itx3BD5FAMb+qvDjhbi8YpyEem+kGMcL5tGkLnjLbjIPb8CS2j4G6kOIHxr1fS6MWHz8S5aXOKFQ1kYF1YeZhxcW1Bf8KQbZ4roc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778885115; c=relaxed/simple; bh=1e7fgKH6ZHeEkbYoDTjZ8GFH0h4OGqbLMN+7qmTi3sc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rq0sdljFw9H1mxezqAWryhrEDSn8sKQX7bVMzSHe63czqt26KP+TpgSdOvQzbV2UIWFf0vtxQwU+kp6HX8Inv7egjyPtnhCrnaaUXAYQfHJ5K6ibht5EpitljYJFwRALHpkqEBzNe6BSj122UmYVREt15Ay10ZiAKukJNs9P9Q4= 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=fVQsvrJB; arc=none smtp.client-ip=198.175.65.13 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="fVQsvrJB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1778885113; x=1810421113; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1e7fgKH6ZHeEkbYoDTjZ8GFH0h4OGqbLMN+7qmTi3sc=; b=fVQsvrJB18gid3JyAeF8q3B7u0CeD8Ow9j3WWZlxzfGuGxj6MYLhehTY un6/I7P8R8yo5PsPXi3UXxN8ozgvLlm40C8yP388amH90GaOrhLa0vNM9 FqSRPfwV3IFZHKXoOIvd+TL4ms2lwC79ZDnPnZwxkZudqVOEAfdGUh+yd rMBNLihthm6Q2fDzurGOO1CTf9gijwklJPLJCMO9fPJyzDHCYNNwnHu31 4V1p4SymKDGd31sNXNNm+on9GzaU2v3tdD8U+HqR7698DJtuR+n3YG6J4 oSNfQpwvP13yiKLE6r+eXCTaTGQ3sCyOt6iWwa5/UDkP6eu383/FROLel w==; X-CSE-ConnectionGUID: +W2TQLAtQ7Sk/AD6+E2F0A== X-CSE-MsgGUID: 6N3u5mHUSBO+hW1tkycLpA== X-IronPort-AV: E=McAfee;i="6800,10657,11787"; a="90949230" X-IronPort-AV: E=Sophos;i="6.23,237,1770624000"; d="scan'208";a="90949230" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2026 15:45:07 -0700 X-CSE-ConnectionGUID: aXk6I3rAR8iYAWuNNEPBFQ== X-CSE-MsgGUID: hu3yJ917TQukBcG0CoQHVQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,237,1770624000"; d="scan'208";a="243146682" Received: from anguy11-upstream.jf.intel.com ([10.166.9.133]) by orviesa004.jf.intel.com with ESMTP; 15 May 2026 15:45:07 -0700 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, andrew+netdev@lunn.ch, netdev@vger.kernel.org Cc: Larysa Zaremba , anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, aleksander.lobakin@intel.com, sridhar.samudrala@intel.com, anjali.singhai@intel.com, michal.swiatkowski@linux.intel.com, maciej.fijalkowski@intel.com, emil.s.tantilov@intel.com, madhu.chittim@intel.com, joshua.a.hay@intel.com, jacob.e.keller@intel.com, jayaprakash.shanmugam@intel.com, jiri@resnulli.us, horms@kernel.org, corbet@lwn.net, richardcochran@gmail.com, linux-doc@vger.kernel.org, Samuel Salin , Aleksandr Loktionov Subject: [PATCH net-next v3 09/14] idpf: make mbx_task queueing and cancelling more consistent Date: Fri, 15 May 2026 15:44:33 -0700 Message-ID: <20260515224443.2772147-10-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260515224443.2772147-1-anthony.l.nguyen@intel.com> References: <20260515224443.2772147-1-anthony.l.nguyen@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 From: Larysa Zaremba 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 Reviewed-by: Aleksandr Loktionov 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.1