From patchwork Mon Mar 21 06:14:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kumar Amber X-Patchwork-Id: 1607582 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=VUxHhO6C; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KMPxc4n5lz9s1l for ; Mon, 21 Mar 2022 17:35:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id F3E46827DE; Mon, 21 Mar 2022 06:35:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kq9PTqZnK3Z7; Mon, 21 Mar 2022 06:35:12 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id ACF73825E8; Mon, 21 Mar 2022 06:35:11 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 147B9C0088; Mon, 21 Mar 2022 06:35:10 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1D27EC0033 for ; Mon, 21 Mar 2022 06:35:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 368AA60E37 for ; Mon, 21 Mar 2022 06:34:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=intel.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nwirjrnhAyCg for ; Mon, 21 Mar 2022 06:34:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by smtp3.osuosl.org (Postfix) with ESMTPS id D48F860E3E for ; Mon, 21 Mar 2022 06:34:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647844485; x=1679380485; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Xg/n6CpZF92TAGQPyHh9Lug/CXe+83FNmrca9ydLIOU=; b=VUxHhO6CCkH8u7aG65Vgx29UXyk5JigmRgGeApmz7MZMOvjz0f9XKQPy tfkIZXV5MGZWthuJBU50FswWXOJsISMtC0I1Ra+mHiGjX6pp3Ls0kE9An lV6Xd8THHdBWdbEWoFOQIcxEB513JmqX0fU7GvyfMXEx1kOyKIiyFa86h SEeuSi2iwMUq26UrukU36Te4BTe3+Z34tzWd9i22M+2/nyZGZE78eyXjJ aDP0cxqPgoCbNa39EUWolKkBXND553DxdGixLMOKdaDwSMwxpVPDiv2jm kpIy9MXJgTLE+C7eRmBkYKlnc4wNoDVK2kt+B9bBs5fW05mVVjIcXcwfm Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10292"; a="244953113" X-IronPort-AV: E=Sophos;i="5.90,197,1643702400"; d="scan'208";a="244953113" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2022 23:34:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,197,1643702400"; d="scan'208";a="518308699" Received: from unknown (HELO localhost.localdomain) ([10.190.213.111]) by orsmga006.jf.intel.com with ESMTP; 20 Mar 2022 23:34:39 -0700 From: Kumar Amber To: ovs-dev@openvswitch.org Date: Mon, 21 Mar 2022 11:44:37 +0530 Message-Id: <20220321061441.1833575-7-kumar.amber@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220321061441.1833575-1-kumar.amber@intel.com> References: <20220321061441.1833575-1-kumar.amber@intel.com> MIME-Version: 1.0 Cc: i.maximets@ovn.org, fbl@sysclose.org, Kumar Amber Subject: [ovs-dev] [PATCH v1 06/10] dpif-mfex: Change mfex fn pointer prototype to include md_is_valid. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" The md_is_valid parameter is passed from DPIF to MFEX to allow mfex functions to detect the tunneling and decide the processing of Inner packets in static predictable branches. Signed-off-by: Kumar Amber --- lib/dpif-netdev-avx512.c | 3 ++- lib/dpif-netdev-extract-avx512.c | 9 +++++---- lib/dpif-netdev-extract-study.c | 6 ++++-- lib/dpif-netdev-private-extract.c | 6 ++++-- lib/dpif-netdev-private-extract.h | 13 ++++++++----- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/lib/dpif-netdev-avx512.c b/lib/dpif-netdev-avx512.c index fa8773331..5cf1264f8 100644 --- a/lib/dpif-netdev-avx512.c +++ b/lib/dpif-netdev-avx512.c @@ -162,7 +162,8 @@ dp_netdev_input_avx512__(struct dp_netdev_pmd_thread *pmd, miniflow_extract_func mfex_func; atomic_read_relaxed(&pmd->miniflow_extract_opt, &mfex_func); if (mfex_func) { - mf_mask = mfex_func(packets, keys, batch_size, in_port, pmd); + mf_mask = mfex_func(packets, keys, batch_size, in_port, pmd, + md_is_valid); } uint32_t lookup_pkts_bitmask = (1ULL << batch_size) - 1; diff --git a/lib/dpif-netdev-extract-avx512.c b/lib/dpif-netdev-extract-avx512.c index c1c1fefb6..02056b731 100644 --- a/lib/dpif-netdev-extract-avx512.c +++ b/lib/dpif-netdev-extract-avx512.c @@ -480,6 +480,7 @@ mfex_avx512_process(struct dp_packet_batch *packets, uint32_t keys_size OVS_UNUSED, odp_port_t in_port, void *pmd_handle OVS_UNUSED, + bool md_is_valid OVS_UNUSED, const enum MFEX_PROFILES profile_id, const uint32_t use_vbmi) { @@ -634,10 +635,10 @@ __attribute__((__target__("avx512vbmi"))) \ mfex_avx512_vbmi_##name(struct dp_packet_batch *packets, \ struct netdev_flow_key *keys, uint32_t keys_size,\ odp_port_t in_port, struct dp_netdev_pmd_thread \ - *pmd_handle) \ + *pmd_handle, bool md_is_valid) \ { \ return mfex_avx512_process(packets, keys, keys_size, in_port, \ - pmd_handle, profile, 1); \ + pmd_handle, md_is_valid, profile, 1); \ } \ \ uint32_t \ @@ -646,10 +647,10 @@ __attribute__((__target__("avx512vl"))) \ mfex_avx512_##name(struct dp_packet_batch *packets, \ struct netdev_flow_key *keys, uint32_t keys_size, \ odp_port_t in_port, struct dp_netdev_pmd_thread \ - *pmd_handle) \ + *pmd_handle, bool md_is_valid) \ { \ return mfex_avx512_process(packets, keys, keys_size, in_port, \ - pmd_handle, profile, 0); \ + pmd_handle, md_is_valid, profile, 0); \ } /* Each profile gets a single declare here, which specializes the function diff --git a/lib/dpif-netdev-extract-study.c b/lib/dpif-netdev-extract-study.c index 69077c844..71354cc4c 100644 --- a/lib/dpif-netdev-extract-study.c +++ b/lib/dpif-netdev-extract-study.c @@ -71,7 +71,8 @@ uint32_t mfex_study_traffic(struct dp_packet_batch *packets, struct netdev_flow_key *keys, uint32_t keys_size, odp_port_t in_port, - struct dp_netdev_pmd_thread *pmd_handle) + struct dp_netdev_pmd_thread *pmd_handle, + bool md_is_valid) { uint32_t hitmask = 0; uint32_t mask = 0; @@ -90,7 +91,8 @@ mfex_study_traffic(struct dp_packet_batch *packets, } hitmask = miniflow_funcs[i].extract_func(packets, keys, keys_size, - in_port, pmd_handle); + in_port, pmd_handle, + md_is_valid); stats->impl_hitcount[i] += count_1bits(hitmask); /* If traffic is not classified then we dont overwrite the keys diff --git a/lib/dpif-netdev-private-extract.c b/lib/dpif-netdev-private-extract.c index c70f1fca9..b26603a57 100644 --- a/lib/dpif-netdev-private-extract.c +++ b/lib/dpif-netdev-private-extract.c @@ -251,7 +251,8 @@ uint32_t dpif_miniflow_extract_autovalidator(struct dp_packet_batch *packets, struct netdev_flow_key *keys, uint32_t keys_size, odp_port_t in_port, - struct dp_netdev_pmd_thread *pmd_handle) + struct dp_netdev_pmd_thread *pmd_handle, + bool md_is_valid) { const size_t cnt = dp_packet_batch_size(packets); uint16_t good_l2_5_ofs[NETDEV_MAX_BURST]; @@ -296,7 +297,8 @@ dpif_miniflow_extract_autovalidator(struct dp_packet_batch *packets, /* Call optimized miniflow for each batch of packet. */ uint32_t hit_mask = mfex_impls[j].extract_func(packets, test_keys, keys_size, in_port, - pmd_handle); + pmd_handle, + md_is_valid); /* Do a miniflow compare for bits, blocks and offsets for all the * classified packets in the hitmask marked by set bits. */ diff --git a/lib/dpif-netdev-private-extract.h b/lib/dpif-netdev-private-extract.h index 14365219e..1327dd7cb 100644 --- a/lib/dpif-netdev-private-extract.h +++ b/lib/dpif-netdev-private-extract.h @@ -36,7 +36,8 @@ typedef uint32_t (*miniflow_extract_func)(struct dp_packet_batch *batch, uint32_t keys_size, odp_port_t in_port, struct dp_netdev_pmd_thread - *pmd_handle); + *pmd_handle, + bool md_is_valid); /* The function pointer miniflow_extract_func depends on batch size. */ @@ -157,7 +158,8 @@ uint32_t dpif_miniflow_extract_autovalidator(struct dp_packet_batch *batch, struct netdev_flow_key *keys, uint32_t keys_size, odp_port_t in_port, - struct dp_netdev_pmd_thread *pmd_handle); + struct dp_netdev_pmd_thread *pmd_handle, + bool md_is_valid); /* Retrieve the number of packets by studying packets using different miniflow * implementations to choose the best implementation using the maximum hitmask @@ -169,7 +171,8 @@ uint32_t mfex_study_traffic(struct dp_packet_batch *packets, struct netdev_flow_key *keys, uint32_t keys_size, odp_port_t in_port, - struct dp_netdev_pmd_thread *pmd_handle); + struct dp_netdev_pmd_thread *pmd_handle, + bool md_is_valid); /* Sets the packet count from user to the stats for use in * study function to match against the classified packets to choose @@ -192,12 +195,12 @@ int32_t mfex_avx512_vbmi_probe(void); mfex_avx512_vbmi_##name(struct dp_packet_batch *packets, \ struct netdev_flow_key *keys, uint32_t keys_size,\ odp_port_t in_port, struct dp_netdev_pmd_thread \ - *pmd_handle); \ + *pmd_handle, bool md_is_valid); \ uint32_t \ mfex_avx512_##name(struct dp_packet_batch *packets, \ struct netdev_flow_key *keys, uint32_t keys_size, \ odp_port_t in_port, struct dp_netdev_pmd_thread \ - *pmd_handle); \ + *pmd_handle, bool md_is_valid); \ DECLARE_AVX512_MFEX_PROTOTYPE(ip_udp); DECLARE_AVX512_MFEX_PROTOTYPE(ip_tcp);