From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 A59E82940B; Mon, 23 Jun 2025 22:01:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750716063; cv=none; b=EGjdmg091c3VlR++mfVuFkXwIEJZR71uRdmYt/FlJVQWTSQcOm8SOEQybBTU3HtCj6fOcrt7xBHnNvAwIBgOFmSYTaY8Vpiyb2v0NPkOX0VN7IKm6EVHuH9L4N2g/ALYGr/KDoCwS/XPUbbJbifKd2dlD4mv0Ek0lR2N3Ls23k8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750716063; c=relaxed/simple; bh=9Z2wcuDqYsMHpmkcgInm1r8S8vVZjvxQJlekDCaICuY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u7spD2AQejgPB3MZjL00IGvoi+dA0S/CiEV29PxOG7H9qwNXM8Ofy/IOxG/YPai8ywmMbqfdYcf/DUExU5RB/C5oNmcuIt6P11k+Get3V5xi2ljeySoEsIsDwfnGx+cFkOE8ojOTZ4r1DPi6vCvORx5ni9+c8l9XzgVJhzWXi7g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=a3llGSwI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="a3llGSwI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3DEC6C4CEEA; Mon, 23 Jun 2025 22:01:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750716063; bh=9Z2wcuDqYsMHpmkcgInm1r8S8vVZjvxQJlekDCaICuY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a3llGSwIIT5h/Tvt2RIKRIHlDpeMp7pss3lyORxQt2cgsnqW6PwVuLAfz1ngEEiH5 MCTxuBpA3MpyWwoqKHdEtXyjJ4eRGF9NQqTleG+1WHeN/qsZknoCVr+S5uzGCvat0T UV+hndp+79Tevg1fJMBi4KDmsgxg5Fp/LcRSn934= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jason Xing , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12 225/414] net: atlantic: generate software timestamp just before the doorbell Date: Mon, 23 Jun 2025 15:06:02 +0200 Message-ID: <20250623130647.655981696@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250623130642.015559452@linuxfoundation.org> References: <20250623130642.015559452@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jason Xing [ Upstream commit 285ad7477559b6b5ceed10ba7ecfed9d17c0e7c6 ] Make sure the call of skb_tx_timestamp is as close as possible to the doorbell. Signed-off-by: Jason Xing Link: https://patch.msgid.link/20250510134812.48199-2-kerneljasonxing@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/aquantia/atlantic/aq_main.c | 1 - drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_main.c b/drivers/net/ethernet/aquantia/atlantic/aq_main.c index c1d1673c5749d..b565189e59139 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_main.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_main.c @@ -123,7 +123,6 @@ static netdev_tx_t aq_ndev_start_xmit(struct sk_buff *skb, struct net_device *nd } #endif - skb_tx_timestamp(skb); return aq_nic_xmit(aq_nic, skb); } diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c index 71e50fc65c147..b0994bd05874a 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c @@ -898,6 +898,8 @@ int aq_nic_xmit(struct aq_nic_s *self, struct sk_buff *skb) frags = aq_nic_map_skb(self, skb, ring); + skb_tx_timestamp(skb); + if (likely(frags)) { err = self->aq_hw_ops->hw_ring_tx_xmit(self->aq_hw, ring, frags); -- 2.39.5