These are already in the git repository code. Mike Polehn
-----Original Message----- From: dev [mailto:dev-boun...@openvswitch.org] On Behalf Of Daniele Di Proietto Sent: Monday, June 30, 2014 10:00 AM To: Ryan Wilson Cc: dev@openvswitch.org Subject: Re: [ovs-dev] [PATCH v2 5/5] netdev-dpdk: Add OVS_UNLIKELY annotations in dpdk_do_tx_copy(). Acked-by: Daniele Di Proietto <ddiproie...@vmware.com> On Jun 26, 2014, at 7:17 PM, Ben Pfaff <b...@nicira.com> wrote: > Great, thanks. Looks good. > > I'll leave it to whoever reviews the series as a whole to push this. > On Jun 26, 2014 6:36 PM, "Ryan Wilson 76511" <wr...@vmware.com> wrote: > >> Crap, its late in the day and I can't think / type apparently. Yes >> 0.04 million is what I meant. >> >> And I ran 2 more tests in the meantime with and without the patch and >> I got a 0.03 and 0.04 million PPS increase, respectively. >> Nonetheless, the increase is fairly consistent over 5 different tests. >> >> Ryan >> >> From: Ben Pfaff <b...@nicira.com> >> Date: Thursday, June 26, 2014 6:26 PM >> To: Ryan Wilson <wr...@vmware.com> >> Cc: Ryan Wilson <wr...@nicira.com>, "dev@openvswitch.org" < >> dev@openvswitch.org> >> Subject: Re: [ovs-dev] [PATCH v2 5/5] netdev-dpdk: Add OVS_UNLIKELY >> annotations in dpdk_do_tx_copy(). >> >> .4 million or .04 million? There's a big difference. >> On Jun 26, 2014 6:24 PM, "Ryan Wilson 76511" <wr...@vmware.com> wrote: >> >>> Its between 0.2 - 0.6 million PPS increase after running 3 tests >>> with and without this patch. So I went with the average of 0.4 :) >>> >>> And we actually use these annotations elsewhere in >>> netdev_dpdk_send() where we measure size of packets and dropped >>> packets, so it would be nice to add these annotations for code consistency >>> as well. >>> >>> Ryan >>> >>> From: Ben Pfaff <b...@nicira.com> >>> Date: Thursday, June 26, 2014 6:20 PM >>> To: Ryan Wilson <wr...@nicira.com> >>> Cc: "dev@openvswitch.org" <dev@openvswitch.org> >>> Subject: Re: [ovs-dev] [PATCH v2 5/5] netdev-dpdk: Add OVS_UNLIKELY >>> annotations in dpdk_do_tx_copy(). >>> >>> That's pretty impressive. Is the performance consistent enough to >>> be sure, then? >>> >>> In either case I don't object to the patch. >>> On Jun 26, 2014 6:17 PM, "Ryan Wilson" <wr...@nicira.com> wrote: >>> >>>> Since dropped packets due to large packet size or lack of memory >>>> are unlikely, it is best to add OVS_UNLIKELY annotations to these >>>> conditions. >>>> >>>> With DPDK fast path forwarding test, this increased throughtput >>>> from 4.12 to 4.16 million packets per second. >>>> >>>> Signed-off-by: Ryan Wilson <wr...@nicira.com> >>>> --- >>>> lib/netdev-dpdk.c | 4 ++-- >>>> 1 file changed, 2 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index >>>> 0aee14e..03f1e02 100644 >>>> --- a/lib/netdev-dpdk.c >>>> +++ b/lib/netdev-dpdk.c >>>> @@ -664,7 +664,7 @@ dpdk_do_tx_copy(struct netdev *netdev, struct >>>> dpif_packet ** pkts, int cnt) >>>> >>>> for (i = 0; i < cnt; i++) { >>>> int size = ofpbuf_size(&pkts[i]->ofpbuf); >>>> - if (size > dev->max_packet_len) { >>>> + if (OVS_UNLIKELY(size > dev->max_packet_len)) { >>>> VLOG_WARN_RL(&rl, "Too big size %d max_packet_len %d", >>>> (int)size , dev->max_packet_len); >>>> >>>> @@ -688,7 +688,7 @@ dpdk_do_tx_copy(struct netdev *netdev, struct >>>> dpif_packet ** pkts, int cnt) >>>> newcnt++; >>>> } >>>> >>>> - if (dropped) { >>>> + if (OVS_UNLIKELY(dropped)) { >>>> ovs_mutex_lock(&dev->mutex); >>>> dev->stats.tx_dropped += dropped; >>>> ovs_mutex_unlock(&dev->mutex); >>>> -- >>>> 1.7.9.5 >>>> >>>> _______________________________________________ >>>> dev mailing list >>>> dev@openvswitch.org >>>> https://urldefense.proofpoint.com/v1/url?u=http://openvswitch.org/m >>>> ailman/listinfo/dev&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=MV9BdLjtF >>>> IdhBDBaw5z%2BU6SSA2gAfY4L%2F1HCy3VjlKU%3D%0A&m=B%2BD2KiuphwYDp1kjSp >>>> IP5KeaBvJJGWoiQ7P6URgnkvM%3D%0A&s=9ce118c52fc0ec372ba651cd20cfd5e5b >>>> 2f4692865c242bb3adea3834b82fb5f >>>> <https://urldefense.proofpoint.com/v1/url?u=http://openvswitch.org/ >>>> mailman/listinfo/dev&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=TfBS78Vw >>>> 3dzttvXidhbffg%3D%3D%0A&m=wtH3lN2ST0E5hR7ESg7AwzXseDogoZZdb1KOoAV5u >>>> Q0%3D%0A&s=1542518c0ff9ce83f83a308a7e942d661a79c78b4fbac3e67a27b268 >>>> c9d58df0> >>>> >>> > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://urldefense.proofpoint.com/v1/url?u=http://openvswitch.org/mail > man/listinfo/dev&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=MV9BdLjtFIdhBDB > aw5z%2BU6SSA2gAfY4L%2F1HCy3VjlKU%3D%0A&m=B%2BD2KiuphwYDp1kjSpIP5KeaBvJ > JGWoiQ7P6URgnkvM%3D%0A&s=9ce118c52fc0ec372ba651cd20cfd5e5b2f4692865c24 > 2bb3adea3834b82fb5f _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev