| 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
| ||
|
Date: Mon, 5 Jun 2023 16:51:21 +0200
From: Larysa Zaremba <larysa.zaremba@...el.com>
To: Juhee Kang <claudiajkang@...il.com>
CC: <netdev@...r.kernel.org>, <kuba@...nel.org>, <pabeni@...hat.com>,
<davem@...emloft.net>, <edumazet@...gle.com>, <leon@...nel.org>,
<saeedm@...dia.com>
Subject: Re: [net-next PATCH] net/mlx5: Add header file for events
On Mon, Jun 05, 2023 at 04:51:36PM +0900, Juhee Kang wrote:
> Separate the event API defined in the generic mlx5.h header into
> a dedicated header. And remove the TODO comment in commit
> 69c1280b1f3b ("net/mlx5: Device events, Use async events chain").
>
Reviewed-by: Larysa Zaremba <larysa.zaremba@...el.com>
> Signed-off-by: Juhee Kang <claudiajkang@...il.com>
> ---
> .../ethernet/mellanox/mlx5/core/en_stats.c | 2 +-
> .../net/ethernet/mellanox/mlx5/core/events.c | 2 +-
> .../net/ethernet/mellanox/mlx5/core/health.c | 1 +
> .../net/ethernet/mellanox/mlx5/core/lag/mp.c | 2 +-
> .../ethernet/mellanox/mlx5/core/lag/mpesw.c | 2 +-
> .../ethernet/mellanox/mlx5/core/lib/events.h | 40 +++++++++++++++++++
> .../ethernet/mellanox/mlx5/core/lib/mlx5.h | 34 ----------------
> 7 files changed, 45 insertions(+), 38 deletions(-)
> create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/events.h
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
> index f1d9596905c6..1ba70a90a476 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
> @@ -30,7 +30,7 @@
> * SOFTWARE.
> */
>
> -#include "lib/mlx5.h"
> +#include "lib/events.h"
> #include "en.h"
> #include "en_accel/ktls.h"
> #include "en_accel/en_accel.h"
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/events.c b/drivers/net/ethernet/mellanox/mlx5/core/events.c
> index 718cf09c28ce..3ec892d51f57 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/events.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/events.c
> @@ -5,7 +5,7 @@
>
> #include "mlx5_core.h"
> #include "lib/eq.h"
> -#include "lib/mlx5.h"
> +#include "lib/events.h"
>
> struct mlx5_event_nb {
> struct mlx5_nb nb;
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/health.c b/drivers/net/ethernet/mellanox/mlx5/core/health.c
> index 871c32dda66e..168c9e9ed2a7 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/health.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/health.c
> @@ -39,6 +39,7 @@
> #include "mlx5_core.h"
> #include "lib/eq.h"
> #include "lib/mlx5.h"
> +#include "lib/events.h"
> #include "lib/pci_vsc.h"
> #include "lib/tout.h"
> #include "diag/fw_tracer.h"
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c
> index d85a8dfc153d..00da17d502e6 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c
> @@ -7,7 +7,7 @@
> #include "lag/mp.h"
> #include "mlx5_core.h"
> #include "eswitch.h"
> -#include "lib/mlx5.h"
> +#include "lib/events.h"
>
> static bool __mlx5_lag_is_multipath(struct mlx5_lag *ldev)
> {
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c
> index 0c0ef600f643..604bb1914d9a 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/lag/mpesw.c
> @@ -6,7 +6,7 @@
> #include "lag/lag.h"
> #include "eswitch.h"
> #include "esw/acl/ofld.h"
> -#include "lib/mlx5.h"
> +#include "lib/events.h"
>
> static void mlx5_mpesw_metadata_cleanup(struct mlx5_lag *ldev)
> {
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/events.h b/drivers/net/ethernet/mellanox/mlx5/core/lib/events.h
> new file mode 100644
> index 000000000000..a0f7faea317b
> --- /dev/null
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/events.h
> @@ -0,0 +1,40 @@
> +/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */
> +/* Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. */
> +
> +#ifndef __LIB_EVENTS_H__
> +#define __LIB_EVENTS_H__
> +
> +#include "mlx5_core.h"
> +
> +#define PORT_MODULE_EVENT_MODULE_STATUS_MASK 0xF
> +#define PORT_MODULE_EVENT_ERROR_TYPE_MASK 0xF
> +
> +enum port_module_event_status_type {
> + MLX5_MODULE_STATUS_PLUGGED = 0x1,
> + MLX5_MODULE_STATUS_UNPLUGGED = 0x2,
> + MLX5_MODULE_STATUS_ERROR = 0x3,
> + MLX5_MODULE_STATUS_DISABLED = 0x4,
> + MLX5_MODULE_STATUS_NUM,
> +};
> +
> +enum port_module_event_error_type {
> + MLX5_MODULE_EVENT_ERROR_POWER_BUDGET_EXCEEDED = 0x0,
> + MLX5_MODULE_EVENT_ERROR_LONG_RANGE_FOR_NON_MLNX = 0x1,
> + MLX5_MODULE_EVENT_ERROR_BUS_STUCK = 0x2,
> + MLX5_MODULE_EVENT_ERROR_NO_EEPROM_RETRY_TIMEOUT = 0x3,
> + MLX5_MODULE_EVENT_ERROR_ENFORCE_PART_NUMBER_LIST = 0x4,
> + MLX5_MODULE_EVENT_ERROR_UNKNOWN_IDENTIFIER = 0x5,
> + MLX5_MODULE_EVENT_ERROR_HIGH_TEMPERATURE = 0x6,
> + MLX5_MODULE_EVENT_ERROR_BAD_CABLE = 0x7,
> + MLX5_MODULE_EVENT_ERROR_PCIE_POWER_SLOT_EXCEEDED = 0xc,
> + MLX5_MODULE_EVENT_ERROR_NUM,
> +};
> +
> +struct mlx5_pme_stats {
> + u64 status_counters[MLX5_MODULE_STATUS_NUM];
> + u64 error_counters[MLX5_MODULE_EVENT_ERROR_NUM];
> +};
> +
> +void mlx5_get_pme_stats(struct mlx5_core_dev *dev, struct mlx5_pme_stats *stats);
> +int mlx5_notifier_call_chain(struct mlx5_events *events, unsigned int event, void *data);
> +#endif
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h b/drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h
> index ccf12f7db6f0..2b5826a785c4 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h
> @@ -45,40 +45,6 @@ int mlx5_crdump_enable(struct mlx5_core_dev *dev);
> void mlx5_crdump_disable(struct mlx5_core_dev *dev);
> int mlx5_crdump_collect(struct mlx5_core_dev *dev, u32 *cr_data);
>
> -/* TODO move to lib/events.h */
> -
> -#define PORT_MODULE_EVENT_MODULE_STATUS_MASK 0xF
> -#define PORT_MODULE_EVENT_ERROR_TYPE_MASK 0xF
> -
> -enum port_module_event_status_type {
> - MLX5_MODULE_STATUS_PLUGGED = 0x1,
> - MLX5_MODULE_STATUS_UNPLUGGED = 0x2,
> - MLX5_MODULE_STATUS_ERROR = 0x3,
> - MLX5_MODULE_STATUS_DISABLED = 0x4,
> - MLX5_MODULE_STATUS_NUM,
> -};
> -
> -enum port_module_event_error_type {
> - MLX5_MODULE_EVENT_ERROR_POWER_BUDGET_EXCEEDED = 0x0,
> - MLX5_MODULE_EVENT_ERROR_LONG_RANGE_FOR_NON_MLNX = 0x1,
> - MLX5_MODULE_EVENT_ERROR_BUS_STUCK = 0x2,
> - MLX5_MODULE_EVENT_ERROR_NO_EEPROM_RETRY_TIMEOUT = 0x3,
> - MLX5_MODULE_EVENT_ERROR_ENFORCE_PART_NUMBER_LIST = 0x4,
> - MLX5_MODULE_EVENT_ERROR_UNKNOWN_IDENTIFIER = 0x5,
> - MLX5_MODULE_EVENT_ERROR_HIGH_TEMPERATURE = 0x6,
> - MLX5_MODULE_EVENT_ERROR_BAD_CABLE = 0x7,
> - MLX5_MODULE_EVENT_ERROR_PCIE_POWER_SLOT_EXCEEDED = 0xc,
> - MLX5_MODULE_EVENT_ERROR_NUM,
> -};
> -
> -struct mlx5_pme_stats {
> - u64 status_counters[MLX5_MODULE_STATUS_NUM];
> - u64 error_counters[MLX5_MODULE_EVENT_ERROR_NUM];
> -};
> -
> -void mlx5_get_pme_stats(struct mlx5_core_dev *dev, struct mlx5_pme_stats *stats);
> -int mlx5_notifier_call_chain(struct mlx5_events *events, unsigned int event, void *data);
> -
> static inline struct net *mlx5_core_net(struct mlx5_core_dev *dev)
> {
> return devlink_net(priv_to_devlink(dev));
> --
> 2.34.1
>
>
Powered by blists - more mailing lists