History

net/mlx5e: Receive buffer support for DCBX

Add dcbnl's set/get buffer configuration callback that allows user to set/get buffer size configuration and priority to buffer mapping. By default, firmware controls receive buffer configuration and priority of buffer mapping based on the changes in pfc settings. When set buffer call back is triggered, the buffer configuration changes to manual mode. The manual mode means mlx5 driver will adjust the buffer configuration accordingly based on the changes in pfc settings. ConnectX buffer stride is 128 Bytes. If the buffer size is not multiple of 128, the buffer size will be rounded down to the nearest multiple of 128.

Huy Nguyen committed 8 years ago

Commit ecdf2da1 parent 0696d602 files · +126 −7Browse files

Unified · Split

2 files
  1. drivers/net/ethernet/mellanox/mlx5/core/en.h +1 −0
  2. drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c +125 −7
drivers/net/ethernet/mellanox/mlx5/core/en.h+1−0
@@ -278,6 +278,7 @@ struct mlx5e_dcbx { · 277 unmodified lines
278 u8 cap;278 u8 cap;
279 279
280 /* Buffer configuration */280 /* Buffer configuration */
281 bool manual_buffer;
281 u32 cable_len;282 u32 cable_len;
282 u32 xoff;283 u32 xoff;
283};284};
drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c+125−7
@@ -32,8 +32,8 @@ · 31 unmodified lines
32#include <linux/device.h>32#include <linux/device.h>
33#include <linux/netdevice.h>33#include <linux/netdevice.h>
34#include "en.h"34#include "en.h"
35 35#include "en/port.h"
36#define MLX5E_MAX_PRIORITY 836#include "en/port_buffer.h"
37 37
38#define MLX5E_100MB (100000)38#define MLX5E_100MB (100000)
39#define MLX5E_1GB (1000000)39#define MLX5E_1GB (1000000)
@@ -41,6 +41,9 @@ · 1 unmodified line
41#define MLX5E_CEE_STATE_UP 141#define MLX5E_CEE_STATE_UP 1
42#define MLX5E_CEE_STATE_DOWN 042#define MLX5E_CEE_STATE_DOWN 0
43 43
44/* Max supported cable length is 1000 meters */
45#define MLX5E_MAX_CABLE_LENGTH 1000
46
44enum {47enum {
45 MLX5E_VENDOR_TC_GROUP_NUM = 7,48 MLX5E_VENDOR_TC_GROUP_NUM = 7,
46 MLX5E_LOWEST_PRIO_GROUP = 0,49 MLX5E_LOWEST_PRIO_GROUP = 0,
@@ -338,6 +341,9 @@ static int mlx5e_dcbnl_ieee_getpfc(struct net_device *dev, · 291 unmodified lines
338 pfc->indications[i] = PPORT_PER_PRIO_GET(pstats, i, rx_pause);341 pfc->indications[i] = PPORT_PER_PRIO_GET(pstats, i, rx_pause);
339 }342 }
340 343
344 if (MLX5_BUFFER_SUPPORTED(mdev))
345 pfc->delay = priv->dcbx.cable_len;
346
341 return mlx5_query_port_pfc(mdev, &pfc->pfc_en, NULL);347 return mlx5_query_port_pfc(mdev, &pfc->pfc_en, NULL);
342}348}
343 349
@@ -346,16 +352,39 @@ static int mlx5e_dcbnl_ieee_setpfc(struct net_device *dev, · 2 unmodified lines
346{352{
347 struct mlx5e_priv *priv = netdev_priv(dev);353 struct mlx5e_priv *priv = netdev_priv(dev);
348 struct mlx5_core_dev *mdev = priv->mdev;354 struct mlx5_core_dev *mdev = priv->mdev;
355 u32 old_cable_len = priv->dcbx.cable_len;
356 struct ieee_pfc pfc_new;
357 u32 changed = 0;
349 u8 curr_pfc_en;358 u8 curr_pfc_en;
350 int ret;359 int ret = 0;
351 360
361 /* pfc_en */
352 mlx5_query_port_pfc(mdev, &curr_pfc_en, NULL);362 mlx5_query_port_pfc(mdev, &curr_pfc_en, NULL);
363 if (pfc->pfc_en != curr_pfc_en) {
364 ret = mlx5_set_port_pfc(mdev, pfc->pfc_en, pfc->pfc_en);
365 if (ret)
366 return ret;
367 mlx5_toggle_port_link(mdev);
368 changed |= MLX5E_PORT_BUFFER_PFC;
369 }
353 370
354 if (pfc->pfc_en == curr_pfc_en)371 if (pfc->delay &&
355 return 0;372 pfc->delay < MLX5E_MAX_CABLE_LENGTH &&
373 pfc->delay != priv->dcbx.cable_len) {
374 priv->dcbx.cable_len = pfc->delay;
375 changed |= MLX5E_PORT_BUFFER_CABLE_LEN;
376 }
356 377
357 ret = mlx5_set_port_pfc(mdev, pfc->pfc_en, pfc->pfc_en);378 if (MLX5_BUFFER_SUPPORTED(mdev)) {
358 mlx5_toggle_port_link(mdev);379 pfc_new.pfc_en = (changed & MLX5E_PORT_BUFFER_PFC) ? pfc->pfc_en : curr_pfc_en;
380 if (priv->dcbx.manual_buffer)
381 ret = mlx5e_port_manual_buffer_config(priv, changed,
382 dev->mtu, &pfc_new,
383 NULL, NULL);
384
385 if (ret && (changed & MLX5E_PORT_BUFFER_CABLE_LEN))
386 priv->dcbx.cable_len = old_cable_len;
387 }
359 388
360 if (!ret) {389 if (!ret) {
361 mlx5e_dbg(HW, priv,390 mlx5e_dbg(HW, priv,
@@ -873,6 +902,90 @@ static void mlx5e_dcbnl_setpfcstate(struct net_device *netdev, u8 state) · 511 unmodified lines
873 cee_cfg->pfc_enable = state;902 cee_cfg->pfc_enable = state;
874}903}
875 904
905static int mlx5e_dcbnl_getbuffer(struct net_device *dev,
906 struct dcbnl_buffer *dcb_buffer)
907{
908 struct mlx5e_priv *priv = netdev_priv(dev);
909 struct mlx5_core_dev *mdev = priv->mdev;
910 struct mlx5e_port_buffer port_buffer;
911 u8 buffer[MLX5E_MAX_PRIORITY];
912 int i, err;
913
914 if (!MLX5_BUFFER_SUPPORTED(mdev))
915 return -EOPNOTSUPP;
916
917 err = mlx5e_port_query_priority2buffer(mdev, buffer);
918 if (err)
919 return err;
920
921 for (i = 0; i < MLX5E_MAX_PRIORITY; i++)
922 dcb_buffer->prio2buffer[i] = buffer[i];
923
924 err = mlx5e_port_query_buffer(priv, &port_buffer);
925 if (err)
926 return err;
927
928 for (i = 0; i < MLX5E_MAX_BUFFER; i++)
929 dcb_buffer->buffer_size[i] = port_buffer.buffer[i].size;
930 dcb_buffer->total_size = port_buffer.port_buffer_size;
931
932 return 0;
933}
934
935static int mlx5e_dcbnl_setbuffer(struct net_device *dev,
936 struct dcbnl_buffer *dcb_buffer)
937{
938 struct mlx5e_priv *priv = netdev_priv(dev);
939 struct mlx5_core_dev *mdev = priv->mdev;
940 struct mlx5e_port_buffer port_buffer;
941 u8 old_prio2buffer[MLX5E_MAX_PRIORITY];
942 u32 *buffer_size = NULL;
943 u8 *prio2buffer = NULL;
944 u32 changed = 0;
945 int i, err;
946
947 if (!MLX5_BUFFER_SUPPORTED(mdev))
948 return -EOPNOTSUPP;
949
950 for (i = 0; i < DCBX_MAX_BUFFERS; i++)
951 mlx5_core_dbg(mdev, "buffer[%d]=%d\n", i, dcb_buffer->buffer_size[i]);
952
953 for (i = 0; i < MLX5E_MAX_PRIORITY; i++)
954 mlx5_core_dbg(mdev, "priority %d buffer%d\n", i, dcb_buffer->prio2buffer[i]);
955
956 err = mlx5e_port_query_priority2buffer(mdev, old_prio2buffer);
957 if (err)
958 return err;
959
960 for (i = 0; i < MLX5E_MAX_PRIORITY; i++) {
961 if (dcb_buffer->prio2buffer[i] != old_prio2buffer[i]) {
962 changed |= MLX5E_PORT_BUFFER_PRIO2BUFFER;
963 prio2buffer = dcb_buffer->prio2buffer;
964 break;
965 }
966 }
967
968 err = mlx5e_port_query_buffer(priv, &port_buffer);
969 if (err)
970 return err;
971
972 for (i = 0; i < MLX5E_MAX_BUFFER; i++) {
973 if (port_buffer.buffer[i].size != dcb_buffer->buffer_size[i]) {
974 changed |= MLX5E_PORT_BUFFER_SIZE;
975 buffer_size = dcb_buffer->buffer_size;
976 break;
977 }
978 }
979
980 if (!changed)
981 return 0;
982
983 priv->dcbx.manual_buffer = true;
984 err = mlx5e_port_manual_buffer_config(priv, changed, dev->mtu, NULL,
985 buffer_size, prio2buffer);
986 return err;
987}
988
876const struct dcbnl_rtnl_ops mlx5e_dcbnl_ops = {989const struct dcbnl_rtnl_ops mlx5e_dcbnl_ops = {
877 .ieee_getets = mlx5e_dcbnl_ieee_getets,990 .ieee_getets = mlx5e_dcbnl_ieee_getets,
878 .ieee_setets = mlx5e_dcbnl_ieee_setets,991 .ieee_setets = mlx5e_dcbnl_ieee_setets,
@@ -884,6 +997,8 @@ const struct dcbnl_rtnl_ops mlx5e_dcbnl_ops = { · 5 unmodified lines
884 .ieee_delapp = mlx5e_dcbnl_ieee_delapp,997 .ieee_delapp = mlx5e_dcbnl_ieee_delapp,
885 .getdcbx = mlx5e_dcbnl_getdcbx,998 .getdcbx = mlx5e_dcbnl_getdcbx,
886 .setdcbx = mlx5e_dcbnl_setdcbx,999 .setdcbx = mlx5e_dcbnl_setdcbx,
1000 .dcbnl_getbuffer = mlx5e_dcbnl_getbuffer,
1001 .dcbnl_setbuffer = mlx5e_dcbnl_setbuffer,
887 1002
888/* CEE interfaces */1003/* CEE interfaces */
889 .setall = mlx5e_dcbnl_setall,1004 .setall = mlx5e_dcbnl_setall,
@@ -1091,5 +1206,8 @@ void mlx5e_dcbnl_initialize(struct mlx5e_priv *priv) · 201 unmodified lines
1091 if (priv->dcbx.mode == MLX5E_DCBX_PARAM_VER_OPER_HOST)1206 if (priv->dcbx.mode == MLX5E_DCBX_PARAM_VER_OPER_HOST)
1092 priv->dcbx.cap |= DCB_CAP_DCBX_HOST;1207 priv->dcbx.cap |= DCB_CAP_DCBX_HOST;
1093 1208
1209 priv->dcbx.manual_buffer = false;
1210 priv->dcbx.cable_len = MLX5E_DEFAULT_CABLE_LEN;
1211
1094 mlx5e_ets_init(priv);1212 mlx5e_ets_init(priv);
1095}1213}

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t