| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <1dc15200-ee39-4134-9d2a-56bdd8c53b40@linux.dev>
Date: Thu, 14 Nov 2024 11:01:01 +0000
From: Vadim Fedorenko <vadim.fedorenko@...ux.dev>
To: Milena Olech <milena.olech@...el.com>, intel-wired-lan@...ts.osuosl.org
Cc: netdev@...r.kernel.org, anthony.l.nguyen@...el.com,
przemyslaw.kitszel@...el.com,
Alexander Lobakin <aleksander.lobakin@...el.com>
Subject: Re: [PATCH iwl-net 01/10] idpf: initial PTP support
On 13/11/2024 15:46, Milena Olech wrote:
> PTP feature is supported if the VIRTCHNL2_CAP_PTP is negotiated during the
> capabilities recognition. Initial PTP support includes PTP initialization
> and registration of the clock.
>
> Reviewed-by: Alexander Lobakin <aleksander.lobakin@...el.com>
> Signed-off-by: Milena Olech <milena.olech@...el.com>
> ---
> drivers/net/ethernet/intel/idpf/Kconfig | 1 +
> drivers/net/ethernet/intel/idpf/Makefile | 1 +
> drivers/net/ethernet/intel/idpf/idpf.h | 3 +
> drivers/net/ethernet/intel/idpf/idpf_main.c | 4 +
> drivers/net/ethernet/intel/idpf/idpf_ptp.c | 89 +++++++++++++++++++
> drivers/net/ethernet/intel/idpf/idpf_ptp.h | 32 +++++++
> .../net/ethernet/intel/idpf/idpf_virtchnl.c | 9 +-
> 7 files changed, 138 insertions(+), 1 deletion(-)
> create mode 100644 drivers/net/ethernet/intel/idpf/idpf_ptp.c
> create mode 100644 drivers/net/ethernet/intel/idpf/idpf_ptp.h
>
> diff --git a/drivers/net/ethernet/intel/idpf/Kconfig b/drivers/net/ethernet/intel/idpf/Kconfig
> index 1addd663acad..2c359a8551c7 100644
> --- a/drivers/net/ethernet/intel/idpf/Kconfig
> +++ b/drivers/net/ethernet/intel/idpf/Kconfig
> @@ -4,6 +4,7 @@
> config IDPF
> tristate "Intel(R) Infrastructure Data Path Function Support"
> depends on PCI_MSI
> + depends on PTP_1588_CLOCK_OPTIONAL
> select DIMLIB
> select LIBETH
> help
> diff --git a/drivers/net/ethernet/intel/idpf/Makefile b/drivers/net/ethernet/intel/idpf/Makefile
> index 2ce01a0b5898..1f38a9d7125c 100644
> --- a/drivers/net/ethernet/intel/idpf/Makefile
> +++ b/drivers/net/ethernet/intel/idpf/Makefile
> @@ -17,3 +17,4 @@ idpf-y := \
> idpf_vf_dev.o
>
> idpf-$(CONFIG_IDPF_SINGLEQ) += idpf_singleq_txrx.o
> +idpf-$(CONFIG_PTP_1588_CLOCK) += idpf_ptp.o
> diff --git a/drivers/net/ethernet/intel/idpf/idpf.h b/drivers/net/ethernet/intel/idpf/idpf.h
> index 66544faab710..2e8b14dd9d96 100644
> --- a/drivers/net/ethernet/intel/idpf/idpf.h
> +++ b/drivers/net/ethernet/intel/idpf/idpf.h
> @@ -530,6 +530,7 @@ struct idpf_vc_xn_manager;
> * @vector_lock: Lock to protect vector distribution
> * @queue_lock: Lock to protect queue distribution
> * @vc_buf_lock: Lock to protect virtchnl buffer
> + * @ptp: Storage for PTP-related data
> */
> struct idpf_adapter {
> struct pci_dev *pdev;
> @@ -587,6 +588,8 @@ struct idpf_adapter {
> struct mutex vector_lock;
> struct mutex queue_lock;
> struct mutex vc_buf_lock;
> +
> + struct idpf_ptp *ptp;
> };
>
> /**
> diff --git a/drivers/net/ethernet/intel/idpf/idpf_main.c b/drivers/net/ethernet/intel/idpf/idpf_main.c
> index db476b3314c8..22d9e2646444 100644
> --- a/drivers/net/ethernet/intel/idpf/idpf_main.c
> +++ b/drivers/net/ethernet/intel/idpf/idpf_main.c
> @@ -163,6 +163,10 @@ static int idpf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> goto err_free;
> }
>
> + err = pci_enable_ptm(pdev, NULL);
> + if (err)
> + pci_dbg(pdev, "PCIe PTM is not supported by PCIe bus/controller\n");
> +
> /* set up for high or low dma */
> err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
> if (err) {
> diff --git a/drivers/net/ethernet/intel/idpf/idpf_ptp.c b/drivers/net/ethernet/intel/idpf/idpf_ptp.c
> new file mode 100644
> index 000000000000..1ac6367f5989
> --- /dev/null
> +++ b/drivers/net/ethernet/intel/idpf/idpf_ptp.c
> @@ -0,0 +1,89 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/* Copyright (C) 2024 Intel Corporation */
> +
> +#include "idpf.h"
> +#include "idpf_ptp.h"
> +
> +/**
> + * idpf_ptp_create_clock - Create PTP clock device for userspace
> + * @adapter: Driver specific private structure
> + *
> + * This function creates a new PTP clock device.
> + *
> + * Return: 0 on success, -errno otherwise.
> + */
> +static int idpf_ptp_create_clock(const struct idpf_adapter *adapter)
> +{
> + struct ptp_clock *clock;
> +
> + /* Attempt to register the clock before enabling the hardware. */
> + clock = ptp_clock_register(&adapter->ptp->info,
> + &adapter->pdev->dev);
> + if (IS_ERR(clock)) {
> + pci_err(adapter->pdev, "PTP clock creation failed: %pe\n", clock);
> + return PTR_ERR(clock);
> + }
> +
> + adapter->ptp->clock = clock;
> +
> + return 0;
> +}
> +
> +/**
> + * idpf_ptp_init - Initialize PTP hardware clock support
> + * @adapter: Driver specific private structure
> + *
> + * Set up the device for interacting with the PTP hardware clock for all
> + * functions. Function will allocate and register a ptp_clock with the
> + * PTP_1588_CLOCK infrastructure.
> + *
> + * Return: 0 on success, -errno otherwise.
> + */
> +int idpf_ptp_init(struct idpf_adapter *adapter)
> +{
> + int err;
> +
> + if (!idpf_is_cap_ena(adapter, IDPF_OTHER_CAPS, VIRTCHNL2_CAP_PTP)) {
> + pci_dbg(adapter->pdev, "PTP capability is not detected\n");
> + return -EOPNOTSUPP;
> + }
> +
> + adapter->ptp = kzalloc(sizeof(*adapter->ptp), GFP_KERNEL);
> + if (!adapter->ptp)
> + return -ENOMEM;
> +
> + /* add a back pointer to adapter */
> + adapter->ptp->adapter = adapter;
> +
> + err = idpf_ptp_create_clock(adapter);
> + if (err)
> + goto free_ptp;
> +
> + pci_dbg(adapter->pdev, "PTP init successful\n");
> +
> + return 0;
> +
> +free_ptp:
> + kfree(adapter->ptp);
> + adapter->ptp = NULL;
> +
> + return err;
> +}
> +
> +/**
> + * idpf_ptp_release - Clear PTP hardware clock support
> + * @adapter: Driver specific private structure
> + */
> +void idpf_ptp_release(struct idpf_adapter *adapter)
> +{
> + struct idpf_ptp *ptp = adapter->ptp;
> +
> + if (!ptp)
> + return;
> +
> + if (ptp->clock)
> + ptp_clock_unregister(ptp->clock);
> +
> + kfree(ptp);
> + adapter->ptp = NULL;
> +}
> diff --git a/drivers/net/ethernet/intel/idpf/idpf_ptp.h b/drivers/net/ethernet/intel/idpf/idpf_ptp.h
> new file mode 100644
> index 000000000000..cb19988ca60f
> --- /dev/null
> +++ b/drivers/net/ethernet/intel/idpf/idpf_ptp.h
> @@ -0,0 +1,32 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +/* Copyright (C) 2024 Intel Corporation */
> +
> +#ifndef _IDPF_PTP_H
> +#define _IDPF_PTP_H
> +
> +#include <linux/ptp_clock_kernel.h>
> +
> +/**
> + * struct idpf_ptp - PTP parameters
> + * @info: structure defining PTP hardware capabilities
> + * @clock: pointer to registered PTP clock device
> + * @adapter: back pointer to the adapter
> + */
> +struct idpf_ptp {
> + struct ptp_clock_info info;
> + struct ptp_clock *clock;
> + struct idpf_adapter *adapter;
> +};
> +
> +#if IS_ENABLED(CONFIG_PTP_1588_CLOCK)
> +int idpf_ptp_init(struct idpf_adapter *adapter);
> +void idpf_ptp_release(struct idpf_adapter *adapter);
> +#else /* CONFIG_PTP_1588_CLOCK */
> +static inline int idpf_ptp_init(struct idpf_adapter *adpater)
> +{
> + return 0;
> +}
> +
> +static inline void idpf_ptp_release(struct idpf_adapter *adpater) { }
> +#endif /* CONFIG_PTP_1588_CLOCK */
> +#endif /* _IDPF_PTP_H */
> diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
> index d46c95f91b0d..c73c38511ea3 100644
> --- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
> +++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
> @@ -5,6 +5,7 @@
>
> #include "idpf.h"
> #include "idpf_virtchnl.h"
> +#include "idpf_ptp.h"
>
> #define IDPF_VC_XN_MIN_TIMEOUT_MSEC 2000
> #define IDPF_VC_XN_DEFAULT_TIMEOUT_MSEC (60 * 1000)
> @@ -896,7 +897,8 @@ static int idpf_send_get_caps_msg(struct idpf_adapter *adapter)
> VIRTCHNL2_CAP_MACFILTER |
> VIRTCHNL2_CAP_SPLITQ_QSCHED |
> VIRTCHNL2_CAP_PROMISC |
> - VIRTCHNL2_CAP_LOOPBACK);
> + VIRTCHNL2_CAP_LOOPBACK |
> + VIRTCHNL2_CAP_PTP);
>
> xn_params.vc_op = VIRTCHNL2_OP_GET_CAPS;
> xn_params.send_buf.iov_base = ∩︀
> @@ -3025,6 +3027,10 @@ int idpf_vc_core_init(struct idpf_adapter *adapter)
> goto err_intr_req;
> }
>
> + err = idpf_ptp_init(adapter);
> + if (err)
> + pci_err(adapter->pdev, "PTP init failed, err=%pe\n", ERR_PTR(err));
> +
> idpf_init_avail_queues(adapter);
>
> /* Skew the delay for init tasks for each function based on fn number
> @@ -3080,6 +3086,7 @@ void idpf_vc_core_deinit(struct idpf_adapter *adapter)
> if (!test_bit(IDPF_VC_CORE_INIT, adapter->flags))
> return;
>
> + idpf_ptp_release(adapter);
> idpf_deinit_task(adapter);
> idpf_intr_rel(adapter);
> idpf_vc_xn_shutdown(adapter->vcxn_mngr);
Reviewed-by: Vadim Fedorenko <vadim.fedorenko@...ux.dev>
Powered by blists - more mailing lists