From patchwork Fri Oct 6 15:12:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 149299 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp402262vqo; Fri, 6 Oct 2023 08:15:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGlq205Bb1gP3gP9CpA13X861AurdFg7W+Ropy8LQuIrwudo09KKlG2S44JRBzg2KmA4T6K X-Received: by 2002:a17:90b:3911:b0:276:d357:c4bd with SMTP id ob17-20020a17090b391100b00276d357c4bdmr8900895pjb.28.1696605306903; Fri, 06 Oct 2023 08:15:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696605306; cv=none; d=google.com; s=arc-20160816; b=uqHCtexCeQhlT5wZII9X6WDkp6Y1yI0vG+LYSE+uZCqVGpvW1FXJ9Ii0/MPNn9+nly xPMTau11LHSA6vNXgnz2qcEgG6vHvRiXBHwaQNwyxuznOtllK7d/Q2YdKQ0HzWJ0LVS+ 5bn9BSv1u70sJqGqDjMdd+xoxA0/wXNyMExMXeyYZzRQg5zNCR0k+m273Aaf3M7TNP7K oxbWnQPeih1iiFywlLuTCJBWKRVivUlBRd3pvc4ChpyUmTxZ7kaMYnTLTj9PUX+Q91ju W/TJLRHsto+Du9SCZ6A+W4Pa1Gx+uOn/9ssqAQgTLIZU5WSw6GRY8cWTUq52XsjOQrjg +0Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=a3BtezrsO4g/f4wdN64oWX3Tfa1nQARVL1ef9IRoW74=; fh=MdzQONQ/gulM6swFM9amSgUVTs752ZpsSWOQLplcSFQ=; b=L6ryErATF5eatf53gjQkcCjo6NRWL5jdRQlIlJSUl058wuDP2lI96Xmls4molZCA3A zoa6YlGxL7Y2yA/pp/pnfkYmVMF/3kSN0UIrFGxv8oBeIZGbTgC3igXa+pDPuUuf7NUW OMkLBgebDIQxtNyZARNe5OLdlKfNxA5He/ZEH1WIS5MfStIcwllkX3I9WM/V6aXBunWL DO/X4FCpaYCqCnwWHHou67S6NY+UlEa34YKVUhRjSGhkFYgKCBRbl6f4DQVbkNPiw3qi ED9NK0QZpaJFRspc3pgxxNq6mLLEobcGtLahOp3qrpftM4Gg7bRSC29g+nCJ0GODJ5ig P/ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ExoUkFwr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id m1-20020a17090ade0100b0026b51ae4574si6089462pjv.36.2023.10.06.08.14.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 08:15:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ExoUkFwr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 8A10883DB338; Fri, 6 Oct 2023 08:14:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232767AbjJFPOT (ORCPT + 18 others); Fri, 6 Oct 2023 11:14:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232750AbjJFPOP (ORCPT ); Fri, 6 Oct 2023 11:14:15 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F349CE for ; Fri, 6 Oct 2023 08:13:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696605190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a3BtezrsO4g/f4wdN64oWX3Tfa1nQARVL1ef9IRoW74=; b=ExoUkFwryC7F4BlhJRXS7o3i5YfZlrSY3u+V/YHS5SxmaUEcq9oWyuxnhLKe2dciukzzjf BpJRD+zGS/DCYg+t9aWFjgb0spjL99ab+SgoVG7zQowyOFP6Q49MdD5tu2VbRhG8H+R4P+ QWSHrO4J0Le4SDQE1EwpIuGFayUTAVA= 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-446-ocmP3CosMayolbt9PTMNog-1; Fri, 06 Oct 2023 11:13:02 -0400 X-MC-Unique: ocmP3CosMayolbt9PTMNog-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3A290811E88; Fri, 6 Oct 2023 15:13:00 +0000 (UTC) Received: from RHTPC1VM0NT.lan (unknown [10.22.33.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id C017940D1EA; Fri, 6 Oct 2023 15:12:59 +0000 (UTC) From: Aaron Conole To: netdev@vger.kernel.org Cc: dev@openvswitch.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Pravin B Shelar , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Adrian Moreno , Eelco Chaudron Subject: [PATCH net 1/4] selftests: openvswitch: Add version check for pyroute2 Date: Fri, 6 Oct 2023 11:12:55 -0400 Message-Id: <20231006151258.983906-2-aconole@redhat.com> In-Reply-To: <20231006151258.983906-1-aconole@redhat.com> References: <20231006151258.983906-1-aconole@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Fri, 06 Oct 2023 08:14:50 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779019606337607226 X-GMAIL-MSGID: 1779019606337607226 Paolo Abeni reports that on some systems the pyroute2 version isn't new enough to run the test suite. Ensure that we support a minimum version of 0.6 for all cases (which does include the existing ones). The 0.6.1 version was released in May of 2021, so should be propagated to most installations at this point. The alternative that Paolo proposed was to only skip when the add-flow is being run. This would be okay for most cases, except if a future test case is added that needs to do flow dump without an associated add (just guessing). In that case, it could also be broken and we would need additional skip logic anyway. Just draw a line in the sand now. Fixes: 25f16c873fb1 ("selftests: add openvswitch selftest suite") Reported-by: Paolo Abeni Closes: https://lore.kernel.org/lkml/8470c431e0930d2ea204a9363a60937289b7fdbe.camel@redhat.com/ Signed-off-by: Aaron Conole --- tools/testing/selftests/net/openvswitch/openvswitch.sh | 2 +- tools/testing/selftests/net/openvswitch/ovs-dpctl.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/openvswitch/openvswitch.sh b/tools/testing/selftests/net/openvswitch/openvswitch.sh index 9c2012d70b08e..220c3356901ef 100755 --- a/tools/testing/selftests/net/openvswitch/openvswitch.sh +++ b/tools/testing/selftests/net/openvswitch/openvswitch.sh @@ -525,7 +525,7 @@ run_test() { fi if python3 ovs-dpctl.py -h 2>&1 | \ - grep "Need to install the python" >/dev/null 2>&1; then + grep -E "Need to (install|upgrade) the python" >/dev/null 2>&1; then stdbuf -o0 printf "TEST: %-60s [PYLIB]\n" "${tdesc}" return $ksft_skip fi diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py index 912dc8c490858..9686ca30d516d 100644 --- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py +++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py @@ -28,6 +28,8 @@ try: from pyroute2.netlink import nlmsg_atoms from pyroute2.netlink.exceptions import NetlinkError from pyroute2.netlink.generic import GenericNetlinkSocket + import pyroute2 + except ModuleNotFoundError: print("Need to install the python pyroute2 package.") sys.exit(0) @@ -1998,6 +2000,12 @@ def main(argv): nlmsg_atoms.ovskey = ovskey nlmsg_atoms.ovsactions = ovsactions + # version check for pyroute2 + prverscheck = pyroute2.__version__.split(".") + if int(prverscheck[0]) == 0 and int(prverscheck[1]) < 6: + print("Need to upgrade the python pyroute2 package.") + sys.exit(0) + parser = argparse.ArgumentParser() parser.add_argument( "-v", From patchwork Fri Oct 6 15:12:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 149297 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp401640vqo; Fri, 6 Oct 2023 08:14:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGxhFmBpLy7jehbj+xKCoxo5I5wf+FdvZxzIQZ3IDNQ3azP5AqmKDb4qMFonz/w2vOBH3fR X-Received: by 2002:a05:6358:4327:b0:14f:6a41:5d14 with SMTP id r39-20020a056358432700b0014f6a415d14mr9594162rwc.27.1696605263474; Fri, 06 Oct 2023 08:14:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696605263; cv=none; d=google.com; s=arc-20160816; b=S8IxcM6GyY5IsMhSauR+0fAYR/c48JOjhzNChomOc9kl3hYwunjrCv8KgZpYUpR/B6 39MxbO5dSMY4+LvCqcws2aH+PMp9o+NPW+MqEr6WfxMGfRKX5XxDSIly59fiHpbkrAHP xElRKBxcNEkHyNpjuBE9xWwvmUxb5qN88AzuXVE5ao53IIm/My3x1kFN73wIVOQzkLnJ FRMLO7jnoplIdPtbvVqOLMg6oKPFl6WolNiwWjMNvzl7PDOZcH5ljNpC0/UTd1m68ge7 a4uKbSta4Rr+JhioTTQo4aiqo6yqWtaPEW87M1lwg4LBBjohAzq0ZYKEPKSUl4hjrKUe +6YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hEs2YTai71Oxsm1h48XGSC/OcSdgTJbKcxBa3FO/lWI=; fh=MdzQONQ/gulM6swFM9amSgUVTs752ZpsSWOQLplcSFQ=; b=uSF9YUEE88AnCJAR4naw/vDa++jJqiXLC9sZSaDa6+pup9B7ttnaG5RX/Wlr3Z8aP5 EdB4WgOGpTk28yYi3FhqdWGsy6POBFSrApwqkMxHzcRQtRDs7XY9jyRUZdtzl1e1fVTo DypBqxvOBh7NBYe67qG6UPU+9HkGqJ15opsqwNPxrrwiCgbSt0K2pRE9RifJ9+EbnlDX aFBS3RvTf18iiCRi67/ci7NoxcJTL36mbyMv3tJ0aIvsQsrsKFsAfyl+DwY5eXPrtF7z aCaFEiwHxtainOmA8Pym/HXuBQGvNEAp9cg6ZfzO1JCcKFUYNI3A8QdveFA656FE9cu1 +GDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fG6yhCDq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id j63-20020a638042000000b005859eba7939si3668547pgd.20.2023.10.06.08.14.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 08:14:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fG6yhCDq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 14046803203C; Fri, 6 Oct 2023 08:14:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232771AbjJFPOE (ORCPT + 18 others); Fri, 6 Oct 2023 11:14:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232697AbjJFPNw (ORCPT ); Fri, 6 Oct 2023 11:13:52 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63B90D6 for ; Fri, 6 Oct 2023 08:13:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696605184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hEs2YTai71Oxsm1h48XGSC/OcSdgTJbKcxBa3FO/lWI=; b=fG6yhCDqSFD2sLQoZYY1Nnas6kQfcOHgaD9CDSMf7SbvE0QHmK282EGhN/1ZWuyXp+rzSL F2vBFP6704Qbf1yVEIGJUNZgWnLNT17v7EKBv9KWX3eZgUaZGZf1G46r4TJ889e0/qjh+g DC/GEjU7nWFPNA4sq82PQPdJ3DRIJ9Q= 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-153-GX01X3SPOG6PpMjEqmc9QQ-1; Fri, 06 Oct 2023 11:13:01 -0400 X-MC-Unique: GX01X3SPOG6PpMjEqmc9QQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CCFEB85A5A8; Fri, 6 Oct 2023 15:13:00 +0000 (UTC) Received: from RHTPC1VM0NT.lan (unknown [10.22.33.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49C2D40D1EA; Fri, 6 Oct 2023 15:13:00 +0000 (UTC) From: Aaron Conole To: netdev@vger.kernel.org Cc: dev@openvswitch.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Pravin B Shelar , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Adrian Moreno , Eelco Chaudron Subject: [PATCH net 2/4] selftests: openvswitch: Catch cases where the tests are killed Date: Fri, 6 Oct 2023 11:12:56 -0400 Message-Id: <20231006151258.983906-3-aconole@redhat.com> In-Reply-To: <20231006151258.983906-1-aconole@redhat.com> References: <20231006151258.983906-1-aconole@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 06 Oct 2023 08:14:12 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779019560729664512 X-GMAIL-MSGID: 1779019560729664512 In case of fatal signal, or early abort at least cleanup the current test case. Fixes: 25f16c873fb1 ("selftests: add openvswitch selftest suite") Signed-off-by: Aaron Conole --- tools/testing/selftests/net/openvswitch/openvswitch.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/net/openvswitch/openvswitch.sh b/tools/testing/selftests/net/openvswitch/openvswitch.sh index 220c3356901ef..2a0112be7ead5 100755 --- a/tools/testing/selftests/net/openvswitch/openvswitch.sh +++ b/tools/testing/selftests/net/openvswitch/openvswitch.sh @@ -3,6 +3,8 @@ # # OVS kernel module self tests +trap ovs_exit_sig EXIT TERM INT ERR + # Kselftest framework requirement - SKIP code is 4. ksft_skip=4 From patchwork Fri Oct 6 15:12:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 149296 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp401616vqo; Fri, 6 Oct 2023 08:14:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEr2vrUh2nXdyk48DqIIV5IFYv1xvyevISWr1k/eMSBvyxYhxqi2/AIvTCH68ctrLDIdHMg X-Received: by 2002:aa7:8884:0:b0:68a:5773:6319 with SMTP id z4-20020aa78884000000b0068a57736319mr10192225pfe.11.1696605261584; Fri, 06 Oct 2023 08:14:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696605261; cv=none; d=google.com; s=arc-20160816; b=Bo8fDvsBAutg3Ziy5gt5GtTm0lSqi7gxYvS0OS7lhNpxGm5RbMWAUtW1ZudduYF92Q cemXLzU1JeSdW7rWk2UQT5Lk2X9YJ4/T9GGEnp8YGyWP472Ip5wHr1kVD+RTAB6omyt3 XuCrEK0iZdCQLZ7gP+II/Qe0gL541RdRnFHDPBASTcyzIp0Z9OsqkheKS/P+bmLDCrn1 BzYCoP3jKHrJ4GHq1njcA5O9f8ebXJypDzAaXKIx2LdWldVfQDVubCwmmiEQF9/H1AVu gNln4ayhMBOcQrvwd7WzRmaWmtnmZXEucDU2JpQ/ddzt6bRyWgVSRXhfSjhj/k9C1gM7 IKFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7IoOSdAcWEnoM23if8NwRWqcJLrYCXde/SbXH5MuvOk=; fh=MdzQONQ/gulM6swFM9amSgUVTs752ZpsSWOQLplcSFQ=; b=za+1k7UX2EhzEpJ02clwJ2FsZPbDsCKdrvaojJ/MVNeM4A+ZFy5o0XlbCfJ9ttGylP wQZL05zeUBBxul5/jc46PRWolJZupXdh7lv2m5nSLBqVuwBFF+80OZsFDtiUxALiyqkK GqSvNOUZRBkmmMFIM8s4iHBLoRZm9F115/HpRHR71Lu+O38WHH0eLZErdeWB6DD2s5vp bbVw3QcmO629nSCdjOaVKZ2xBfOQ+z4CKS+KJ/iQP8JfI0Eu/LxDsLA504tjJU1yeyM8 ltaYUYKJoGwqymBZM44nhAqOCRDZGVAuETGKz6RdaC/2uV1IjCHnve86lNKEFjYhpLJm qDzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SNXJR4FM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id o193-20020a62cdca000000b0068e42950c86si1613107pfg.44.2023.10.06.08.14.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 08:14:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SNXJR4FM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id D50C180A9E26; Fri, 6 Oct 2023 08:14:09 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232743AbjJFPOB (ORCPT + 18 others); Fri, 6 Oct 2023 11:14:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232770AbjJFPNx (ORCPT ); Fri, 6 Oct 2023 11:13:53 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99E70CF for ; Fri, 6 Oct 2023 08:13:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696605183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7IoOSdAcWEnoM23if8NwRWqcJLrYCXde/SbXH5MuvOk=; b=SNXJR4FMfsxjNt66y/QxRLlhKDsrXVBqg10WbPDLmsxsvNxGJT94rciu1Hx5H8LkEwSQZT v2xaI0F+pItDYU9To0/1YE/Ch/wUQl9QnoexWpWB3t8OU4ReYhxMD6Tc65D7FRYQ6BFHLJ kAtxvrHNxBIslix8rpvFy7eOBdeWf7c= 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-46-83qTOefDP0Ww2bJv63tvwg-1; Fri, 06 Oct 2023 11:13:02 -0400 X-MC-Unique: 83qTOefDP0Ww2bJv63tvwg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 56724801E91; Fri, 6 Oct 2023 15:13:01 +0000 (UTC) Received: from RHTPC1VM0NT.lan (unknown [10.22.33.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id DBC3640D1BE; Fri, 6 Oct 2023 15:13:00 +0000 (UTC) From: Aaron Conole To: netdev@vger.kernel.org Cc: dev@openvswitch.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Pravin B Shelar , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Adrian Moreno , Eelco Chaudron Subject: [PATCH net 3/4] selftests: openvswitch: Skip drop testing on older kernels Date: Fri, 6 Oct 2023 11:12:57 -0400 Message-Id: <20231006151258.983906-4-aconole@redhat.com> In-Reply-To: <20231006151258.983906-1-aconole@redhat.com> References: <20231006151258.983906-1-aconole@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Fri, 06 Oct 2023 08:14:09 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779019558554743425 X-GMAIL-MSGID: 1779019558554743425 Kernels that don't have support for openvswitch drop reasons also won't have the drop counter reasons, so we should skip the test completely. It previously wasn't possible to build a test case for this without polluting the datapath, so we introduce a mechanism to clear all the flows from a datapath allowing us to test for explicit drop actions, and then clear the flows to build the original test case. Fixes: 4242029164d6 ("selftests: openvswitch: add explicit drop testcase") Signed-off-by: Aaron Conole --- .../selftests/net/openvswitch/openvswitch.sh | 17 ++++++++++ .../selftests/net/openvswitch/ovs-dpctl.py | 34 +++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/tools/testing/selftests/net/openvswitch/openvswitch.sh b/tools/testing/selftests/net/openvswitch/openvswitch.sh index 2a0112be7ead5..ca7090e71bff2 100755 --- a/tools/testing/selftests/net/openvswitch/openvswitch.sh +++ b/tools/testing/selftests/net/openvswitch/openvswitch.sh @@ -144,6 +144,12 @@ ovs_add_flow () { return 0 } +ovs_del_flows () { + info "Deleting all flows from DP: sbx:$1 br:$2" + ovs_sbx "$1" python3 $ovs_base/ovs-dpctl.py del-flows "$2" + return 0 +} + ovs_drop_record_and_run () { local sbx=$1 shift @@ -200,6 +206,17 @@ test_drop_reason() { ip netns exec server ip addr add 172.31.110.20/24 dev s1 ip netns exec server ip link set s1 up + # Check if drop reasons can be sent + ovs_add_flow "test_drop_reason" dropreason \ + 'in_port(1),eth(),eth_type(0x0806),arp()' 'drop(10)' 2>/dev/null + if [ $? == 1 ]; then + info "no support for drop reasons - skipping" + ovs_exit_sig + return $ksft_skip + fi + + ovs_del_flows "test_drop_reason" dropreason + # Allow ARP ovs_add_flow "test_drop_reason" dropreason \ 'in_port(1),eth(),eth_type(0x0806),arp()' '2' || return 1 diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py index 9686ca30d516d..153042c1e8c13 100644 --- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py +++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py @@ -1906,6 +1906,32 @@ class OvsFlow(GenericNetlinkSocket): raise ne return reply + def del_flows(self, dpifindex): + """ + Send a del message to the kernel that will drop all flows. + + dpifindex should be a valid datapath obtained by calling + into the OvsDatapath lookup + """ + + flowmsg = OvsFlow.ovs_flow_msg() + flowmsg["cmd"] = OVS_FLOW_CMD_DEL + flowmsg["version"] = OVS_DATAPATH_VERSION + flowmsg["reserved"] = 0 + flowmsg["dpifindex"] = dpifindex + + try: + reply = self.nlm_request( + flowmsg, + msg_type=self.prid, + msg_flags=NLM_F_REQUEST | NLM_F_ACK, + ) + reply = reply[0] + except NetlinkError as ne: + print(flowmsg) + raise ne + return reply + def dump(self, dpifindex, flowspec=None): """ Returns a list of messages containing flows. @@ -2068,6 +2094,9 @@ def main(argv): addflcmd.add_argument("flow", help="Flow specification") addflcmd.add_argument("acts", help="Flow actions") + delfscmd = subparsers.add_parser("del-flows") + delfscmd.add_argument("flsbr", help="Datapath name") + args = parser.parse_args() if args.verbose > 0: @@ -2151,6 +2180,11 @@ def main(argv): flow = OvsFlow.ovs_flow_msg() flow.parse(args.flow, args.acts, rep["dpifindex"]) ovsflow.add_flow(rep["dpifindex"], flow) + elif hasattr(args, "flsbr"): + rep = ovsdp.info(args.flsbr, 0) + if rep is None: + print("DP '%s' not found." % args.flsbr) + ovsflow.del_flows(rep["dpifindex"]) return 0 From patchwork Fri Oct 6 15:12:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 149298 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp401959vqo; Fri, 6 Oct 2023 08:14:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGi5SxSmGx7Z79BUQF4RxPFp/zeTV57sYb7d/KxCgUwZ0ynrMeXgVrjag1EmmeRKkXPnmS+ X-Received: by 2002:a17:90b:1c0f:b0:261:2824:6b8c with SMTP id oc15-20020a17090b1c0f00b0026128246b8cmr7057909pjb.13.1696605288099; Fri, 06 Oct 2023 08:14:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696605288; cv=none; d=google.com; s=arc-20160816; b=i1/lXoa3AWeQmbFg3dxBNiXCV6d3Rd/AUl/9xyDoKkeV3xFyJO8Au1yksifMCuF7MC Yeow+MpevydBuKM4x1i/kmg45rBmF968mgDkcyH2Ybyl04aFhYNravRGUtPeQpgiUSUL tJR/1OMtOAwoCRdd0k1hzsy5nBhHHsQ9L3qJ57muH6P3Rl7+AqWPXpmuSojhwvK0F+S/ Zc2y1JyRjnoB5zPsCT7Cww2v3XGI/UITWDhirAE1yD9sLolAOTWQTGvLppbko0zmj3m8 Q92yVCgOP5XJQaAHj9Btmty2uoEjgzFNJKQ3PDUQn5wVuM8kq95yRDv9dVcP4p+wy84I NdRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BBBTecis4bs5YluD0BKJX2HGCbDC8Ki7O67H1hXsk1U=; fh=MdzQONQ/gulM6swFM9amSgUVTs752ZpsSWOQLplcSFQ=; b=EOL2FERtHEPHga2i92E6YimuQWCBX1bR1NPPp4gVOLWPoAdTrapMnslG9FqNLJ/giA QZHQrXO6VN7bLiNYUbpUkLr6/L8Qj2gcJzzDN4e1O/F8UW8HKv+mQLqc8mfyC9dcuHho 2EaGwXAr1lmJNYH4/YAyTy3RWyAPCDNDaibkaAPsbCkPdKWc1Wgl8Gl6Wg1r1k22Hkyv dSXHvCv9II7ib04taG8zhVR2Ry4OJEAJ5sDqs7YcjAqXt/BqD/Q8xRJrlYuZ9iKphCXC DUlfQyhjG2HZ8t7OqaKJ/DE4Injl9O4dGMlW6mwXv20jaRfzHamGRTDkeuE//E3B+SUS Ha8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=M0iBQyAw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id na14-20020a17090b4c0e00b002632a1243dbsi6644959pjb.104.2023.10.06.08.14.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 08:14:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=M0iBQyAw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id DBB29802D523; Fri, 6 Oct 2023 08:14:36 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232750AbjJFPOc (ORCPT + 18 others); Fri, 6 Oct 2023 11:14:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232779AbjJFPOa (ORCPT ); Fri, 6 Oct 2023 11:14:30 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78735F7 for ; Fri, 6 Oct 2023 08:13:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696605195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BBBTecis4bs5YluD0BKJX2HGCbDC8Ki7O67H1hXsk1U=; b=M0iBQyAwqhIQ9HRp43WbIjKDTuxXTw1A7CuPaLFgNL3+2MOY/EXZy+9Fa80EzMJgNoOcrB SLtWhuRX3vJlJ19TA0Ft6p4nZYbQaxmA11p/goPL37G/yxyONMnE9JjDSdfEmNl5ZoCunh ITE6Rc5bpdT7SkxsjPMU+InwFqNQa3g= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-22-J__u-p-BPL6NobSryWhYgw-1; Fri, 06 Oct 2023 11:13:02 -0400 X-MC-Unique: J__u-p-BPL6NobSryWhYgw-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E2FF23C1E9D3; Fri, 6 Oct 2023 15:13:01 +0000 (UTC) Received: from RHTPC1VM0NT.lan (unknown [10.22.33.74]) by smtp.corp.redhat.com (Postfix) with ESMTP id 65D6A40D1EA; Fri, 6 Oct 2023 15:13:01 +0000 (UTC) From: Aaron Conole To: netdev@vger.kernel.org Cc: dev@openvswitch.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Pravin B Shelar , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Adrian Moreno , Eelco Chaudron Subject: [PATCH net 4/4] selftests: openvswitch: Fix the ct_tuple for v4 Date: Fri, 6 Oct 2023 11:12:58 -0400 Message-Id: <20231006151258.983906-5-aconole@redhat.com> In-Reply-To: <20231006151258.983906-1-aconole@redhat.com> References: <20231006151258.983906-1-aconole@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 06 Oct 2023 08:14:36 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779019586797969340 X-GMAIL-MSGID: 1779019586797969340 Caught during code review. Fixes: e52b07aa1a54 ("selftests: openvswitch: add flow dump support") Signed-off-by: Aaron Conole --- tools/testing/selftests/net/openvswitch/ovs-dpctl.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py index 153042c1e8c13..ed7bef7ca6883 100644 --- a/tools/testing/selftests/net/openvswitch/ovs-dpctl.py +++ b/tools/testing/selftests/net/openvswitch/ovs-dpctl.py @@ -1119,12 +1119,14 @@ class ovskey(nla): "src", lambda x: str(ipaddress.IPv4Address(x)), int, + convert_ipv4, ), ( "dst", "dst", - lambda x: str(ipaddress.IPv6Address(x)), + lambda x: str(ipaddress.IPv4Address(x)), int, + convert_ipv4, ), ("tp_src", "tp_src", "%d", int), ("tp_dst", "tp_dst", "%d", int),