| Message ID | 20220831101631.13585-2-ihuguet@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | sfc: add support for PTP over IPv6 and 802.3 | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/fixes_present | success | Fixes tag not required for -next series |
| netdev/subject_prefix | success | Link |
| netdev/cover_letter | success | Series has a cover letter |
| netdev/patch_count | success | Link |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/cc_maintainers | success | CCed 7 of 7 maintainers |
| netdev/build_clang | success | Errors and warnings before: 0 this patch: 0 |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/check_selftest | success | No net selftest shell script |
| netdev/verify_fixes | success | No Fixes tag |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 116 lines checked |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
On 31/08/2022 11:16, Íñigo Huguet wrote: > In preparation for the support of PTP over IPv6/UDP and Ethernet in next > patches, allow a more flexible way of adding and removing RX filters for > PTP. Right now, only 2 filters are allowed, which are the ones needed > for PTP over IPv4/UDP. > > Signed-off-by: Íñigo Huguet <ihuguet@redhat.com> > --- > drivers/net/ethernet/sfc/ptp.c | 67 ++++++++++++++++------------------ > 1 file changed, 31 insertions(+), 36 deletions(-) > > diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c > index 10ad0b93d283..719005d79943 100644 > --- a/drivers/net/ethernet/sfc/ptp.c > +++ b/drivers/net/ethernet/sfc/ptp.c > @@ -118,6 +118,8 @@ > > #define PTP_MIN_LENGTH 63 > > +#define PTP_RXFILTERS_LEN 2 > + > #define PTP_ADDRESS 0xe0000181 /* 224.0.1.129 */ > #define PTP_EVENT_PORT 319 > #define PTP_GENERAL_PORT 320 > @@ -224,9 +226,8 @@ struct efx_ptp_timeset { > * @work: Work task > * @reset_required: A serious error has occurred and the PTP task needs to be > * reset (disable, enable). > - * @rxfilter_event: Receive filter when operating > - * @rxfilter_general: Receive filter when operating > - * @rxfilter_installed: Receive filter installed > + * @rxfilters: Receive filters when operating > + * @rxfilters_count: Num of installed rxfilters, should be == PTP_RXFILTERS_LEN > * @config: Current timestamp configuration > * @enabled: PTP operation enabled > * @mode: Mode in which PTP operating (PTP version) > @@ -295,9 +296,8 @@ struct efx_ptp_data { > struct workqueue_struct *workwq; > struct work_struct work; > bool reset_required; > - u32 rxfilter_event; > - u32 rxfilter_general; > - bool rxfilter_installed; > + u32 rxfilters[PTP_RXFILTERS_LEN]; > + size_t rxfilters_count; > struct hwtstamp_config config; > bool enabled; > unsigned int mode; > @@ -1290,61 +1290,56 @@ static void efx_ptp_remove_multicast_filters(struct efx_nic *efx) > { > struct efx_ptp_data *ptp = efx->ptp_data; > > - if (ptp->rxfilter_installed) { > - efx_filter_remove_id_safe(efx, EFX_FILTER_PRI_REQUIRED, > - ptp->rxfilter_general); > + while (ptp->rxfilters_count) { > + ptp->rxfilters_count--; > efx_filter_remove_id_safe(efx, EFX_FILTER_PRI_REQUIRED, > - ptp->rxfilter_event); > - ptp->rxfilter_installed = false; > + ptp->rxfilters[ptp->rxfilters_count]); > } > } > > -static int efx_ptp_insert_multicast_filters(struct efx_nic *efx) > +static int efx_ptp_insert_ipv4_filter(struct efx_nic *efx, u16 port) > { > struct efx_ptp_data *ptp = efx->ptp_data; > struct efx_filter_spec rxfilter; > int rc; > > - if (!ptp->channel || ptp->rxfilter_installed) > - return 0; > - > - /* Must filter on both event and general ports to ensure > - * that there is no packet re-ordering. > - */ Rather than losing this comment... > efx_filter_init_rx(&rxfilter, EFX_FILTER_PRI_REQUIRED, 0, > efx_rx_queue_index( > efx_channel_get_rx_queue(ptp->channel))); > - rc = efx_filter_set_ipv4_local(&rxfilter, IPPROTO_UDP, > - htonl(PTP_ADDRESS), > - htons(PTP_EVENT_PORT)); > - if (rc != 0) > - return rc; > + > + efx_filter_set_ipv4_local(&rxfilter, IPPROTO_UDP, htonl(PTP_ADDRESS), > + htons(port)); > > rc = efx_filter_insert_filter(efx, &rxfilter, true); > if (rc < 0) > return rc; > - ptp->rxfilter_event = rc; > > - efx_filter_init_rx(&rxfilter, EFX_FILTER_PRI_REQUIRED, 0, > - efx_rx_queue_index( > - efx_channel_get_rx_queue(ptp->channel))); > - rc = efx_filter_set_ipv4_local(&rxfilter, IPPROTO_UDP, > - htonl(PTP_ADDRESS), > - htons(PTP_GENERAL_PORT)); > - if (rc != 0) > + ptp->rxfilters[ptp->rxfilters_count] = rc; > + ptp->rxfilters_count++; > + > + return 0; > +} > + > +static int efx_ptp_insert_multicast_filters(struct efx_nic *efx) > +{ > + struct efx_ptp_data *ptp = efx->ptp_data; > + int rc; > + > + if (!ptp->channel || ptp->rxfilters_count) > + return 0; > + ... could it not migrate to here? Otherwise looks good. -ed > + rc = efx_ptp_insert_ipv4_filter(efx, PTP_EVENT_PORT); > + if (rc < 0) > goto fail; > > - rc = efx_filter_insert_filter(efx, &rxfilter, true); > + rc = efx_ptp_insert_ipv4_filter(efx, PTP_GENERAL_PORT); > if (rc < 0) > goto fail; > - ptp->rxfilter_general = rc; > > - ptp->rxfilter_installed = true; > return 0; > > fail: > - efx_filter_remove_id_safe(efx, EFX_FILTER_PRI_REQUIRED, > - ptp->rxfilter_event); > + efx_ptp_remove_multicast_filters(efx); > return rc; > } > >
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c index 10ad0b93d283..719005d79943 100644 --- a/drivers/net/ethernet/sfc/ptp.c +++ b/drivers/net/ethernet/sfc/ptp.c @@ -118,6 +118,8 @@ #define PTP_MIN_LENGTH 63 +#define PTP_RXFILTERS_LEN 2 + #define PTP_ADDRESS 0xe0000181 /* 224.0.1.129 */ #define PTP_EVENT_PORT 319 #define PTP_GENERAL_PORT 320 @@ -224,9 +226,8 @@ struct efx_ptp_timeset { * @work: Work task * @reset_required: A serious error has occurred and the PTP task needs to be * reset (disable, enable). - * @rxfilter_event: Receive filter when operating - * @rxfilter_general: Receive filter when operating - * @rxfilter_installed: Receive filter installed + * @rxfilters: Receive filters when operating + * @rxfilters_count: Num of installed rxfilters, should be == PTP_RXFILTERS_LEN * @config: Current timestamp configuration * @enabled: PTP operation enabled * @mode: Mode in which PTP operating (PTP version) @@ -295,9 +296,8 @@ struct efx_ptp_data { struct workqueue_struct *workwq; struct work_struct work; bool reset_required; - u32 rxfilter_event; - u32 rxfilter_general; - bool rxfilter_installed; + u32 rxfilters[PTP_RXFILTERS_LEN]; + size_t rxfilters_count; struct hwtstamp_config config; bool enabled; unsigned int mode; @@ -1290,61 +1290,56 @@ static void efx_ptp_remove_multicast_filters(struct efx_nic *efx) { struct efx_ptp_data *ptp = efx->ptp_data; - if (ptp->rxfilter_installed) { - efx_filter_remove_id_safe(efx, EFX_FILTER_PRI_REQUIRED, - ptp->rxfilter_general); + while (ptp->rxfilters_count) { + ptp->rxfilters_count--; efx_filter_remove_id_safe(efx, EFX_FILTER_PRI_REQUIRED, - ptp->rxfilter_event); - ptp->rxfilter_installed = false; + ptp->rxfilters[ptp->rxfilters_count]); } } -static int efx_ptp_insert_multicast_filters(struct efx_nic *efx) +static int efx_ptp_insert_ipv4_filter(struct efx_nic *efx, u16 port) { struct efx_ptp_data *ptp = efx->ptp_data; struct efx_filter_spec rxfilter; int rc; - if (!ptp->channel || ptp->rxfilter_installed) - return 0; - - /* Must filter on both event and general ports to ensure - * that there is no packet re-ordering. - */ efx_filter_init_rx(&rxfilter, EFX_FILTER_PRI_REQUIRED, 0, efx_rx_queue_index( efx_channel_get_rx_queue(ptp->channel))); - rc = efx_filter_set_ipv4_local(&rxfilter, IPPROTO_UDP, - htonl(PTP_ADDRESS), - htons(PTP_EVENT_PORT)); - if (rc != 0) - return rc; + + efx_filter_set_ipv4_local(&rxfilter, IPPROTO_UDP, htonl(PTP_ADDRESS), + htons(port)); rc = efx_filter_insert_filter(efx, &rxfilter, true); if (rc < 0) return rc; - ptp->rxfilter_event = rc; - efx_filter_init_rx(&rxfilter, EFX_FILTER_PRI_REQUIRED, 0, - efx_rx_queue_index( - efx_channel_get_rx_queue(ptp->channel))); - rc = efx_filter_set_ipv4_local(&rxfilter, IPPROTO_UDP, - htonl(PTP_ADDRESS), - htons(PTP_GENERAL_PORT)); - if (rc != 0) + ptp->rxfilters[ptp->rxfilters_count] = rc; + ptp->rxfilters_count++; + + return 0; +} + +static int efx_ptp_insert_multicast_filters(struct efx_nic *efx) +{ + struct efx_ptp_data *ptp = efx->ptp_data; + int rc; + + if (!ptp->channel || ptp->rxfilters_count) + return 0; + + rc = efx_ptp_insert_ipv4_filter(efx, PTP_EVENT_PORT); + if (rc < 0) goto fail; - rc = efx_filter_insert_filter(efx, &rxfilter, true); + rc = efx_ptp_insert_ipv4_filter(efx, PTP_GENERAL_PORT); if (rc < 0) goto fail; - ptp->rxfilter_general = rc; - ptp->rxfilter_installed = true; return 0; fail: - efx_filter_remove_id_safe(efx, EFX_FILTER_PRI_REQUIRED, - ptp->rxfilter_event); + efx_ptp_remove_multicast_filters(efx); return rc; }
In preparation for the support of PTP over IPv6/UDP and Ethernet in next patches, allow a more flexible way of adding and removing RX filters for PTP. Right now, only 2 filters are allowed, which are the ones needed for PTP over IPv4/UDP. Signed-off-by: Íñigo Huguet <ihuguet@redhat.com> --- drivers/net/ethernet/sfc/ptp.c | 67 ++++++++++++++++------------------ 1 file changed, 31 insertions(+), 36 deletions(-)