Improvements to SJA1105 DSA RX timestamping
Subsystems (5)
Vladimir Oltean
maintainerv2 cover Improvements to SJA1105 DSA RX timestamping
This series makes the sja1105 DSA driver use a dedicated kernel thread for RX timestamping, a process which is time-sensitive and otherwise a bit fragile. This allows users to customize their system (probabil an embedded PTP switch) fully and allocate the CPU bandwidth for the driver to expedite the RX timestamps as quickly as possible.
While doing this conversion, add a function to the PTP core for cancelling this kernel thread (function which I found rather strange to be missing).
Vladimir Oltean (3):
ptp: introduce ptp_cancel_worker_sync
net: dsa: sja1105: Use PTP core's dedicated kernel thread for RX
timestamping
net: dsa: sja1105: Empty the RX timestamping queue on PTP settings
change
drivers/net/dsa/sja1105/sja1105_ptp.c | 36 +++++++++++++-------------- drivers/net/dsa/sja1105/sja1105_ptp.h | 1 + drivers/ptp/ptp_clock.c | 6 +++++ include/linux/dsa/sja1105.h | 2 -- include/linux/ptp_clock_kernel.h | 9 +++++++ 5 files changed, 34 insertions(+), 20 deletions(-)
Signature · 1 line
2.17.1
Vladimir Oltean
maintainerPATCH v2 1/3 ptp: introduce ptp_cancel_worker_sync
In order to effectively use the PTP kernel thread for tasks such as timestamping packets, allow the user control over stopping it, which is needed e.g. when the timestamping queues must be drained.
---
Changes in v2:
- Added stub for the case where CONFIG_PTP_1588_CLOCK=n
drivers/ptp/ptp_clock.c | 6 ++++++ include/linux/ptp_clock_kernel.h | 9 +++++++++ 2 files changed, 15 insertions(+)
drivers/ptp/ptp_clock.c +6 -0
@@ -371,6 +371,12 @@ int ptp_schedule_worker(struct ptp_clock *ptp, unsigned long delay) }EXPORT_SYMBOL (ptp_schedule_worker); +void ptp_cancel_worker_sync (struct ptp_clock *ptp) +{ +kthread_cancel_delayed_work_sync (&ptp->aux_work); +} +EXPORT_SYMBOL (ptp_cancel_worker_sync); +/* module operations */ static void __exit ptp_exit(void)
include/linux/ptp_clock_kernel.h +9 -0
@@ -243,6 +243,13 @@ int ptp_find_pin(struct ptp_clock *ptp,int ptp_schedule_worker (struct ptp_clock *ptp,unsigned long delay); +/** +* ptp_cancel_worker_sync() - cancel ptp auxiliary clock +* +* @ptp: The clock obtained from ptp_clock_register(). +*/ +void ptp_cancel_worker_sync (struct ptp_clock *ptp); +#else static inline struct ptp_clock *ptp_clock_register (struct ptp_clock_info *info,struct device *parent)
@@ -260,6 +267,8 @@ static inline int ptp_find_pin(struct ptp_clock *ptp,static inline int ptp_schedule_worker (struct ptp_clock *ptp,unsigned long delay) {return -EOPNOTSUPP ; } +static inline void ptp_cancel_worker_sync (struct ptp_clock *ptp) +{ }#endif
Signature · 1 line
2.17.1
Vladimir Oltean
maintainerPATCH v2 2/3 net: dsa: sja1105: Use PTP core's dedicated kernel thread for RX timestamping
In reply to Vladimir OlteanAnd move the queue of skb's waiting for RX timestamps into the ptp_data structure, since it isn't needed if PTP is not compiled.
---
Changes in v2:
- Moved "struct sja1105_ptp_data *ptp_data" declaration in sja1105_change_rxtstamping to patch 3/3.
drivers/net/dsa/sja1105/sja1105_ptp.c | 33 ++++++++++++--------------- drivers/net/dsa/sja1105/sja1105_ptp.h | 1 + include/linux/dsa/sja1105.h | 2 -- 3 files changed, 16 insertions(+), 20 deletions(-)
drivers/net/dsa/sja1105/sja1105_ptp.c +15 -18
@@ -367,22 +367,16 @@ static int sja1105_ptpclkval_write(struct sja1105_private *priv, u64 ticks, ptp_sts); } -#define rxtstamp_to_tagger (d) \ - container_of((d), struct sja1105_tagger_data, rxtstamp_work) -#define tagger_to_sja1105 (d) \ - container_of((d), struct sja1105_private, tagger_data) - -static void sja1105_rxtstamp_work (struct work_struct *work) +static long sja1105_rxtstamp_work (struct ptp_clock_info *ptp) { -struct sja1105_tagger_data *tagger_data =rxtstamp_to_tagger (work); -struct sja1105_private *priv =tagger_to_sja1105 (tagger_data); -struct sja1105_ptp_data *ptp_data = &priv->ptp_data; +struct sja1105_ptp_data *ptp_data =ptp_caps_to_data (ptp); +struct sja1105_private *priv =ptp_data_to_sja1105 (ptp_data);struct dsa_switch *ds = priv->ds;struct sk_buff *skb;mutex_lock (&ptp_data->lock); -while ((skb =skb_dequeue (&tagger_data->skb_rxtstamp_queue)) !=NULL ) { +while ((skb =skb_dequeue (&ptp_data->skb_rxtstamp_queue)) !=NULL ) {struct skb_shared_hwtstamps *shwt =skb_hwtstamps (skb);u64 ticks, ts;int rc;
@@ -404,6 +398,9 @@ static void sja1105_rxtstamp_work(struct work_struct *work) }mutex_unlock (&ptp_data->lock); + +/* Don't restart */ +return -1 ; }/* Called from dsa_skb_defer_rx_timestamp */
@@ -411,16 +408,16 @@ bool sja1105_port_rxtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb, unsigned int type) {struct sja1105_private *priv = ds->priv; -struct sja1105_tagger_data *tagger_data = &priv->tagger_data; +struct sja1105_ptp_data *ptp_data = &priv->ptp_data; -if (!test_bit (SJA1105_HWTS_RX_EN , &tagger_data->state)) +if (!test_bit (SJA1105_HWTS_RX_EN , &priv->tagger_data.state))return false;/* We need to read the full PTP clock to reconstruct the Rx * timestamp. For that we need a sleepable context. */ -skb_queue_tail (&tagger_data->skb_rxtstamp_queue, skb); -schedule_work (&tagger_data->rxtstamp_work); +skb_queue_tail (&ptp_data->skb_rxtstamp_queue, skb); +ptp_schedule_worker (ptp_data->clock,0 );return true; }
@@ -628,11 +625,11 @@ int sja1105_ptp_clock_register(struct dsa_switch *ds) .adjtime = sja1105_ptp_adjtime, .gettimex64 = sja1105_ptp_gettimex, .settime64 = sja1105_ptp_settime, + .do_aux_work = sja1105_rxtstamp_work, .max_adj = SJA1105_MAX_ADJ_PPB, }; -skb_queue_head_init (&tagger_data->skb_rxtstamp_queue); -INIT_WORK (&tagger_data->rxtstamp_work, sja1105_rxtstamp_work); +skb_queue_head_init (&ptp_data->skb_rxtstamp_queue);spin_lock_init (&tagger_data->meta_lock); ptp_data->clock =ptp_clock_register (&ptp_data->caps, ds->dev);
@@ -653,8 +650,8 @@ void sja1105_ptp_clock_unregister(struct dsa_switch *ds)if (IS_ERR_OR_NULL (ptp_data->clock))return ; -cancel_work_sync (&priv->tagger_data.rxtstamp_work); -skb_queue_purge (&priv->tagger_data.skb_rxtstamp_queue); +ptp_cancel_worker_sync (ptp_data->clock); +skb_queue_purge (&ptp_data->skb_rxtstamp_queue);ptp_clock_unregister (ptp_data->clock); ptp_data->clock =NULL ; }
drivers/net/dsa/sja1105/sja1105_ptp.h +1 -0
@@ -30,6 +30,7 @@ struct sja1105_ptp_cmd { };struct sja1105_ptp_data { +struct sk_buff_head skb_rxtstamp_queue;struct ptp_clock_info caps;struct ptp_clock *clock;struct sja1105_ptp_cmd cmd;
include/linux/dsa/sja1105.h +0 -2
@@ -37,8 +37,6 @@* the structure defined in struct sja1105_private. */ struct sja1105_tagger_data { -struct sk_buff_head skb_rxtstamp_queue; -struct work_struct rxtstamp_work;struct sk_buff *stampable_skb;/* Protects concurrent access to the meta state machine * from taggers running on multiple ports on SMP systems
Signature · 1 line
2.17.1
Vladimir Oltean
maintainerPATCH v2 3/3 net: dsa: sja1105: Empty the RX timestamping queue on PTP settings change
In reply to Vladimir OlteanWhen disabling PTP timestamping, don't reset the switch with the new static config until all existing PTP frames have been timestamped on the RX path or dropped. There's nothing we can do with these afterwards.
---
Changes in v2:
- Moved "struct sja1105_ptp_data *ptp_data" declaration in sja1105_change_rxtstamping here from patch 2/3.
drivers/net/dsa/sja1105/sja1105_ptp.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/dsa/sja1105/sja1105_ptp.c +3 -0
@@ -83,6 +83,7 @@ static int sja1105_init_avb_params(struct sja1105_private *priv,static int sja1105_change_rxtstamping (struct sja1105_private *priv,bool on) { +struct sja1105_ptp_data *ptp_data = &priv->ptp_data;struct sja1105_general_params_entry *general_params;struct sja1105_table *table;int rc;
@@ -101,6 +102,8 @@ static int sja1105_change_rxtstamping(struct sja1105_private *priv,kfree_skb (priv->tagger_data.stampable_skb); priv->tagger_data.stampable_skb =NULL ; } +ptp_cancel_worker_sync (ptp_data->clock); +skb_queue_purge (&ptp_data->skb_rxtstamp_queue);return sja1105_static_config_reload (priv,SJA1105_RX_HWTSTAMPING ); }
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Vladimir Oltean <[email protected]>
Date: Fri, 27 Dec 2019 15:02:27 +0200
Quoted 9 lines
This series makes the sja1105 DSA driver use a dedicated kernel thread for RX timestamping, a process which is time-sensitive and otherwise a bit fragile. This allows users to customize their system (probabil an embedded PTP switch) fully and allocate the CPU bandwidth for the driver to expedite the RX timestamps as quickly as possible.
While doing this conversion, add a function to the PTP core for cancelling this kernel thread (function which I found rather strange to be missing).
Series applied, thanks Vladimir.