| Message ID | 1328922274-23993-3-git-send-email-greearb@candelatech.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
2012/2/11 <greearb@candelatech.com>: > From: Ben Greear <greearb@candelatech.com> [...] > @@ -1951,9 +1956,11 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, > } > > /* Get actual data size */ > + if (unlikely(dev->features & NETIF_F_RXFCS)) > + fcs_pad = 4; > actual_size = le16_to_cpu(rfd->actual_size) & 0x3FFF; > - if (unlikely(actual_size > RFD_BUF_LEN - sizeof(struct rfd))) > - actual_size = RFD_BUF_LEN - sizeof(struct rfd); > + if (unlikely(actual_size > RFD_BUF_LEN + fcs_pad - sizeof(struct rfd))) > + actual_size = RFD_BUF_LEN + fcs_pad - sizeof(struct rfd); BTW, Is this even triggered? I looks like this would indicate corruption in the descriptor. Best Regards, Michał Mirosław -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 02/11/2012 08:07 AM, Michał Mirosław wrote: > 2012/2/11<greearb@candelatech.com>: >> From: Ben Greear<greearb@candelatech.com> > [...] >> @@ -1951,9 +1956,11 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, >> } >> >> /* Get actual data size */ >> + if (unlikely(dev->features& NETIF_F_RXFCS)) >> + fcs_pad = 4; >> actual_size = le16_to_cpu(rfd->actual_size)& 0x3FFF; >> - if (unlikely(actual_size> RFD_BUF_LEN - sizeof(struct rfd))) >> - actual_size = RFD_BUF_LEN - sizeof(struct rfd); >> + if (unlikely(actual_size> RFD_BUF_LEN + fcs_pad - sizeof(struct rfd))) >> + actual_size = RFD_BUF_LEN + fcs_pad - sizeof(struct rfd); > > BTW, Is this even triggered? I looks like this would indicate > corruption in the descriptor. No idea, but better safe than sorry unless someone can prove it never happens in all cases... Ben
Le vendredi 10 février 2012 à 17:04 -0800, greearb@candelatech.com a écrit : > From: Ben Greear <greearb@candelatech.com> > > This allows e100 to be configured to append the > Ethernet FCS to the skb. > > Useful for sniffing networks. > > Signed-off-by: Ben Greear <greearb@candelatech.com> > --- Did you try this patch with 8021Q frames ? You must change #define RFD_BUF_LEN (sizeof(struct rfd) + VLAN_ETH_FRAME_LEN) to : #define RFD_BUF_LEN (sizeof(struct rfd) + VLAN_ETH_FRAME_LEN + ETH_FCS_LEN) And also on various spots where VLAN_ETH_FRAME_LEN is used in this driver... nic->blank_rfd.size = cpu_to_le16(VLAN_ETH_FRAME_LEN); -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 02/11/2012 09:07 AM, Eric Dumazet wrote: > Le vendredi 10 février 2012 à 17:04 -0800, greearb@candelatech.com a > écrit : >> From: Ben Greear<greearb@candelatech.com> >> >> This allows e100 to be configured to append the >> Ethernet FCS to the skb. >> >> Useful for sniffing networks. >> >> Signed-off-by: Ben Greear<greearb@candelatech.com> >> --- > > Did you try this patch with 8021Q frames ? > > You must change > > #define RFD_BUF_LEN (sizeof(struct rfd) + VLAN_ETH_FRAME_LEN) > > to : > > #define RFD_BUF_LEN (sizeof(struct rfd) + VLAN_ETH_FRAME_LEN + ETH_FCS_LEN) > > And also on various spots where VLAN_ETH_FRAME_LEN is used in this > driver... > > nic->blank_rfd.size = cpu_to_le16(VLAN_ETH_FRAME_LEN); Thanks for the review. I did not try it with VLAN frames. It may be a few days until I can get this done and test it well.... Thanks, Ben
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c index 485ab8c..1fd4603 100644 --- a/drivers/net/ethernet/intel/e100.c +++ b/drivers/net/ethernet/intel/e100.c @@ -1089,6 +1089,7 @@ static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) { struct config *config = &cb->u.config; u8 *c = (u8 *)config; + struct net_device *netdev = nic->netdev; cb->command = cpu_to_le16(cb_config); @@ -1132,6 +1133,9 @@ static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) config->promiscuous_mode = 0x1; /* 1=on, 0=off */ } + if (unlikely(netdev->features & NETIF_F_RXFCS)) + config->rx_crc_transfer = 0x1; /* 1=save, 0=discard */ + if (nic->flags & multicast_all) config->multicast_all = 0x1; /* 1=accept, 0=no */ @@ -1919,6 +1923,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, struct sk_buff *skb = rx->skb; struct rfd *rfd = (struct rfd *)skb->data; u16 rfd_status, actual_size; + u16 fcs_pad = 0; if (unlikely(work_done && *work_done >= work_to_do)) return -EAGAIN; @@ -1951,9 +1956,11 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, } /* Get actual data size */ + if (unlikely(dev->features & NETIF_F_RXFCS)) + fcs_pad = 4; actual_size = le16_to_cpu(rfd->actual_size) & 0x3FFF; - if (unlikely(actual_size > RFD_BUF_LEN - sizeof(struct rfd))) - actual_size = RFD_BUF_LEN - sizeof(struct rfd); + if (unlikely(actual_size > RFD_BUF_LEN + fcs_pad - sizeof(struct rfd))) + actual_size = RFD_BUF_LEN + fcs_pad - sizeof(struct rfd); /* Get data */ pci_unmap_single(nic->pdev, rx->dma_addr, @@ -1980,13 +1987,13 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, if (unlikely(!(rfd_status & cb_ok))) { /* Don't indicate if hardware indicates errors */ dev_kfree_skb_any(skb); - } else if (actual_size > ETH_DATA_LEN + VLAN_ETH_HLEN) { + } else if (actual_size > ETH_DATA_LEN + VLAN_ETH_HLEN + fcs_pad) { /* Don't indicate oversized frames */ nic->rx_over_length_errors++; dev_kfree_skb_any(skb); } else { dev->stats.rx_packets++; - dev->stats.rx_bytes += actual_size; + dev->stats.rx_bytes += (actual_size - fcs_pad); netif_receive_skb(skb); if (work_done) (*work_done)++; @@ -2729,6 +2736,20 @@ static int e100_close(struct net_device *netdev) return 0; } +static int e100_set_features(struct net_device *netdev, + netdev_features_t features) +{ + struct nic *nic = netdev_priv(netdev); + netdev_features_t changed = features ^ netdev->features; + + if (!(changed & (NETIF_F_RXFCS))) + return 0; + + netdev->features = features; + e100_exec_cb(nic, NULL, e100_configure); + return 0; +} + static const struct net_device_ops e100_netdev_ops = { .ndo_open = e100_open, .ndo_stop = e100_close, @@ -2742,6 +2763,7 @@ static const struct net_device_ops e100_netdev_ops = { #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = e100_netpoll, #endif + .ndo_set_features = e100_set_features, }; static int __devinit e100_probe(struct pci_dev *pdev, @@ -2754,6 +2776,8 @@ static int __devinit e100_probe(struct pci_dev *pdev, if (!(netdev = alloc_etherdev(sizeof(struct nic)))) return -ENOMEM; + netdev->hw_features |= NETIF_F_RXFCS; + netdev->netdev_ops = &e100_netdev_ops; SET_ETHTOOL_OPS(netdev, &e100_ethtool_ops); netdev->watchdog_timeo = E100_WATCHDOG_PERIOD;