diff options
| author |   Tonghao Zhang <xiangxia.m.yue@gmail.com> | 2019-11-07 00:34:28 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-11-06 21:25:19 -0800 |
| commit | 90ce9f23a886bdef7a4b7a9bd52c7a50a6a81635 (patch) | |
| tree | 36cd9844870e57a7c3dcb9862ade31286dba151f /net | |
| parent | net: axienet: Fix error return code in axienet_probe() (diff) | |
| download | linux-dev-90ce9f23a886bdef7a4b7a9bd52c7a50a6a81635.tar.xz linux-dev-90ce9f23a886bdef7a4b7a9bd52c7a50a6a81635.zip | |
net: openvswitch: select vport upcall portid directly
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/openvswitch/vport.c | 5 |
1 files changed, 3 insertions, 2 deletions
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); |