From patchwork Wed Jun 1 16:38:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Traynor X-Patchwork-Id: 1638042 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=CF2sSXbv; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (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 4LCvxG6cxgz9s0w for ; Thu, 2 Jun 2022 02:39:14 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 9664A418C4; Wed, 1 Jun 2022 16:39:12 +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 2tOxbhbIpBbq; Wed, 1 Jun 2022 16:39:11 +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 A724E418A3; Wed, 1 Jun 2022 16:39:10 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7AD87C0032; Wed, 1 Jun 2022 16:39:10 +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 1E0FBC007E for ; Wed, 1 Jun 2022 16:39:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 6306841861 for ; Wed, 1 Jun 2022 16:39:07 +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 UgzbrlGJOJz9 for ; Wed, 1 Jun 2022 16:39:06 +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 5408F41883 for ; Wed, 1 Jun 2022 16:39:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654101545; 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: in-reply-to:in-reply-to:references:references; bh=S8DKq7RBVJ2BuzzDjEvji6YZMRv/7sArVG8dHSHlqJ8=; b=CF2sSXbv17Z7lmKaBFgPHGIrGcijNoEHIStD4xf8s85gfG1TPagh8g6om8hB/e/HAWUAGf rYLsFOOJH2XEzG5iOO9cO7pYbNDK4Q3fQXnwlSjJJm2VDqm8H8AhLMw8cWuM6dJm6HVrIK 0/42YQN/MGPu9jU4Xxma1nZAWQBy8IE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-326-gqP6a59HNTaEuE1lnmWq0w-1; Wed, 01 Jun 2022 12:39:02 -0400 X-MC-Unique: gqP6a59HNTaEuE1lnmWq0w-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 67AEE833A1C; Wed, 1 Jun 2022 16:38:48 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.241]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2AD63492C3B; Wed, 1 Jun 2022 16:38:46 +0000 (UTC) From: Kevin Traynor To: dev@openvswitch.org Date: Wed, 1 Jun 2022 17:38:36 +0100 Message-Id: <20220601163837.206937-3-ktraynor@redhat.com> In-Reply-To: <20220601163837.206937-1-ktraynor@redhat.com> References: <20220601163837.206937-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: david.marchand@redhat.com Subject: [ovs-dev] [PATCH v4 2/3] system-dpdk: Split ovsdb creation and vswitchd start. 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" Splitting them allows them to be reused separately. This is useful for setting some things in ovsdb before vswitchd is started or DPDK is initialized. Signed-off-by: Kevin Traynor Reviewed-by: David Marchand --- tests/system-dpdk-macros.at | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/tests/system-dpdk-macros.at b/tests/system-dpdk-macros.at index ef0e84e93..d171a4508 100644 --- a/tests/system-dpdk-macros.at +++ b/tests/system-dpdk-macros.at @@ -36,9 +36,19 @@ m4_define([OVS_DPDK_PRE_PHY_SKIP], # OVS_DPDK_START() # -# Create an empty database and start ovsdb-server. Add special configuration -# dpdk-init to enable DPDK functionality. Start ovs-vswitchd connected to that -# database using system devices (no dummies). +# Start ovsdb-server. Set dpdk-init to initialize DPDK. Start ovs-vswitchd. # m4_define([OVS_DPDK_START], + [dnl start ovs dpdk + OVS_DPDK_START_OVSDB() + dnl Enable DPDK functionality + AT_CHECK([ovs-vsctl --no-wait set Open_vSwitch . other_config:dpdk-init=true]) + OVS_DPDK_START_VSWITCHD() +]) + +# OVS_DPDK_START_OVSDB() +# +# Create an empty database and start ovsdb-server. +# +m4_define([OVS_DPDK_START_OVSDB], [dnl Create database. AT_CHECK([touch .conf.db.~lock~]) @@ -55,9 +65,12 @@ m4_define([OVS_DPDK_START], dnl Initialize database. AT_CHECK([ovs-vsctl --no-wait init]) +]) - 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 +# OVS_DPDK_START_VSWITCHD() +# +# Add special configuration for dpdk-init. Start ovs-vswitchd. +# +m4_define([OVS_DPDK_START_VSWITCHD], + [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])