Netdev List
 help / color / mirror / Atom feed
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: Daniel Machon <daniel.machon@microchip.com>
Cc: netdev@vger.kernel.org, "(JC),
	Jayachandran" <j-rameshbabu@ti.com>,
	Andrew Lunn <andrew+netdev@lunn.ch>,
	Chintan Vankar <c-vankar@ti.com>,
	Danish Anwar <danishanwar@ti.com>, Daolin Qiu <d-qiu@ti.com>,
	"David S. Miller" <davem@davemloft.net>,
	Felix Maurer <fmaurer@redhat.com>,
	Jakub Kicinski <kuba@kernel.org>,
	Neelima Muralidharan <neelima@ti.com>,
	Paolo Abeni <pabeni@redhat.com>,
	Praneeth Bajjuri <praneeth@ti.com>,
	Pratheesh Gangadhar TK <pratheesh@ti.com>,
	Richard Cochran <richardcochran@gmail.com>,
	Simon Horman <horms@kernel.org>,
	Vignesh Raghavendra <vigneshr@ti.com>,
	Willem de Bruijn <willemdebruijn.kernel@gmail.com>,
	Eric Dumazet <edumazet@kernel.org>
Subject: Re: [PATCH net-next v10 3/8] hsr: Add a magic header for sending PTP packets
Date: Fri, 20 Nov 2026 09:55:15 +0100	[thread overview]
Message-ID: <20261120085515.Yd_dUps9@linutronix.de> (raw)
In-Reply-To: <20261110131214.5i4b3jt7iigbewsw@DEN-DL-M70577>

On 2026-11-10 14:12:14 [+0100], Daniel Machon wrote:
> Hi Sebastian,
Hi Daniel,

> > --- a/include/linux/if_hsr.h
> > +++ b/include/linux/if_hsr.h
> > @@ -3,6 +3,7 @@
> >  #define _LINUX_IF_HSR_H_
> >  
> >  #include <linux/types.h>
> > +#include <uapi/linux/hsr_ptp.h>
> 
> Is this needed?

hsr_device.c needs the defines and the struct hsr_inline_header from it.
Let me move it there where it used.

> >  
> >  struct net_device;
> >  
> > --- a/net/hsr/hsr_device.c
> > +++ b/net/hsr/hsr_device.c
> > @@ -223,24 +223,71 @@ static netdev_features_t hsr_fix_features(struct net_device *dev,
> >  
> >  static netdev_tx_t hsr_dev_xmit(struct sk_buff *skb, struct net_device *dev)
> >  {
> > +	enum hsr_port_type req_tx_port = HSR_PT_NONE;
> >  	struct hsr_priv *hsr = netdev_priv(dev);
> >  	struct hsr_port *master;
> > +	bool has_hsr_header = false;
> 
> RXT.

ups.

> >  
> >  	rcu_read_lock();
> >  	master = hsr_port_get_hsr(hsr, HSR_PT_MASTER);
> > -	if (master) {
> > -		skb->dev = master->dev;
> > -		skb_reset_mac_header(skb);
> > -		skb_reset_mac_len(skb);
> > -		spin_lock_bh(&hsr->seqnr_lock);
> > -		hsr_forward_skb(skb, master);
> > -		spin_unlock_bh(&hsr->seqnr_lock);
> > -	} else {
> > -		dev_core_stats_tx_dropped_inc(dev);
> > -		dev_kfree_skb_any(skb);
> > +	if (!master)
> > +		goto drop;
> > +
> > +	skb->dev = master->dev;
> > +	if (skb->protocol == htons(ETH_P_1588)) {
> > +		struct hsr_inline_header *hsr_opt;
> 
> Is 'hsr_opt' a leftover name from a previous version? I would have expected it
> to be something like hsr_inline_hdr.

Right. Let me rename it.

> > +		struct ethhdr *eth_hdr;
> > +		unsigned int hdr_len;
…
> > +		eth_hdr = skb_pull(skb, sizeof(struct hsr_inline_header));
> > +		skb_set_network_header(skb, hdr_len);
> > +		skb->protocol = eth_hdr->h_proto;
> >  	}
> 
> I think that is a big ptp-hsr specific block in a hot xmit function. Personally,
> I would probably have put that into a helper hsr_ptp_parse_header() or
> something. Not a big deal though.

Hmm. Hot or not there is a comparison at the begin and it should jump
over it. Moving into a function shouldn't change the outcome since the
compiler will inline it. It might look nicer and the "error" path is the
same so let me make it a helper as suggested. There is just req_tx_port
and has_hsr_header that needs to be passed around but that is doable.

> > +
> > +	skb_reset_mac_header(skb);
> > +	skb_reset_mac_len(skb);
> > +	spin_lock_bh(&hsr->seqnr_lock);
> > +	hsr_forward_skb(skb, master, req_tx_port, has_hsr_header);
> > +	spin_unlock_bh(&hsr->seqnr_lock);
> >  	rcu_read_unlock();
> >  
> > +	return NETDEV_TX_OK;
> > +drop:
> > +	rcu_read_unlock();
> > +	dev_core_stats_tx_dropped_inc(dev);
> > +	dev_kfree_skb_any(skb);
> >  	return NETDEV_TX_OK;
> >  }
> >  
…
> /Daniel

Sebastian

  reply	other threads:[~2026-11-20  8:55 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-04 15:10 [PATCH net-next v10 0/8] hsr: Allow to send packets on specific port and pass the timestamp Sebastian Andrzej Siewior
2026-11-04 15:10 ` [PATCH net-next v10 1/8] hsr: Add header_ops::parse_protocol Sebastian Andrzej Siewior
2026-11-10 12:21   ` Daniel Machon
2026-11-04 15:10 ` [PATCH net-next v10 2/8] hsr: Use skb_clone() while adding the HSR header Sebastian Andrzej Siewior
2026-11-10 12:24   ` Daniel Machon
2026-11-04 15:10 ` [PATCH net-next v10 3/8] hsr: Add a magic header for sending PTP packets Sebastian Andrzej Siewior
2026-11-10 13:12   ` Daniel Machon
2026-11-20  8:55     ` Sebastian Andrzej Siewior [this message]
2026-11-04 15:10 ` [PATCH net-next v10 4/8] hsr: Drop received " Sebastian Andrzej Siewior
2026-11-10 13:13   ` Daniel Machon
2026-11-04 15:10 ` [PATCH net-next v10 5/8] hsr: Use the port and header information in hsr_forward_skb() Sebastian Andrzej Siewior
2026-11-10 13:23   ` Daniel Machon
2026-11-20  9:06     ` Sebastian Andrzej Siewior
2026-11-04 15:10 ` [PATCH net-next v10 6/8] hsr: Assign a socket for cloned skbs Sebastian Andrzej Siewior
2026-11-10 13:24   ` Daniel Machon
2026-11-04 15:10 ` [PATCH net-next v10 7/8] hsr: Move struct hsr_ethhdr to a global header Sebastian Andrzej Siewior
2026-11-10 13:24   ` Daniel Machon
2026-11-04 15:10 ` [PATCH net-next v10 8/8] selftests: hsr: Add test for the inline PTP header on HSR Sebastian Andrzej Siewior
2026-11-10 13:48 ` [PATCH net-next v10 0/8] hsr: Allow to send packets on specific port and pass the timestamp Daniel Machon
2026-11-20  7:47   ` Sebastian Andrzej Siewior

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261120085515.Yd_dUps9@linutronix.de \
    --to=bigeasy@linutronix.de \
    --cc=andrew+netdev@lunn.ch \
    --cc=c-vankar@ti.com \
    --cc=d-qiu@ti.com \
    --cc=daniel.machon@microchip.com \
    --cc=danishanwar@ti.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@kernel.org \
    --cc=fmaurer@redhat.com \
    --cc=horms@kernel.org \
    --cc=j-rameshbabu@ti.com \
    --cc=kuba@kernel.org \
    --cc=neelima@ti.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=praneeth@ti.com \
    --cc=pratheesh@ti.com \
    --cc=richardcochran@gmail.com \
    --cc=vigneshr@ti.com \
    --cc=willemdebruijn.kernel@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox