From patchwork Wed Apr 27 11:18:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kumar Amber X-Patchwork-Id: 1622983 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=aD2aKs6J; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 4KpGyR4Cp6z9s3q for ; Wed, 27 Apr 2022 21:40:15 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C15C441A07; Wed, 27 Apr 2022 11:40:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4VAOzeuRqfjP; Wed, 27 Apr 2022 11:40:12 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id 6C6AC400CC; Wed, 27 Apr 2022 11:40:10 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 33525C0082; Wed, 27 Apr 2022 11:40:10 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 135EDC0080 for ; Wed, 27 Apr 2022 11:40:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 0149B83EA7 for ; Wed, 27 Apr 2022 11:40:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=intel.com 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 9JF6-DMt4R9P for ; Wed, 27 Apr 2022 11:40:08 +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 smtp1.osuosl.org (Postfix) with ESMTPS id 1E15F82E14 for ; Wed, 27 Apr 2022 11:40:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651059608; x=1682595608; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TCcM/Q0L0YRFmNtcd3cGGPBXBpcThOS/LArItt5V/uo=; b=aD2aKs6Jj1uqKKlcGyf4UfTnniqVdmX+LgXoY0VMAR2mOL0SC4xnAmYi Cohh1Q7+grZFC/N4JenekiJ2j11hPsO3ZG/YPuai7InxKypybg04BUMPH na06uabLl32wEiRgevWZJNRdp6GIbs7MOmjRSy2ncR6wDLaev9xcDPtK1 ifT8UtsYM+7HeWCwjWC8CFaZwUNCYz62jyUHqVsQi9SvL5wtubWkY7Wzg Q6v0OGcVR6rY2Qen4a8tNu2PwRSpnzOg9XA49XRmvLFl3YSrF0gZdD7ET pVbq3SyfW0yxs0AfEPhhrSr6A0uQynxXSoigJqDSVY+nC2BoFknITBq0Y A==; X-IronPort-AV: E=McAfee;i="6400,9594,10329"; a="253281200" X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="253281200" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2022 04:40:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="628973521" Received: from unknown (HELO localhost.localdomain) ([10.190.213.111]) by fmsmga004.fm.intel.com with ESMTP; 27 Apr 2022 04:40:05 -0700 From: Kumar Amber To: ovs-dev@openvswitch.org Date: Wed, 27 Apr 2022 16:48:36 +0530 Message-Id: <20220427111836.2091315-4-kumar.amber@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220427111836.2091315-1-kumar.amber@intel.com> References: <20220427111836.2091315-1-kumar.amber@intel.com> MIME-Version: 1.0 Cc: i.maximets@ovn.org, fbl@sysclose.org, Kumar Amber Subject: [ovs-dev] [PATCH v3 3/3] flow: Add autovalidator support to miniflow_extract. 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 patch adds the flag based switch between choice of using miniflow_extract in normal pipeline or select mfex_autovalidator in debug and test builds. The compile time flag used to select autoval can be done using option: ./configure CFLAGS="--enable-mfex-default-autovalidator" Signed-off-by: Kumar Amber --- v3: - Fix comments from Cian. --- --- lib/dpif-netdev-private-extract.c | 8 ++++---- lib/flow.c | 34 ++++++++++++++++++++++++++++++- lib/flow.h | 4 ++++ 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/lib/dpif-netdev-private-extract.c b/lib/dpif-netdev-private-extract.c index 42b970e75..bbc0e3c78 100644 --- a/lib/dpif-netdev-private-extract.c +++ b/lib/dpif-netdev-private-extract.c @@ -124,8 +124,8 @@ dpif_miniflow_extract_init(void) /* For the first call, this will be choosen based on the * compile time flag. */ - VLOG_INFO("Default MFEX Extract implementation is %s.\n", - mfex_impls[mfex_idx].name); + VLOG_DBG("Default MFEX Extract implementation is %s.\n", + mfex_impls[mfex_idx].name); atomic_store_relaxed(mfex_func, (uintptr_t) mfex_impls [mfex_idx].extract_func); } @@ -251,7 +251,7 @@ dpif_miniflow_extract_autovalidator(struct dp_packet_batch *packets, /* Run scalar miniflow_extract to get default result. */ DP_PACKET_BATCH_FOR_EACH (i, packet, packets) { pkt_metadata_init(&packet->md, in_port); - miniflow_extract(packet, &keys[i]); + miniflow_extract_(packet, &keys[i]); /* Store known good metadata to compare with optimized metadata. */ good_l2_5_ofs[i] = packet->l2_5_ofs; @@ -347,7 +347,7 @@ dpif_miniflow_extract_autovalidator(struct dp_packet_batch *packets, } /* Having dumped the debug info for the batch, disable autovalidator. */ - if (batch_failed) { + if (batch_failed && (pmd != NULL)) { atomic_store_relaxed(&pmd->miniflow_extract_opt, NULL); } diff --git a/lib/flow.c b/lib/flow.c index 086096d5e..16698cedd 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -36,6 +36,8 @@ #include "openvswitch/match.h" #include "dp-packet.h" #include "dpif-netdev-private-dpcls.h" +#include "dpif-netdev-private-dpif.h" +#include "dpif-netdev-private-extract.h" #include "openflow/openflow.h" #include "packets.h" #include "odp-util.h" @@ -757,7 +759,7 @@ dump_invalid_packet(struct dp_packet *packet, const char *reason) * of interest for the flow, otherwise UINT16_MAX. */ void -miniflow_extract(struct dp_packet *packet, struct netdev_flow_key *key) +miniflow_extract_(struct dp_packet *packet, struct netdev_flow_key *key) { /* Add code to this function (or its callees) to extract new fields. */ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 42); @@ -1112,6 +1114,36 @@ miniflow_extract(struct dp_packet *packet, struct netdev_flow_key *key) key->mf.map = mf.map; } +void +miniflow_extract(struct dp_packet *packet, struct netdev_flow_key *key) +{ +#ifdef MFEX_AUTOVALIDATOR_DEFAULT + static struct ovsthread_once once_enable = OVSTHREAD_ONCE_INITIALIZER; + if (ovsthread_once_start(&once_enable)) { + dpif_miniflow_extract_init(); + ovsthread_once_done(&once_enable); + } + struct dp_packet_batch packets; + const struct pkt_metadata *md = &packet->md; + dp_packet_batch_init(&packets); + dp_packet_batch_add(&packets, packet); + const uint32_t recirc_depth = *recirc_depth_get(); + + /* Currently AVX512 DPIF dont support recirculation + * Once the support will be added the condition would + * be removed. + */ + if (recirc_depth) { + miniflow_extract_(packet, key); + } else { + dpif_miniflow_extract_autovalidator(&packets, key, 1, + odp_to_u32(md->in_port.odp_port), NULL); + } +#else + miniflow_extract_(packet, key); +#endif +} + static ovs_be16 parse_dl_type(const void **datap, size_t *sizep, ovs_be16 *first_vlan_tci_p) { diff --git a/lib/flow.h b/lib/flow.h index ba7c3c63a..7b277275f 100644 --- a/lib/flow.h +++ b/lib/flow.h @@ -543,6 +543,10 @@ struct pkt_metadata; * were extracted. */ void miniflow_extract(struct dp_packet *packet, struct netdev_flow_key *key); + +void +miniflow_extract_(struct dp_packet *packet, struct netdev_flow_key *key); + void miniflow_map_init(struct miniflow *, const struct flow *); void flow_wc_map(const struct flow *, struct flowmap *); size_t miniflow_alloc(struct miniflow *dsts[], size_t n,