* [PATCH net-next 5/9] drivers: net: xgene: Extend ethtool statistics
From: Iyappan Subramanian @ 2017-04-26 23:38 UTC (permalink / raw)
To: davem, netdev; +Cc: linux-arm-kernel, patches, Quan Nguyen, Iyappan Subramanian
In-Reply-To: <1493249935-30759-1-git-send-email-isubramanian@apm.com>
From: Quan Nguyen <qnguyen@apm.com>
This patch adds extended ethtool statistics support.
Signed-off-by: Quan Nguyen <qnguyen@apm.com>
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
---
.../net/ethernet/apm/xgene/xgene_enet_ethtool.c | 90 +++++++++++++++++++++-
drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 20 +++++
drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 50 ++++++++++++
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 8 ++
drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 5 ++
drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 16 ++++
drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 20 +++++
drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 1 +
8 files changed, 209 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
index 217cde8..bbc90b6 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
@@ -23,9 +23,17 @@
struct xgene_gstrings_stats {
char name[ETH_GSTRING_LEN];
int offset;
+ u32 addr;
+ u32 mask;
};
#define XGENE_STAT(m) { #m, offsetof(struct rtnl_link_stats64, m) }
+#define XGENE_EXTD_STAT(s, a, m) \
+ { \
+ .name = #s, \
+ .addr = a ## _ADDR, \
+ .mask = m \
+ }
static const struct xgene_gstrings_stats gstrings_stats[] = {
XGENE_STAT(rx_packets),
@@ -40,7 +48,51 @@ struct xgene_gstrings_stats {
XGENE_STAT(rx_fifo_errors)
};
+static const struct xgene_gstrings_stats gstrings_extd_stats[] = {
+ XGENE_EXTD_STAT(tx_rx_64b_frame_cntr, TR64, 31),
+ XGENE_EXTD_STAT(tx_rx_127b_frame_cntr, TR127, 31),
+ XGENE_EXTD_STAT(tx_rx_255b_frame_cntr, TR255, 31),
+ XGENE_EXTD_STAT(tx_rx_511b_frame_cntr, TR511, 31),
+ XGENE_EXTD_STAT(tx_rx_1023b_frame_cntr, TR1K, 31),
+ XGENE_EXTD_STAT(tx_rx_1518b_frame_cntr, TRMAX, 31),
+ XGENE_EXTD_STAT(tx_rx_1522b_frame_cntr, TRMGV, 31),
+ XGENE_EXTD_STAT(rx_fcs_error_cntr, RFCS, 16),
+ XGENE_EXTD_STAT(rx_multicast_pkt_cntr, RMCA, 31),
+ XGENE_EXTD_STAT(rx_broadcast_pkt_cntr, RBCA, 31),
+ XGENE_EXTD_STAT(rx_ctrl_frame_pkt_cntr, RXCF, 16),
+ XGENE_EXTD_STAT(rx_pause_frame_pkt_cntr, RXPF, 16),
+ XGENE_EXTD_STAT(rx_unk_opcode_cntr, RXUO, 16),
+ XGENE_EXTD_STAT(rx_align_err_cntr, RALN, 16),
+ XGENE_EXTD_STAT(rx_frame_len_err_cntr, RFLR, 16),
+ XGENE_EXTD_STAT(rx_code_err_cntr, RCDE, 16),
+ XGENE_EXTD_STAT(rx_carrier_sense_err_cntr, RCSE, 16),
+ XGENE_EXTD_STAT(rx_undersize_pkt_cntr, RUND, 16),
+ XGENE_EXTD_STAT(rx_oversize_pkt_cntr, ROVR, 16),
+ XGENE_EXTD_STAT(rx_fragments_cntr, RFRG, 16),
+ XGENE_EXTD_STAT(rx_jabber_cntr, RJBR, 16),
+ XGENE_EXTD_STAT(rx_dropped_pkt_cntr, RDRP, 16),
+ XGENE_EXTD_STAT(tx_multicast_pkt_cntr, TMCA, 31),
+ XGENE_EXTD_STAT(tx_broadcast_pkt_cntr, TBCA, 31),
+ XGENE_EXTD_STAT(tx_pause_ctrl_frame_cntr, TXPF, 16),
+ XGENE_EXTD_STAT(tx_defer_pkt_cntr, TDFR, 31),
+ XGENE_EXTD_STAT(tx_excv_defer_pkt_cntr, TEDF, 31),
+ XGENE_EXTD_STAT(tx_single_col_pkt_cntr, TSCL, 31),
+ XGENE_EXTD_STAT(tx_multi_col_pkt_cntr, TMCL, 31),
+ XGENE_EXTD_STAT(tx_late_col_pkt_cntr, TLCL, 31),
+ XGENE_EXTD_STAT(tx_excv_col_pkt_cntr, TXCL, 31),
+ XGENE_EXTD_STAT(tx_total_col_cntr, TNCL, 31),
+ XGENE_EXTD_STAT(tx_pause_frames_hnrd_cntr, TPFH, 16),
+ XGENE_EXTD_STAT(tx_drop_frame_cntr, TDRP, 16),
+ XGENE_EXTD_STAT(tx_jabber_frame_cntr, TJBR, 12),
+ XGENE_EXTD_STAT(tx_fcs_error_cntr, TFCS, 12),
+ XGENE_EXTD_STAT(tx_ctrl_frame_cntr, TXCF, 12),
+ XGENE_EXTD_STAT(tx_oversize_frame_cntr, TOVR, 12),
+ XGENE_EXTD_STAT(tx_undersize_frame_cntr, TUND, 12),
+ XGENE_EXTD_STAT(tx_fragments_cntr, TFRG, 12)
+};
+
#define XGENE_STATS_LEN ARRAY_SIZE(gstrings_stats)
+#define XGENE_EXTD_STATS_LEN ARRAY_SIZE(gstrings_extd_stats)
static void xgene_get_drvinfo(struct net_device *ndev,
struct ethtool_drvinfo *info)
@@ -142,6 +194,11 @@ static void xgene_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
memcpy(p, gstrings_stats[i].name, ETH_GSTRING_LEN);
p += ETH_GSTRING_LEN;
}
+
+ for (i = 0; i < XGENE_EXTD_STATS_LEN; i++) {
+ memcpy(p, gstrings_extd_stats[i].name, ETH_GSTRING_LEN);
+ p += ETH_GSTRING_LEN;
+ }
}
static int xgene_get_sset_count(struct net_device *ndev, int sset)
@@ -149,19 +206,50 @@ static int xgene_get_sset_count(struct net_device *ndev, int sset)
if (sset != ETH_SS_STATS)
return -EINVAL;
- return XGENE_STATS_LEN;
+ return XGENE_STATS_LEN + XGENE_EXTD_STATS_LEN;
+}
+
+static void xgene_get_extd_stats(struct xgene_enet_pdata *pdata)
+{
+ u32 tmp;
+ int i;
+
+ for (i = 0; i < XGENE_EXTD_STATS_LEN; i++) {
+ pdata->mac_ops->read_stats(pdata,
+ gstrings_extd_stats[i].addr, &tmp);
+ pdata->extd_stats[i] += tmp &
+ GENMASK(gstrings_extd_stats[i].mask - 1, 0);
+ }
+}
+
+int xgene_extd_stats_init(struct xgene_enet_pdata *pdata)
+{
+ pdata->extd_stats = devm_kmalloc_array(&pdata->pdev->dev,
+ XGENE_EXTD_STATS_LEN, sizeof(u64), GFP_KERNEL);
+ if (!pdata->extd_stats)
+ return -ENOMEM;
+
+ xgene_get_extd_stats(pdata);
+ memset(pdata->extd_stats, 0, XGENE_EXTD_STATS_LEN * sizeof(u64));
+
+ return 0;
}
static void xgene_get_ethtool_stats(struct net_device *ndev,
struct ethtool_stats *dummy,
u64 *data)
{
+ struct xgene_enet_pdata *pdata = netdev_priv(ndev);
struct rtnl_link_stats64 stats;
int i;
dev_get_stats(ndev, &stats);
for (i = 0; i < XGENE_STATS_LEN; i++)
data[i] = *(u64 *)((char *)&stats + gstrings_stats[i].offset);
+
+ xgene_get_extd_stats(pdata);
+ for (i = 0; i < XGENE_EXTD_STATS_LEN; i++)
+ data[i + XGENE_STATS_LEN] = pdata->extd_stats[i];
}
static void xgene_get_pauseparam(struct net_device *ndev,
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
index 06bef14..ec5f61f 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
@@ -366,6 +366,25 @@ static void xgene_enet_rd_mcx_mac(struct xgene_enet_pdata *pdata,
spin_unlock(&pdata->mac_lock);
}
+static void xgene_enet_rd_mcx_stats(struct xgene_enet_pdata *pdata,
+ u32 rd_addr, u32 *rd_data)
+{
+ void __iomem *addr, *rd, *cmd, *cmd_done;
+ int ret;
+
+ addr = pdata->mcx_stats_addr + STAT_ADDR_REG_OFFSET;
+ rd = pdata->mcx_stats_addr + STAT_READ_REG_OFFSET;
+ cmd = pdata->mcx_stats_addr + STAT_COMMAND_REG_OFFSET;
+ cmd_done = pdata->mcx_stats_addr + STAT_COMMAND_DONE_REG_OFFSET;
+
+ spin_lock(&pdata->stats_lock);
+ ret = xgene_enet_rd_indirect(addr, rd, cmd, cmd_done, rd_addr, rd_data);
+ if (!ret)
+ netdev_err(pdata->ndev, "MCX stats read not completed, addr: %04x\n",
+ rd_addr);
+ spin_unlock(&pdata->stats_lock);
+}
+
static void xgene_gmac_set_mac_addr(struct xgene_enet_pdata *pdata)
{
u32 addr0, addr1;
@@ -1005,6 +1024,7 @@ void xgene_enet_mdio_remove(struct xgene_enet_pdata *pdata)
.tx_enable = xgene_gmac_tx_enable,
.rx_disable = xgene_gmac_rx_disable,
.tx_disable = xgene_gmac_tx_disable,
+ .read_stats = xgene_enet_rd_mcx_stats,
.set_speed = xgene_gmac_set_speed,
.set_mac_addr = xgene_gmac_set_mac_addr,
.set_framesize = xgene_enet_set_frame_size,
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
index 5a9f9d5..9130c05 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
@@ -115,6 +115,7 @@ enum xgene_enet_rm {
#define BLOCK_ETH_CLKRST_CSR_OFFSET 0xc000
#define BLOCK_ETH_DIAG_CSR_OFFSET 0xD000
#define BLOCK_ETH_MAC_OFFSET 0x0000
+#define BLOCK_ETH_STATS_OFFSET 0x0000
#define BLOCK_ETH_MAC_CSR_OFFSET 0x2800
#define CLKEN_ADDR 0xc208
@@ -126,6 +127,12 @@ enum xgene_enet_rm {
#define MAC_READ_REG_OFFSET 0x0c
#define MAC_COMMAND_DONE_REG_OFFSET 0x10
+#define STAT_ADDR_REG_OFFSET 0x14
+#define STAT_COMMAND_REG_OFFSET 0x18
+#define STAT_WRITE_REG_OFFSET 0x1c
+#define STAT_READ_REG_OFFSET 0x20
+#define STAT_COMMAND_DONE_REG_OFFSET 0x24
+
#define PCS_ADDR_REG_OFFSET 0x00
#define PCS_COMMAND_REG_OFFSET 0x04
#define PCS_WRITE_REG_OFFSET 0x08
@@ -218,6 +225,49 @@ enum xgene_enet_rm {
#define PAD_CRC BIT(2)
#define LENGTH_CHK BIT(4)
+#define TR64_ADDR 0x20
+#define TR127_ADDR 0x21
+#define TR255_ADDR 0x22
+#define TR511_ADDR 0x23
+#define TR1K_ADDR 0x24
+#define TRMAX_ADDR 0x25
+#define TRMGV_ADDR 0x26
+
+#define RFCS_ADDR 0x29
+#define RMCA_ADDR 0x2a
+#define RBCA_ADDR 0x2b
+#define RXCF_ADDR 0x2c
+#define RXPF_ADDR 0x2d
+#define RXUO_ADDR 0x2e
+#define RALN_ADDR 0x2f
+#define RFLR_ADDR 0x30
+#define RCDE_ADDR 0x31
+#define RCSE_ADDR 0x32
+#define RUND_ADDR 0x33
+#define ROVR_ADDR 0x34
+#define RFRG_ADDR 0x35
+#define RJBR_ADDR 0x36
+#define RDRP_ADDR 0x37
+
+#define TMCA_ADDR 0x3a
+#define TBCA_ADDR 0x3b
+#define TXPF_ADDR 0x3c
+#define TDFR_ADDR 0x3d
+#define TEDF_ADDR 0x3e
+#define TSCL_ADDR 0x3f
+#define TMCL_ADDR 0x40
+#define TLCL_ADDR 0x41
+#define TXCL_ADDR 0x42
+#define TNCL_ADDR 0x43
+#define TPFH_ADDR 0x44
+#define TDRP_ADDR 0x45
+#define TJBR_ADDR 0x46
+#define TFCS_ADDR 0x47
+#define TXCF_ADDR 0x48
+#define TOVR_ADDR 0x49
+#define TUND_ADDR 0x4a
+#define TFRG_ADDR 0x4b
+
#define TSO_IPPROTO_TCP 1
#define USERINFO_POS 0
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 3f24b83..bd2486e 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -1792,12 +1792,15 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII ||
pdata->phy_mode == PHY_INTERFACE_MODE_SGMII) {
pdata->mcx_mac_addr = pdata->base_addr + BLOCK_ETH_MAC_OFFSET;
+ pdata->mcx_stats_addr =
+ pdata->base_addr + BLOCK_ETH_STATS_OFFSET;
offset = (pdata->enet_id == XGENE_ENET1) ?
BLOCK_ETH_MAC_CSR_OFFSET :
X2_BLOCK_ETH_MAC_CSR_OFFSET;
pdata->mcx_mac_csr_addr = base_addr + offset;
} else {
pdata->mcx_mac_addr = base_addr + BLOCK_AXG_MAC_OFFSET;
+ pdata->mcx_stats_addr = base_addr + BLOCK_AXG_STATS_OFFSET;
pdata->mcx_mac_csr_addr = base_addr + BLOCK_AXG_MAC_CSR_OFFSET;
pdata->pcs_addr = base_addr + BLOCK_PCS_OFFSET;
}
@@ -2090,6 +2093,11 @@ static int xgene_enet_probe(struct platform_device *pdev)
goto err1;
}
+ spin_lock_init(&pdata->stats_lock);
+ ret = xgene_extd_stats_init(pdata);
+ if (ret)
+ goto err2;
+
xgene_enet_napi_add(pdata);
ret = register_netdev(ndev);
if (ret) {
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
index 3bf6638..dc56519 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
@@ -157,6 +157,7 @@ struct xgene_mac_ops {
void (*rx_enable)(struct xgene_enet_pdata *pdata);
void (*tx_disable)(struct xgene_enet_pdata *pdata);
void (*rx_disable)(struct xgene_enet_pdata *pdata);
+ void (*read_stats)(struct xgene_enet_pdata *pdata, u32 addr, u32 *data);
void (*set_speed)(struct xgene_enet_pdata *pdata);
void (*set_mac_addr)(struct xgene_enet_pdata *pdata);
void (*set_framesize)(struct xgene_enet_pdata *pdata, int framesize);
@@ -214,6 +215,7 @@ struct xgene_enet_pdata {
void __iomem *eth_diag_csr_addr;
void __iomem *mcx_mac_addr;
void __iomem *mcx_mac_csr_addr;
+ void __iomem *mcx_stats_addr;
void __iomem *base_addr;
void __iomem *pcs_addr;
void __iomem *ring_csr_addr;
@@ -221,6 +223,8 @@ struct xgene_enet_pdata {
int phy_mode;
enum xgene_enet_rm rm;
struct xgene_enet_cle cle;
+ u64 *extd_stats;
+ spinlock_t stats_lock; /* statistics lock */
const struct xgene_mac_ops *mac_ops;
spinlock_t mac_lock; /* mac lock */
const struct xgene_port_ops *port_ops;
@@ -265,5 +269,6 @@ static inline u16 xgene_enet_dst_ring_num(struct xgene_enet_desc_ring *ring)
}
void xgene_enet_set_ethtool_ops(struct net_device *netdev);
+int xgene_extd_stats_init(struct xgene_enet_pdata *pdata);
#endif /* __XGENE_ENET_MAIN_H__ */
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
index 4dd41f5..ec4341c 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
@@ -145,6 +145,21 @@ static u32 xgene_enet_rd_mac(struct xgene_enet_pdata *p, u32 rd_addr)
return val;
}
+static void xgene_enet_rd_mcx_stats(struct xgene_enet_pdata *p,
+ u32 rd_addr, u32 *rd_data)
+{
+ struct xgene_indirect_ctl ctl = {
+ .addr = p->mcx_stats_addr + STAT_ADDR_REG_OFFSET,
+ .ctl = p->mcx_stats_addr + STAT_READ_REG_OFFSET,
+ .cmd = p->mcx_stats_addr + STAT_COMMAND_REG_OFFSET,
+ .cmd_done = p->mcx_stats_addr + STAT_COMMAND_DONE_REG_OFFSET
+ };
+
+ spin_lock(&p->stats_lock);
+ *rd_data = xgene_enet_rd_indirect(&ctl, rd_addr);
+ spin_unlock(&p->stats_lock);
+}
+
static int xgene_enet_ecc_init(struct xgene_enet_pdata *p)
{
struct net_device *ndev = p->ndev;
@@ -676,6 +691,7 @@ static void xgene_sgmac_enable_tx_pause(struct xgene_enet_pdata *p, bool enable)
.tx_enable = xgene_sgmac_tx_enable,
.rx_disable = xgene_sgmac_rx_disable,
.tx_disable = xgene_sgmac_tx_disable,
+ .read_stats = xgene_enet_rd_mcx_stats,
.set_speed = xgene_sgmac_set_speed,
.set_mac_addr = xgene_sgmac_set_mac_addr,
.set_framesize = xgene_sgmac_set_frame_size,
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
index 9a2d0ca..0a28162 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
@@ -165,6 +165,25 @@ static void xgene_enet_rd_mac(struct xgene_enet_pdata *pdata,
spin_unlock(&pdata->mac_lock);
}
+static void xgene_enet_rd_axg_stats(struct xgene_enet_pdata *pdata,
+ u32 rd_addr, u32 *rd_data)
+{
+ void __iomem *addr, *rd, *cmd, *cmd_done;
+ int ret;
+
+ addr = pdata->mcx_stats_addr + STAT_ADDR_REG_OFFSET;
+ rd = pdata->mcx_stats_addr + STAT_READ_REG_OFFSET;
+ cmd = pdata->mcx_stats_addr + STAT_COMMAND_REG_OFFSET;
+ cmd_done = pdata->mcx_stats_addr + STAT_COMMAND_DONE_REG_OFFSET;
+
+ spin_lock(&pdata->stats_lock);
+ ret = xgene_enet_rd_indirect(addr, rd, cmd, cmd_done, rd_addr, rd_data);
+ if (!ret)
+ netdev_err(pdata->ndev, "AXG stats read not completed, addr: %04x\n",
+ rd_addr);
+ spin_unlock(&pdata->stats_lock);
+}
+
static bool xgene_enet_rd_pcs(struct xgene_enet_pdata *pdata,
u32 rd_addr, u32 *rd_data)
{
@@ -569,6 +588,7 @@ static void xgene_enet_link_state(struct work_struct *work)
.set_mac_addr = xgene_xgmac_set_mac_addr,
.set_framesize = xgene_xgmac_set_frame_size,
.set_mss = xgene_xgmac_set_mss,
+ .read_stats = xgene_enet_rd_axg_stats,
.link_state = xgene_enet_link_state,
.enable_tx_pause = xgene_xgmac_enable_tx_pause,
.flowctl_rx = xgene_xgmac_flowctl_rx,
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h
index e644a42..9b98c83 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h
@@ -23,6 +23,7 @@
#define X2_BLOCK_ETH_MAC_CSR_OFFSET 0x3000
#define BLOCK_AXG_MAC_OFFSET 0x0800
+#define BLOCK_AXG_STATS_OFFSET 0x0800
#define BLOCK_AXG_MAC_CSR_OFFSET 0x2000
#define BLOCK_PCS_OFFSET 0x3800
--
1.9.1
^ permalink raw reply related
* [PATCH net-next 3/9] drivers: net: xgene: Refactor statistics error parsing code
From: Iyappan Subramanian @ 2017-04-26 23:38 UTC (permalink / raw)
To: davem, netdev; +Cc: linux-arm-kernel, patches, Quan Nguyen, Iyappan Subramanian
In-Reply-To: <1493249935-30759-1-git-send-email-isubramanian@apm.com>
From: Quan Nguyen <qnguyen@apm.com>
This patch fixes the tx error counters and adds more rx error counters.
Signed-off-by: Quan Nguyen <qnguyen@apm.com>
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
---
drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 6 ------
drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 2 --
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 26 +++++++++++++++---------
drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 2 ++
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
index 3697ba7..06bef14 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
@@ -205,30 +205,24 @@ static u32 xgene_enet_ring_len(struct xgene_enet_desc_ring *ring)
}
void xgene_enet_parse_error(struct xgene_enet_desc_ring *ring,
- struct xgene_enet_pdata *pdata,
enum xgene_enet_err_code status)
{
switch (status) {
case INGRESS_CRC:
ring->rx_crc_errors++;
- ring->rx_dropped++;
break;
case INGRESS_CHECKSUM:
case INGRESS_CHECKSUM_COMPUTE:
ring->rx_errors++;
- ring->rx_dropped++;
break;
case INGRESS_TRUNC_FRAME:
ring->rx_frame_errors++;
- ring->rx_dropped++;
break;
case INGRESS_PKT_LEN:
ring->rx_length_errors++;
- ring->rx_dropped++;
break;
case INGRESS_PKT_UNDER:
ring->rx_frame_errors++;
- ring->rx_dropped++;
break;
case INGRESS_FIFO_OVERRUN:
ring->rx_fifo_errors++;
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
index d250bfe..c6b5bbd 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
@@ -380,9 +380,7 @@ static inline u16 xgene_enet_get_numslots(u16 id, u32 size)
}
void xgene_enet_parse_error(struct xgene_enet_desc_ring *ring,
- struct xgene_enet_pdata *pdata,
enum xgene_enet_err_code status);
-
int xgene_enet_mdio_config(struct xgene_enet_pdata *pdata);
void xgene_enet_mdio_remove(struct xgene_enet_pdata *pdata);
bool xgene_ring_mgr_init(struct xgene_enet_pdata *p);
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index e4f2ef2..3f24b83 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -246,9 +246,9 @@ static int xgene_enet_tx_completion(struct xgene_enet_desc_ring *cp_ring,
skb_frag_t *frag;
dma_addr_t *frag_dma_addr;
u16 skb_index;
- u8 status;
- int i, ret = 0;
u8 mss_index;
+ u8 status;
+ int i;
skb_index = GET_VAL(USERINFO, le64_to_cpu(raw_desc->m0));
skb = cp_ring->cp_skb[skb_index];
@@ -275,19 +275,17 @@ static int xgene_enet_tx_completion(struct xgene_enet_desc_ring *cp_ring,
/* Checking for error */
status = GET_VAL(LERR, le64_to_cpu(raw_desc->m0));
if (unlikely(status > 2)) {
- xgene_enet_parse_error(cp_ring, netdev_priv(cp_ring->ndev),
- status);
- ret = -EIO;
+ cp_ring->tx_dropped++;
+ cp_ring->tx_errors++;
}
if (likely(skb)) {
dev_kfree_skb_any(skb);
} else {
netdev_err(cp_ring->ndev, "completion skb is NULL\n");
- ret = -EIO;
}
- return ret;
+ return 0;
}
static int xgene_enet_setup_mss(struct net_device *ndev, u32 mss)
@@ -711,7 +709,8 @@ static int xgene_enet_rx_frame(struct xgene_enet_desc_ring *rx_ring,
if (!xgene_enet_errata_10GE_8(skb, datalen, status)) {
dev_kfree_skb_any(skb);
xgene_enet_free_pagepool(page_pool, raw_desc, exp_desc);
- xgene_enet_parse_error(rx_ring, pdata, status);
+ xgene_enet_parse_error(rx_ring, status);
+ rx_ring->rx_dropped++;
goto out;
}
}
@@ -1477,6 +1476,8 @@ static void xgene_enet_get_stats64(
if (ring) {
stats->tx_packets += ring->tx_packets;
stats->tx_bytes += ring->tx_bytes;
+ stats->tx_dropped += ring->tx_dropped;
+ stats->tx_errors += ring->tx_errors;
}
}
@@ -1485,11 +1486,16 @@ static void xgene_enet_get_stats64(
if (ring) {
stats->rx_packets += ring->rx_packets;
stats->rx_bytes += ring->rx_bytes;
- stats->rx_errors += ring->rx_length_errors +
+ stats->rx_dropped += ring->rx_dropped;
+ stats->rx_errors += ring->rx_errors +
+ ring->rx_length_errors +
ring->rx_crc_errors +
ring->rx_frame_errors +
ring->rx_fifo_errors;
- stats->rx_dropped += ring->rx_dropped;
+ stats->rx_length_errors += ring->rx_length_errors;
+ stats->rx_crc_errors += ring->rx_crc_errors;
+ stats->rx_frame_errors += ring->rx_frame_errors;
+ stats->rx_fifo_errors += ring->rx_fifo_errors;
}
}
}
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
index 5e6fd71..3bf6638 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
@@ -138,6 +138,8 @@ struct xgene_enet_desc_ring {
__le64 *exp_bufs;
u64 tx_packets;
u64 tx_bytes;
+ u64 tx_dropped;
+ u64 tx_errors;
u64 rx_packets;
u64 rx_bytes;
u64 rx_dropped;
--
1.9.1
^ permalink raw reply related
* [PATCH net-next 4/9] drivers: net: xgene: Remove unused macros
From: Iyappan Subramanian @ 2017-04-26 23:38 UTC (permalink / raw)
To: davem, netdev; +Cc: linux-arm-kernel, patches, Quan Nguyen, Iyappan Subramanian
In-Reply-To: <1493249935-30759-1-git-send-email-isubramanian@apm.com>
From: Quan Nguyen <qnguyen@apm.com>
This patch cleans up unused macros to improve readability.
Signed-off-by: Quan Nguyen <qnguyen@apm.com>
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
---
drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
index c6b5bbd..5a9f9d5 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.h
@@ -217,12 +217,6 @@ enum xgene_enet_rm {
#define FULL_DUPLEX2 BIT(0)
#define PAD_CRC BIT(2)
#define LENGTH_CHK BIT(4)
-#define SCAN_AUTO_INCR BIT(5)
-#define TBYT_ADDR 0x38
-#define TPKT_ADDR 0x39
-#define TDRP_ADDR 0x45
-#define TFCS_ADDR 0x47
-#define TUND_ADDR 0x4a
#define TSO_IPPROTO_TCP 1
--
1.9.1
^ permalink raw reply related
* [PATCH net-next 2/9] drivers: net: xgene: Remove redundant local stats
From: Iyappan Subramanian @ 2017-04-26 23:38 UTC (permalink / raw)
To: davem, netdev; +Cc: linux-arm-kernel, patches, Quan Nguyen, Iyappan Subramanian
In-Reply-To: <1493249935-30759-1-git-send-email-isubramanian@apm.com>
From: Quan Nguyen <qnguyen@apm.com>
Commit 5944701df90d ("net: remove useless memset's in drivers get_stats64")
makes the pdata->stats redundant. This patch removes pdata->stats and
updates get_stats64() callback accordingly.
Signed-off-by: Quan Nguyen <qnguyen@apm.com>
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
---
drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c | 7 ++++---
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 4 +---
drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 1 -
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
index 28fdedc..217cde8 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_ethtool.c
@@ -25,7 +25,7 @@ struct xgene_gstrings_stats {
int offset;
};
-#define XGENE_STAT(m) { #m, offsetof(struct xgene_enet_pdata, stats.m) }
+#define XGENE_STAT(m) { #m, offsetof(struct rtnl_link_stats64, m) }
static const struct xgene_gstrings_stats gstrings_stats[] = {
XGENE_STAT(rx_packets),
@@ -156,11 +156,12 @@ static void xgene_get_ethtool_stats(struct net_device *ndev,
struct ethtool_stats *dummy,
u64 *data)
{
- void *pdata = netdev_priv(ndev);
+ struct rtnl_link_stats64 stats;
int i;
+ dev_get_stats(ndev, &stats);
for (i = 0; i < XGENE_STATS_LEN; i++)
- *data++ = *(u64 *)(pdata + gstrings_stats[i].offset);
+ data[i] = *(u64 *)((char *)&stats + gstrings_stats[i].offset);
}
static void xgene_get_pauseparam(struct net_device *ndev,
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 9a28ac3..e4f2ef2 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -1466,10 +1466,9 @@ static int xgene_enet_create_desc_rings(struct net_device *ndev)
static void xgene_enet_get_stats64(
struct net_device *ndev,
- struct rtnl_link_stats64 *storage)
+ struct rtnl_link_stats64 *stats)
{
struct xgene_enet_pdata *pdata = netdev_priv(ndev);
- struct rtnl_link_stats64 *stats = &pdata->stats;
struct xgene_enet_desc_ring *ring;
int i;
@@ -1493,7 +1492,6 @@ static void xgene_enet_get_stats64(
stats->rx_dropped += ring->rx_dropped;
}
}
- memcpy(storage, stats, sizeof(struct rtnl_link_stats64));
}
static int xgene_enet_set_mac_address(struct net_device *ndev, void *addr)
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
index 827b33d..5e6fd71 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
@@ -219,7 +219,6 @@ struct xgene_enet_pdata {
int phy_mode;
enum xgene_enet_rm rm;
struct xgene_enet_cle cle;
- struct rtnl_link_stats64 stats;
const struct xgene_mac_ops *mac_ops;
spinlock_t mac_lock; /* mac lock */
const struct xgene_port_ops *port_ops;
--
1.9.1
^ permalink raw reply related
* [PATCH net-next 1/9] drivers: net: xgene: Protect indirect MAC access
From: Iyappan Subramanian @ 2017-04-26 23:38 UTC (permalink / raw)
To: davem, netdev; +Cc: linux-arm-kernel, patches, Quan Nguyen, Iyappan Subramanian
In-Reply-To: <1493249935-30759-1-git-send-email-isubramanian@apm.com>
From: Quan Nguyen <qnguyen@apm.com>
This patch adds lock to protect indirect mac access sequence.
Signed-off-by: Quan Nguyen <qnguyen@apm.com>
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
---
drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 2 ++
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 1 +
drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 1 +
drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 7 ++++++-
drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 2 ++
5 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
index 2a835e0..3697ba7 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
@@ -365,9 +365,11 @@ static void xgene_enet_rd_mcx_mac(struct xgene_enet_pdata *pdata,
cmd = pdata->mcx_mac_addr + MAC_COMMAND_REG_OFFSET;
cmd_done = pdata->mcx_mac_addr + MAC_COMMAND_DONE_REG_OFFSET;
+ spin_lock(&pdata->mac_lock);
if (!xgene_enet_rd_indirect(addr, rd, cmd, cmd_done, rd_addr, rd_data))
netdev_err(pdata->ndev, "MCX mac read failed, addr: %04x\n",
rd_addr);
+ spin_unlock(&pdata->mac_lock);
}
static void xgene_gmac_set_mac_addr(struct xgene_enet_pdata *pdata)
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 5f37ed3..9a28ac3 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -2055,6 +2055,7 @@ static int xgene_enet_probe(struct platform_device *pdev)
goto err;
xgene_enet_setup_ops(pdata);
+ spin_lock_init(&pdata->mac_lock);
if (pdata->phy_mode == PHY_INTERFACE_MODE_XGMII) {
ndev->features |= NETIF_F_TSO | NETIF_F_RXCSUM;
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
index 0d4be24..827b33d 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
@@ -221,6 +221,7 @@ struct xgene_enet_pdata {
struct xgene_enet_cle cle;
struct rtnl_link_stats64 stats;
const struct xgene_mac_ops *mac_ops;
+ spinlock_t mac_lock; /* mac lock */
const struct xgene_port_ops *port_ops;
struct xgene_ring_ops *ring_ops;
const struct xgene_cle_ops *cle_ops;
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
index a8e063b..4dd41f5 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c
@@ -130,6 +130,7 @@ static u32 xgene_enet_rd_indirect(struct xgene_indirect_ctl *ctl, u32 rd_addr)
static u32 xgene_enet_rd_mac(struct xgene_enet_pdata *p, u32 rd_addr)
{
+ u32 val;
struct xgene_indirect_ctl ctl = {
.addr = p->mcx_mac_addr + MAC_ADDR_REG_OFFSET,
.ctl = p->mcx_mac_addr + MAC_READ_REG_OFFSET,
@@ -137,7 +138,11 @@ static u32 xgene_enet_rd_mac(struct xgene_enet_pdata *p, u32 rd_addr)
.cmd_done = p->mcx_mac_addr + MAC_COMMAND_DONE_REG_OFFSET
};
- return xgene_enet_rd_indirect(&ctl, rd_addr);
+ spin_lock(&p->mac_lock);
+ val = xgene_enet_rd_indirect(&ctl, rd_addr);
+ spin_unlock(&p->mac_lock);
+
+ return val;
}
static int xgene_enet_ecc_init(struct xgene_enet_pdata *p)
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
index 423240c..9a2d0ca 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c
@@ -158,9 +158,11 @@ static void xgene_enet_rd_mac(struct xgene_enet_pdata *pdata,
cmd = pdata->mcx_mac_addr + MAC_COMMAND_REG_OFFSET;
cmd_done = pdata->mcx_mac_addr + MAC_COMMAND_DONE_REG_OFFSET;
+ spin_lock(&pdata->mac_lock);
if (!xgene_enet_rd_indirect(addr, rd, cmd, cmd_done, rd_addr, rd_data))
netdev_err(pdata->ndev, "MCX mac read failed, addr: %04x\n",
rd_addr);
+ spin_unlock(&pdata->mac_lock);
}
static bool xgene_enet_rd_pcs(struct xgene_enet_pdata *pdata,
--
1.9.1
^ permalink raw reply related
* [PATCH net-next 0/9] drivers: net: xgene: Add ethtool stats and bug fixes
From: Iyappan Subramanian @ 2017-04-26 23:38 UTC (permalink / raw)
To: davem, netdev; +Cc: linux-arm-kernel, patches, Iyappan Subramanian, Quan Nguyen
This patch set,
- adds ethtool extended statistics support
- addresses errata workarounds
- fixes bugs related to statistics
Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: Quan Nguyen <qnguyen@apm.com>
---
Quan Nguyen (9):
drivers: net: xgene: Protect indirect MAC access
drivers: net: xgene: Remove redundant local stats
drivers: net: xgene: Refactor statistics error parsing code
drivers: net: xgene: Remove unused macros
drivers: net: xgene: Extend ethtool statistics
drivers: net: xgene: Add rx_overrun/tx_underrun statistic
drivers: net: xgene: Workaround for HW errata 10GE_4
drivers: net: xgene: Add frame recovered statistics counter for errata
10GE_8/ENET_11
drivers: net: xgene: Workaround for HW errata 10GE_10/ENET_15
.../net/ethernet/apm/xgene/xgene_enet_ethtool.c | 132 ++++++++++++++++++++-
drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 41 ++++++-
drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 66 +++++++++--
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 57 ++++++---
drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 13 +-
drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 42 ++++++-
drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 35 ++++++
drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 5 +
8 files changed, 357 insertions(+), 34 deletions(-)
--
1.9.1
^ permalink raw reply
* Re: [PATCH v1 net-next 3/6] net: add new control message for incoming HW-timestamped packets
From: Willem de Bruijn @ 2017-04-26 23:34 UTC (permalink / raw)
To: Miroslav Lichvar
Cc: Network Development, Richard Cochran, Willem de Bruijn,
Soheil Hassas Yeganeh, Keller, Jacob E, Denny Page, Jiri Benc
In-Reply-To: <20170426145035.25846-4-mlichvar@redhat.com>
> diff --git a/net/core/dev.c b/net/core/dev.c
> index 1b3317c..0a78f7f 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -160,6 +160,7 @@ static int netif_rx_internal(struct sk_buff *skb);
> static int call_netdevice_notifiers_info(unsigned long val,
> struct net_device *dev,
> struct netdev_notifier_info *info);
> +static struct napi_struct *napi_by_id(unsigned int napi_id);
>
> /*
> * The @dev_base_head list is protected by @dev_base_lock and the rtnl
> @@ -863,6 +864,23 @@ struct net_device *dev_get_by_index(struct net *net, int ifindex)
> }
> EXPORT_SYMBOL(dev_get_by_index);
>
> +struct net_device *dev_get_by_napi_id(unsigned int napi_id)
> +{
> + struct net_device *dev = NULL;
> + struct napi_struct *napi;
> +
> + rcu_read_lock();
> +
> + napi = napi_by_id(napi_id);
> + if (napi)
> + dev = napi->dev;
> +
> + rcu_read_unlock();
> +
> + return dev;
> +}
> +EXPORT_SYMBOL(dev_get_by_napi_id);
Returning dev without holding a reference is not safe. You'll probably
have to call this with rcu_read_lock held instead.
Also, this generic napi function should probably be in a separate patch.
> diff --git a/net/socket.c b/net/socket.c
> index c2564eb..5ea5f29 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -662,6 +662,26 @@ static bool skb_is_err_queue(const struct sk_buff *skb)
> return skb->pkt_type == PACKET_OUTGOING;
> }
>
> +static void put_ts_pktinfo(struct msghdr *msg, struct sk_buff *skb)
> +{
> +#ifdef CONFIG_NET_RX_BUSY_POLL
Let's limit the ifdef scope to napi code. Perhaps we need an skb_get_napi_id
helper that returns 0 if the feature is not compiled in.
> + struct scm_ts_pktinfo ts_pktinfo;
> + struct net_device *orig_dev;
> +
> + if (skb->napi_id < MIN_NAPI_ID || !skb_mac_header_was_set(skb))
> + return;
This MIN_NAPI_ID check can be moved into dev_get_by_napi_id.
> /*
> * called from sock_recv_timestamp() if sock_flag(sk, SOCK_RCVTSTAMP)
> */
> @@ -699,8 +719,12 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
> empty = 0;
> if (shhwtstamps &&
> (sk->sk_tsflags & SOF_TIMESTAMPING_RAW_HARDWARE) &&
This information is also informative with software timestamps.
And getting the real iif is definitely useful outside timestamps. An
alternative approach is to add versioning to IP_PKTINFO with a new
setsockopt IP_PKTINFO_VERSION plus a new struct in_pktinfo_v2
that extends in_pktinfo. Just a thought.
^ permalink raw reply
* Re: [PATCH v2 01/21] scatterlist: Introduce sg_map helper functions
From: Logan Gunthorpe @ 2017-04-26 23:30 UTC (permalink / raw)
To: Christian König, linux-kernel, linux-crypto, linux-media,
dri-devel, intel-gfx, linux-raid, linux-mmc, linux-nvdimm,
linux-scsi, open-iscsi, megaraidlinux.pdl, sparmaintainer, devel,
target-devel, netdev, linux-rdma, dm-devel
Cc: Jens Axboe, James E.J. Bottomley, Martin K. Petersen,
Matthew Wilcox, Greg Kroah-Hartman, Stephen Bates, Ross Zwisler,
Christoph Hellwig, Dan Williams
In-Reply-To: <5dfc5bf5-482c-b5bb-029c-7cee80925f37@amd.com>
On 26/04/17 02:59 AM, wrote:
> Good to know that somebody is working on this. Those problems troubled
> us as well.
Thanks Christian. It's a daunting problem and a there's a lot of work to
do before we will ever be where we need to be so any help, even an ack,
is greatly appreciated.
Logan
^ permalink raw reply
* Re: [PATCH net-next 02/10] tcp: do not pass timestamp to tcp_rack_detect_loss()
From: Eric Dumazet @ 2017-04-26 23:03 UTC (permalink / raw)
To: Eric Dumazet; +Cc: David S . Miller, netdev, Soheil Hassas Yeganeh
In-Reply-To: <20170425171541.3417-3-edumazet@google.com>
On Tue, 2017-04-25 at 10:15 -0700, Eric Dumazet wrote:
> We can use tp->tcp_mstamp as it contains a recent timestamp.
>
> @@ -165,12 +164,10 @@ void tcp_rack_advance(struct tcp_sock *tp, u8 sacked, u32 end_seq,
> void tcp_rack_reo_timeout(struct sock *sk)
> {
> struct tcp_sock *tp = tcp_sk(sk);
> - struct skb_mstamp now;
> u32 timeout, prior_inflight;
>
> - skb_mstamp_get(&now);
Oh this is silly, a timer event is not updating tp->tcp_mstamp yet.
I will provide a patch, after tests.
> prior_inflight = tcp_packets_in_flight(tp);
> - tcp_rack_detect_loss(sk, &now, &timeout);
> + tcp_rack_detect_loss(sk, &timeout);
> if (prior_inflight != tcp_packets_in_flight(tp)) {
> if (inet_csk(sk)->icsk_ca_state != TCP_CA_Recovery) {
> tcp_enter_recovery(sk, false);
Something like :
diff --git a/net/ipv4/tcp_recovery.c b/net/ipv4/tcp_recovery.c
index fdac262e277b2f25492f155bbb295d6d87e31d02..75096becac21f09fd14466b5f87dffe5820325b5 100644
--- a/net/ipv4/tcp_recovery.c
+++ b/net/ipv4/tcp_recovery.c
@@ -167,6 +167,7 @@ void tcp_rack_reo_timeout(struct sock *sk)
u32 timeout, prior_inflight;
prior_inflight = tcp_packets_in_flight(tp);
+ skb_mstamp_get(&tp->tcp_mstamp);
tcp_rack_detect_loss(sk, &timeout);
if (prior_inflight != tcp_packets_in_flight(tp)) {
if (inet_csk(sk)->icsk_ca_state != TCP_CA_Recovery) {
^ permalink raw reply related
* Re: [PATCH v2 0/8] NFC: fix device allocation and nfcmrvl crashes
From: Samuel Ortiz @ 2017-04-26 22:42 UTC (permalink / raw)
To: Johan Hovold; +Cc: linux-wireless, netdev, linux-kernel
In-Reply-To: <20170330101542.15384-1-johan@kernel.org>
Hi Johan,
On Thu, Mar 30, 2017 at 12:15:34PM +0200, Johan Hovold wrote:
> This started out with the observation that the nfcmrvl_uart driver
> unconditionally dereferenced the tty class device despite the fact that
> not every tty has an associated struct device (Unix98 ptys). Some
> further changes were needed in the common nfcmrvl code to fully address
> this, some of which also incidentally fixed a few related bugs (e.g.
> resource leaks in error paths).
>
> While fixing this I stumbled over a regression in NFC core that lead to
> broken registration error paths and misnamed workqueues.
>
> Note that this has only been tested by configuring the n_hci line
> discipline for different ttys without any actual NFC hardware connected.
>
> Johan
>
>
> Changes in v2
> - fix typo in commit message (1/8)
> - release reset gpio in error paths (3/8)
> - fix description of patch impact (3/8)
> - allow gpio 0 to be used for reset signalling (8/8, new)
>
>
> Johan Hovold (8):
> NFC: fix broken device allocation
> NFC: nfcmrvl_uart: add missing tty-device sanity check
> NFC: nfcmrvl: do not use device-managed resources
> NFC: nfcmrvl: use nfc-device for firmware download
> NFC: nfcmrvl: fix firmware-management initialisation
> NFC: nfcmrvl_uart: fix device-node leak during probe
> NFC: nfcmrvl_usb: use interface as phy device
> NFC: nfcmrvl: allow gpio 0 for reset signalling
Applied, thanks.
Cheers,
Samuel.
^ permalink raw reply
* Re: [PATCH 5/7] IB/hfi1: use pcie_flr instead of duplicating it
From: Jeff Kirsher @ 2017-04-26 22:10 UTC (permalink / raw)
To: Bjorn Helgaas, Christoph Hellwig
Cc: Byczkowski, Jakub, Bjorn Helgaas, Cabiddu, Giovanni,
Benedetto, Salvatore, Marciniszyn, Mike, Dalessandro, Dennis,
Derek Chickles, Satanand Burla, Felix Manlunas, Raghu Vatsavayi,
linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, qat-linux,
linux-crypto-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, "linu
In-Reply-To: <20170425193955.GC29024-1RhO1Y9PlrlHTL0Zs8A6p5iNqAH0jzoTYJqu5kTmcBRl57MIdRCFDg@public.gmane.org>
[-- Attachment #1: Type: text/plain, Size: 888 bytes --]
On Tue, 2017-04-25 at 14:39 -0500, Bjorn Helgaas wrote:
> On Mon, Apr 24, 2017 at 04:35:07PM +0200, Christoph Hellwig wrote:
> > On Mon, Apr 24, 2017 at 02:16:31PM +0000, Byczkowski, Jakub wrote:
> > > Tested-by: Jakub Byczkowski <jakub.byczkowski-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> >
> > Are you (and Doug) ok with queueing this up in the PCI tree?
>
> Applied this with Jakub's tested-by and Doug's ack to pci/virtualization
> for v4.12.
>
> This still leaves these:
>
> [PATCH 4/7] ixgbe: use pcie_flr instead of duplicating it
> [PATCH 6/7] crypto: qat: use pcie_flr instead of duplicating it
> [PATCH 7/7] liquidio: use pcie_flr instead of duplicating it
>
> I haven't seen any response to 4 and 6. Felix reported an unused
> variable in 7. Let me know if you'd like me to do anything with
> these.
Just provided my ACK for ixgbe patch.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [PATCH 4/7] ixgbe: use pcie_flr instead of duplicating it
From: Jeff Kirsher @ 2017-04-26 22:09 UTC (permalink / raw)
To: Christoph Hellwig, Bjorn Helgaas, Giovanni Cabiddu,
Salvatore Benedetto, Mike Marciniszyn, Dennis Dalessandro,
Derek Chickles, Satanand Burla, Felix Manlunas, Raghu Vatsavayi
Cc: linux-pci, qat-linux, linux-crypto, linux-rdma, netdev,
linux-kernel
In-Reply-To: <20170413145339.20186-5-hch@lst.de>
[-- Attachment #1: Type: text/plain, Size: 325 bytes --]
On Thu, 2017-04-13 at 16:53 +0200, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 16 ++--------------
> 1 file changed, 2 insertions(+), 14 deletions(-)
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Sorry for the late ACK.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* [PATCH 2/2] arm64: dts: apq8016-sbc: Correct WLAN LED default-trigger
From: Bjorn Andersson @ 2017-04-26 22:04 UTC (permalink / raw)
To: Andy Gross, David Brown
Cc: devicetree, linux-arm-msm, linux-wireless, linux-kernel,
Kalle Valo, netdev, Nicolas Dechesne, wcn36xx, linux-soc,
Eugene Krasnikov, linux-arm-kernel
In-Reply-To: <20170426220444.10539-1-bjorn.andersson@linaro.org>
The TX status trigger of the wlan interface is named phy0tx, so this
updates the default-trigger for the WLAN LED to use that instead.
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
Note that without patch 1/2 this trigger does not fire - but there's also no
harm in picking the two patches through separate trees.
arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
index 5d83b02b7c4a..21a8f5ce8955 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi
@@ -178,7 +178,7 @@
led@5 {
label = "apq8016-sbc:yellow:wlan";
gpios = <&pm8916_mpps 2 GPIO_ACTIVE_HIGH>;
- linux,default-trigger = "wlan";
+ linux,default-trigger = "phy0tx";
default-state = "off";
};
--
2.12.0
^ permalink raw reply related
* [PATCH 1/2] wcn36xx: Pass used skb to ieee80211_tx_status()
From: Bjorn Andersson @ 2017-04-26 22:04 UTC (permalink / raw)
To: Eugene Krasnikov, Kalle Valo
Cc: Andy Gross, David Brown, devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-soc-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA,
wcn36xx-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Nicolas Dechesne
As the tx skbs are collected they should be passed to
ieee80211_tx_status() rather than ieee80211_free_txskb(), as the prior
will take care of monitoring and LED triggers while the latter will
consider the skb dropped.
Signed-off-by: Bjorn Andersson <bjorn.andersson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
drivers/net/wireless/ath/wcn36xx/dxe.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/wcn36xx/dxe.c b/drivers/net/wireless/ath/wcn36xx/dxe.c
index 87dfdaf9044c..938b7bd733cf 100644
--- a/drivers/net/wireless/ath/wcn36xx/dxe.c
+++ b/drivers/net/wireless/ath/wcn36xx/dxe.c
@@ -371,7 +371,7 @@ static void reap_tx_dxes(struct wcn36xx *wcn, struct wcn36xx_dxe_ch *ch)
info = IEEE80211_SKB_CB(ctl->skb);
if (!(info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS)) {
/* Keep frame until TX status comes */
- ieee80211_free_txskb(wcn->hw, ctl->skb);
+ ieee80211_tx_status(wcn->hw, ctl->skb);
}
spin_lock(&ctl->skb_lock);
if (wcn->queues_stopped) {
--
2.12.0
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related
* Re: [PATCH net-next 6/6] bpf: show bpf programs
From: Daniel Borkmann @ 2017-04-26 21:35 UTC (permalink / raw)
To: Hannes Frederic Sowa, netdev; +Cc: ast, daniel, jbenc, aconole
In-Reply-To: <20170426182419.14574-7-hannes@stressinduktion.org>
On 04/26/2017 08:24 PM, Hannes Frederic Sowa wrote:
> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
> ---
> include/uapi/linux/bpf.h | 32 +++++++++++++++++++-------------
> kernel/bpf/core.c | 30 +++++++++++++++++++++++++++++-
> 2 files changed, 48 insertions(+), 14 deletions(-)
>
> diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
> index e553529929f683..d6506e320953d5 100644
> --- a/include/uapi/linux/bpf.h
> +++ b/include/uapi/linux/bpf.h
> @@ -101,20 +101,26 @@ enum bpf_map_type {
> BPF_MAP_TYPE_HASH_OF_MAPS,
> };
>
> +#define BPF_PROG_TYPES \
> + X(BPF_PROG_TYPE_UNSPEC), \
> + X(BPF_PROG_TYPE_SOCKET_FILTER), \
> + X(BPF_PROG_TYPE_KPROBE), \
> + X(BPF_PROG_TYPE_SCHED_CLS), \
> + X(BPF_PROG_TYPE_SCHED_ACT), \
> + X(BPF_PROG_TYPE_TRACEPOINT), \
> + X(BPF_PROG_TYPE_XDP), \
> + X(BPF_PROG_TYPE_PERF_EVENT), \
> + X(BPF_PROG_TYPE_CGROUP_SKB), \
> + X(BPF_PROG_TYPE_CGROUP_SOCK), \
> + X(BPF_PROG_TYPE_LWT_IN), \
> + X(BPF_PROG_TYPE_LWT_OUT), \
> + X(BPF_PROG_TYPE_LWT_XMIT),
> +
> +
> enum bpf_prog_type {
> - BPF_PROG_TYPE_UNSPEC,
> - BPF_PROG_TYPE_SOCKET_FILTER,
> - BPF_PROG_TYPE_KPROBE,
> - BPF_PROG_TYPE_SCHED_CLS,
> - BPF_PROG_TYPE_SCHED_ACT,
> - BPF_PROG_TYPE_TRACEPOINT,
> - BPF_PROG_TYPE_XDP,
> - BPF_PROG_TYPE_PERF_EVENT,
> - BPF_PROG_TYPE_CGROUP_SKB,
> - BPF_PROG_TYPE_CGROUP_SOCK,
> - BPF_PROG_TYPE_LWT_IN,
> - BPF_PROG_TYPE_LWT_OUT,
> - BPF_PROG_TYPE_LWT_XMIT,
> +#define X(type) type
Defining X in uapi could clash easily with other headers e.g.
from application side.
> + BPF_PROG_TYPES
> +#undef X
> };
>
> enum bpf_attach_type {
> diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
> index 3ba175a24e971a..685c1d0f31e029 100644
> --- a/kernel/bpf/core.c
> +++ b/kernel/bpf/core.c
> @@ -536,13 +536,41 @@ static void ebpf_proc_stop(struct seq_file *s, void *v)
> rcu_read_unlock();
> }
>
> +static const char *bpf_type_string(enum bpf_prog_type type)
> +{
> + static const char *bpf_type_names[] = {
> +#define X(type) #type
> + BPF_PROG_TYPES
> +#undef X
> + };
> +
> + if (type >= ARRAY_SIZE(bpf_type_names))
> + return "<unknown>";
> +
> + return bpf_type_names[type];
> +}
> +
> static int ebpf_proc_show(struct seq_file *s, void *v)
> {
> + struct bpf_prog *prog;
> + struct bpf_prog_aux *aux;
> + char prog_tag[sizeof(prog->tag) * 2 + 1] = { };
> +
> if (v == SEQ_START_TOKEN) {
> - seq_printf(s, "# tag\n");
> + seq_printf(s, "# tag\t\t\ttype\t\t\truntime\tcap\tmemlock\n");
> return 0;
> }
>
> + aux = v;
> + prog = aux->prog;
> +
> + bin2hex(prog_tag, prog->tag, sizeof(prog->tag));
> + seq_printf(s, "%s\t%s\t%s\t%s\t%llu\n", prog_tag,
> + bpf_type_string(prog->type),
> + prog->jited ? "jit" : "int",
> + prog->priv_cap_sys_admin ? "priv" : "unpriv",
> + prog->pages * 1ULL << PAGE_SHIFT);
Yeah, so that would be quite similar to what we dump in
bpf_prog_show_fdinfo() modulo the priv bit.
I generally agree that a facility for dumping all progs is needed
and it was also on the TODO list after the bpf(2) cmd for dumping
program insns back to user space.
I think the procfs interface has pro and cons: the upside is that
you can use it with tools like cat to inspect it, but what you still
cannot do is to say that you want to see the prog insns for, say,
prog #4 from that list. If we could iterate over that list through fds
via bpf(2) syscall, you could i) present the same info you have above
via fdinfo already and ii) also dump the BPF insns from that specific
program through a BPF_PROG_DUMP bpf(2) command. Once that dump also
supports maps in progs, you could go further and fetch related map
fds for inspection, etc.
Such option of iterating through that would need a new BPF syscall
cmd aka BPF_PROG_GET_NEXT which returns the first prog from the list
and you would walk the next one by passing the current fd, which can
later also be closed as not needed anymore. We could restrict that
dump to capable(CAP_SYS_ADMIN), and the kernel tree would need to
ship a tool e.g. under tools/bpf/ that can be used for inspection.
> +
> return 0;
> }
>
>
^ permalink raw reply
* Re: [PATCH net-next 6/6] bpf: show bpf programs
From: Alexei Starovoitov @ 2017-04-26 21:25 UTC (permalink / raw)
To: Hannes Frederic Sowa
Cc: netdev, ast, daniel, jbenc, aconole, Martin KaFai Lau
In-Reply-To: <20170426182419.14574-7-hannes@stressinduktion.org>
On Wed, Apr 26, 2017 at 08:24:19PM +0200, Hannes Frederic Sowa wrote:
>
> +static const char *bpf_type_string(enum bpf_prog_type type)
> +{
> + static const char *bpf_type_names[] = {
> +#define X(type) #type
> + BPF_PROG_TYPES
> +#undef X
> + };
> +
> + if (type >= ARRAY_SIZE(bpf_type_names))
> + return "<unknown>";
> +
> + return bpf_type_names[type];
> +}
> +
> static int ebpf_proc_show(struct seq_file *s, void *v)
> {
> + struct bpf_prog *prog;
> + struct bpf_prog_aux *aux;
> + char prog_tag[sizeof(prog->tag) * 2 + 1] = { };
> +
> if (v == SEQ_START_TOKEN) {
> - seq_printf(s, "# tag\n");
> + seq_printf(s, "# tag\t\t\ttype\t\t\truntime\tcap\tmemlock\n");
> return 0;
> }
>
> + aux = v;
> + prog = aux->prog;
> +
> + bin2hex(prog_tag, prog->tag, sizeof(prog->tag));
> + seq_printf(s, "%s\t%s\t%s\t%s\t%llu\n", prog_tag,
> + bpf_type_string(prog->type),
> + prog->jited ? "jit" : "int",
> + prog->priv_cap_sys_admin ? "priv" : "unpriv",
> + prog->pages * 1ULL << PAGE_SHIFT);
As I said several times already I'm strongly against procfs
style of exposing information about the programs.
I don't want this to become debugfs for bpf.
Maintaining the list of all loaded programs is fine
and we need a way to iterate through them, but procfs
is obviously not the interface to do that.
Programs/maps are binary whereas any fs interface is text.
It also doesn't scale with large number of programs/maps.
I prefer Daniel's suggestion on adding 'get_next' like API.
Also would be good if you can wait for Martin to finish his
prog->handle/id patches. Then user space will be able
to iterate through all the progs/maps and fetch all info about
them through syscall in extensible way.
And you wouldn't need to abuse kallsyms list for different purpose.
^ permalink raw reply
* Re: [PATCH net-next 4/6] bpf: track if the bpf program was loaded with SYS_ADMIN capabilities
From: Alexei Starovoitov @ 2017-04-26 21:08 UTC (permalink / raw)
To: Hannes Frederic Sowa; +Cc: netdev, ast, daniel, jbenc, aconole
In-Reply-To: <20170426182419.14574-5-hannes@stressinduktion.org>
On Wed, Apr 26, 2017 at 08:24:17PM +0200, Hannes Frederic Sowa wrote:
> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
> ---
> include/linux/filter.h | 6 ++++--
> kernel/bpf/core.c | 4 +++-
> kernel/bpf/syscall.c | 7 ++++---
> kernel/bpf/verifier.c | 4 ++--
> net/core/filter.c | 6 +++---
> 5 files changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/include/linux/filter.h b/include/linux/filter.h
> index 63624c619e371b..635311f57bf24f 100644
> --- a/include/linux/filter.h
> +++ b/include/linux/filter.h
> @@ -413,7 +413,8 @@ struct bpf_prog {
> locked:1, /* Program image locked? */
> gpl_compatible:1, /* Is filter GPL compatible? */
> cb_access:1, /* Is control block accessed? */
> - dst_needed:1; /* Do we need dst entry? */
> + dst_needed:1, /* Do we need dst entry? */
> + priv_cap_sys_admin:1; /* Where we loaded as sys_admin? */
This is no go.
You didn't provide any explanation whatsoever why you want to see this boolean value.
^ permalink raw reply
* Re: [PATCH net-next 4/6] bpf: track if the bpf program was loaded with SYS_ADMIN capabilities
From: Daniel Borkmann @ 2017-04-26 21:04 UTC (permalink / raw)
To: Hannes Frederic Sowa, netdev; +Cc: ast, daniel, jbenc, aconole
In-Reply-To: <20170426182419.14574-5-hannes@stressinduktion.org>
On 04/26/2017 08:24 PM, Hannes Frederic Sowa wrote:
> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Ahh, looks this got swapped with 3/6.
> ---
> include/linux/filter.h | 6 ++++--
> kernel/bpf/core.c | 4 +++-
> kernel/bpf/syscall.c | 7 ++++---
> kernel/bpf/verifier.c | 4 ++--
> net/core/filter.c | 6 +++---
> 5 files changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/include/linux/filter.h b/include/linux/filter.h
> index 63624c619e371b..635311f57bf24f 100644
> --- a/include/linux/filter.h
> +++ b/include/linux/filter.h
> @@ -413,7 +413,8 @@ struct bpf_prog {
> locked:1, /* Program image locked? */
> gpl_compatible:1, /* Is filter GPL compatible? */
> cb_access:1, /* Is control block accessed? */
> - dst_needed:1; /* Do we need dst entry? */
> + dst_needed:1, /* Do we need dst entry? */
> + priv_cap_sys_admin:1; /* Where we loaded as sys_admin? */
> kmemcheck_bitfield_end(meta);
> enum bpf_prog_type type; /* Type of BPF program */
[...]
> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
> index 6f8b6ed690be93..24c9dac374770f 100644
> --- a/kernel/bpf/verifier.c
> +++ b/kernel/bpf/verifier.c
> @@ -3488,7 +3488,7 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr)
> if (ret < 0)
> goto skip_full_check;
>
> - env->allow_ptr_leaks = capable(CAP_SYS_ADMIN);
> + env->allow_ptr_leaks = env->prog->priv_cap_sys_admin;
>
> ret = do_check(env);
>
> @@ -3589,7 +3589,7 @@ int bpf_analyzer(struct bpf_prog *prog, const struct bpf_ext_analyzer_ops *ops,
> if (ret < 0)
> goto skip_full_check;
>
> - env->allow_ptr_leaks = capable(CAP_SYS_ADMIN);
> + env->allow_ptr_leaks = prog->priv_cap_sys_admin;
>
> ret = do_check(env);
>
> diff --git a/net/core/filter.c b/net/core/filter.c
> index 9a37860a80fc78..dc020d40bb770a 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -1100,7 +1100,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
> if (!bpf_check_basics_ok(fprog->filter, fprog->len))
> return -EINVAL;
>
> - fp = bpf_prog_alloc(bpf_prog_size(fprog->len), 0);
> + fp = bpf_prog_alloc(bpf_prog_size(fprog->len), 0, false);
> if (!fp)
> return -ENOMEM;
>
Did you check that transferring allow_ptr_leaks doesn't have a side
effect on the nfp JIT? I believe it can also do cbpf migrations to
a certain extend.
^ permalink raw reply
* Re: xdp_redirect ifindex vs port. Was: best API for returning/setting egress port?
From: Andy Gospodarek @ 2017-04-26 20:55 UTC (permalink / raw)
To: Alexei Starovoitov
Cc: John Fastabend, Jesper Dangaard Brouer, Alexei Starovoitov,
Daniel Borkmann, Daniel Borkmann, netdev@vger.kernel.org,
xdp-newbies@vger.kernel.org
In-Reply-To: <c9b3ff9b-8938-3274-da29-c04f9da2a314@fb.com>
On Wed, Apr 26, 2017 at 10:58:45AM -0700, Alexei Starovoitov wrote:
> On 4/26/17 9:35 AM, John Fastabend wrote:
> >
> > > As Alexei also mentioned before, ifindex vs port makes no real
> > > difference seen from the bpf program side. It is userspace's
> > > responsibility to add ifindex/port's to the bpf-maps, according to how
> > > the bpf program "policy" want to "connect" these ports. The
> > > port-table system add one extra step, of also adding this port to the
> > > port-table (which lives inside the kernel).
> > >
> >
> > I'm not sure I understand the "lives inside the kernel" bit. I assumed
> > the 'map' should be a bpf map and behave like any other bpf map.
> >
> > I wanted a new map to be defined, something like this from the bpf programmer
> > side.
> >
> > struct bpf_map_def SEC("maps") port_table =
> > .type = BPF_MAP_TYPE_PORT_CONNECTION,
> > .key_size = sizeof(u32),
> > .value_size = BPF_PORT_CONNECTION_SIZE,
> > .max_entries = 256,
> > };
>
> I like the idea.
> We have prog_array, perf_event_array, cgroup_array map specializations.
> This one can be new netdev_array with some new bpf_redirect-like helper
> accessing it.
>
> > > When loading the XDP program, we also need to pass along a port table
> > > "id" this XDP program is associated with (and if it doesn't exists you
> > > create it). And your userspace "control-plane" application also need
> > > to know this port table "id", when adding a new port.
> >
> > So the user space application that is loading the program also needs
> > to handle this map. This seems correct to me. But I don't see the
> > value in making some new port table when we already have well understood
> > framework for maps.
>
> +1
>
> > >
> > > The concept of having multiple port tables is key. As this implies we
> > > can have several simultaneous "data-planes" that is *isolated* from
> > > each-other. Think about how network-namespaces/containers want
> > > isolation. A subtle thing I'm afraid to mention, is that oppose to the
> > > ifindex model, a port table with mapping to a net_device pointer, would
> > > allow (faster) delivery into the container's inner net_device, which
> > > sort of violates the isolation, but I would argue it is not a problem
> > > as this net_device pointer could only be added from a process within the
> > > namespace. I like this feature, but it could easily be disallowed via
> > > port insertion-time validation.
> > >
> >
> > I think the above optimization should be allowed. And agree multiple port
> > tables (maps?) is needed. Again all this points to using standard maps
> > logic in my mind. For permissions and different domains, which I think
> > you were starting to touch on, it looks like we could extend the pinning API.
> > At the moment it does an inode_permission(inode, MAY_WRITE) check but I
> > presume this could be extended. None of this would be needed in v1 and
> > could be added subsequently. read-only maps seems doable.
>
> this is great idea. Once BPF_MAP_TYPE_NETDEV_ARRAY is populated
> the user space can make it readonly to prevent further changes.
>
> From user space it can be done similar to perf_events/cgroups as well.
> bpf_map_update_elem(&netdev_array, &port_num, &ifindex)
> should work.
> For bpf_map_lookup_elem() from such netdev_array we can return
> ifindex back.
> The bpf_map_show_fdinfo() can be customized as well to pretty print
> ifindexes of netdevs stored in there.
>
I agree with both of you on all of these points. Having the port
redirection in a new type of map and/or array seems like the way to go.
I understood Jesper's perspecitive when thinking about a way to pass a
port-table id down, but I think the idea that the userspace loader code
defining the maps is going to be the one making this link is the right
idea and handling things like ifindex changes (rather than identifiers
that perform lookups in other tables) is going to have to be yet another
exercise left up to the...user. :-)
^ permalink raw reply
* [Patch net-next] ipv4: get rid of ip_ra_lock
From: Cong Wang @ 2017-04-26 20:55 UTC (permalink / raw)
To: netdev; +Cc: Cong Wang
After commit 1215e51edad1 ("ipv4: fix a deadlock in ip_ra_control")
we always take RTNL lock for ip_ra_control() which is the only place
we update the list ip_ra_chain, so the ip_ra_lock is no longer needed,
we just need to disable BH there.
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
---
net/ipv4/ip_sockglue.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 1d46d05..2923ea1 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -330,7 +330,6 @@ int ip_cmsg_send(struct sock *sk, struct msghdr *msg, struct ipcm_cookie *ipc,
sent to multicast group to reach destination designated router.
*/
struct ip_ra_chain __rcu *ip_ra_chain;
-static DEFINE_SPINLOCK(ip_ra_lock);
static void ip_ra_destroy_rcu(struct rcu_head *head)
@@ -352,21 +351,21 @@ int ip_ra_control(struct sock *sk, unsigned char on,
new_ra = on ? kmalloc(sizeof(*new_ra), GFP_KERNEL) : NULL;
- spin_lock_bh(&ip_ra_lock);
+ ASSERT_RTNL();
+ local_bh_disable();
for (rap = &ip_ra_chain;
- (ra = rcu_dereference_protected(*rap,
- lockdep_is_held(&ip_ra_lock))) != NULL;
+ (ra = rtnl_dereference(*rap)) != NULL;
rap = &ra->next) {
if (ra->sk == sk) {
if (on) {
- spin_unlock_bh(&ip_ra_lock);
+ local_bh_enable();
kfree(new_ra);
return -EADDRINUSE;
}
/* dont let ip_call_ra_chain() use sk again */
ra->sk = NULL;
RCU_INIT_POINTER(*rap, ra->next);
- spin_unlock_bh(&ip_ra_lock);
+ local_bh_enable();
if (ra->destructor)
ra->destructor(sk);
@@ -381,7 +380,7 @@ int ip_ra_control(struct sock *sk, unsigned char on,
}
}
if (!new_ra) {
- spin_unlock_bh(&ip_ra_lock);
+ local_bh_enable();
return -ENOBUFS;
}
new_ra->sk = sk;
@@ -390,7 +389,7 @@ int ip_ra_control(struct sock *sk, unsigned char on,
RCU_INIT_POINTER(new_ra->next, ra);
rcu_assign_pointer(*rap, new_ra);
sock_hold(sk);
- spin_unlock_bh(&ip_ra_lock);
+ local_bh_enable();
return 0;
}
--
2.5.5
^ permalink raw reply related
* Re: [PATCH net-next] bpf: restore skb->sk before pskb_trim() call
From: Alexei Starovoitov @ 2017-04-26 20:53 UTC (permalink / raw)
To: Eric Dumazet; +Cc: David Miller, netdev, Andrey Konovalov, Willem de Bruijn
In-Reply-To: <1493222963.6453.77.camel@edumazet-glaptop3.roam.corp.google.com>
On Wed, Apr 26, 2017 at 09:09:23AM -0700, Eric Dumazet wrote:
> From: Eric Dumazet <edumazet@google.com>
>
> While testing a fix [1] in ___pskb_trim(), addressing the WARN_ON_ONCE()
> in skb_try_coalesce() reported by Andrey, I found that we had an skb
> with skb->sk set but no skb->destructor.
>
> This invalidated heuristic found in commit 158f323b9868 ("net: adjust
> skb->truesize in pskb_expand_head()") and in cited patch.
>
> Considering the BUG_ON(skb->sk) we have in skb_orphan(), we should
> restrain the temporary setting to a minimal section.
>
> [1] https://patchwork.ozlabs.org/patch/755570/
> net: adjust skb->truesize in ___pskb_trim()
>
> Fixes: 8f917bba0042 ("bpf: pass sk to helper functions")
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: Willem de Bruijn <willemb@google.com>
> Cc: Andrey Konovalov <andreyknvl@google.com>
Ahh. Thanks for the fix.
Acked-by: Alexei Starovoitov <ast@kernel.org>
^ permalink raw reply
* Re: [PATCH net-next 3/6] bpf: bpf_progs stores all loaded programs
From: Daniel Borkmann @ 2017-04-26 20:44 UTC (permalink / raw)
To: Hannes Frederic Sowa, netdev; +Cc: ast, jbenc, aconole
In-Reply-To: <20170426182419.14574-4-hannes@stressinduktion.org>
[ -daniel@iogearbox.com (wrong address) ]
On 04/26/2017 08:24 PM, Hannes Frederic Sowa wrote:
> We later want to give users a quick dump of what is possible with procfs,
> so store a list of all currently loaded bpf programs. Later this list
> will be printed in procfs.
>
> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
> ---
> include/linux/filter.h | 4 ++--
> kernel/bpf/core.c | 51 +++++++++++++++++++++++---------------------------
> kernel/bpf/syscall.c | 4 ++--
> 3 files changed, 27 insertions(+), 32 deletions(-)
>
> diff --git a/include/linux/filter.h b/include/linux/filter.h
> index 9a7786db14fa53..63624c619e371b 100644
> --- a/include/linux/filter.h
> +++ b/include/linux/filter.h
> @@ -753,8 +753,8 @@ bpf_address_lookup(unsigned long addr, unsigned long *size,
> return ret;
> }
>
> -void bpf_prog_kallsyms_add(struct bpf_prog *fp);
> -void bpf_prog_kallsyms_del(struct bpf_prog *fp);
> +void bpf_prog_link(struct bpf_prog *fp);
> +void bpf_prog_unlink(struct bpf_prog *fp);
>
> #else /* CONFIG_BPF_JIT */
>
> diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
> index 043f634ff58d87..2139118258cdf8 100644
> --- a/kernel/bpf/core.c
> +++ b/kernel/bpf/core.c
> @@ -365,22 +365,6 @@ static struct latch_tree_root bpf_tree __cacheline_aligned;
>
> int bpf_jit_kallsyms __read_mostly;
>
> -static void bpf_prog_ksym_node_add(struct bpf_prog_aux *aux)
> -{
> - WARN_ON_ONCE(!list_empty(&aux->bpf_progs_head));
> - list_add_tail_rcu(&aux->bpf_progs_head, &bpf_progs);
> - latch_tree_insert(&aux->ksym_tnode, &bpf_tree, &bpf_tree_ops);
> -}
> -
> -static void bpf_prog_ksym_node_del(struct bpf_prog_aux *aux)
> -{
> - if (list_empty(&aux->bpf_progs_head))
> - return;
> -
> - latch_tree_erase(&aux->ksym_tnode, &bpf_tree, &bpf_tree_ops);
> - list_del_rcu(&aux->bpf_progs_head);
> -}
> -
> static bool bpf_prog_kallsyms_candidate(const struct bpf_prog *fp)
> {
> return fp->jited && !bpf_prog_was_classic(fp);
> @@ -392,38 +376,45 @@ static bool bpf_prog_kallsyms_verify_off(const struct bpf_prog *fp)
> fp->aux->bpf_progs_head.prev == LIST_POISON2;
> }
>
> -void bpf_prog_kallsyms_add(struct bpf_prog *fp)
> +void bpf_prog_link(struct bpf_prog *fp)
> {
> - if (!bpf_prog_kallsyms_candidate(fp) ||
> - !capable(CAP_SYS_ADMIN))
> - return;
> + struct bpf_prog_aux *aux = fp->aux;
>
> spin_lock_bh(&bpf_lock);
> - bpf_prog_ksym_node_add(fp->aux);
> + list_add_tail_rcu(&aux->bpf_progs_head, &bpf_progs);
> + if (bpf_prog_kallsyms_candidate(fp))
> + latch_tree_insert(&aux->ksym_tnode, &bpf_tree, &bpf_tree_ops);
Hmm, this has the side-effect that it will hook up all progs
to kallsyms (I left out !capable(CAP_SYS_ADMIN) intentionally).
> spin_unlock_bh(&bpf_lock);
> }
>
> -void bpf_prog_kallsyms_del(struct bpf_prog *fp)
> +void bpf_prog_unlink(struct bpf_prog *fp)
> {
> - if (!bpf_prog_kallsyms_candidate(fp))
> - return;
> + struct bpf_prog_aux *aux = fp->aux;
>
> spin_lock_bh(&bpf_lock);
> - bpf_prog_ksym_node_del(fp->aux);
> + list_del_rcu(&aux->bpf_progs_head);
> + if (bpf_prog_kallsyms_candidate(fp))
> + latch_tree_erase(&aux->ksym_tnode, &bpf_tree, &bpf_tree_ops);
> spin_unlock_bh(&bpf_lock);
> }
>
> static struct bpf_prog *bpf_prog_kallsyms_find(unsigned long addr)
> {
> struct latch_tree_node *n;
> + struct bpf_prog *prog;
>
> if (!bpf_jit_kallsyms_enabled())
> return NULL;
>
> n = latch_tree_find((void *)addr, &bpf_tree, &bpf_tree_ops);
> - return n ?
> - container_of(n, struct bpf_prog_aux, ksym_tnode)->prog :
> - NULL;
> + if (!n)
> + return NULL;
> +
> + prog = container_of(n, struct bpf_prog_aux, ksym_tnode)->prog;
> + if (!prog->priv_cap_sys_admin)
Where is this bit defined?
If we return NULL on them anyway, why adding them to the tree
in the first place, just wastes resources on the traversal?
> + return NULL;
> +
> + return prog;
> }
>
> const char *__bpf_address_lookup(unsigned long addr, unsigned long *size,
> @@ -474,6 +465,10 @@ int bpf_get_kallsym(unsigned int symnum, unsigned long *value, char *type,
>
> rcu_read_lock();
> list_for_each_entry_rcu(aux, &bpf_progs, bpf_progs_head) {
> + if (!bpf_prog_kallsyms_candidate(aux->prog) ||
> + !aux->prog->priv_cap_sys_admin)
Same here.
> + continue;
> +
> if (it++ != symnum)
> continue;
>
> diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
> index 13642c73dca0b4..d61d1bd3e6fee6 100644
> --- a/kernel/bpf/syscall.c
> +++ b/kernel/bpf/syscall.c
> @@ -664,7 +664,7 @@ void bpf_prog_put(struct bpf_prog *prog)
> {
> if (atomic_dec_and_test(&prog->aux->refcnt)) {
> trace_bpf_prog_put_rcu(prog);
> - bpf_prog_kallsyms_del(prog);
> + bpf_prog_unlink(prog);
> call_rcu(&prog->aux->rcu, __bpf_prog_put_rcu);
> }
> }
> @@ -858,7 +858,7 @@ static int bpf_prog_load(union bpf_attr *attr)
> /* failed to allocate fd */
> goto free_used_maps;
>
> - bpf_prog_kallsyms_add(prog);
> + bpf_prog_link(prog);
> trace_bpf_prog_load(prog, err);
> return err;
>
>
^ permalink raw reply
* Re: [PATCH net-next v8 2/3] net sched actions: dump more than TCA_ACT_MAX_PRIO actions per batch
From: Jamal Hadi Salim @ 2017-04-26 20:07 UTC (permalink / raw)
To: Jiri Pirko
Cc: davem, xiyou.wangcong, eric.dumazet, netdev, Simon Horman,
Benjamin LaHaise
In-Reply-To: <20170426135627.GI1867@nanopsycho.orion>
On 17-04-26 09:56 AM, Jiri Pirko wrote:
> Wed, Apr 26, 2017 at 03:14:38PM CEST, jhs@mojatatu.com wrote:
>> On 17-04-26 08:08 AM, Jiri Pirko wrote:
[..]
>> Jiri, what are you arguing about if you have done the math? ;->
>
> I can do 3*2*64. What I cannot do is to figure out the real performance
> impact.
>
Jiri, I do a lot of very large data dumping and setting towards the
kernel. You know that. It is why I even have these patches to begin
with.
The math should be convincing enough.
48B per rule extra for just MPLS in a filter rule. I havent started
testing the overhead of flower but i do plan to use it - with about a
million rules for offloading. I will give you the numbers then.
I think we are at a stalemate.
You are not going to convince me to use an attribute with a
u8 for a bit flag when I can fit 32 of them in one attribute (with
the same cost). And I am not able to convince you that you are
wrong to put beauty first.
>> Again: You are looking at this from a manageability point of view which
>> is useful but not the only input into a design. If i can squeeze more
>> data without killing usability - I am all for it. It just doesnt
>> compute that it is ok to use a flag per attribute because it looks
>> beautiful.
>
> Hmm. Now that I'm thinking about it, why don't we have NLA_FLAGS with
> couple of helpers around it? It will be obvious what the attr is, all
> kernel code would use the same helpers. Would be nice.
>
I think to have flags at that level is useful but it
is a different hierarchy level. I am not sure the
"actions dump large messages" is a fit for that level.
cheers,
jamal
^ permalink raw reply
* Low speed MPLS to virtio-net
From: Алексей Болдырев @ 2017-04-26 19:15 UTC (permalink / raw)
To: netdev
Started MPLS on the branch - Everything was fine. When I tried to run MPLS on a real network of virtual machines, there were problems with the speed:
root@containers:~# iperf3 -c 10.194.10.2 -B 10.194.10.1 -Z
Connecting to host 10.194.10.2, port 5201
[ 4] local 10.194.10.1 port 49533 connected to 10.194.10.2 port 5201
[ ID] Interval Transfer Bandwidth Retr Cwnd
[ 4] 0.00-1.00 sec 1018 KBytes 8.34 Mbits/sec 238 5.64 KBytes
[ 4] 1.00-2.00 sec 1.42 MBytes 11.9 Mbits/sec 373 1.41 KBytes
[ 4] 2.00-3.00 sec 1.43 MBytes 12.0 Mbits/sec 379 5.64 KBytes
[ 4] 3.00-4.00 sec 1.43 MBytes 12.0 Mbits/sec 376 5.64 KBytes
[ 4] 4.00-5.00 sec 1.41 MBytes 11.8 Mbits/sec 375 2.82 KBytes
[ 4] 5.00-6.00 sec 1.42 MBytes 11.9 Mbits/sec 376 2.82 KBytes
[ 4] 6.00-7.00 sec 1.42 MBytes 11.9 Mbits/sec 373 5.64 KBytes
[ 4] 7.00-8.00 sec 1.41 MBytes 11.8 Mbits/sec 372 5.64 KBytes
[ 4] 8.00-9.00 sec 1.42 MBytes 11.9 Mbits/sec 379 2.82 KBytes
[ 4] 9.00-10.00 sec 1.42 MBytes 11.9 Mbits/sec 373 5.64 KBytes
- - - - - - - - - - - - - - - - - - - - - - - - -
[ ID] Interval Transfer Bandwidth Retr
[ 4] 0.00-10.00 sec 13.8 MBytes 11.5 Mbits/sec 3614 sender
[ 4] 0.00-10.00 sec 13.6 MBytes 11.4 Mbits/sec receiver
iperf Done.
root@containers:~#
Here are the settings:
test0:
lo: flags=73<UP,LOOPBACK,RUNNING> mtu 65536
inet 127.0.0.1 netmask 255.0.0.0
inet6 ::1 prefixlen 128 scopeid 0x10<host>
loop txqueuelen 1000 (Local Loopback)
RX packets 0 bytes 0 (0.0 B)
RX errors 0 dropped 0 overruns 0 frame 0
TX packets 0 bytes 0 (0.0 B)
TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0
lo:1: flags=73<UP,LOOPBACK,RUNNING> mtu 65536
inet 10.194.10.1 netmask 255.255.255.255
loop txqueuelen 1000 (Local Loopback)
test0p1: flags=4163<UP,BROADCAST,RUNNING,MULTICAST> mtu 1500
inet 10.194.1.50 netmask 255.255.255.0 broadcast 10.194.1.255
inet6 fe80::b0a7:b1ff:fec1:3d5c prefixlen 64 scopeid 0x20<link>
ether b2:a7:b1:c1:3d:5c txqueuelen 1000 (Ethernet)
RX packets 19974 bytes 1410944 (1.3 MiB)
RX errors 0 dropped 0 overruns 0 frame 0
TX packets 3726844 bytes 5236310466 (4.8 GiB)
TX errors 0 dropped 3604 overruns 0 carrier 0 collisions 0
test1:
lo: flags=73<UP,LOOPBACK,RUNNING> mtu 65536
inet 127.0.0.1 netmask 255.0.0.0
inet6 ::1 prefixlen 128 scopeid 0x10<host>
loop txqueuelen 1000 (Local Loopback)
RX packets 0 bytes 0 (0.0 B)
RX errors 0 dropped 0 overruns 0 frame 0
TX packets 0 bytes 0 (0.0 B)
TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0
lo:1: flags=73<UP,LOOPBACK,RUNNING> mtu 65536
inet 10.194.10.2 netmask 255.255.255.255
loop txqueuelen 1000 (Local Loopback)
test1p1: flags=4163<UP,BROADCAST,RUNNING,MULTICAST> mtu 1500
inet 10.194.1.51 netmask 255.255.255.0 broadcast 10.194.1.255
inet6 fe80::5cc0:45ff:fe1a:9705 prefixlen 64 scopeid 0x20<link>
ether 5e:c0:45:1a:97:05 txqueuelen 1000 (Ethernet)
RX packets 2001923 bytes 2806406771 (2.6 GiB)
RX errors 0 dropped 0 overruns 0 frame 0
TX packets 19907 bytes 1485150 (1.4 MiB)
TX errors 0 dropped 0 overruns 0 carrier 0 collisions 0
Server configuration:
root@ne-vlezay80:~# ip -M r
100 via inet 10.194.1.50 dev vlan11
101 via inet 10.194.1.51 dev vlan11
root@ne-vlezay80:~#
root@ne-vlezay80:~# ifconfig
eth0 Link encap:Ethernet HWaddr 52:54:00:5d:81:90
inet addr:10.247.0.250 Bcast:10.247.0.255 Mask:255.255.255.0
inet6 addr: fe80::5054:ff:fe5d:8190/64 Scope:Link
inet6 addr: fd00:1002:1289:10::10/64 Scope:Global
UP BROADCAST RUNNING MULTICAST MTU:2500 Metric:1
RX packets:7403 errors:0 dropped:0 overruns:0 frame:0
TX packets:4182 errors:0 dropped:0 overruns:0 carrier:0
collisions:0 txqueuelen:1000
RX bytes:621871 (607.2 KiB) TX bytes:445766 (435.3 KiB)
eth1 Link encap:Ethernet HWaddr 52:54:00:0b:ff:2e
inet addr:192.168.122.1 Bcast:192.168.122.255 Mask:255.255.255.0
inet6 addr: fd00:104:1::1/64 Scope:Global
inet6 addr: fe80::5054:ff:fe0b:ff2e/64 Scope:Link
UP BROADCAST RUNNING MULTICAST MTU:2500 Metric:1
RX packets:2204837 errors:0 dropped:5 overruns:0 frame:0
TX packets:2083636 errors:0 dropped:0 overruns:0 carrier:0
collisions:0 txqueuelen:1000
RX bytes:3073876412 (2.8 GiB) TX bytes:2897017540 (2.6 GiB)
lo Link encap:Local Loopback
inet addr:127.0.0.1 Mask:255.0.0.0
inet6 addr: ::1/128 Scope:Host
UP LOOPBACK RUNNING MTU:65536 Metric:1
RX packets:75 errors:0 dropped:0 overruns:0 frame:0
TX packets:75 errors:0 dropped:0 overruns:0 carrier:0
collisions:0 txqueuelen:1000
RX bytes:6600 (6.4 KiB) TX bytes:6600 (6.4 KiB)
servers Link encap:Ethernet HWaddr b2:c2:cf:9a:9c:00
UP RUNNING NOARP MASTER MTU:65536 Metric:1
RX packets:2259 errors:0 dropped:0 overruns:0 frame:0
TX packets:4062 errors:0 dropped:219 overruns:0 carrier:0
collisions:0 txqueuelen:1000
RX bytes:220368 (215.2 KiB) TX bytes:340283 (332.3 KiB)
vlan10 Link encap:Ethernet HWaddr 52:54:00:0b:ff:2e
inet addr:10.194.0.1 Bcast:10.194.0.255 Mask:255.255.255.0
inet6 addr: 2a01:d0:c353:180::1/64 Scope:Global
inet6 addr: fe80::5054:ff:fe0b:ff2e/64 Scope:Link
UP BROADCAST RUNNING MULTICAST MTU:2500 Metric:1
RX packets:2260 errors:0 dropped:0 overruns:0 frame:0
TX packets:15 errors:0 dropped:0 overruns:0 carrier:0
collisions:0 txqueuelen:1000
RX bytes:85868 (83.8 KiB) TX bytes:1322 (1.2 KiB)
vlan11 Link encap:Ethernet HWaddr 52:54:00:0b:ff:2e
inet addr:10.194.1.1 Bcast:10.194.1.255 Mask:255.255.255.0
inet6 addr: fe80::5054:ff:fe0b:ff2e/64 Scope:Link
UP BROADCAST RUNNING MULTICAST MTU:2500 Metric:1
RX packets:2201655 errors:0 dropped:58 overruns:0 frame:0
TX packets:2083391 errors:0 dropped:119523 overruns:0 carrier:0
collisions:0 txqueuelen:1000
RX bytes:3034042872 (2.8 GiB) TX bytes:2888672290 (2.6 GiB)
^ permalink raw reply
* [GIT] Networking
From: David Miller @ 2017-04-26 19:21 UTC (permalink / raw)
To: torvalds; +Cc: akpm, netdev, linux-kernel
1) MLX5 bug fixes from Saeed Mahameed et al.
a) Release wrong resources when firmware timeout happens
b) Wrong check for encapsulation size limits
c) UAR memory leak
d) ETHTOOL_GRXCLSRLALL fails to fill in info->data
2) Don't cache l3mdev on mis-matches local route, causes
net devices to leak refs. From Robert Shearman.
3) Handle fragmented SKBs properly in macsec driver, the problem
is that we were mis-sizing the sgvec table. From Jason A.
Donenfeld.
4) We cannot have checksum offload enabled for inner UDP tunneled
packet during IPSEC, from Ansis Atteka.
5) Fix double SKB free in ravb driver, from Dan Carpenter.
6) Fix CPU port handling in b53 DSA driver, from Florian Dainelli.
7) Don't use on-stack buffers for usb_control_msg() in CAN usb driver,
from Maksim Salau.
8) Fix device leak in macvlan driver, from Herbert Xu. We have to
purge the broadcast queue properly on port destroy.
9) Fix tx ring entry limit on EF10 devices in sfc driver. From
Bert Kenward.
10) Fix memory leaks in team driver, from Pan Bian.
11) Don't setup ipv6_stub before it can be actually used, from Paolo
Abeni.
12) Fix tipc socket flow control accounting, from Parthasarathy
Bhuvaragan.
13) Fix crash on module unload in hso driver, from Andreas Kemnade.
14) Fix purging of bridge multicast entries, the problem is that if
we don't defer it to ndo_uninit it's possible for new entries to
get added after we purge. Fix from Xin Long.
15) Don't return garbage for PACKET_HDRLEN getsockopt, from Alexander
Potapenko.
16) Fix autoneg stall properly in PHY layer, and revert micrel driver
change that was papering over it. From Alexander Kochetkov.
17) Don't dereference an ipv4 route as an ipv6 one in the ip6_tunnnel
code, from Cong Wang.
18) Clear out the congestion control private of the TCP socket in all
of the right places, from Wei Wang.
19) rawv6_ioctl measures SKB length incorrectly, fix from Jamie
Bainbridge.
Please pull, thanks a lot!
The following changes since commit 94836ecf1e7378b64d37624fbb81fe48fbd4c772:
Merge tag 'nfsd-4.11-2' of git://linux-nfs.org/~bfields/linux (2017-04-21 16:37:48 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
for you to fetch changes up to 105f5528b9bbaa08b526d3405a5bcd2ff0c953c8:
ipv6: check raw payload size correctly in ioctl (2017-04-26 14:59:35 -0400)
----------------------------------------------------------------
Alexander Kochetkov (1):
net: phy: fix auto-negotiation stall due to unavailable interrupt
Alexander Potapenko (1):
net/packet: check length in getsockopt() called with PACKET_HDRLEN
Andreas Kemnade (1):
net: hso: fix module unloading
Ansis Atteka (1):
udp: disable inner UDP checksum offloads in IPsec case
Bert Kenward (1):
sfc: tx ring can only have 2048 entries for all EF10 NICs
Dan Carpenter (2):
net: tc35815: move free after the dereference
ravb: Double free on error in ravb_start_xmit()
David Ahern (2):
net: ipv6: send unsolicited NA if enabled for all interfaces
net: ipv6: regenerate host route if moved to gc list
David S. Miller (4):
Merge tag 'mlx5-fixes-2017-04-22' of git://git.kernel.org/.../saeed/linux
Merge branch 'dsa-b53-58xx-fixes'
Merge tag 'linux-can-fixes-for-4.11-20170425' of git://git.kernel.org/.../mkl/linux-can
Revert "phy: micrel: Disable auto negotiation on startup"
Eugenia Emantayev (1):
net/mlx5e: Fix small packet threshold
Florian Fainelli (3):
net: dsa: b53: Include IMP/CPU port in dumb forwarding mode
net: dsa: b53: Implement software reset for 58xx devices
net: dsa: b53: Fix CPU port for 58xx devices
Herbert Xu (1):
macvlan: Fix device ref leak when purging bc_queue
Ilan Tayari (1):
net/mlx5e: Fix ETHTOOL_GRXCLSRLALL handling
Jamie Bainbridge (1):
ipv6: check raw payload size correctly in ioctl
Jason A. Donenfeld (2):
macsec: avoid heap overflow in skb_to_sgvec
macsec: dynamically allocate space for sglist
Maksim Salau (1):
net: can: usb: gs_usb: Fix buffer on stack
Maor Gottlieb (1):
net/mlx5: Fix UAR memory leak
Martin KaFai Lau (1):
net/mlx5e: Fix race in mlx5e_sw_stats and mlx5e_vport_stats
Mohamad Haj Yahia (1):
net/mlx5: Fix driver load bad flow when having fw initializing timeout
Myungho Jung (1):
net: core: Prevent from dereferencing null pointer when releasing SKB
Or Gerlitz (3):
net/mlx5: E-Switch, Correctly deal with inline mode on ConnectX-5
net/mlx5e: Make sure the FW max encap size is enough for ipv4 tunnels
net/mlx5e: Make sure the FW max encap size is enough for ipv6 tunnels
Pan Bian (1):
team: fix memory leaks
Paolo Abeni (1):
ipv6: move stub initialization after ipv6 setup completion
Parthasarathy Bhuvaragan (2):
tipc: fix socket flow control accounting error at tipc_send_stream
tipc: fix socket flow control accounting error at tipc_recv_stream
Robert Shearman (1):
ipv4: Avoid caching l3mdev dst on mismatched local route
Roman Spychała (1):
usb: plusb: Add support for PL-27A1
Sabrina Dubroca (1):
ipv6: fix source routing
Stephane Grosjean (2):
can: usb: Add support of PCAN-Chip USB stamp module
can: usb: Kconfig: Add PCAN-USB X6 device in help text
WANG Cong (1):
ipv6: check skb->protocol before lookup for nexthop
Wei Wang (1):
tcp: memset ca_priv data to 0 properly
Xin Long (1):
bridge: move bridge multicast cleanup to ndo_uninit
stephen hemminger (1):
netvsc: fix calculation of available send sections
sudarsana.kalluru@cavium.com (1):
qed: Fix error in the dcbx app meta data initialization.
drivers/net/can/usb/Kconfig | 2 ++
drivers/net/can/usb/gs_usb.c | 17 ++++++++++++-----
drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 ++
drivers/net/can/usb/peak_usb/pcan_usb_core.h | 2 ++
drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
drivers/net/dsa/b53/b53_common.c | 37 +++++++++++++++++++++++++++++++++++--
drivers/net/dsa/b53/b53_regs.h | 5 +++++
drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 1 +
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 ++--
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 36 ++++++++++++++++++++++++------------
drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/uar.c | 1 +
drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 10 +++++-----
drivers/net/ethernet/renesas/ravb_main.c | 7 ++++---
drivers/net/ethernet/sfc/efx.h | 5 ++++-
drivers/net/ethernet/sfc/workarounds.h | 1 +
drivers/net/ethernet/toshiba/tc35815.c | 2 +-
drivers/net/hyperv/hyperv_net.h | 1 -
drivers/net/hyperv/netvsc.c | 9 ++++-----
drivers/net/macsec.c | 27 +++++++++++++++++++++------
drivers/net/macvlan.c | 11 ++++++++++-
drivers/net/phy/micrel.c | 11 -----------
drivers/net/phy/phy.c | 40 ++++++++++++++++++++++++++++++++++++----
drivers/net/team/team.c | 8 ++++++--
drivers/net/usb/Kconfig | 2 +-
drivers/net/usb/hso.c | 2 +-
drivers/net/usb/plusb.c | 15 +++++++++++++--
include/linux/phy.h | 1 +
net/bridge/br_device.c | 1 +
net/bridge/br_if.c | 1 -
net/core/dev.c | 3 +++
net/ipv4/route.c | 3 ++-
net/ipv4/tcp_cong.c | 11 +++--------
net/ipv4/udp_offload.c | 3 +++
net/ipv6/addrconf.c | 14 ++++++++++++--
net/ipv6/af_inet6.c | 6 ++++--
net/ipv6/exthdrs.c | 4 ++++
net/ipv6/ip6_tunnel.c | 34 ++++++++++++++++++----------------
net/ipv6/ndisc.c | 3 ++-
net/ipv6/raw.c | 3 +--
net/packet/af_packet.c | 2 ++
net/tipc/socket.c | 4 ++--
44 files changed, 373 insertions(+), 141 deletions(-)
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox