From patchwork Tue May 17 14:11:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pai G, Sunil" X-Patchwork-Id: 1632388 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=Z3zmajv9; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L2dMV3DZ2z9s2R for ; Wed, 18 May 2022 00:11:18 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 9551840CCC; Tue, 17 May 2022 14:11:16 +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 ajvFRQlJCbDI; Tue, 17 May 2022 14:11:15 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id 9E2DB4053D; Tue, 17 May 2022 14:11:14 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 727B8C0039; Tue, 17 May 2022 14:11:14 +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 DF6A0C002D for ; Tue, 17 May 2022 14:11:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id BFC8460D72 for ; Tue, 17 May 2022 14:11:12 +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 TAzN5vbwepnk for ; Tue, 17 May 2022 14:11:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by smtp3.osuosl.org (Postfix) with ESMTPS id DEBFC60ACC for ; Tue, 17 May 2022 14:11:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652796671; x=1684332671; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=ERpnMVGp0ztBYLynqf8Ymr3qbFE8+6fhMxGsmp3zhcs=; b=Z3zmajv98rrcVn6gj/NyivH5T18zeglAwkY2KdAphR3HZsZdfT1MK2uj dLMdjpG505dfyyLgNQcPE/dq8oWLqxiae3ZhYJQXwwkGDvh2SV8FnflEv oEKDF66JnunXYvPlf4LYB7PZ+RI1SeQCT266bWt+d1occ4L4Rae/Iocwe CWWO/6stFfclsDhwrdy2Jg3PtlF6+JO352DeAk64GEYvkQ9DH9OKYxSEC e/syohK4uIJnovEQSN0mcPqO7Edq3Yv4r4M3RKfKYST+ZNv1eizr8SlI0 OUmI2M2vMHsYfxUyGFz6FE+GfqAt5zjLLIGy9nw22r7C8dmB8ZTdta/6l g==; X-IronPort-AV: E=McAfee;i="6400,9594,10349"; a="331810479" X-IronPort-AV: E=Sophos;i="5.91,233,1647327600"; d="scan'208";a="331810479" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2022 07:11:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,233,1647327600"; d="scan'208";a="555789425" Received: from silpixa00400896.ir.intel.com ([10.243.22.124]) by orsmga002.jf.intel.com with ESMTP; 17 May 2022 07:11:09 -0700 From: Sunil Pai G To: dev@openvswitch.org Date: Tue, 17 May 2022 14:11:06 +0000 Message-Id: <20220517141106.592229-1-sunil.pai.g@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Cc: david.marchand@redhat.com, maxime.coquelin@redhat.com Subject: [ovs-dev] [PATCH dpdk-latest] system-dpdk: Update vhost tests to be compatible with DPDK 22.03. 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 DPDK commit [1] improves the socket layer logs in the vhost library to ease log filtering and debugging. Update the system-dpdk vhost tests to reflect this change. [1] c85c35b1d447 ("vhost: improve socket layer logs") Signed-off-by: Sunil Pai G Acked-by: Maxime Coquelin Acked-by: Cian Ferriter --- tests/system-dpdk.at | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/system-dpdk.at b/tests/system-dpdk.at index 7d2715c4a..f73612f67 100644 --- a/tests/system-dpdk.at +++ b/tests/system-dpdk.at @@ -63,14 +63,14 @@ AT_CHECK([ovs-vsctl show], [], [stdout]) sleep 2 dnl Parse log file -AT_CHECK([grep "VHOST_CONFIG: vhost-user client: socket created" ovs-vswitchd.log], [], [stdout]) +AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) vhost-user client: socket created" ovs-vswitchd.log], [], [stdout]) AT_CHECK([grep "vHost User device 'dpdkvhostuserclient0' created in 'client' mode, using client socket" ovs-vswitchd.log], [], [stdout]) -AT_CHECK([grep "VHOST_CONFIG: $OVS_RUNDIR/dpdkvhostclient0: reconnecting..." ovs-vswitchd.log], [], [stdout]) +AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) reconnecting..." ovs-vswitchd.log], [], [stdout]) dnl Clean up AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr]) OVS_VSWITCHD_STOP("m4_join([], [SYSTEM_DPDK_ALLOWED_LOGS], [ -\@VHOST_CONFIG: failed to connect to $OVS_RUNDIR/dpdkvhostclient0: No such file or directory@d +\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) failed to connect: No such file or directory@d ])") AT_CLEANUP dnl -------------------------------------------------------------------------- @@ -97,11 +97,11 @@ AT_CHECK([ovs-vsctl add-port br10 dpdkvhostuser0 -- set Interface dpdkvhostuser0 AT_CHECK([ovs-vsctl show], [], [stdout]) dnl Parse log file -AT_CHECK([grep "VHOST_CONFIG: vhost-user server: socket created" \ +AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostuser0) vhost-user server: socket created" \ ovs-vswitchd.log], [], [stdout]) AT_CHECK([grep "Socket $OVS_RUNDIR/dpdkvhostuser0 created for vhost-user port dpdkvhostuser0" \ ovs-vswitchd.log], [], [stdout]) -AT_CHECK([grep "VHOST_CONFIG: bind to $OVS_RUNDIR/dpdkvhostuser0" ovs-vswitchd.log], [], +AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostuser0) binding succeeded" ovs-vswitchd.log], [], [stdout]) dnl Set up namespaces @@ -142,8 +142,8 @@ pkill -f -x -9 'tail -f /dev/null' dnl Clean up AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuser0], [], [stdout], [stderr]) 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 +\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostuser0) recvmsg failed@d +\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostuser0) failed to connect: No such file or directory@d \@dpdkvhostuser ports are considered deprecated; please migrate to dpdkvhostuserclient ports.@d \@failed to enumerate system datapaths: No such file or directory@d ])") @@ -172,9 +172,9 @@ AT_CHECK([ovs-vsctl add-port br10 dpdkvhostuserclient0 -- set Interface \ AT_CHECK([ovs-vsctl show], [], [stdout]) dnl Parse log file -AT_CHECK([grep "VHOST_CONFIG: vhost-user client: socket created" ovs-vswitchd.log], [], [stdout]) +AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) vhost-user client: socket created" ovs-vswitchd.log], [], [stdout]) AT_CHECK([grep "vHost User device 'dpdkvhostuserclient0' created in 'client' mode, using client socket" ovs-vswitchd.log], [], [stdout]) -AT_CHECK([grep "VHOST_CONFIG: $OVS_RUNDIR/dpdkvhostclient0: reconnecting..." ovs-vswitchd.log], [], [stdout]) +AT_CHECK([grep "VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) reconnecting..." ovs-vswitchd.log], [], [stdout]) dnl Set up namespaces ADD_NAMESPACES(ns1, ns2) @@ -214,8 +214,8 @@ pkill -f -x -9 'tail -f /dev/null' dnl Clean up AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr]) 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 +\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) recvmsg failed@d +\@VHOST_CONFIG: ($OVS_RUNDIR/dpdkvhostclient0) failed to connect: No such file or directory@d \@dpdkvhostuser ports are considered deprecated; please migrate to dpdkvhostuserclient ports.@d \@failed to enumerate system datapaths: No such file or directory@d ])")