| 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: <20230609100052.a6gmrzpzgayfnkx3@DEN-LT-70577>
Date: Fri, 9 Jun 2023 10:00:52 +0000
From: Daniel Machon <daniel.machon@...rochip.com>
To: Dave Ertman <david.m.ertman@...el.com>
CC: <intel-wired-lan@...ts.osuosl.org>, <netdev@...r.kernel.org>
Subject: Re: [PATCH iwl-next v3 04/10] ice: implement lag netdev event handler
Hi Dave,
This patch fails to build, as ice_lag_move_new_vf_nodes() is used in
ice_vc_cfg_qs_msg(), but first defined in the next patch.
> The event handler for LAG will create a work item to place on the ordered
> workqueue to be processed.
>
> Add in defines for training packets and new recipes to be used by the
> switching block of the HW for LAG packet steering.
>
> Update the ice_lag struct to reflect the new processing methodology.
>
> Signed-off-by: Dave Ertman <david.m.ertman@...el.com>
> ---
> drivers/net/ethernet/intel/ice/ice_lag.c | 125 ++++++++++++++++--
> drivers/net/ethernet/intel/ice/ice_lag.h | 31 ++++-
> drivers/net/ethernet/intel/ice/ice_virtchnl.c | 2 +
> 3 files changed, 144 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_lag.c b/drivers/net/ethernet/intel/ice/ice_lag.c
> index 73bfc5cd8b37..529abfb904d0 100644
> --- a/drivers/net/ethernet/intel/ice/ice_lag.c
> +++ b/drivers/net/ethernet/intel/ice/ice_lag.c
> @@ -56,11 +56,10 @@ static void ice_lag_set_backup(struct ice_lag *lag)
> */
> static void ice_display_lag_info(struct ice_lag *lag)
> {
> - const char *name, *peer, *upper, *role, *bonded, *primary;
> + const char *name, *upper, *role, *bonded, *primary;
> struct device *dev = &lag->pf->pdev->dev;
>
> name = lag->netdev ? netdev_name(lag->netdev) : "unset";
> - peer = lag->peer_netdev ? netdev_name(lag->peer_netdev) : "unset";
> upper = lag->upper_netdev ? netdev_name(lag->upper_netdev) : "unset";
> primary = lag->primary ? "TRUE" : "FALSE";
> bonded = lag->bonded ? "BONDED" : "UNBONDED";
> @@ -82,8 +81,8 @@ static void ice_display_lag_info(struct ice_lag *lag)
> role = "ERROR";
> }
>
> - dev_dbg(dev, "%s %s, peer:%s, upper:%s, role:%s, primary:%s\n", name,
> - bonded, peer, upper, role, primary);
> + dev_dbg(dev, "%s %s, upper:%s, role:%s, primary:%s\n", name, bonded,
> + upper, role, primary);
> }
>
> /**
> @@ -198,7 +197,6 @@ ice_lag_unlink(struct ice_lag *lag,
> lag->upper_netdev = NULL;
> }
>
> - lag->peer_netdev = NULL;
> ice_set_rdma_cap(pf);
> lag->bonded = false;
> lag->role = ICE_LAG_NONE;
> @@ -288,6 +286,60 @@ static void ice_lag_changeupper_event(struct ice_lag *lag, void *ptr)
> ice_display_lag_info(lag);
> }
>
> +/**
> + * ice_lag_process_event - process a task assigned to the lag_wq
> + * @work: pointer to work_struct
> + */
> +static void ice_lag_process_event(struct work_struct *work)
> +{
> + struct netdev_notifier_changeupper_info *info;
> + struct ice_lag_work *lag_work;
> + struct net_device *netdev;
> + struct list_head *tmp, *n;
> + struct ice_pf *pf;
> +
> + lag_work = container_of(work, struct ice_lag_work, lag_task);
> + pf = lag_work->lag->pf;
> +
> + mutex_lock(&pf->lag_mutex);
> + lag_work->lag->netdev_head = &lag_work->netdev_list.node;
> +
> + switch (lag_work->event) {
> + case NETDEV_CHANGEUPPER:
> + info = &lag_work->info.changeupper_info;
> + if (ice_is_feature_supported(pf, ICE_F_SRIOV_LAG))
> + ice_lag_changeupper_event(lag_work->lag, info);
> + break;
> + case NETDEV_BONDING_INFO:
> + ice_lag_info_event(lag_work->lag, &lag_work->info.bonding_info);
> + break;
> + case NETDEV_UNREGISTER:
> + if (ice_is_feature_supported(pf, ICE_F_SRIOV_LAG)) {
> + netdev = lag_work->info.bonding_info.info.dev;
> + if ((netdev == lag_work->lag->netdev ||
> + lag_work->lag->primary) && lag_work->lag->bonded)
> + ice_lag_unregister(lag_work->lag, netdev);
> + }
> + break;
> + default:
> + break;
> + }
> +
> + /* cleanup resources allocated for this work item */
> + list_for_each_safe(tmp, n, &lag_work->netdev_list.node) {
> + struct ice_lag_netdev_list *entry;
> +
> + entry = list_entry(tmp, struct ice_lag_netdev_list, node);
> + list_del(&entry->node);
> + kfree(entry);
> + }
> + lag_work->lag->netdev_head = NULL;
> +
> + mutex_unlock(&pf->lag_mutex);
> +
> + kfree(work);
> +}
> +
> /**
> * ice_lag_event_handler - handle LAG events from netdev
> * @notif_blk: notifier block registered by this netdev
> @@ -299,31 +351,79 @@ ice_lag_event_handler(struct notifier_block *notif_blk, unsigned long event,
> void *ptr)
> {
> struct net_device *netdev = netdev_notifier_info_to_dev(ptr);
> + struct net_device *upper_netdev;
> + struct ice_lag_work *lag_work;
> struct ice_lag *lag;
>
> - lag = container_of(notif_blk, struct ice_lag, notif_block);
> + if (!netif_is_ice(netdev))
> + return NOTIFY_DONE;
> +
> + if (event != NETDEV_CHANGEUPPER && event != NETDEV_BONDING_INFO &&
> + event != NETDEV_UNREGISTER)
> + return NOTIFY_DONE;
>
> + if (!(netdev->priv_flags & IFF_BONDING))
> + return NOTIFY_DONE;
> +
> + lag = container_of(notif_blk, struct ice_lag, notif_block);
> if (!lag->netdev)
> return NOTIFY_DONE;
>
> - /* Check that the netdev is in the working namespace */
> if (!net_eq(dev_net(netdev), &init_net))
> return NOTIFY_DONE;
>
> + /* This memory will be freed at the end of ice_lag_process_event */
> + lag_work = kzalloc(sizeof(*lag_work), GFP_KERNEL);
> + if (!lag_work)
> + return -ENOMEM;
> +
> + lag_work->event_netdev = netdev;
> + lag_work->lag = lag;
> + lag_work->event = event;
> + if (event == NETDEV_CHANGEUPPER) {
> + struct netdev_notifier_changeupper_info *info;
> +
> + info = ptr;
> + upper_netdev = info->upper_dev;
> + } else {
> + upper_netdev = netdev_master_upper_dev_get(netdev);
> + }
> +
> + INIT_LIST_HEAD(&lag_work->netdev_list.node);
> + if (upper_netdev) {
> + struct ice_lag_netdev_list *nd_list;
> + struct net_device *tmp_nd;
> +
> + rcu_read_lock();
> + for_each_netdev_in_bond_rcu(upper_netdev, tmp_nd) {
> + nd_list = kzalloc(sizeof(*nd_list), GFP_KERNEL);
> + if (!nd_list)
> + break;
> +
> + nd_list->netdev = tmp_nd;
> + list_add(&nd_list->node, &lag_work->netdev_list.node);
> + }
> + rcu_read_unlock();
> + }
> +
> switch (event) {
> case NETDEV_CHANGEUPPER:
> - ice_lag_changeupper_event(lag, ptr);
> + lag_work->info.changeupper_info =
> + *((struct netdev_notifier_changeupper_info *)ptr);
> break;
> case NETDEV_BONDING_INFO:
> - ice_lag_info_event(lag, ptr);
> - break;
> - case NETDEV_UNREGISTER:
> - ice_lag_unregister(lag, netdev);
> + lag_work->info.bonding_info =
> + *((struct netdev_notifier_bonding_info *)ptr);
> break;
> default:
> + lag_work->info.notifier_info =
> + *((struct netdev_notifier_info *)ptr);
> break;
> }
>
> + INIT_WORK(&lag_work->lag_task, ice_lag_process_event);
> + queue_work(ice_lag_wq, &lag_work->lag_task);
> +
> return NOTIFY_DONE;
> }
>
> @@ -398,7 +498,6 @@ int ice_init_lag(struct ice_pf *pf)
> lag->netdev = vsi->netdev;
> lag->role = ICE_LAG_NONE;
> lag->bonded = false;
> - lag->peer_netdev = NULL;
> lag->upper_netdev = NULL;
> lag->notif_block.notifier_call = NULL;
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_lag.h b/drivers/net/ethernet/intel/ice/ice_lag.h
> index 2c373676c42f..df4af5184a75 100644
> --- a/drivers/net/ethernet/intel/ice/ice_lag.h
> +++ b/drivers/net/ethernet/intel/ice/ice_lag.h
> @@ -14,20 +14,49 @@ enum ice_lag_role {
> ICE_LAG_UNSET
> };
>
> +#define ICE_LAG_INVALID_PORT 0xFF
> +
> struct ice_pf;
> +struct ice_vf;
> +
> +struct ice_lag_netdev_list {
> + struct list_head node;
> + struct net_device *netdev;
> +};
>
> /* LAG info struct */
> struct ice_lag {
> struct ice_pf *pf; /* backlink to PF struct */
> struct net_device *netdev; /* this PF's netdev */
> - struct net_device *peer_netdev;
> struct net_device *upper_netdev; /* upper bonding netdev */
> + struct list_head *netdev_head;
> struct notifier_block notif_block;
> + s32 bond_mode;
> + u16 bond_swid; /* swid for primary interface */
> + u8 active_port; /* lport value for the current active port */
> u8 bonded:1; /* currently bonded */
> u8 primary:1; /* this is primary */
> + u16 pf_recipe;
> + u16 pf_rule_id;
> + u16 cp_rule_idx;
> u8 role;
> };
>
> +/* LAG workqueue struct */
> +struct ice_lag_work {
> + struct work_struct lag_task;
> + struct ice_lag_netdev_list netdev_list;
> + struct ice_lag *lag;
> + unsigned long event;
> + struct net_device *event_netdev;
> + union {
> + struct netdev_notifier_changeupper_info changeupper_info;
> + struct netdev_notifier_bonding_info bonding_info;
> + struct netdev_notifier_info notifier_info;
> + } info;
> +};
> +
> +void ice_lag_move_new_vf_nodes(struct ice_vf *vf);
> int ice_init_lag(struct ice_pf *pf);
> void ice_deinit_lag(struct ice_pf *pf);
> #endif /* _ICE_LAG_H_ */
> diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.c b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
> index efbc2968a7bf..625da88e7965 100644
> --- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c
> +++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
> @@ -1724,6 +1724,8 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg)
> vf->vf_id, i);
> }
>
> + ice_lag_move_new_vf_nodes(vf);
> +
> /* send the response to the VF */
> return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_VSI_QUEUES,
> VIRTCHNL_STATUS_ERR_PARAM, NULL, 0);
> --
> 2.40.1
>
Powered by blists - more mailing lists