| Message ID | 20231115175301.534113-3-larysa.zaremba@intel.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF |
| Headers | show |
| Series | XDP metadata via kfuncs for ice + VLAN hint | expand |
On Wed, Nov 15, 2023 at 06:52:44PM +0100, Larysa Zaremba wrote: > Previously, we only needed RX HW timestamp in skb path, > hence all related code was written with skb in mind. > But with the addition of XDP hints via kfuncs to the ice driver, > the same logic will be needed in .xmo_() callbacks. > > Put generic process of reading RX HW timestamp from a descriptor > into a separate function. > Move skb-related code into another source file. > > Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com> Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > --- > drivers/net/ethernet/intel/ice/ice_ptp.c | 20 ++++++----------- > drivers/net/ethernet/intel/ice/ice_ptp.h | 16 +++++++++----- > drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 22 ++++++++++++++++++- > 3 files changed, 38 insertions(+), 20 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c > index 1eddcbe89b0c..a435f89b262f 100644 > --- a/drivers/net/ethernet/intel/ice/ice_ptp.c > +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c > @@ -2103,30 +2103,26 @@ int ice_ptp_set_ts_config(struct ice_pf *pf, struct ifreq *ifr) > } > > /** > - * ice_ptp_rx_hwtstamp - Check for an Rx timestamp > - * @rx_ring: Ring to get the VSI info > + * ice_ptp_get_rx_hwts - Get packet Rx timestamp in ns > * @rx_desc: Receive descriptor > - * @skb: Particular skb to send timestamp with > + * @rx_ring: Ring to get the cached time > * > * The driver receives a notification in the receive descriptor with timestamp. > - * The timestamp is in ns, so we must convert the result first. > */ > -void > -ice_ptp_rx_hwtstamp(struct ice_rx_ring *rx_ring, > - union ice_32b_rx_flex_desc *rx_desc, struct sk_buff *skb) > +u64 ice_ptp_get_rx_hwts(const union ice_32b_rx_flex_desc *rx_desc, > + struct ice_rx_ring *rx_ring) > { > - struct skb_shared_hwtstamps *hwtstamps; > u64 ts_ns, cached_time; > u32 ts_high; > > if (!(rx_desc->wb.time_stamp_low & ICE_PTP_TS_VALID)) > - return; > + return 0; > > cached_time = READ_ONCE(rx_ring->cached_phctime); > > /* Do not report a timestamp if we don't have a cached PHC time */ > if (!cached_time) > - return; > + return 0; > > /* Use ice_ptp_extend_32b_ts directly, using the ring-specific cached > * PHC value, rather than accessing the PF. This also allows us to > @@ -2137,9 +2133,7 @@ ice_ptp_rx_hwtstamp(struct ice_rx_ring *rx_ring, > ts_high = le32_to_cpu(rx_desc->wb.flex_ts.ts_high); > ts_ns = ice_ptp_extend_32b_ts(cached_time, ts_high); > > - hwtstamps = skb_hwtstamps(skb); > - memset(hwtstamps, 0, sizeof(*hwtstamps)); > - hwtstamps->hwtstamp = ns_to_ktime(ts_ns); > + return ts_ns; > } > > /** > diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.h b/drivers/net/ethernet/intel/ice/ice_ptp.h > index 8f6f94392756..0274da964fe3 100644 > --- a/drivers/net/ethernet/intel/ice/ice_ptp.h > +++ b/drivers/net/ethernet/intel/ice/ice_ptp.h > @@ -298,9 +298,8 @@ void ice_ptp_extts_event(struct ice_pf *pf); > s8 ice_ptp_request_ts(struct ice_ptp_tx *tx, struct sk_buff *skb); > enum ice_tx_tstamp_work ice_ptp_process_ts(struct ice_pf *pf); > > -void > -ice_ptp_rx_hwtstamp(struct ice_rx_ring *rx_ring, > - union ice_32b_rx_flex_desc *rx_desc, struct sk_buff *skb); > +u64 ice_ptp_get_rx_hwts(const union ice_32b_rx_flex_desc *rx_desc, > + struct ice_rx_ring *rx_ring); > void ice_ptp_reset(struct ice_pf *pf); > void ice_ptp_prepare_for_reset(struct ice_pf *pf); > void ice_ptp_init(struct ice_pf *pf); > @@ -330,9 +329,14 @@ static inline bool ice_ptp_process_ts(struct ice_pf *pf) > { > return true; > } > -static inline void > -ice_ptp_rx_hwtstamp(struct ice_rx_ring *rx_ring, > - union ice_32b_rx_flex_desc *rx_desc, struct sk_buff *skb) { } > + > +static inline u64 > +ice_ptp_get_rx_hwts(const union ice_32b_rx_flex_desc *rx_desc, > + struct ice_rx_ring *rx_ring) > +{ > + return 0; > +} > + > static inline void ice_ptp_reset(struct ice_pf *pf) { } > static inline void ice_ptp_prepare_for_reset(struct ice_pf *pf) { } > static inline void ice_ptp_init(struct ice_pf *pf) { } > diff --git a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c > index 17530359aaf8..c4dbbb246946 100644 > --- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c > +++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c > @@ -184,6 +184,26 @@ ice_rx_csum(struct ice_rx_ring *ring, struct sk_buff *skb, > ring->vsi->back->hw_csum_rx_error++; > } > > +/** > + * ice_ptp_rx_hwts_to_skb - Put RX timestamp into skb > + * @rx_ring: Ring to get the VSI info > + * @rx_desc: Receive descriptor > + * @skb: Particular skb to send timestamp with > + * > + * The timestamp is in ns, so we must convert the result first. > + */ > +static void > +ice_ptp_rx_hwts_to_skb(struct ice_rx_ring *rx_ring, > + const union ice_32b_rx_flex_desc *rx_desc, > + struct sk_buff *skb) > +{ > + u64 ts_ns = ice_ptp_get_rx_hwts(rx_desc, rx_ring); > + > + *skb_hwtstamps(skb) = (struct skb_shared_hwtstamps){ > + .hwtstamp = ns_to_ktime(ts_ns), > + }; could this just be skb_hwtstamps(skb)->hwtstamp = ns_to_ktime(ts_ns); ? > +} > + > /** > * ice_process_skb_fields - Populate skb header fields from Rx descriptor > * @rx_ring: Rx descriptor ring packet is being transacted on > @@ -208,7 +228,7 @@ ice_process_skb_fields(struct ice_rx_ring *rx_ring, > ice_rx_csum(rx_ring, skb, rx_desc, ptype); > > if (rx_ring->ptp_rx) > - ice_ptp_rx_hwtstamp(rx_ring, rx_desc, skb); > + ice_ptp_rx_hwts_to_skb(rx_ring, rx_desc, skb); > } > > /** > -- > 2.41.0 >
On Thu, Nov 16, 2023 at 04:19:37PM +0100, Maciej Fijalkowski wrote: > On Wed, Nov 15, 2023 at 06:52:44PM +0100, Larysa Zaremba wrote: > > Previously, we only needed RX HW timestamp in skb path, > > hence all related code was written with skb in mind. > > But with the addition of XDP hints via kfuncs to the ice driver, > > the same logic will be needed in .xmo_() callbacks. > > > > Put generic process of reading RX HW timestamp from a descriptor > > into a separate function. > > Move skb-related code into another source file. > > > > Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com> > > Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> > > > --- > > drivers/net/ethernet/intel/ice/ice_ptp.c | 20 ++++++----------- > > drivers/net/ethernet/intel/ice/ice_ptp.h | 16 +++++++++----- > > drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 22 ++++++++++++++++++- > > 3 files changed, 38 insertions(+), 20 deletions(-) > > > > diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c > > index 1eddcbe89b0c..a435f89b262f 100644 > > --- a/drivers/net/ethernet/intel/ice/ice_ptp.c > > +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c > > @@ -2103,30 +2103,26 @@ int ice_ptp_set_ts_config(struct ice_pf *pf, struct ifreq *ifr) > > } > > > > /** > > - * ice_ptp_rx_hwtstamp - Check for an Rx timestamp > > - * @rx_ring: Ring to get the VSI info > > + * ice_ptp_get_rx_hwts - Get packet Rx timestamp in ns > > * @rx_desc: Receive descriptor > > - * @skb: Particular skb to send timestamp with > > + * @rx_ring: Ring to get the cached time > > * > > * The driver receives a notification in the receive descriptor with timestamp. > > - * The timestamp is in ns, so we must convert the result first. > > */ > > -void > > -ice_ptp_rx_hwtstamp(struct ice_rx_ring *rx_ring, > > - union ice_32b_rx_flex_desc *rx_desc, struct sk_buff *skb) > > +u64 ice_ptp_get_rx_hwts(const union ice_32b_rx_flex_desc *rx_desc, > > + struct ice_rx_ring *rx_ring) > > { > > - struct skb_shared_hwtstamps *hwtstamps; > > u64 ts_ns, cached_time; > > u32 ts_high; > > > > if (!(rx_desc->wb.time_stamp_low & ICE_PTP_TS_VALID)) > > - return; > > + return 0; > > > > cached_time = READ_ONCE(rx_ring->cached_phctime); > > > > /* Do not report a timestamp if we don't have a cached PHC time */ > > if (!cached_time) > > - return; > > + return 0; > > > > /* Use ice_ptp_extend_32b_ts directly, using the ring-specific cached > > * PHC value, rather than accessing the PF. This also allows us to > > @@ -2137,9 +2133,7 @@ ice_ptp_rx_hwtstamp(struct ice_rx_ring *rx_ring, > > ts_high = le32_to_cpu(rx_desc->wb.flex_ts.ts_high); > > ts_ns = ice_ptp_extend_32b_ts(cached_time, ts_high); > > > > - hwtstamps = skb_hwtstamps(skb); > > - memset(hwtstamps, 0, sizeof(*hwtstamps)); > > - hwtstamps->hwtstamp = ns_to_ktime(ts_ns); > > + return ts_ns; > > } > > > > /** > > diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.h b/drivers/net/ethernet/intel/ice/ice_ptp.h > > index 8f6f94392756..0274da964fe3 100644 > > --- a/drivers/net/ethernet/intel/ice/ice_ptp.h > > +++ b/drivers/net/ethernet/intel/ice/ice_ptp.h > > @@ -298,9 +298,8 @@ void ice_ptp_extts_event(struct ice_pf *pf); > > s8 ice_ptp_request_ts(struct ice_ptp_tx *tx, struct sk_buff *skb); > > enum ice_tx_tstamp_work ice_ptp_process_ts(struct ice_pf *pf); > > > > -void > > -ice_ptp_rx_hwtstamp(struct ice_rx_ring *rx_ring, > > - union ice_32b_rx_flex_desc *rx_desc, struct sk_buff *skb); > > +u64 ice_ptp_get_rx_hwts(const union ice_32b_rx_flex_desc *rx_desc, > > + struct ice_rx_ring *rx_ring); > > void ice_ptp_reset(struct ice_pf *pf); > > void ice_ptp_prepare_for_reset(struct ice_pf *pf); > > void ice_ptp_init(struct ice_pf *pf); > > @@ -330,9 +329,14 @@ static inline bool ice_ptp_process_ts(struct ice_pf *pf) > > { > > return true; > > } > > -static inline void > > -ice_ptp_rx_hwtstamp(struct ice_rx_ring *rx_ring, > > - union ice_32b_rx_flex_desc *rx_desc, struct sk_buff *skb) { } > > + > > +static inline u64 > > +ice_ptp_get_rx_hwts(const union ice_32b_rx_flex_desc *rx_desc, > > + struct ice_rx_ring *rx_ring) > > +{ > > + return 0; > > +} > > + > > static inline void ice_ptp_reset(struct ice_pf *pf) { } > > static inline void ice_ptp_prepare_for_reset(struct ice_pf *pf) { } > > static inline void ice_ptp_init(struct ice_pf *pf) { } > > diff --git a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c > > index 17530359aaf8..c4dbbb246946 100644 > > --- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c > > +++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c > > @@ -184,6 +184,26 @@ ice_rx_csum(struct ice_rx_ring *ring, struct sk_buff *skb, > > ring->vsi->back->hw_csum_rx_error++; > > } > > > > +/** > > + * ice_ptp_rx_hwts_to_skb - Put RX timestamp into skb > > + * @rx_ring: Ring to get the VSI info > > + * @rx_desc: Receive descriptor > > + * @skb: Particular skb to send timestamp with > > + * > > + * The timestamp is in ns, so we must convert the result first. > > + */ > > +static void > > +ice_ptp_rx_hwts_to_skb(struct ice_rx_ring *rx_ring, > > + const union ice_32b_rx_flex_desc *rx_desc, > > + struct sk_buff *skb) > > +{ > > + u64 ts_ns = ice_ptp_get_rx_hwts(rx_desc, rx_ring); > > + > > + *skb_hwtstamps(skb) = (struct skb_shared_hwtstamps){ > > + .hwtstamp = ns_to_ktime(ts_ns), > > + }; > > could this just be > > skb_hwtstamps(skb)->hwtstamp = ns_to_ktime(ts_ns); > > ? > Seem so. The previous logic was basically: memset(skb_hwtstamps(skb), 0, sizeof(*skb_hwtstamps(skb))); skb_hwtstamps(skb)->hwtstamp = ns_to_ktime(ts_ns); So it was changed to a more nice-looking '= {}' construct after Olek's review. Honestly, I've thought memset serves some purpose, but after actually looking at the structures it does not seem so. Also, not only intel drivers do such thing, seems like some historical artifact. TLDR: will change :) > > +} > > + > > /** > > * ice_process_skb_fields - Populate skb header fields from Rx descriptor > > * @rx_ring: Rx descriptor ring packet is being transacted on > > @@ -208,7 +228,7 @@ ice_process_skb_fields(struct ice_rx_ring *rx_ring, > > ice_rx_csum(rx_ring, skb, rx_desc, ptype); > > > > if (rx_ring->ptp_rx) > > - ice_ptp_rx_hwtstamp(rx_ring, rx_desc, skb); > > + ice_ptp_rx_hwts_to_skb(rx_ring, rx_desc, skb); > > } > > > > /** > > -- > > 2.41.0 > >
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c index 1eddcbe89b0c..a435f89b262f 100644 --- a/drivers/net/ethernet/intel/ice/ice_ptp.c +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c @@ -2103,30 +2103,26 @@ int ice_ptp_set_ts_config(struct ice_pf *pf, struct ifreq *ifr) } /** - * ice_ptp_rx_hwtstamp - Check for an Rx timestamp - * @rx_ring: Ring to get the VSI info + * ice_ptp_get_rx_hwts - Get packet Rx timestamp in ns * @rx_desc: Receive descriptor - * @skb: Particular skb to send timestamp with + * @rx_ring: Ring to get the cached time * * The driver receives a notification in the receive descriptor with timestamp. - * The timestamp is in ns, so we must convert the result first. */ -void -ice_ptp_rx_hwtstamp(struct ice_rx_ring *rx_ring, - union ice_32b_rx_flex_desc *rx_desc, struct sk_buff *skb) +u64 ice_ptp_get_rx_hwts(const union ice_32b_rx_flex_desc *rx_desc, + struct ice_rx_ring *rx_ring) { - struct skb_shared_hwtstamps *hwtstamps; u64 ts_ns, cached_time; u32 ts_high; if (!(rx_desc->wb.time_stamp_low & ICE_PTP_TS_VALID)) - return; + return 0; cached_time = READ_ONCE(rx_ring->cached_phctime); /* Do not report a timestamp if we don't have a cached PHC time */ if (!cached_time) - return; + return 0; /* Use ice_ptp_extend_32b_ts directly, using the ring-specific cached * PHC value, rather than accessing the PF. This also allows us to @@ -2137,9 +2133,7 @@ ice_ptp_rx_hwtstamp(struct ice_rx_ring *rx_ring, ts_high = le32_to_cpu(rx_desc->wb.flex_ts.ts_high); ts_ns = ice_ptp_extend_32b_ts(cached_time, ts_high); - hwtstamps = skb_hwtstamps(skb); - memset(hwtstamps, 0, sizeof(*hwtstamps)); - hwtstamps->hwtstamp = ns_to_ktime(ts_ns); + return ts_ns; } /** diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.h b/drivers/net/ethernet/intel/ice/ice_ptp.h index 8f6f94392756..0274da964fe3 100644 --- a/drivers/net/ethernet/intel/ice/ice_ptp.h +++ b/drivers/net/ethernet/intel/ice/ice_ptp.h @@ -298,9 +298,8 @@ void ice_ptp_extts_event(struct ice_pf *pf); s8 ice_ptp_request_ts(struct ice_ptp_tx *tx, struct sk_buff *skb); enum ice_tx_tstamp_work ice_ptp_process_ts(struct ice_pf *pf); -void -ice_ptp_rx_hwtstamp(struct ice_rx_ring *rx_ring, - union ice_32b_rx_flex_desc *rx_desc, struct sk_buff *skb); +u64 ice_ptp_get_rx_hwts(const union ice_32b_rx_flex_desc *rx_desc, + struct ice_rx_ring *rx_ring); void ice_ptp_reset(struct ice_pf *pf); void ice_ptp_prepare_for_reset(struct ice_pf *pf); void ice_ptp_init(struct ice_pf *pf); @@ -330,9 +329,14 @@ static inline bool ice_ptp_process_ts(struct ice_pf *pf) { return true; } -static inline void -ice_ptp_rx_hwtstamp(struct ice_rx_ring *rx_ring, - union ice_32b_rx_flex_desc *rx_desc, struct sk_buff *skb) { } + +static inline u64 +ice_ptp_get_rx_hwts(const union ice_32b_rx_flex_desc *rx_desc, + struct ice_rx_ring *rx_ring) +{ + return 0; +} + static inline void ice_ptp_reset(struct ice_pf *pf) { } static inline void ice_ptp_prepare_for_reset(struct ice_pf *pf) { } static inline void ice_ptp_init(struct ice_pf *pf) { } diff --git a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c index 17530359aaf8..c4dbbb246946 100644 --- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c +++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c @@ -184,6 +184,26 @@ ice_rx_csum(struct ice_rx_ring *ring, struct sk_buff *skb, ring->vsi->back->hw_csum_rx_error++; } +/** + * ice_ptp_rx_hwts_to_skb - Put RX timestamp into skb + * @rx_ring: Ring to get the VSI info + * @rx_desc: Receive descriptor + * @skb: Particular skb to send timestamp with + * + * The timestamp is in ns, so we must convert the result first. + */ +static void +ice_ptp_rx_hwts_to_skb(struct ice_rx_ring *rx_ring, + const union ice_32b_rx_flex_desc *rx_desc, + struct sk_buff *skb) +{ + u64 ts_ns = ice_ptp_get_rx_hwts(rx_desc, rx_ring); + + *skb_hwtstamps(skb) = (struct skb_shared_hwtstamps){ + .hwtstamp = ns_to_ktime(ts_ns), + }; +} + /** * ice_process_skb_fields - Populate skb header fields from Rx descriptor * @rx_ring: Rx descriptor ring packet is being transacted on @@ -208,7 +228,7 @@ ice_process_skb_fields(struct ice_rx_ring *rx_ring, ice_rx_csum(rx_ring, skb, rx_desc, ptype); if (rx_ring->ptp_rx) - ice_ptp_rx_hwtstamp(rx_ring, rx_desc, skb); + ice_ptp_rx_hwts_to_skb(rx_ring, rx_desc, skb); } /**
Previously, we only needed RX HW timestamp in skb path, hence all related code was written with skb in mind. But with the addition of XDP hints via kfuncs to the ice driver, the same logic will be needed in .xmo_() callbacks. Put generic process of reading RX HW timestamp from a descriptor into a separate function. Move skb-related code into another source file. Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com> --- drivers/net/ethernet/intel/ice/ice_ptp.c | 20 ++++++----------- drivers/net/ethernet/intel/ice/ice_ptp.h | 16 +++++++++----- drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 22 ++++++++++++++++++- 3 files changed, 38 insertions(+), 20 deletions(-)