Skip to content

Commit

Permalink
DCB: Add support for DCB BCN
Browse files Browse the repository at this point in the history 
Adds an interface to configure the Backward Congestion Notification
(BCN) feature.  In a BCN capabale network, congestion notifications
from congested points out in the network can cause the end station
limit the rate of a given traffic flow.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
@davem330
Alexander Duyck authored and davem330 committed Nov 21, 2008
1 parent 0eb3aa9 commit 859ee3c
Show file tree
Hide file tree
Showing 5 changed files with 416 additions and 9 deletions.
27 changes: 27 additions & 0 deletions drivers/net/ixgbe/ixgbe_dcb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,34 @@ enum dcb_rx_pba_cfg {
pba_80_48 /* PBA[0-3] each use 80KB, PBA[4-7] each use 48KB */
};

/*
* This structure contains many values encoded as fixed-point
* numbers, meaning that some of bits are dedicated to the
* magnitude and others to the fraction part. In the comments
* this is shown as f=n, where n is the number of fraction bits.
* These fraction bits are always the low-order bits. The size
* of the magnitude is not specified.
*/
struct bcn_config {
u32 rp_admin_mode[MAX_TRAFFIC_CLASS]; /* BCN enabled, per TC */
u32 bcna_option[2]; /* BCNA Port + MAC Addr */
u32 rp_w; /* Derivative Weight, f=3 */
u32 rp_gi; /* Increase Gain, f=12 */
u32 rp_gd; /* Decrease Gain, f=12 */
u32 rp_ru; /* Rate Unit */
u32 rp_alpha; /* Max Decrease Factor, f=12 */
u32 rp_beta; /* Max Increase Factor, f=12 */
u32 rp_ri; /* Initial Rate */
u32 rp_td; /* Drift Interval Timer */
u32 rp_rd; /* Drift Increase */
u32 rp_tmax; /* Severe Congestion Backoff Timer Range */
u32 rp_rmin; /* Severe Congestion Restart Rate */
u32 rp_wrtt; /* RTT Moving Average Weight */
};

struct ixgbe_dcb_config {
struct bcn_config bcn;

struct tc_configuration tc_config[MAX_TRAFFIC_CLASS];
u8 bw_percentage[2][MAX_BW_GROUP]; /* One each for Tx/Rx */

Expand Down
176 changes: 175 additions & 1 deletion drivers/net/ixgbe/ixgbe_dcb_nl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#define BIT_PFC 0x02
#define BIT_PG_RX 0x04
#define BIT_PG_TX 0x08
#define BIT_BCN 0x10

int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,
struct ixgbe_dcb_config *dst_dcb_cfg, int tc_max)
Expand Down Expand Up @@ -88,6 +89,23 @@ int ixgbe_copy_dcb_cfg(struct ixgbe_dcb_config *src_dcb_cfg,
src_dcb_cfg->tc_config[i - DCB_PFC_UP_ATTR_0].dcb_pfc;
}

for (i = DCB_BCN_ATTR_RP_0; i < DCB_BCN_ATTR_RP_ALL; i++) {
dst_dcb_cfg->bcn.rp_admin_mode[i - DCB_BCN_ATTR_RP_0] =
src_dcb_cfg->bcn.rp_admin_mode[i - DCB_BCN_ATTR_RP_0];
}
dst_dcb_cfg->bcn.rp_alpha = src_dcb_cfg->bcn.rp_alpha;
dst_dcb_cfg->bcn.rp_beta = src_dcb_cfg->bcn.rp_beta;
dst_dcb_cfg->bcn.rp_gd = src_dcb_cfg->bcn.rp_gd;
dst_dcb_cfg->bcn.rp_gi = src_dcb_cfg->bcn.rp_gi;
dst_dcb_cfg->bcn.rp_tmax = src_dcb_cfg->bcn.rp_tmax;
dst_dcb_cfg->bcn.rp_td = src_dcb_cfg->bcn.rp_td;
dst_dcb_cfg->bcn.rp_rmin = src_dcb_cfg->bcn.rp_rmin;
dst_dcb_cfg->bcn.rp_w = src_dcb_cfg->bcn.rp_w;
dst_dcb_cfg->bcn.rp_rd = src_dcb_cfg->bcn.rp_rd;
dst_dcb_cfg->bcn.rp_ru = src_dcb_cfg->bcn.rp_ru;
dst_dcb_cfg->bcn.rp_wrtt = src_dcb_cfg->bcn.rp_wrtt;
dst_dcb_cfg->bcn.rp_ri = src_dcb_cfg->bcn.rp_ri;

return 0;
}

Expand Down Expand Up @@ -313,6 +331,7 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
struct ixgbe_adapter *adapter = netdev_priv(netdev);
int ret;

adapter->dcb_set_bitmap &= ~BIT_BCN; /* no set for BCN */
if (!adapter->dcb_set_bitmap)
return 1;

Expand Down Expand Up @@ -417,6 +436,157 @@ static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state)
return;
}

static void ixgbe_dcbnl_getbcnrp(struct net_device *netdev, int priority,
u8 *setting)
{
struct ixgbe_adapter *adapter = netdev_priv(netdev);

*setting = adapter->dcb_cfg.bcn.rp_admin_mode[priority];
}


static void ixgbe_dcbnl_getbcncfg(struct net_device *netdev, int enum_index,
u32 *setting)
{
struct ixgbe_adapter *adapter = netdev_priv(netdev);

switch (enum_index) {
case DCB_BCN_ATTR_ALPHA:
*setting = adapter->dcb_cfg.bcn.rp_alpha;
break;
case DCB_BCN_ATTR_BETA:
*setting = adapter->dcb_cfg.bcn.rp_beta;
break;
case DCB_BCN_ATTR_GD:
*setting = adapter->dcb_cfg.bcn.rp_gd;
break;
case DCB_BCN_ATTR_GI:
*setting = adapter->dcb_cfg.bcn.rp_gi;
break;
case DCB_BCN_ATTR_TMAX:
*setting = adapter->dcb_cfg.bcn.rp_tmax;
break;
case DCB_BCN_ATTR_TD:
*setting = adapter->dcb_cfg.bcn.rp_td;
break;
case DCB_BCN_ATTR_RMIN:
*setting = adapter->dcb_cfg.bcn.rp_rmin;
break;
case DCB_BCN_ATTR_W:
*setting = adapter->dcb_cfg.bcn.rp_w;
break;
case DCB_BCN_ATTR_RD:
*setting = adapter->dcb_cfg.bcn.rp_rd;
break;
case DCB_BCN_ATTR_RU:
*setting = adapter->dcb_cfg.bcn.rp_ru;
break;
case DCB_BCN_ATTR_WRTT:
*setting = adapter->dcb_cfg.bcn.rp_wrtt;
break;
case DCB_BCN_ATTR_RI:
*setting = adapter->dcb_cfg.bcn.rp_ri;
break;
default:
*setting = -1;
}
}

static void ixgbe_dcbnl_setbcnrp(struct net_device *netdev, int priority,
u8 setting)
{
struct ixgbe_adapter *adapter = netdev_priv(netdev);

adapter->temp_dcb_cfg.bcn.rp_admin_mode[priority] = setting;

if (adapter->temp_dcb_cfg.bcn.rp_admin_mode[priority] !=
adapter->dcb_cfg.bcn.rp_admin_mode[priority])
adapter->dcb_set_bitmap |= BIT_BCN;
}

static void ixgbe_dcbnl_setbcncfg(struct net_device *netdev, int enum_index,
u32 setting)
{
struct ixgbe_adapter *adapter = netdev_priv(netdev);

switch (enum_index) {
case DCB_BCN_ATTR_ALPHA:
adapter->temp_dcb_cfg.bcn.rp_alpha = setting;
if (adapter->temp_dcb_cfg.bcn.rp_alpha !=
adapter->dcb_cfg.bcn.rp_alpha)
adapter->dcb_set_bitmap |= BIT_BCN;
break;
case DCB_BCN_ATTR_BETA:
adapter->temp_dcb_cfg.bcn.rp_beta = setting;
if (adapter->temp_dcb_cfg.bcn.rp_beta !=
adapter->dcb_cfg.bcn.rp_beta)
adapter->dcb_set_bitmap |= BIT_BCN;
break;
case DCB_BCN_ATTR_GD:
adapter->temp_dcb_cfg.bcn.rp_gd = setting;
if (adapter->temp_dcb_cfg.bcn.rp_gd !=
adapter->dcb_cfg.bcn.rp_gd)
adapter->dcb_set_bitmap |= BIT_BCN;
break;
case DCB_BCN_ATTR_GI:
adapter->temp_dcb_cfg.bcn.rp_gi = setting;
if (adapter->temp_dcb_cfg.bcn.rp_gi !=
adapter->dcb_cfg.bcn.rp_gi)
adapter->dcb_set_bitmap |= BIT_BCN;
break;
case DCB_BCN_ATTR_TMAX:
adapter->temp_dcb_cfg.bcn.rp_tmax = setting;
if (adapter->temp_dcb_cfg.bcn.rp_tmax !=
adapter->dcb_cfg.bcn.rp_tmax)
adapter->dcb_set_bitmap |= BIT_BCN;
break;
case DCB_BCN_ATTR_TD:
adapter->temp_dcb_cfg.bcn.rp_td = setting;
if (adapter->temp_dcb_cfg.bcn.rp_td !=
adapter->dcb_cfg.bcn.rp_td)
adapter->dcb_set_bitmap |= BIT_BCN;
break;
case DCB_BCN_ATTR_RMIN:
adapter->temp_dcb_cfg.bcn.rp_rmin = setting;
if (adapter->temp_dcb_cfg.bcn.rp_rmin !=
adapter->dcb_cfg.bcn.rp_rmin)
adapter->dcb_set_bitmap |= BIT_BCN;
break;
case DCB_BCN_ATTR_W:
adapter->temp_dcb_cfg.bcn.rp_w = setting;
if (adapter->temp_dcb_cfg.bcn.rp_w !=
adapter->dcb_cfg.bcn.rp_w)
adapter->dcb_set_bitmap |= BIT_BCN;
break;
case DCB_BCN_ATTR_RD:
adapter->temp_dcb_cfg.bcn.rp_rd = setting;
if (adapter->temp_dcb_cfg.bcn.rp_rd !=
adapter->dcb_cfg.bcn.rp_rd)
adapter->dcb_set_bitmap |= BIT_BCN;
break;
case DCB_BCN_ATTR_RU:
adapter->temp_dcb_cfg.bcn.rp_ru = setting;
if (adapter->temp_dcb_cfg.bcn.rp_ru !=
adapter->dcb_cfg.bcn.rp_ru)
adapter->dcb_set_bitmap |= BIT_BCN;
break;
case DCB_BCN_ATTR_WRTT:
adapter->temp_dcb_cfg.bcn.rp_wrtt = setting;
if (adapter->temp_dcb_cfg.bcn.rp_wrtt !=
adapter->dcb_cfg.bcn.rp_wrtt)
adapter->dcb_set_bitmap |= BIT_BCN;
break;
case DCB_BCN_ATTR_RI:
adapter->temp_dcb_cfg.bcn.rp_ri = setting;
if (adapter->temp_dcb_cfg.bcn.rp_ri !=
adapter->dcb_cfg.bcn.rp_ri)
adapter->dcb_set_bitmap |= BIT_BCN;
break;
default:
break;
}
}

struct dcbnl_rtnl_ops dcbnl_ops = {
.getstate = ixgbe_dcbnl_get_state,
.setstate = ixgbe_dcbnl_set_state,
Expand All @@ -436,6 +606,10 @@ struct dcbnl_rtnl_ops dcbnl_ops = {
.getnumtcs = ixgbe_dcbnl_getnumtcs,
.setnumtcs = ixgbe_dcbnl_setnumtcs,
.getpfcstate = ixgbe_dcbnl_getpfcstate,
.setpfcstate = ixgbe_dcbnl_setpfcstate
.setpfcstate = ixgbe_dcbnl_setpfcstate,
.getbcncfg = ixgbe_dcbnl_getbcncfg,
.getbcnrp = ixgbe_dcbnl_getbcnrp,
.setbcncfg = ixgbe_dcbnl_setbcncfg,
.setbcnrp = ixgbe_dcbnl_setbcnrp
};

44 changes: 43 additions & 1 deletion include/linux/dcbnl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ struct dcbmsg {
* @DCB_CMD_GCAP: request the DCB capabilities of the device
* @DCB_CMD_GNUMTCS: get the number of traffic classes currently supported
* @DCB_CMD_SNUMTCS: set the number of traffic classes
* @DCB_CMD_GBCN: set backward congestion notification configuration
* @DCB_CMD_SBCN: get backward congestion notification configration.
*/
enum dcbnl_commands {
DCB_CMD_UNDEFINED,
Expand All @@ -62,18 +64,24 @@ enum dcbnl_commands {
DCB_CMD_PFC_SCFG,

DCB_CMD_SET_ALL,

DCB_CMD_GPERM_HWADDR,

DCB_CMD_GCAP,

DCB_CMD_GNUMTCS,
DCB_CMD_SNUMTCS,

DCB_CMD_PFC_GSTATE,
DCB_CMD_PFC_SSTATE,

DCB_CMD_BCN_GCFG,
DCB_CMD_BCN_SCFG,

__DCB_CMD_ENUM_MAX,
DCB_CMD_MAX = __DCB_CMD_ENUM_MAX - 1,
};


/**
* enum dcbnl_attrs - DCB top-level netlink attributes
*
Expand All @@ -88,6 +96,7 @@ enum dcbnl_commands {
* @DCB_ATTR_PERM_HWADDR: MAC address of the physical device (NLA_NESTED)
* @DCB_ATTR_CAP: DCB capabilities of the device (NLA_NESTED)
* @DCB_ATTR_NUMTCS: number of traffic classes supported (NLA_NESTED)
* @DCB_ATTR_BCN: backward congestion notification configuration (NLA_NESTED)
*/
enum dcbnl_attrs {
DCB_ATTR_UNDEFINED,
Expand All @@ -102,6 +111,7 @@ enum dcbnl_attrs {
DCB_ATTR_PERM_HWADDR,
DCB_ATTR_CAP,
DCB_ATTR_NUMTCS,
DCB_ATTR_BCN,

__DCB_ATTR_ENUM_MAX,
DCB_ATTR_MAX = __DCB_ATTR_ENUM_MAX - 1,
Expand Down Expand Up @@ -282,6 +292,38 @@ enum dcbnl_numtcs_attrs {
DCB_NUMTCS_ATTR_MAX = __DCB_NUMTCS_ATTR_ENUM_MAX - 1,
};

enum dcbnl_bcn_attrs{
DCB_BCN_ATTR_UNDEFINED = 0,

DCB_BCN_ATTR_RP_0,
DCB_BCN_ATTR_RP_1,
DCB_BCN_ATTR_RP_2,
DCB_BCN_ATTR_RP_3,
DCB_BCN_ATTR_RP_4,
DCB_BCN_ATTR_RP_5,
DCB_BCN_ATTR_RP_6,
DCB_BCN_ATTR_RP_7,
DCB_BCN_ATTR_RP_ALL,

DCB_BCN_ATTR_ALPHA,
DCB_BCN_ATTR_BETA,
DCB_BCN_ATTR_GD,
DCB_BCN_ATTR_GI,
DCB_BCN_ATTR_TMAX,
DCB_BCN_ATTR_TD,
DCB_BCN_ATTR_RMIN,
DCB_BCN_ATTR_W,
DCB_BCN_ATTR_RD,
DCB_BCN_ATTR_RU,
DCB_BCN_ATTR_WRTT,
DCB_BCN_ATTR_RI,
DCB_BCN_ATTR_C,
DCB_BCN_ATTR_ALL,

__DCB_BCN_ATTR_ENUM_MAX,
DCB_BCN_ATTR_MAX = __DCB_BCN_ATTR_ENUM_MAX - 1,
};

/**
* enum dcb_general_attr_values - general DCB attribute values
*
Expand Down
4 changes: 4 additions & 0 deletions include/net/dcbnl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ struct dcbnl_rtnl_ops {
u8 (*setnumtcs)(struct net_device *, int, u8);
u8 (*getpfcstate)(struct net_device *);
void (*setpfcstate)(struct net_device *, u8);
void (*getbcncfg)(struct net_device *, int, u32 *);
void (*setbcncfg)(struct net_device *, int, u32);
void (*getbcnrp)(struct net_device *, int, u8 *);
void (*setbcnrp)(struct net_device *, int, u8);
};

#endif /* __NET_DCBNL_H__ */
Loading

0 comments on commit 859ee3c

Please sign in to comment.