From patchwork Tue Nov 30 15:00:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 1561699 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=JxtVz4GO; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (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 4J3QR96d8Qz9sRK for ; Wed, 1 Dec 2021 02:01:41 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 4B4AC401C4; Tue, 30 Nov 2021 15:01:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OL8wjeukUZBp; Tue, 30 Nov 2021 15:01:37 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id E504440282; Tue, 30 Nov 2021 15:01:36 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id BAAAEC0012; Tue, 30 Nov 2021 15:01:36 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id DD57FC0012 for ; Tue, 30 Nov 2021 15:01:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id DA06E60A40 for ; Tue, 30 Nov 2021 15:01:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=redhat.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 WeE-mJezLyds for ; Tue, 30 Nov 2021 15:01:33 +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 smtp3.osuosl.org (Postfix) with ESMTPS id A54AC60A3A for ; Tue, 30 Nov 2021 15:01:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638284492; 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=eR8u4I5Op5/t4973Kqtj4ligZVC6H7dJQFV238hJQkc=; b=JxtVz4GOEYnTsL2A1x0jw5MR7QgA34GqyMqAQmMnwbgAgNOvuvFXrGINefsY6SnQeJO9Kw vYBngTHqT6KEPLtQKLZmSJLsU8ElH+Ya3BtCHhMwtXWeEjk26daZLeK5hgBX5I0IFrnnMI ITWHQ4vAUlIxmEQQiUeU/ZbIGjo75K4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-340-4z9pcLIaMte00fuN4PtrNA-1; Tue, 30 Nov 2021 10:01:28 -0500 X-MC-Unique: 4z9pcLIaMte00fuN4PtrNA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 96EA91006AA0; Tue, 30 Nov 2021 15:01:27 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.39.195.207]) by smtp.corp.redhat.com (Postfix) with ESMTP id 29C7E196E2; Tue, 30 Nov 2021 15:00:33 +0000 (UTC) From: David Marchand To: dev@openvswitch.org Date: Tue, 30 Nov 2021 16:00:10 +0100 Message-Id: <20211130150013.6610-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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, maxime.coquelin@redhat.com, kumar.amber@intel.com Subject: [ovs-dev] [PATCH v3 1/4] 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). Set log level for DPDK drivers to error only: the rationale is that we are not testing DPDK drivers in system-dpdk. 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 Reviewed-by: Maxime Coquelin Acked-by: Eelco Chaudron --- Changes since v2: - configured dpdk drivers log level to error, - added OVS flow control warning to common list, --- tests/system-dpdk-macros.at | 3 ++ tests/system-dpdk.at | 56 ++++++++++++++++++------------------- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/tests/system-dpdk-macros.at b/tests/system-dpdk-macros.at index c6708caaf0..ef0e84e939 100644 --- a/tests/system-dpdk-macros.at +++ b/tests/system-dpdk-macros.at @@ -58,6 +58,9 @@ m4_define([OVS_DPDK_START], dnl Enable DPDK functionality AT_CHECK([ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-init=true]) + dnl Change DPDK drivers log levels so that tests only catch errors + AT_CHECK([ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-extra=--log-level=pmd.*:error]) + dnl Start ovs-vswitchd. AT_CHECK([ovs-vswitchd --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif -vunixctl], [0], [stdout], [stderr]) AT_CAPTURE_FILE([ovs-vswitchd.log]) diff --git a/tests/system-dpdk.at b/tests/system-dpdk.at index e0e750fde5..9c8f4bb15a 100644 --- a/tests/system-dpdk.at +++ b/tests/system-dpdk.at @@ -3,6 +3,13 @@ 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 +\@Failed to enable flow control@d +]) + dnl -------------------------------------------------------------------------- dnl Check if EAL init is successful AT_SETUP([OVS-DPDK - EAL init]) @@ -12,10 +19,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 +41,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 +67,9 @@ 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 -\@Failed to enable flow control@d +OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [ \@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 -\@Failed to enable flow control@d +OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [ \@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,12 @@ 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 -\@Failed to enable flow control@d +OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [ \@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 +243,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 +271,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 +379,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 --------------------------------------------------------------------------