Message ID | 1573058068-7073-1-git-send-email-xiangxia.m.yue@gmail.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | [net-next,v2] net: openvswitch: select vport upcall portid directly | expand |
On Wed, Nov 6, 2019 at 8:34 AM <xiangxia.m.yue@gmail.com> wrote: > > From: Tonghao Zhang <xiangxia.m.yue@gmail.com> > > The commit 69c51582ff786 ("dpif-netlink: don't allocate per > thread netlink sockets"), in Open vSwitch ovs-vswitchd, has > changed the number of allocated sockets to just one per port > by moving the socket array from a per handler structure to > a per datapath one. In the kernel datapath, a vport will have > only one socket in most case, if so select it directly in > fast-path. > > Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com> Acked-by: Pravin B Shelar <pshelar@ovn.org> Thanks.
From: xiangxia.m.yue@gmail.com Date: Thu, 7 Nov 2019 00:34:28 +0800 > From: Tonghao Zhang <xiangxia.m.yue@gmail.com> > > The commit 69c51582ff786 ("dpif-netlink: don't allocate per > thread netlink sockets"), in Open vSwitch ovs-vswitchd, has > changed the number of allocated sockets to just one per port > by moving the socket array from a per handler structure to > a per datapath one. In the kernel datapath, a vport will have > only one socket in most case, if so select it directly in > fast-path. > > Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com> > --- > v2: drectly -> directly in the commit title Applied.
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index 3fc38d16c456..5da9392b03d6 100644 --- a/net/openvswitch/vport.c +++ b/net/openvswitch/vport.c @@ -403,8 +403,9 @@ u32 ovs_vport_find_upcall_portid(const struct vport *vport, struct sk_buff *skb) ids = rcu_dereference(vport->upcall_portids); - if (ids->n_ids == 1 && ids->ids[0] == 0) - return 0; + /* If there is only one portid, select it in the fast-path. */ + if (ids->n_ids == 1) + return ids->ids[0]; hash = skb_get_hash(skb); ids_index = hash - ids->n_ids * reciprocal_divide(hash, ids->rn_ids);