* [Intel-wired-lan] [net-next 0/3] Configure iWARP or RoCEv2 protocol support for E800 devices
@ 2021-10-18 23:16 Shiraz Saleem
2021-10-18 23:16 ` [Intel-wired-lan] [net-next 1/3] devlink: Add 'enable_iwarp' generic device param Shiraz Saleem
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Shiraz Saleem @ 2021-10-18 23:16 UTC (permalink / raw)
To: intel-wired-lan
Currently E800 devices come up as RoCEv2 devices by default.
This series add supports for users to configure iWARP or RoCEv2 functionality
per PCI function. devlink parameters is used to realize this and is keyed
off similar work in [1].
[1] https://lore.kernel.org/linux-rdma/20210810132424.9129-1-parav at nvidia.com/
Shiraz Saleem (3):
devlink: Add 'enable_iwarp' generic device param
net/ice: Add support for enable_iwarp and enable_roce devlink param
RDMA/irdma: Set protocol based on PF rdma_mode flag
.../networking/devlink/devlink-params.rst | 3 +
drivers/infiniband/hw/irdma/main.c | 3 +-
drivers/net/ethernet/intel/ice/ice.h | 1 +
drivers/net/ethernet/intel/ice/ice_devlink.c | 144 +++++++++++++++++++++
drivers/net/ethernet/intel/ice/ice_devlink.h | 6 +
drivers/net/ethernet/intel/ice/ice_idc.c | 4 +-
drivers/net/ethernet/intel/ice/ice_main.c | 9 +-
include/linux/net/intel/iidc.h | 7 +-
include/net/devlink.h | 4 +
net/core/devlink.c | 5 +
10 files changed, 180 insertions(+), 6 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 8+ messages in thread* [Intel-wired-lan] [net-next 1/3] devlink: Add 'enable_iwarp' generic device param 2021-10-18 23:16 [Intel-wired-lan] [net-next 0/3] Configure iWARP or RoCEv2 protocol support for E800 devices Shiraz Saleem @ 2021-10-18 23:16 ` Shiraz Saleem 2021-11-22 9:58 ` Kaliszczuk, Leszek 2021-10-18 23:16 ` [Intel-wired-lan] [net-next 2/3] net/ice: Add support for enable_iwarp and enable_roce devlink param Shiraz Saleem 2021-10-18 23:16 ` [Intel-wired-lan] [net-next 3/3] RDMA/irdma: Set protocol based on PF rdma_mode flag Shiraz Saleem 2 siblings, 1 reply; 8+ messages in thread From: Shiraz Saleem @ 2021-10-18 23:16 UTC (permalink / raw) To: intel-wired-lan Add a new device generic parameter to enable and disable iWARP functionality on a multi-protocol RDMA device. Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com> --- Documentation/networking/devlink/devlink-params.rst | 3 +++ include/net/devlink.h | 4 ++++ net/core/devlink.c | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/Documentation/networking/devlink/devlink-params.rst b/Documentation/networking/devlink/devlink-params.rst index 4878907..b7dfe69 100644 --- a/Documentation/networking/devlink/devlink-params.rst +++ b/Documentation/networking/devlink/devlink-params.rst @@ -109,6 +109,9 @@ own name. - Boolean - When enabled, the device driver will instantiate VDPA networking specific auxiliary device of the devlink device. + * - ``enable_iwarp`` + - Boolean + - Enable handling of iWARP traffic in the device. * - ``internal_err_reset`` - Boolean - When enabled, the device driver will reset the device on internal diff --git a/include/net/devlink.h b/include/net/devlink.h index a7852a2..9f39f38 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -524,6 +524,7 @@ enum devlink_param_generic_id { DEVLINK_PARAM_GENERIC_ID_ENABLE_ETH, DEVLINK_PARAM_GENERIC_ID_ENABLE_RDMA, DEVLINK_PARAM_GENERIC_ID_ENABLE_VNET, + DEVLINK_PARAM_GENERIC_ID_ENABLE_IWARP, /* add new param generic ids above here*/ __DEVLINK_PARAM_GENERIC_ID_MAX, @@ -573,6 +574,9 @@ enum devlink_param_generic_id { #define DEVLINK_PARAM_GENERIC_ENABLE_VNET_NAME "enable_vnet" #define DEVLINK_PARAM_GENERIC_ENABLE_VNET_TYPE DEVLINK_PARAM_TYPE_BOOL +#define DEVLINK_PARAM_GENERIC_ENABLE_IWARP_NAME "enable_iwarp" +#define DEVLINK_PARAM_GENERIC_ENABLE_IWARP_TYPE DEVLINK_PARAM_TYPE_BOOL + #define DEVLINK_PARAM_GENERIC(_id, _cmodes, _get, _set, _validate) \ { \ .id = DEVLINK_PARAM_GENERIC_ID_##_id, \ diff --git a/net/core/devlink.c b/net/core/devlink.c index 4917112..9803fb0 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -4358,6 +4358,11 @@ static int devlink_nl_cmd_flash_update(struct sk_buff *skb, .name = DEVLINK_PARAM_GENERIC_ENABLE_VNET_NAME, .type = DEVLINK_PARAM_GENERIC_ENABLE_VNET_TYPE, }, + { + .id = DEVLINK_PARAM_GENERIC_ID_ENABLE_IWARP, + .name = DEVLINK_PARAM_GENERIC_ENABLE_IWARP_NAME, + .type = DEVLINK_PARAM_GENERIC_ENABLE_IWARP_TYPE, + }, }; static int devlink_param_generic_verify(const struct devlink_param *param) -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Intel-wired-lan] [net-next 1/3] devlink: Add 'enable_iwarp' generic device param 2021-10-18 23:16 ` [Intel-wired-lan] [net-next 1/3] devlink: Add 'enable_iwarp' generic device param Shiraz Saleem @ 2021-11-22 9:58 ` Kaliszczuk, Leszek 0 siblings, 0 replies; 8+ messages in thread From: Kaliszczuk, Leszek @ 2021-11-22 9:58 UTC (permalink / raw) To: intel-wired-lan > -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of > Saleem, Shiraz > Sent: Tuesday, October 19, 2021 1:16 AM > To: intel-wired-lan at lists.osuosl.org > Cc: Saleem, Shiraz <shiraz.saleem@intel.com> > Subject: [Intel-wired-lan] [net-next 1/3] devlink: Add 'enable_iwarp' generic > device param > > Add a new device generic parameter to enable and disable iWARP functionality > on a multi-protocol RDMA device. > > Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com> > --- > Documentation/networking/devlink/devlink-params.rst | 3 +++ > include/net/devlink.h | 4 ++++ > net/core/devlink.c | 5 +++++ > 3 files changed, 12 insertions(+) > Tested-by: Leszek Kaliszczuk <leszek.kaliszczuk@intel.com> --------------------------------------------------------------------- Intel Technology Poland sp. z o.o. ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-wired-lan] [net-next 2/3] net/ice: Add support for enable_iwarp and enable_roce devlink param 2021-10-18 23:16 [Intel-wired-lan] [net-next 0/3] Configure iWARP or RoCEv2 protocol support for E800 devices Shiraz Saleem 2021-10-18 23:16 ` [Intel-wired-lan] [net-next 1/3] devlink: Add 'enable_iwarp' generic device param Shiraz Saleem @ 2021-10-18 23:16 ` Shiraz Saleem 2021-11-22 10:10 ` Kaliszczuk, Leszek 2021-10-18 23:16 ` [Intel-wired-lan] [net-next 3/3] RDMA/irdma: Set protocol based on PF rdma_mode flag Shiraz Saleem 2 siblings, 1 reply; 8+ messages in thread From: Shiraz Saleem @ 2021-10-18 23:16 UTC (permalink / raw) To: intel-wired-lan Allow support for 'enable_iwarp' and 'enable_roce' devlink params to turn on/off iWARP or RoCE protocol support for E800 devices. For example, a user can turn on iWARP functionality with, devlink dev param set pci/0000:07:00.0 name enable_iwarp value true cmode runtime This add an iWARP auxiliary rdma device, ice.iwarp.<>, under this PF. A user request to enable both iWARP and RoCE under the same PF is rejected since this device does not support both protocols simultaneously on the same port. Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com> --- drivers/net/ethernet/intel/ice/ice.h | 1 + drivers/net/ethernet/intel/ice/ice_devlink.c | 144 +++++++++++++++++++++++++++ drivers/net/ethernet/intel/ice/ice_devlink.h | 6 ++ drivers/net/ethernet/intel/ice/ice_idc.c | 4 +- drivers/net/ethernet/intel/ice/ice_main.c | 9 +- include/linux/net/intel/iidc.h | 7 +- 6 files changed, 166 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h index 6bfbf70..7873da6 100644 --- a/drivers/net/ethernet/intel/ice/ice.h +++ b/drivers/net/ethernet/intel/ice/ice.h @@ -505,6 +505,7 @@ struct ice_pf { struct ice_hw_port_stats stats_prev; struct ice_hw hw; u8 stat_prev_loaded:1; /* has previous stats been loaded */ + u8 rdma_mode; u16 dcbx_cap; u32 tx_timeout_count; unsigned long tx_timeout_last_recovery; diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.c b/drivers/net/ethernet/intel/ice/ice_devlink.c index 55353bf..f1036fa 100644 --- a/drivers/net/ethernet/intel/ice/ice_devlink.c +++ b/drivers/net/ethernet/intel/ice/ice_devlink.c @@ -430,6 +430,120 @@ static int ice_devlink_info_get(struct devlink *devlink, .flash_update = ice_devlink_flash_update, }; +static int +ice_devlink_enable_roce_get(struct devlink *devlink, u32 id, + struct devlink_param_gset_ctx *ctx) +{ + struct ice_pf *pf = devlink_priv(devlink); + + ctx->val.vbool = pf->rdma_mode & IIDC_RDMA_PROTOCOL_ROCEV2; + + return 0; +} + +static int +ice_devlink_enable_roce_set(struct devlink *devlink, u32 id, + struct devlink_param_gset_ctx *ctx) +{ + struct ice_pf *pf = devlink_priv(devlink); + bool roce_ena = ctx->val.vbool; + int ret; + + if (!roce_ena) { + ice_unplug_aux_dev(pf); + pf->rdma_mode &= ~IIDC_RDMA_PROTOCOL_ROCEV2; + return 0; + } + + pf->rdma_mode |= IIDC_RDMA_PROTOCOL_ROCEV2; + ret = ice_plug_aux_dev(pf); + if (ret) + pf->rdma_mode &= ~IIDC_RDMA_PROTOCOL_ROCEV2; + + return ret; +} + +static int +ice_devlink_enable_roce_validate(struct devlink *devlink, u32 id, + union devlink_param_value val, + struct netlink_ext_ack *extack) +{ + struct ice_pf *pf = devlink_priv(devlink); + + if (!test_bit(ICE_FLAG_RDMA_ENA, pf->flags)) + return -EOPNOTSUPP; + + if (pf->rdma_mode & IIDC_RDMA_PROTOCOL_IWARP) { + NL_SET_ERR_MSG_MOD(extack, "iWARP is currently enabled. This device cannot enable iWARP and RoCEv2 simultaneously"); + return -EOPNOTSUPP; + } + + return 0; +} + +static int +ice_devlink_enable_iw_get(struct devlink *devlink, u32 id, + struct devlink_param_gset_ctx *ctx) +{ + struct ice_pf *pf = devlink_priv(devlink); + + ctx->val.vbool = pf->rdma_mode & IIDC_RDMA_PROTOCOL_IWARP; + + return 0; +} + +static int +ice_devlink_enable_iw_set(struct devlink *devlink, u32 id, + struct devlink_param_gset_ctx *ctx) +{ + struct ice_pf *pf = devlink_priv(devlink); + bool iw_ena = ctx->val.vbool; + int ret; + + if (!iw_ena) { + ice_unplug_aux_dev(pf); + pf->rdma_mode &= ~IIDC_RDMA_PROTOCOL_IWARP; + return 0; + } + + pf->rdma_mode |= IIDC_RDMA_PROTOCOL_IWARP; + ret = ice_plug_aux_dev(pf); + if (ret) + pf->rdma_mode &= ~IIDC_RDMA_PROTOCOL_IWARP; + + return ret; +} + +static int +ice_devlink_enable_iw_validate(struct devlink *devlink, u32 id, + union devlink_param_value val, + struct netlink_ext_ack *extack) +{ + struct ice_pf *pf = devlink_priv(devlink); + + if (!test_bit(ICE_FLAG_RDMA_ENA, pf->flags)) + return -EOPNOTSUPP; + + if (pf->rdma_mode & IIDC_RDMA_PROTOCOL_ROCEV2) { + NL_SET_ERR_MSG_MOD(extack, "RoCEv2 is currently enabled. This device cannot enable iWARP and RoCEv2 simultaneously"); + return -EOPNOTSUPP; + } + + return 0; +} + +static const struct devlink_param ice_devlink_params[] = { + DEVLINK_PARAM_GENERIC(ENABLE_ROCE, BIT(DEVLINK_PARAM_CMODE_RUNTIME), + ice_devlink_enable_roce_get, + ice_devlink_enable_roce_set, + ice_devlink_enable_roce_validate), + DEVLINK_PARAM_GENERIC(ENABLE_IWARP, BIT(DEVLINK_PARAM_CMODE_RUNTIME), + ice_devlink_enable_iw_get, + ice_devlink_enable_iw_set, + ice_devlink_enable_iw_validate), + +}; + static void ice_devlink_free(void *devlink_ptr) { devlink_free((struct devlink *)devlink_ptr); @@ -486,6 +600,36 @@ void ice_devlink_unregister(struct ice_pf *pf) devlink_unregister(priv_to_devlink(pf)); } +int ice_devlink_register_params(struct ice_pf *pf) +{ + struct devlink *devlink = priv_to_devlink(pf); + union devlink_param_value value; + int err; + + err = devlink_params_register(devlink, ice_devlink_params, + ARRAY_SIZE(ice_devlink_params)); + if (err) + return err; + + value.vbool = false; + devlink_param_driverinit_value_set(devlink, + DEVLINK_PARAM_GENERIC_ID_ENABLE_IWARP, + value); + + value.vbool = test_bit(ICE_FLAG_RDMA_ENA, pf->flags) ? true : false; + devlink_param_driverinit_value_set(devlink, + DEVLINK_PARAM_GENERIC_ID_ENABLE_ROCE, + value); + + return 0; +} + +void ice_devlink_unregister_params(struct ice_pf *pf) +{ + devlink_params_unregister(priv_to_devlink(pf), ice_devlink_params, + ARRAY_SIZE(ice_devlink_params)); +} + /** * ice_devlink_create_pf_port - Create a devlink port for this PF * @pf: the PF to create a devlink port for diff --git a/drivers/net/ethernet/intel/ice/ice_devlink.h b/drivers/net/ethernet/intel/ice/ice_devlink.h index b7f9551e..faea757 100644 --- a/drivers/net/ethernet/intel/ice/ice_devlink.h +++ b/drivers/net/ethernet/intel/ice/ice_devlink.h @@ -4,10 +4,16 @@ #ifndef _ICE_DEVLINK_H_ #define _ICE_DEVLINK_H_ +enum ice_devlink_param_id { + ICE_DEVLINK_PARAM_ID_BASE = DEVLINK_PARAM_GENERIC_ID_MAX, +}; + struct ice_pf *ice_allocate_pf(struct device *dev); void ice_devlink_register(struct ice_pf *pf); void ice_devlink_unregister(struct ice_pf *pf); +int ice_devlink_register_params(struct ice_pf *pf); +void ice_devlink_unregister_params(struct ice_pf *pf); int ice_devlink_create_pf_port(struct ice_pf *pf); void ice_devlink_destroy_pf_port(struct ice_pf *pf); int ice_devlink_create_vf_port(struct ice_vf *vf); diff --git a/drivers/net/ethernet/intel/ice/ice_idc.c b/drivers/net/ethernet/intel/ice/ice_idc.c index adcc9a2..fc35801 100644 --- a/drivers/net/ethernet/intel/ice/ice_idc.c +++ b/drivers/net/ethernet/intel/ice/ice_idc.c @@ -288,7 +288,7 @@ int ice_plug_aux_dev(struct ice_pf *pf) adev->id = pf->aux_idx; adev->dev.release = ice_adev_release; adev->dev.parent = &pf->pdev->dev; - adev->name = IIDC_RDMA_ROCE_NAME; + adev->name = pf->rdma_mode & IIDC_RDMA_PROTOCOL_ROCEV2 ? "roce" : "iwarp"; ret = auxiliary_device_init(adev); if (ret) { @@ -335,6 +335,6 @@ int ice_init_rdma(struct ice_pf *pf) dev_err(dev, "failed to reserve vectors for RDMA\n"); return ret; } - + pf->rdma_mode |= IIDC_RDMA_PROTOCOL_ROCEV2; return ice_plug_aux_dev(pf); } diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index ceb0912..1214eb9 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -4488,6 +4488,10 @@ static int ice_register_netdev(struct ice_pf *pf) if (err) goto err_netdev_reg; + err = ice_devlink_register_params(pf); + if (err) + goto err_netdev_reg; + /* ready to go, so clear down state bit */ clear_bit(ICE_DOWN, pf->state); if (ice_is_aux_ena(pf)) { @@ -4495,7 +4499,7 @@ static int ice_register_netdev(struct ice_pf *pf) if (pf->aux_idx < 0) { dev_err(dev, "Failed to allocate device ID for AUX driver\n"); err = -ENOMEM; - goto err_netdev_reg; + goto err_devlink_reg_param; } err = ice_init_rdma(pf); @@ -4514,6 +4518,8 @@ static int ice_register_netdev(struct ice_pf *pf) err_init_aux_unroll: pf->adev = NULL; ida_free(&ice_aux_ida, pf->aux_idx); +err_devlink_reg_param: + ice_devlink_unregister_params(pf); err_netdev_reg: err_send_version_unroll: ice_vsi_release_all(pf); @@ -4625,6 +4631,7 @@ static void ice_remove(struct pci_dev *pdev) ice_aq_cancel_waiting_tasks(pf); ice_unplug_aux_dev(pf); ida_free(&ice_aux_ida, pf->aux_idx); + ice_devlink_unregister_params(pf); set_bit(ICE_DOWN, pf->state); mutex_destroy(&(&pf->hw)->fdir_fltr_lock); diff --git a/include/linux/net/intel/iidc.h b/include/linux/net/intel/iidc.h index e32f671..1289593 100644 --- a/include/linux/net/intel/iidc.h +++ b/include/linux/net/intel/iidc.h @@ -26,6 +26,11 @@ enum iidc_reset_type { IIDC_GLOBR, }; +enum iidc_rdma_protocol { + IIDC_RDMA_PROTOCOL_IWARP = BIT(0), + IIDC_RDMA_PROTOCOL_ROCEV2 = BIT(1), +}; + #define IIDC_MAX_USER_PRIORITY 8 /* Struct to hold per RDMA Qset info */ @@ -70,8 +75,6 @@ struct iidc_event { int ice_rdma_update_vsi_filter(struct ice_pf *pf, u16 vsi_id, bool enable); void ice_get_qos_params(struct ice_pf *pf, struct iidc_qos_params *qos); -#define IIDC_RDMA_ROCE_NAME "roce" - /* Structure representing auxiliary driver tailored information about the core * PCI dev, each auxiliary driver using the IIDC interface will have an * instance of this struct dedicated to it. -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Intel-wired-lan] [net-next 2/3] net/ice: Add support for enable_iwarp and enable_roce devlink param 2021-10-18 23:16 ` [Intel-wired-lan] [net-next 2/3] net/ice: Add support for enable_iwarp and enable_roce devlink param Shiraz Saleem @ 2021-11-22 10:10 ` Kaliszczuk, Leszek 0 siblings, 0 replies; 8+ messages in thread From: Kaliszczuk, Leszek @ 2021-11-22 10:10 UTC (permalink / raw) To: intel-wired-lan > -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Saleem, > Shiraz > Sent: Tuesday, October 19, 2021 1:16 AM > To: intel-wired-lan at lists.osuosl.org > Cc: Saleem, Shiraz <shiraz.saleem@intel.com> > Subject: [Intel-wired-lan] [net-next 2/3] net/ice: Add support for enable_iwarp and > enable_roce devlink param > > Allow support for 'enable_iwarp' and 'enable_roce' devlink params to turn on/off > iWARP or RoCE protocol support for E800 devices. > > For example, a user can turn on iWARP functionality with, > > devlink dev param set pci/0000:07:00.0 name enable_iwarp value true cmode > runtime > > This add an iWARP auxiliary rdma device, ice.iwarp.<>, under this PF. > > A user request to enable both iWARP and RoCE under the same PF is rejected since > this device does not support both protocols simultaneously on the same port. > > Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com> > --- > drivers/net/ethernet/intel/ice/ice.h | 1 + > drivers/net/ethernet/intel/ice/ice_devlink.c | 144 > +++++++++++++++++++++++++++ > drivers/net/ethernet/intel/ice/ice_devlink.h | 6 ++ > drivers/net/ethernet/intel/ice/ice_idc.c | 4 +- > drivers/net/ethernet/intel/ice/ice_main.c | 9 +- > include/linux/net/intel/iidc.h | 7 +- > 6 files changed, 166 insertions(+), 5 deletions(-) > Tested-by: Leszek Kaliszczuk <leszek.kaliszczuk@intel.com> --------------------------------------------------------------------- Intel Technology Poland sp. z o.o. ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-wired-lan] [net-next 3/3] RDMA/irdma: Set protocol based on PF rdma_mode flag 2021-10-18 23:16 [Intel-wired-lan] [net-next 0/3] Configure iWARP or RoCEv2 protocol support for E800 devices Shiraz Saleem 2021-10-18 23:16 ` [Intel-wired-lan] [net-next 1/3] devlink: Add 'enable_iwarp' generic device param Shiraz Saleem 2021-10-18 23:16 ` [Intel-wired-lan] [net-next 2/3] net/ice: Add support for enable_iwarp and enable_roce devlink param Shiraz Saleem @ 2021-10-18 23:16 ` Shiraz Saleem 2021-11-22 10:11 ` Kaliszczuk, Leszek 2 siblings, 1 reply; 8+ messages in thread From: Shiraz Saleem @ 2021-10-18 23:16 UTC (permalink / raw) To: intel-wired-lan Set the RDMA protocol to use at driver bind time based on the ice PF's rdma_mode flag. Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com> --- drivers/infiniband/hw/irdma/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/irdma/main.c b/drivers/infiniband/hw/irdma/main.c index 51a4135..3fda7b7 100644 --- a/drivers/infiniband/hw/irdma/main.c +++ b/drivers/infiniband/hw/irdma/main.c @@ -228,7 +228,8 @@ static void irdma_fill_device_info(struct irdma_device *iwdev, struct ice_pf *pf rf->msix_count = pf->num_rdma_msix; rf->msix_entries = &pf->msix_entries[pf->rdma_base_vector]; rf->default_vsi.vsi_idx = vsi->vsi_num; - rf->protocol_used = IRDMA_ROCE_PROTOCOL_ONLY; + rf->protocol_used = pf->rdma_mode & IIDC_RDMA_PROTOCOL_ROCEV2 ? + IRDMA_ROCE_PROTOCOL_ONLY : IRDMA_IWARP_PROTOCOL_ONLY; rf->rdma_ver = IRDMA_GEN_2; rf->rsrc_profile = IRDMA_HMC_PROFILE_DEFAULT; rf->rst_to = IRDMA_RST_TIMEOUT_HZ; -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Intel-wired-lan] [net-next 3/3] RDMA/irdma: Set protocol based on PF rdma_mode flag 2021-10-18 23:16 ` [Intel-wired-lan] [net-next 3/3] RDMA/irdma: Set protocol based on PF rdma_mode flag Shiraz Saleem @ 2021-11-22 10:11 ` Kaliszczuk, Leszek 0 siblings, 0 replies; 8+ messages in thread From: Kaliszczuk, Leszek @ 2021-11-22 10:11 UTC (permalink / raw) To: intel-wired-lan > -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Saleem, > Shiraz > Sent: Tuesday, October 19, 2021 1:16 AM > To: intel-wired-lan at lists.osuosl.org > Cc: Saleem, Shiraz <shiraz.saleem@intel.com> > Subject: [Intel-wired-lan] [net-next 3/3] RDMA/irdma: Set protocol based on PF > rdma_mode flag > > Set the RDMA protocol to use at driver bind time based on the ice PF's rdma_mode > flag. > > Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com> > --- > drivers/infiniband/hw/irdma/main.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > Tested-by: Leszek Kaliszczuk <leszek.kaliszczuk@intel.com> --------------------------------------------------------------------- Intel Technology Poland sp. z o.o. ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-wired-lan] [net-next 0/3] Configure iWARP or RoCEv2 protocol support for E800 devices @ 2021-10-13 16:22 Shiraz Saleem 2021-10-13 16:22 ` [Intel-wired-lan] [net-next 1/3] devlink: Add 'enable_iwarp' generic device param Shiraz Saleem 0 siblings, 1 reply; 8+ messages in thread From: Shiraz Saleem @ 2021-10-13 16:22 UTC (permalink / raw) To: intel-wired-lan Currently E800 devices come up as RoCEv2 devices by default. This series add supports for users to configure iWARP or RoCEv2 functionality per PCI function. devlink parameters is used to realize this and is keyed off similar work in [1]. [1] https://lore.kernel.org/linux-rdma/20210810132424.9129-1-parav at nvidia.com/ Shiraz Saleem (3): devlink: Add 'enable_iwarp' generic device param net/ice: Add support for enable_iwarp and enable_roce devlink param RDMA/irdma: Set protocol based on PF rdma_mode flag .../networking/devlink/devlink-params.rst | 3 + drivers/infiniband/hw/irdma/main.c | 3 +- drivers/net/ethernet/intel/ice/ice.h | 1 + drivers/net/ethernet/intel/ice/ice_devlink.c | 137 ++++++++++++++++++++- drivers/net/ethernet/intel/ice/ice_devlink.h | 7 +- drivers/net/ethernet/intel/ice/ice_idc.c | 4 +- drivers/net/ethernet/intel/ice/ice_main.c | 11 +- include/linux/net/intel/iidc.h | 7 +- include/net/devlink.h | 4 + net/core/devlink.c | 5 + 10 files changed, 172 insertions(+), 10 deletions(-) -- 1.8.3.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-wired-lan] [net-next 1/3] devlink: Add 'enable_iwarp' generic device param 2021-10-13 16:22 [Intel-wired-lan] [net-next 0/3] Configure iWARP or RoCEv2 protocol support for E800 devices Shiraz Saleem @ 2021-10-13 16:22 ` Shiraz Saleem 0 siblings, 0 replies; 8+ messages in thread From: Shiraz Saleem @ 2021-10-13 16:22 UTC (permalink / raw) To: intel-wired-lan Add a new device generic parameter to enable and disable iWARP functionality on a multi-protocol RDMA device. Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com> --- Documentation/networking/devlink/devlink-params.rst | 3 +++ include/net/devlink.h | 4 ++++ net/core/devlink.c | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/Documentation/networking/devlink/devlink-params.rst b/Documentation/networking/devlink/devlink-params.rst index 4878907..b7dfe69 100644 --- a/Documentation/networking/devlink/devlink-params.rst +++ b/Documentation/networking/devlink/devlink-params.rst @@ -109,6 +109,9 @@ own name. - Boolean - When enabled, the device driver will instantiate VDPA networking specific auxiliary device of the devlink device. + * - ``enable_iwarp`` + - Boolean + - Enable handling of iWARP traffic in the device. * - ``internal_err_reset`` - Boolean - When enabled, the device driver will reset the device on internal diff --git a/include/net/devlink.h b/include/net/devlink.h index a7852a2..9f39f38 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -524,6 +524,7 @@ enum devlink_param_generic_id { DEVLINK_PARAM_GENERIC_ID_ENABLE_ETH, DEVLINK_PARAM_GENERIC_ID_ENABLE_RDMA, DEVLINK_PARAM_GENERIC_ID_ENABLE_VNET, + DEVLINK_PARAM_GENERIC_ID_ENABLE_IWARP, /* add new param generic ids above here*/ __DEVLINK_PARAM_GENERIC_ID_MAX, @@ -573,6 +574,9 @@ enum devlink_param_generic_id { #define DEVLINK_PARAM_GENERIC_ENABLE_VNET_NAME "enable_vnet" #define DEVLINK_PARAM_GENERIC_ENABLE_VNET_TYPE DEVLINK_PARAM_TYPE_BOOL +#define DEVLINK_PARAM_GENERIC_ENABLE_IWARP_NAME "enable_iwarp" +#define DEVLINK_PARAM_GENERIC_ENABLE_IWARP_TYPE DEVLINK_PARAM_TYPE_BOOL + #define DEVLINK_PARAM_GENERIC(_id, _cmodes, _get, _set, _validate) \ { \ .id = DEVLINK_PARAM_GENERIC_ID_##_id, \ diff --git a/net/core/devlink.c b/net/core/devlink.c index 4917112..9803fb0 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -4358,6 +4358,11 @@ static int devlink_nl_cmd_flash_update(struct sk_buff *skb, .name = DEVLINK_PARAM_GENERIC_ENABLE_VNET_NAME, .type = DEVLINK_PARAM_GENERIC_ENABLE_VNET_TYPE, }, + { + .id = DEVLINK_PARAM_GENERIC_ID_ENABLE_IWARP, + .name = DEVLINK_PARAM_GENERIC_ENABLE_IWARP_NAME, + .type = DEVLINK_PARAM_GENERIC_ENABLE_IWARP_TYPE, + }, }; static int devlink_param_generic_verify(const struct devlink_param *param) -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-11-22 10:11 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-10-18 23:16 [Intel-wired-lan] [net-next 0/3] Configure iWARP or RoCEv2 protocol support for E800 devices Shiraz Saleem 2021-10-18 23:16 ` [Intel-wired-lan] [net-next 1/3] devlink: Add 'enable_iwarp' generic device param Shiraz Saleem 2021-11-22 9:58 ` Kaliszczuk, Leszek 2021-10-18 23:16 ` [Intel-wired-lan] [net-next 2/3] net/ice: Add support for enable_iwarp and enable_roce devlink param Shiraz Saleem 2021-11-22 10:10 ` Kaliszczuk, Leszek 2021-10-18 23:16 ` [Intel-wired-lan] [net-next 3/3] RDMA/irdma: Set protocol based on PF rdma_mode flag Shiraz Saleem 2021-11-22 10:11 ` Kaliszczuk, Leszek -- strict thread matches above, loose matches on Subject: below -- 2021-10-13 16:22 [Intel-wired-lan] [net-next 0/3] Configure iWARP or RoCEv2 protocol support for E800 devices Shiraz Saleem 2021-10-13 16:22 ` [Intel-wired-lan] [net-next 1/3] devlink: Add 'enable_iwarp' generic device param Shiraz Saleem
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.