diff options
author | Emil Tantilov <emil.s.tantilov@intel.com> | 2018-01-30 19:51:54 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2018-02-26 12:36:24 -0500 |
commit | 6d9c02171a8081f3746ea8cf7c67b0063a2272db (patch) | |
tree | 12c8981929093e99c41a5addb287e83cc5e22163 | |
parent | 925f5690ff5d5a1d9ec027e938d37b539e3fd186 (diff) |
ixgbevf: add build_skb support
Add support for build_skb() similar to:
commit 6f429223b31c ("ixgbe: Add support for build_skb")
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index faeb426c2f0f..cb943187816f 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | |||
@@ -910,6 +910,44 @@ static inline void ixgbevf_irq_enable_queues(struct ixgbevf_adapter *adapter, | |||
910 | IXGBE_WRITE_REG(hw, IXGBE_VTEIMS, qmask); | 910 | IXGBE_WRITE_REG(hw, IXGBE_VTEIMS, qmask); |
911 | } | 911 | } |
912 | 912 | ||
913 | static struct sk_buff *ixgbevf_build_skb(struct ixgbevf_ring *rx_ring, | ||
914 | struct ixgbevf_rx_buffer *rx_buffer, | ||
915 | union ixgbe_adv_rx_desc *rx_desc, | ||
916 | unsigned int size) | ||
917 | { | ||
918 | void *va = page_address(rx_buffer->page) + rx_buffer->page_offset; | ||
919 | #if (PAGE_SIZE < 8192) | ||
920 | unsigned int truesize = ixgbevf_rx_pg_size(rx_ring) / 2; | ||
921 | #else | ||
922 | unsigned int truesize = SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) + | ||
923 | SKB_DATA_ALIGN(IXGBEVF_SKB_PAD + size); | ||
924 | #endif | ||
925 | struct sk_buff *skb; | ||
926 | |||
927 | /* prefetch first cache line of first page */ | ||
928 | prefetch(va); | ||
929 | #if L1_CACHE_BYTES < 128 | ||
930 | prefetch(va + L1_CACHE_BYTES); | ||
931 | #endif | ||
932 | |||
933 | /* build an skb to around the page buffer */ | ||
934 | skb = build_skb(va - IXGBEVF_SKB_PAD, truesize); | ||
935 | if (unlikely(!skb)) | ||
936 | return NULL; | ||
937 | |||
938 | /* update pointers within the skb to store the data */ | ||
939 | skb_reserve(skb, IXGBEVF_SKB_PAD); | ||
940 | __skb_put(skb, size); | ||
941 | |||
942 | /* update buffer offset */ | ||
943 | #if (PAGE_SIZE < 8192) | ||
944 | rx_buffer->page_offset ^= truesize; | ||
945 | #else | ||
946 | rx_buffer->page_offset += truesize; | ||
947 | #endif | ||
948 | |||
949 | return skb; | ||
950 | } | ||
913 | static int ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector, | 951 | static int ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector, |
914 | struct ixgbevf_ring *rx_ring, | 952 | struct ixgbevf_ring *rx_ring, |
915 | int budget) | 953 | int budget) |
@@ -945,6 +983,9 @@ static int ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector, | |||
945 | /* retrieve a buffer from the ring */ | 983 | /* retrieve a buffer from the ring */ |
946 | if (skb) | 984 | if (skb) |
947 | ixgbevf_add_rx_frag(rx_ring, rx_buffer, skb, size); | 985 | ixgbevf_add_rx_frag(rx_ring, rx_buffer, skb, size); |
986 | else if (ring_uses_build_skb(rx_ring)) | ||
987 | skb = ixgbevf_build_skb(rx_ring, rx_buffer, | ||
988 | rx_desc, size); | ||
948 | else | 989 | else |
949 | skb = ixgbevf_construct_skb(rx_ring, rx_buffer, | 990 | skb = ixgbevf_construct_skb(rx_ring, rx_buffer, |
950 | rx_desc, size); | 991 | rx_desc, size); |