Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1540770iob; Thu, 5 May 2022 03:42:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9RuwM49F18+DXO/wZDqXWLFrWyvc/gSKXhL7W7K9/kHVK2NWyCv4TYTGt8aKfGYyv01Wi X-Received: by 2002:a17:907:8a14:b0:6f4:4365:dc07 with SMTP id sc20-20020a1709078a1400b006f44365dc07mr19103630ejc.693.1651747351884; Thu, 05 May 2022 03:42:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651747351; cv=none; d=google.com; s=arc-20160816; b=q6ADaRAXKF1fO0JMY6wNLxBpd/qFHBAVd8OTJB77sMff5CKGmmHiZrvl9SVm5k0TTH JpOB1d/UJRgOJn5cfFxJa7qWAhQHFUuoYFuRYU4GEtwkvLr1ce6MmJaFRT9ImTCGm+B+ I2FtuctfaSIRJDSOMO1TtjYYrQ72z4VlFMVWxlzzWyYDebKBhVLsNO8PHrqtKwqg9PU+ PNAxCwDeKQeLZp5rMA3GU3xr35HmDOyVuRTFKdAFexRjQMIQ9gKGZGFQfdQW324pcPqQ I52stiLJjIHrvim+QI+bYzQ5f342SG12bEK+hs/5C02dGzgs//uPbhWDngee6HNuQHSH 2+CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YZbORUhIWMVhokaNzatWDHW6LGzg83HYMFC3Q+JWbsQ=; b=ILdcFLqDRRPbIsR6EbXTWG4O5dr/QYbbEsGHA8QGYk0Zd3L+WHe3gI3mtb8VcTq5Yk 74GCDzBhhleB1ZtSAYwE5wu7ZDAcTiXMnHHAMdzYetX79hR8Qg0PeNdtbkquncxhvcNd Nv0pF8wrCI7NA61oDBuopkOpsK8ybj/6NN48+W98jk6bHCxd8SCgjUix/zDR3Dxtt8as NMT6rsU9BqvYvrMPjwYuku4fC9K9keMfAnYyUUaSjHj3HV6kPeJOBCYkrh9fpibhoLxu kWUUJC9AdcgYUg2bvv7H2d34ulAEDyj49+JTJegUCpVyBJ48eTraPFS/pdS4yuvjm3NH DpYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WadLr26t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fp21-20020a1709069e1500b006e8618a4c75si1647525ejc.97.2022.05.05.03.42.08; Thu, 05 May 2022 03:42:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WadLr26t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377226AbiEDRpt (ORCPT + 99 others); Wed, 4 May 2022 13:45:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356282AbiEDRL5 (ORCPT ); Wed, 4 May 2022 13:11:57 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF2BC4B86B; Wed, 4 May 2022 09:57:41 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 070F2B827A5; Wed, 4 May 2022 16:57:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A937C385AF; Wed, 4 May 2022 16:57:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683455; bh=YoUFmdvg5KfbtmqFuUJalffTSLiY1qDj5yqd8lBmxaE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WadLr26t8G4tp6VbEwUsZ4Z3cwbP52OdKSGxoKr1kS6/ZqiFZJtEVMKHKWAOpZ4/K Ta8BIZH0fzi6lWtqSNR+u9+zSglMw/Xgf/PcdoJN6ANUdg3wSZ/sYmM9XMRsjPmEXK +I+cgGUN++bQ2vM8h3dLXJ4AEbFOgAh+/rYZl2Lw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Lemon , Florian Fainelli , Paolo Abeni , Sasha Levin Subject: [PATCH 5.17 130/225] net: bcmgenet: hide status block before TX timestamping Date: Wed, 4 May 2022 18:46:08 +0200 Message-Id: <20220504153121.957057863@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jonathan Lemon [ Upstream commit acac0541d1d65e81e599ec399d34d184d2424401 ] The hardware checksum offloading requires use of a transmit status block inserted before the outgoing frame data, this was updated in '9a9ba2a4aaaa ("net: bcmgenet: always enable status blocks")' However, skb_tx_timestamp() assumes that it is passed a raw frame and PTP parsing chokes on this status block. Fix this by calling __skb_pull(), which hides the TSB before calling skb_tx_timestamp(), so an outgoing PTP packet is parsed correctly. As the data in the skb has already been set up for DMA, and the dma_unmap_* calls use a separately stored address, there is no no effective change in the data transmission. Signed-off-by: Jonathan Lemon Acked-by: Florian Fainelli Link: https://lore.kernel.org/r/20220424165307.591145-1-jonathan.lemon@gmail.com Fixes: d03825fba459 ("net: bcmgenet: add skb_tx_timestamp call") Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 2da804f84b48..c2bfb25e087c 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -2035,6 +2035,11 @@ static struct sk_buff *bcmgenet_add_tsb(struct net_device *dev, return skb; } +static void bcmgenet_hide_tsb(struct sk_buff *skb) +{ + __skb_pull(skb, sizeof(struct status_64)); +} + static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev) { struct bcmgenet_priv *priv = netdev_priv(dev); @@ -2141,6 +2146,8 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev) } GENET_CB(skb)->last_cb = tx_cb_ptr; + + bcmgenet_hide_tsb(skb); skb_tx_timestamp(skb); /* Decrement total BD count and advance our write pointer */ -- 2.35.1