[ovs-dev] [PATCH v2 08/12] netdev-dpdk: Cleanup dpdk_do_tx_copy.

[Darrell Ball]

I applied the patch to dpdk_merge here

https://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_darball_ovs_commits_dpdk-5Fmerge&d=DwIGaQ&c=uilaK90D4TOVoH58JNXRgQ&r=BVhFA09CGX7JQ5Ih-uZnsw&m=A2_FCacqbp2moAo3HGFlTuxsjONUGhlN42OBcAuQQ6w&s=b6btPKhgvOFr2GOUYvktND6kaC6jc3fXI-mXfvNgXOU&e=


On 9/20/17, 6:28 AM, "ovs-dev-bounces at openvswitch.org on behalf of Bhanuprakash Bodireddy" <ovs-dev-bounces at openvswitch.org on behalf of bhanuprakash.bodireddy at intel.com> wrote:

    Cleanup dpdk_do_tx_copy().
    
    Signed-off-by: Bhanuprakash Bodireddy <bhanuprakash.bodireddy at intel.com>
    ---
     lib/netdev-dpdk.c | 22 ++++++++++------------
     1 file changed, 10 insertions(+), 12 deletions(-)
    
    diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
    index 60ec528..60887e5 100644
    --- a/lib/netdev-dpdk.c
    +++ b/lib/netdev-dpdk.c
    @@ -1835,22 +1835,23 @@ static void
     dpdk_do_tx_copy(struct netdev *netdev, int qid, struct dp_packet_batch *batch)
         OVS_NO_THREAD_SAFETY_ANALYSIS
     {
    +    const size_t batch_cnt = dp_packet_batch_size(batch);
     #if !defined(__CHECKER__) && !defined(_WIN32)
    -    const size_t PKT_ARRAY_SIZE = batch->count;
    +    const size_t PKT_ARRAY_SIZE = batch_cnt;
     #else
         /* Sparse or MSVC doesn't like variable length array. */
         enum { PKT_ARRAY_SIZE = NETDEV_MAX_BURST };
     #endif
         struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
         struct rte_mbuf *pkts[PKT_ARRAY_SIZE];
    -    uint32_t cnt = batch->count;
    +    uint32_t cnt = batch_cnt;
         uint32_t dropped = 0;
     
         if (dev->type != DPDK_DEV_VHOST) {
             /* Check if QoS has been configured for this netdev. */
             cnt = netdev_dpdk_qos_run(dev, (struct rte_mbuf **) batch->packets,
    -                                  cnt, false);
    -        dropped += batch->count - cnt;
    +                                  batch_cnt, false);
    +        dropped += batch_cnt - cnt;
         }
     
         dp_packet_batch_apply_cutlen(batch);
    @@ -1858,8 +1859,8 @@ dpdk_do_tx_copy(struct netdev *netdev, int qid, struct dp_packet_batch *batch)
         uint32_t txcnt = 0;
     
         for (uint32_t i = 0; i < cnt; i++) {
    -
    -        uint32_t size = dp_packet_size(batch->packets[i]);
    +        struct dp_packet *packet = batch->packets[i];
    +        uint32_t size = dp_packet_size(packet);
     
             if (OVS_UNLIKELY(size > dev->max_packet_len)) {
                 VLOG_WARN_RL(&rl, "Too big size %u max_packet_len %d",
    @@ -1870,18 +1871,15 @@ dpdk_do_tx_copy(struct netdev *netdev, int qid, struct dp_packet_batch *batch)
             }
     
             pkts[txcnt] = rte_pktmbuf_alloc(dev->dpdk_mp->mp);
    -
    -        if (!pkts[txcnt]) {
    +        if (OVS_UNLIKELY(!pkts[txcnt])) {
                 dropped += cnt - i;
                 break;
             }
     
             /* We have to do a copy for now */
             memcpy(rte_pktmbuf_mtod(pkts[txcnt], void *),
    -               dp_packet_data(batch->packets[i]), size);
    -
    -        rte_pktmbuf_data_len(pkts[txcnt]) = size;
    -        rte_pktmbuf_pkt_len(pkts[txcnt]) = size;
    +               dp_packet_data(packet), size);
    +        dp_packet_set_size((struct dp_packet *)pkts[txcnt], size);
     
             txcnt++;
         }
    -- 
    2.4.11
    
    _______________________________________________
    dev mailing list
    dev at openvswitch.org
    https://urldefense.proofpoint.com/v2/url?u=https-3A__mail.openvswitch.org_mailman_listinfo_ovs-2Ddev&d=DwICAg&c=uilaK90D4TOVoH58JNXRgQ&r=BVhFA09CGX7JQ5Ih-uZnsw&m=KVkaC1b7vq0ZhITyJqwrjMEw5FmS2iT-F9m6_cD-s0U&s=FulsJ8CXEawukbcPckl5ZsIjs_uZTnSLU56B1FUVj7U&e=