From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 43EC9C55822 for ; Tue, 4 Aug 2026 21:39:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id C378160618; Tue, 4 Aug 2026 21:39:54 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id v0xrRC7dWQ9R; Tue, 4 Aug 2026 21:39:53 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org E6DD7605EC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1785879592; bh=M/YdfITwA2i5MXUEvTL9egSEPZBECQ60NxmAon/pChQ=; h=Date:To:Cc:References:From:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=zF5UkUEpZaUJgS4njZUfGcr3s0bNVbGlnx6h+QzOPDllSxOFBhcO7XdqjddOcKhL5 i4ExvBFpCpuxaltwNXmCycEcajxkkjxJMr7PBCyuPCSfukU1BTavi8waI77svM0WXB Y0BAsYWa0Q03pkrECS6Tnw6bfVczkM/Wui79BffESfv6qrTOjt0tCx6L1UGtcD3a6y X/sGFBAemXr6hCfKmdaSNJRDoq2gWQl04fYvq4Ouk9sp7p0kpNqkfDmdujhVxon/8g aHTOoNfuflpXBy/rP+2iF7thjJfwk/9KKDGKQxJksx/FIGXlrsi2zj9kiKBX3oqODZ TJsF14kCLar4Q== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp3.osuosl.org (Postfix) with ESMTP id E6DD7605EC; Tue, 4 Aug 2026 21:39:52 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists1.osuosl.org (Postfix) with ESMTP id 936A12FA for ; Tue, 4 Aug 2026 21:39:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 7C9C9401DF for ; Tue, 4 Aug 2026 21:39:51 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id xH6l8c2CBv5H for ; Tue, 4 Aug 2026 21:39:50 +0000 (UTC) X-Greylist: delayed 343 seconds by postgrey-1.37 at util1.osuosl.org; Tue, 04 Aug 2026 21:39:48 UTC DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 4946D40029 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 4946D40029 Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=91.218.175.189; helo=out-189.mta0.migadu.com; envelope-from=vadim.fedorenko@linux.dev; receiver= Received: from out-189.mta0.migadu.com (out-189.mta0.migadu.com [91.218.175.189]) by smtp2.osuosl.org (Postfix) with ESMTPS id 4946D40029 for ; Tue, 4 Aug 2026 21:39:48 +0000 (UTC) Message-ID: Date: Tue, 4 Aug 2026 22:33:39 +0100 MIME-Version: 1.0 To: xuanqiang.luo@linux.dev, intel-wired-lan@lists.osuosl.org Cc: anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, richardcochran@gmail.com, piotr.kwapulinski@intel.com, arkadiusz.kubalewski@intel.com, aleksandr.loktionov@intel.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, Xuanqiang Luo References: <20260724093448.63154-1-xuanqiang.luo@linux.dev> Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Vadim Fedorenko In-Reply-To: <20260724093448.63154-1-xuanqiang.luo@linux.dev> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1785879239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M/YdfITwA2i5MXUEvTL9egSEPZBECQ60NxmAon/pChQ=; b=f1CG7/8TCMnSiDNWVJMl17/vQSwYBLADVFt/u9bg7lanyoo0mO/1WUAhuQMgAV0tRH2mgM La7qWZRyisA5xunqxbdZPKurkPTOILucvVXVw8BRDBcQVEZbdqaRpDCMRoBjAwr2g0Ho1L cnDxFkOhDtwaIMJaeP0vrLFK4WEI6wA= X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=linux.dev X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=f1CG7/8T Subject: Re: [Intel-wired-lan] [PATCH iwl-net v1] i40e: fix races in PTP external timestamp work handling X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" On 24/07/2026 10:34, xuanqiang.luo@linux.dev wrote: > From: Xuanqiang Luo > > The time sync interrupt queues ptp_extts0_work, which reads device > registers and reports events through pf->ptp_clock. > > i40e_ptp_stop() unregisters the PHC without first disabling the event > source or draining the work. The worker can therefore access the clock or > PF after either has been freed, causing a use-after-free. Disable external > timestamp events and call disable_work_sync() before unregistering the PHC. > Disabling the work also prevents an interrupt already in progress from > queuing it after the drain. > > INIT_WORK() is called from i40e_ptp_set_timestamp_mode(), which runs on > reset and whenever timestamping is reconfigured. Reinitializing pending or > running work can corrupt its workqueue state. Initialize the work once from > i40e_sw_init() instead. > > Also exclude reset recovery before stopping PTP so a concurrent rebuild > cannot re-enable timestamp events or recreate the PHC during removal. > > Fixes: 1050713026a0 ("i40e: add support for PTP external synchronization clock") > Signed-off-by: Xuanqiang Luo > --- > drivers/net/ethernet/intel/i40e/i40e.h | 1 + > drivers/net/ethernet/intel/i40e/i40e_main.c | 17 +++++++------- > drivers/net/ethernet/intel/i40e/i40e_ptp.c | 25 +++++++++++++++------ > 3 files changed, 28 insertions(+), 15 deletions(-) > > diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h > index 83e780919ac97..e2ae61bc38786 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e.h > +++ b/drivers/net/ethernet/intel/i40e/i40e.h > @@ -1315,6 +1315,7 @@ int i40e_ptp_hwtstamp_set(struct net_device *netdev, > struct netlink_ext_ack *extack); > void i40e_ptp_save_hw_time(struct i40e_pf *pf); > void i40e_ptp_restore_hw_time(struct i40e_pf *pf); > +void i40e_ptp_init_work(struct i40e_pf *pf); > void i40e_ptp_init(struct i40e_pf *pf); > void i40e_ptp_stop(struct i40e_pf *pf); > int i40e_ptp_alloc_pins(struct i40e_pf *pf); > diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c > index a04683004a567..2909a58d57562 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_main.c > +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c > @@ -12819,6 +12819,7 @@ static int i40e_sw_init(struct i40e_pf *pf) > "total-port-shutdown was enabled, link-down-on-close is forced on\n"); > } > mutex_init(&pf->switch_mutex); > + i40e_ptp_init_work(pf); > > sw_init_done: > return err; > @@ -16157,14 +16158,6 @@ static void i40e_remove(struct pci_dev *pdev) > > i40e_devlink_unregister(pf); > > - i40e_dbg_pf_exit(pf); > - > - i40e_ptp_stop(pf); > - > - /* Disable RSS in hw */ > - i40e_write_rx_ctl(hw, I40E_PFQF_HENA(0), 0); > - i40e_write_rx_ctl(hw, I40E_PFQF_HENA(1), 0); > - > /* Grab __I40E_RESET_RECOVERY_PENDING and set __I40E_IN_REMOVE > * flags, once they are set, i40e_rebuild should not be called as > * i40e_prep_for_reset always returns early. > @@ -16173,6 +16166,14 @@ static void i40e_remove(struct pci_dev *pdev) > usleep_range(1000, 2000); > set_bit(__I40E_IN_REMOVE, pf->state); > > + i40e_dbg_pf_exit(pf); > + > + i40e_ptp_stop(pf); > + > + /* Disable RSS in hw */ > + i40e_write_rx_ctl(hw, I40E_PFQF_HENA(0), 0); > + i40e_write_rx_ctl(hw, I40E_PFQF_HENA(1), 0); > + > if (test_bit(I40E_FLAG_SRIOV_ENA, pf->flags)) { > set_bit(__I40E_VF_RESETS_DISABLED, pf->state); > i40e_free_vfs(pf); > diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c > index ff62b5f2c8150..fd51ab8c10c20 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c > +++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c > @@ -169,6 +169,17 @@ static void i40e_ptp_extts0_work(struct work_struct *work) > ptp_clock_event(pf->ptp_clock, &event); > } > > +/** > + * i40e_ptp_init_work - Initialize PTP work for a PF > + * @pf: Board private structure > + * > + * Initialize work which must remain valid for the lifetime of the PF. > + */ > +void i40e_ptp_init_work(struct i40e_pf *pf) > +{ > + INIT_WORK(&pf->ptp_extts0_work, i40e_ptp_extts0_work); > +} > + why do you need extra function for a single line of code? why cannot you put it into i40e_ptp_init? > /** > * i40e_is_ptp_pin_dev - check if device supports PTP pins > * @hw: pointer to the hardware structure > @@ -1186,8 +1197,6 @@ static int i40e_ptp_set_timestamp_mode(struct i40e_pf *pf, > regval |= 1 << I40E_PRTTSYN_CTL0_EVENT_INT_ENA_SHIFT; > wr32(hw, I40E_PRTTSYN_CTL0, regval); > > - INIT_WORK(&pf->ptp_extts0_work, i40e_ptp_extts0_work); > - > switch (config->tx_type) { > case HWTSTAMP_TX_OFF: > pf->ptp_tx = false;