| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <1409960112.2460.38.camel@jtkirshe-mobl>
Date: Fri, 05 Sep 2014 16:35:12 -0700
From: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
To: Alexander Duyck <alexander.h.duyck@...el.com>
Cc: netdev@...r.kernel.org, davem@...emloft.net, eric.dumazet@...il.com
Subject: Re: [PATCH net-next v2 3/3] ixgbe: use new eth_get_headlen interface
On Fri, 2014-09-05 at 19:22 -0400, Alexander Duyck wrote:
> Update ixgbe to drop the ixgbe_get_headlen function in favor of eth_get_headlen.
>
> Signed-off-by: Alexander Duyck <alexander.h.duyck@...el.com>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
> ---
> drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 116 -------------------------
> 1 file changed, 1 insertion(+), 115 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> index 53fbf06..09c3746 100644
> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
> @@ -1521,120 +1521,6 @@ void ixgbe_alloc_rx_buffers(struct ixgbe_ring *rx_ring, u16 cleaned_count)
> ixgbe_release_rx_desc(rx_ring, i);
> }
>
> -/**
> - * ixgbe_get_headlen - determine size of header for RSC/LRO/GRO/FCOE
> - * @data: pointer to the start of the headers
> - * @max_len: total length of section to find headers in
> - *
> - * This function is meant to determine the length of headers that will
> - * be recognized by hardware for LRO, GRO, and RSC offloads. The main
> - * motivation of doing this is to only perform one pull for IPv4 TCP
> - * packets so that we can do basic things like calculating the gso_size
> - * based on the average data per packet.
> - **/
> -static unsigned int ixgbe_get_headlen(unsigned char *data,
> - unsigned int max_len)
> -{
> - union {
> - unsigned char *network;
> - /* l2 headers */
> - struct ethhdr *eth;
> - struct vlan_hdr *vlan;
> - /* l3 headers */
> - struct iphdr *ipv4;
> - struct ipv6hdr *ipv6;
> - } hdr;
> - __be16 protocol;
> - u8 nexthdr = 0; /* default to not TCP */
> - u8 hlen;
> -
> - /* this should never happen, but better safe than sorry */
> - if (max_len < ETH_HLEN)
> - return max_len;
> -
> - /* initialize network frame pointer */
> - hdr.network = data;
> -
> - /* set first protocol and move network header forward */
> - protocol = hdr.eth->h_proto;
> - hdr.network += ETH_HLEN;
> -
> - /* handle any vlan tag if present */
> - if (protocol == htons(ETH_P_8021Q)) {
> - if ((hdr.network - data) > (max_len - VLAN_HLEN))
> - return max_len;
> -
> - protocol = hdr.vlan->h_vlan_encapsulated_proto;
> - hdr.network += VLAN_HLEN;
> - }
> -
> - /* handle L3 protocols */
> - if (protocol == htons(ETH_P_IP)) {
> - if ((hdr.network - data) > (max_len - sizeof(struct iphdr)))
> - return max_len;
> -
> - /* access ihl as a u8 to avoid unaligned access on ia64 */
> - hlen = (hdr.network[0] & 0x0F) << 2;
> -
> - /* verify hlen meets minimum size requirements */
> - if (hlen < sizeof(struct iphdr))
> - return hdr.network - data;
> -
> - /* record next protocol if header is present */
> - if (!(hdr.ipv4->frag_off & htons(IP_OFFSET)))
> - nexthdr = hdr.ipv4->protocol;
> - } else if (protocol == htons(ETH_P_IPV6)) {
> - if ((hdr.network - data) > (max_len - sizeof(struct ipv6hdr)))
> - return max_len;
> -
> - /* record next protocol */
> - nexthdr = hdr.ipv6->nexthdr;
> - hlen = sizeof(struct ipv6hdr);
> -#ifdef IXGBE_FCOE
> - } else if (protocol == htons(ETH_P_FCOE)) {
> - if ((hdr.network - data) > (max_len - FCOE_HEADER_LEN))
> - return max_len;
> - hlen = FCOE_HEADER_LEN;
> -#endif
> - } else {
> - return hdr.network - data;
> - }
> -
> - /* relocate pointer to start of L4 header */
> - hdr.network += hlen;
> -
> - /* finally sort out TCP/UDP */
> - if (nexthdr == IPPROTO_TCP) {
> - if ((hdr.network - data) > (max_len - sizeof(struct tcphdr)))
> - return max_len;
> -
> - /* access doff as a u8 to avoid unaligned access on ia64 */
> - hlen = (hdr.network[12] & 0xF0) >> 2;
> -
> - /* verify hlen meets minimum size requirements */
> - if (hlen < sizeof(struct tcphdr))
> - return hdr.network - data;
> -
> - hdr.network += hlen;
> - } else if (nexthdr == IPPROTO_UDP) {
> - if ((hdr.network - data) > (max_len - sizeof(struct udphdr)))
> - return max_len;
> -
> - hdr.network += sizeof(struct udphdr);
> - }
> -
> - /*
> - * If everything has gone correctly hdr.network should be the
> - * data section of the packet and will be the end of the header.
> - * If not then it probably represents the end of the last recognized
> - * header.
> - */
> - if ((hdr.network - data) < max_len)
> - return hdr.network - data;
> - else
> - return max_len;
> -}
> -
> static void ixgbe_set_rsc_gso_size(struct ixgbe_ring *ring,
> struct sk_buff *skb)
> {
> @@ -1793,7 +1679,7 @@ static void ixgbe_pull_tail(struct ixgbe_ring *rx_ring,
> * we need the header to contain the greater of either ETH_HLEN or
> * 60 bytes if the skb->len is less than 60 for skb_pad.
> */
> - pull_len = ixgbe_get_headlen(va, IXGBE_RX_HDR_SIZE);
> + pull_len = eth_get_headlen(va, IXGBE_RX_HDR_SIZE);
>
> /* align pull length to size of long to optimize memcpy performance */
> skb_copy_to_linear_data(skb, va, ALIGN(pull_len, sizeof(long)));
>
Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)
Powered by blists - more mailing lists