From patchwork Wed May 27 19:24:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 1299184 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49XLPZ4Gyyz9sRY for ; Thu, 28 May 2020 05:24:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 01A4987E5F; Wed, 27 May 2020 19:24:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f0hQXr5UgGgY; Wed, 27 May 2020 19:24:46 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 7101C87DB4; Wed, 27 May 2020 19:24:46 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 508E3C088D; Wed, 27 May 2020 19:24:46 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4940FC016F for ; Wed, 27 May 2020 19:24:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 45DCA86E90 for ; Wed, 27 May 2020 19:24:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rM_LEB2bR32e for ; Wed, 27 May 2020 19:24:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by fraxinus.osuosl.org (Postfix) with ESMTPS id DE02A86E35 for ; Wed, 27 May 2020 19:24:42 +0000 (UTC) X-Originating-IP: 75.54.222.30 Received: from sigfpe.attlocal.net (75-54-222-30.lightspeed.rdcyca.sbcglobal.net [75.54.222.30]) (Authenticated sender: blp@ovn.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 9DC71E0002; Wed, 27 May 2020 19:24:38 +0000 (UTC) From: Ben Pfaff To: dev@openvswitch.org Date: Wed, 27 May 2020 12:24:31 -0700 Message-Id: <20200527192431.1442778-1-blp@ovn.org> X-Mailer: git-send-email 2.25.3 MIME-Version: 1.0 Cc: Ben Pfaff , Antonin Bas Subject: [ovs-dev] [PATCH] meta-flow: Document that constituents of conjunctive flows may overlap. 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" Suggested-by: Antonin Bas Signed-off-by: Ben Pfaff Acked-by: William Tu --- lib/meta-flow.xml | 2 ++ manpages.mk | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/meta-flow.xml b/lib/meta-flow.xml index d4495552b3c2..1546758744b4 100644 --- a/lib/meta-flow.xml +++ b/lib/meta-flow.xml @@ -1240,6 +1240,8 @@ tcp,tp_src=0x07c0/0xfff0 priority, that is, any given packet must be able to match at most one conjunctive flow at a given priority. Overlapping conjunctive flows yield unpredictable results. + (The flows that constitute a conjunctive flow may overlap with those + that constitute the same or another conjunctive flow.)
  • Following a conjunctive flow match, the search for the flow with diff --git a/manpages.mk b/manpages.mk index dc201484c637..54a3a82ad963 100644 --- a/manpages.mk +++ b/manpages.mk @@ -104,7 +104,6 @@ utilities/bugtool/ovs-bugtool.8: \ utilities/bugtool/ovs-bugtool.8.in: lib/ovs.tmac: - utilities/ovs-dpctl-top.8: \ utilities/ovs-dpctl-top.8.in \ lib/ovs.tmac @@ -155,8 +154,6 @@ lib/common-syn.man: lib/common.man: lib/ovs.tmac: -lib/ovs.tmac: - utilities/ovs-testcontroller.8: \ utilities/ovs-testcontroller.8.in \ lib/common.man \