From patchwork Fri Nov 1 14:23:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tonghao Zhang X-Patchwork-Id: 1188086 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QdfwaJbo"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 474PjT0D6Vz9sP4 for ; Sat, 2 Nov 2019 01:30:05 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id DEC87DAB; Fri, 1 Nov 2019 14:24:31 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id DD8DCDAB for ; Fri, 1 Nov 2019 14:24:30 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 9ECA714D for ; Fri, 1 Nov 2019 14:24:30 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id p24so683186pfn.4 for ; Fri, 01 Nov 2019 07:24:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wcdpZmmeZAo/k2NkvkUCVVJa5T89dwfwECWke5u/oEE=; b=QdfwaJboLYLlCyiwyGwg7xfY/wZVKYhrHqbrec8/lp+RNryGrJZ584pxVa51L3KISq HlrlWy03VT2BubOJ9MyIZR7+x2GIFN6YeYW/0kpJvRjPwaaIjTgdw11f//TzLuj2qnWh eQYarQjkR+71jla6srqCL/pC9jQ5mQvVkBJsGzmmtABaDVA3rTqHNfcBVGrbBKKfbOSO /JdHbCL5u8k0/8TwjRt1KuQAWXLg0MgvfYqAZDXdy1JPhdirCj8iHrssxLjtWjdv/jVW fJarMAxiYsYCu+LwawCmuRamMkrBpW7308DWWL6L8zdZ/t6G+Y4w35d3UYA8lg58aJNq 54BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wcdpZmmeZAo/k2NkvkUCVVJa5T89dwfwECWke5u/oEE=; b=YP0+oqxoXSpLXCr2IBFUvHGIrkeZjgnEOqNSdJOcG107sfJmQIk/Rmv7hEMSOI0lKX JsLXphiwUdeo3h5WFu2WHQZKcKaurA5HgVXMl1Rwnc6bRVTLbiAVRjHXC2/NLlAbVXcc vEBzTafNk3OFYnGsYJEiNtDo5bzB/SvX/1nO9zB3sWA79cvC4YqqKrehSbJUR/n/G/vk jT2FyTYW5PV+DvpSFm3lTw54cXRlAydb3pbNZP5kzgv39ETuDT6aOETrOaLbBt74v6rH gs72sgwqEYoWf2C+L8YXVK+d89jUGpvoUOTTh6AbMRDxjgUmY9EfnchPIEHgroqWnCxJ g84w== X-Gm-Message-State: APjAAAUVtqdFRoKiE4Y48s8azh2YTqmNho+dbTayj5hos63syqbLaCfl 64CNSZ1VFX9raxz6mLnR0fs= X-Google-Smtp-Source: APXvYqwJmTFhmV7lDzszpmeZ3DLL5+wVdBKVPjRxmx71enTrftOOdaG5SYiajc5mj8DVK0wPM70W7A== X-Received: by 2002:a17:90a:24b:: with SMTP id t11mr15837371pje.77.1572618270220; Fri, 01 Nov 2019 07:24:30 -0700 (PDT) Received: from local.opencloud.tech.localdomain ([1.203.173.208]) by smtp.gmail.com with ESMTPSA id c12sm8296499pfp.67.2019.11.01.07.24.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Nov 2019 07:24:29 -0700 (PDT) From: xiangxia.m.yue@gmail.com To: gvrose8192@gmail.com, pshelar@ovn.org, davem@davemloft.net Date: Fri, 1 Nov 2019 22:23:51 +0800 Message-Id: <1572618234-6904-8-git-send-email-xiangxia.m.yue@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1572618234-6904-1-git-send-email-xiangxia.m.yue@gmail.com> References: <1572618234-6904-1-git-send-email-xiangxia.m.yue@gmail.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: dev@openvswitch.org, netdev@vger.kernel.org Subject: [ovs-dev] [PATCH net-next v6 07/10] net: openvswitch: add likely in flow_lookup X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Tonghao Zhang The most case *index < ma->max, and flow-mask is not NULL. We add un/likely for performance. Signed-off-by: Tonghao Zhang Tested-by: Greg Rose Acked-by: William Tu Acked-by: Pravin B Shelar --- net/openvswitch/flow_table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c index 96757e2..9f5a06e 100644 --- a/net/openvswitch/flow_table.c +++ b/net/openvswitch/flow_table.c @@ -519,7 +519,7 @@ static struct sw_flow *flow_lookup(struct flow_table *tbl, struct sw_flow_mask *mask; int i; - if (*index < ma->max) { + if (likely(*index < ma->max)) { mask = rcu_dereference_ovsl(ma->masks[*index]); if (mask) { flow = masked_flow_lookup(ti, key, mask, n_mask_hit); @@ -534,7 +534,7 @@ static struct sw_flow *flow_lookup(struct flow_table *tbl, continue; mask = rcu_dereference_ovsl(ma->masks[i]); - if (!mask) + if (unlikely(!mask)) break; flow = masked_flow_lookup(ti, key, mask, n_mask_hit);