From patchwork Mon Sep 27 13:57:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 1533355 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" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Ci/L1LDh; 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 4HJ43H6Scyz9tk7 for ; Mon, 27 Sep 2021 23:58:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 5BFD24061D; Mon, 27 Sep 2021 13:58:01 +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 AecwnPifFRzJ; Mon, 27 Sep 2021 13:58:00 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id 6A2CC405DC; Mon, 27 Sep 2021 13:57:59 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2C0ADC0011; Mon, 27 Sep 2021 13:57:59 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 69188C000D for ; Mon, 27 Sep 2021 13:57:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 5827C405E2 for ; Mon, 27 Sep 2021 13:57:57 +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 gXc2RLxG3Abg for ; Mon, 27 Sep 2021 13:57:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp4.osuosl.org (Postfix) with ESMTPS id 4429E405DC for ; Mon, 27 Sep 2021 13:57:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632751074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OIpk3O1Gvu3HQI3DhWPgt7jySIthqvfsjlqiRGZpL0Q=; b=Ci/L1LDhkqU9pZem/gfs8+qT0wCUNZZooA+SoOmdX4WnqhLxIu6ihgyFsrUpobmGvijU+0 7EysDzItViIeVzo/AHmiwR6yvwclwFZUD07BqUyEY0ehErar8hRR3YBDNai4SWZ0qjsDhH 0oJhgKTCB8uWmQl+DCn5Kk1b8yiCoeA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-526-DIlbxtuTOGW_W_MCPNAZ-g-1; Mon, 27 Sep 2021 09:57:51 -0400 X-MC-Unique: DIlbxtuTOGW_W_MCPNAZ-g-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6DF421023F4E; Mon, 27 Sep 2021 13:57:50 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.192.179]) by smtp.corp.redhat.com (Postfix) with ESMTP id 617BF60871; Mon, 27 Sep 2021 13:57:40 +0000 (UTC) From: David Marchand To: dev@openvswitch.org Date: Mon, 27 Sep 2021 15:57:31 +0200 Message-Id: <20210927135732.16175-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: i.maximets@ovn.org, fbl@sysclose.org, kumar.amber@intel.com Subject: [ovs-dev] [PATCH 1/2] system-dpdk: Refactor common logs matching. 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" Move EAL logs and commonly ignored logs to a common macro. Remove obsolete ones (like i40e [1] and timer [2] logs). Extend regex on hugepage logs since a check on hugepages availability is already present on OVS side, and as a consequence, we don't care about the warnings on availability for certain hugepage size. Add logs checks for MFEX tests that were missing them. 1: https://git.dpdk.org/dpdk/commit/?id=a075ce2b3e8c 2: https://git.dpdk.org/dpdk/commit/?id=c1077933d45b Signed-off-by: David Marchand --- tests/system-dpdk.at | 53 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/tests/system-dpdk.at b/tests/system-dpdk.at index e0e750fde5..2f45613171 100644 --- a/tests/system-dpdk.at +++ b/tests/system-dpdk.at @@ -3,6 +3,12 @@ m4_define([CONFIGURE_VETH_OFFLOADS], AT_BANNER([OVS-DPDK unit tests]) +m4_define([SYSTEM_DPDK_ALLOWED_LOGS],[ +\@does not exist. The Open vSwitch kernel module is probably not loaded.@d +\@EAL: Invalid NUMA socket, default to 0@d +\@EAL: No \(available\|free\) hugepages reported in hugepages-@d +]) + dnl -------------------------------------------------------------------------- dnl Check if EAL init is successful AT_SETUP([OVS-DPDK - EAL init]) @@ -12,10 +18,7 @@ OVS_DPDK_START() AT_CHECK([grep "DPDK Enabled - initializing..." ovs-vswitchd.log], [], [stdout]) AT_CHECK([grep "EAL" ovs-vswitchd.log], [], [stdout]) AT_CHECK([grep "DPDK Enabled - initialized" ovs-vswitchd.log], [], [stdout]) -OVS_VSWITCHD_STOP(["/Global register is changed during/d -/EAL: Invalid NUMA socket, default to 0/d -/EAL: WARNING: cpu flags constant_tsc=yes nonstop_tsc=no -> using unreliable clock cycles !/d -/EAL: No free hugepages reported in hugepages-1048576kB/d"]) +OVS_VSWITCHD_STOP("[SYSTEM_DPDK_ALLOWED_LOGS]") AT_CLEANUP dnl -------------------------------------------------------------------------- @@ -37,12 +40,7 @@ sleep 2 dnl Clean up AT_CHECK([ovs-vsctl del-port br10 phy0], [], [stdout], [stderr]) -OVS_VSWITCHD_STOP("/does not exist. The Open vSwitch kernel module is probably not loaded./d -/Failed to enable flow control/d -/Global register is changed during/d -/EAL: WARNING: cpu flags constant_tsc=yes nonstop_tsc=no -> using unreliable clock cycles !/d -/EAL: No free hugepages reported in hugepages-1048576kB/d -") +OVS_VSWITCHD_STOP("[SYSTEM_DPDK_ALLOWED_LOGS]") AT_CLEANUP dnl -------------------------------------------------------------------------- @@ -68,13 +66,10 @@ AT_CHECK([grep "VHOST_CONFIG: $OVS_RUNDIR/dpdkvhostclient0: reconnecting..." ovs dnl Clean up AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr]) -OVS_VSWITCHD_STOP(["\@does not exist. The Open vSwitch kernel module is probably not loaded.@d +OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [ \@Failed to enable flow control@d \@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@d -\@Global register is changed during@d -\@EAL: Invalid NUMA socket, default to 0@d -\@EAL: WARNING: cpu flags constant_tsc=yes nonstop_tsc=no -> using unreliable clock cycles !@d -\@EAL: No free hugepages reported in hugepages-1048576kB@d"]) +])") AT_CLEANUP dnl -------------------------------------------------------------------------- @@ -144,16 +139,12 @@ pkill -f -x -9 'tail -f /dev/null' dnl Clean up AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuser0], [], [stdout], [stderr]) -OVS_VSWITCHD_STOP(["\@does not exist. The Open vSwitch kernel module is probably not loaded.@d +OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [ \@Failed to enable flow control@d \@VHOST_CONFIG: recvmsg failed@d \@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostuser0: No such file or directory@d -\@Global register is changed during@d \@dpdkvhostuser ports are considered deprecated; please migrate to dpdkvhostuserclient ports.@d -\@failed to enumerate system datapaths: No such file or directory@d -\@EAL: Invalid NUMA socket, default to 0@d -\@EAL: WARNING: cpu flags constant_tsc=yes nonstop_tsc=no -> using unreliable clock cycles !@d -\@EAL: No free hugepages reported in hugepages-1048576kB@d"]) +])") AT_CLEANUP dnl -------------------------------------------------------------------------- @@ -220,16 +211,13 @@ pkill -f -x -9 'tail -f /dev/null' dnl Clean up AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr]) -OVS_VSWITCHD_STOP(["\@does not exist. The Open vSwitch kernel module is probably not loaded.@d +OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [ \@Failed to enable flow control@d \@VHOST_CONFIG: recvmsg failed@d \@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@d -\@Global register is changed during@d \@dpdkvhostuser ports are considered deprecated; please migrate to dpdkvhostuserclient ports.@d \@failed to enumerate system datapaths: No such file or directory@d -\@EAL: Invalid NUMA socket, default to 0@d -\@EAL: WARNING: cpu flags constant_tsc=yes nonstop_tsc=no -> using unreliable clock cycles !@d -\@EAL: No free hugepages reported in hugepages-1048576kB@d"]) +])") AT_CLEANUP dnl -------------------------------------------------------------------------- @@ -256,6 +244,7 @@ OVS_WAIT_UNTIL([test `ovs-vsctl get interface p1 statistics | grep -oP 'rx_packe dnl Clean up AT_CHECK([ovs-vsctl del-port br0 p1], [], [stdout], [stderr]) +OVS_VSWITCHD_STOP("[SYSTEM_DPDK_ALLOWED_LOGS]") AT_CLEANUP dnl -------------------------------------------------------------------------- @@ -283,6 +272,7 @@ OVS_WAIT_UNTIL([test `ovs-vsctl get interface p1 statistics | grep -oP 'rx_packe dnl Clean up AT_CHECK([ovs-vsctl del-port br0 p1], [], [stdout], [stderr]) +OVS_VSWITCHD_STOP("[SYSTEM_DPDK_ALLOWED_LOGS]") AT_CLEANUP dnl -------------------------------------------------------------------------- @@ -390,5 +380,16 @@ ovs-appctl: ovs-vswitchd: server returned an error dnl Clean up AT_CHECK([ovs-vsctl del-port br0 p1], [], [stdout], [stderr]) +OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [ +\@Error: unknown argument 1.@d +\@Error: invalid study_pkt_cnt value: xyz.@d +\@Error: unknown argument abcd.@d +\@Error: -pmd option requires a thread id argument.@d +\@Error: invalid study_pkt_cnt value: abcd.@d +\@Error: miniflow extract parser not changed, PMD thread passed is not valid: 'zero'. Pass a valid pmd thread ID.@d +\@Error: no miniflow extract name provided. Output of miniflow-parser-get shows implementation list.@d +\@Error: unknown miniflow extract implementation superstudy.@d +\@Error: invalid study_pkt_cnt value: -pmd.@d +])") AT_CLEANUP dnl dnl --------------------------------------------------------------------------