From patchwork Sat Nov 9 02:49:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Sharma X-Patchwork-Id: 1192355 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.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nutanix.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nutanix.com header.i=@nutanix.com header.b="oPkz6Yd8"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4791qh4S5mz9sPF for ; Sat, 9 Nov 2019 13:51:28 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 52FCECA6; Sat, 9 Nov 2019 02:49:57 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id EFDF1C87 for ; Sat, 9 Nov 2019 02:49:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx0b-002c1b01.pphosted.com (mx0b-002c1b01.pphosted.com [148.163.155.12]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id A6AFEEC for ; Sat, 9 Nov 2019 02:49:52 +0000 (UTC) Received: from pps.filterd (m0127842.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xA92i1mj005578 for ; Fri, 8 Nov 2019 18:49:51 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=proofpoint20171006; bh=Yw6lkYuhqErd/7CCN8FrpZj+uGJJt4GuBSc6oN4YlAY=; b=oPkz6Yd8oQUMqoId2HsaaVM8GlJ7OwNCb/O8rT4FJcAficOmLkKlvRNNy7RdsLdHSl/j s9/mkdmKj19jS7kLOu9MGSJKcasBiTAZN01DVmZ6CH1/jntEt///xZsLIwRebzoZB8i5 ahYS3qUPj7GG8TZKmQBuZHiq1c4OkPbsmoFOzEuKNAtZs+r3IEfkcXFK4BrjssqadVY+ E0+84wUiLab9qTYiMX0w1y5MTVchjqhfEjaWsBKjMD30YfYnmL5VBVIsQq2tD6HUCMhV p0I5Qg6Ky+oeFZge6ZgQzyjgmwzDhjAhQF/KjjsJ7EiJm+bBMieCxcfpltqJSABqGnId lQ== Received: from nam03-dm3-obe.outbound.protection.outlook.com (mail-dm3nam03lp2057.outbound.protection.outlook.com [104.47.41.57]) by mx0b-002c1b01.pphosted.com with ESMTP id 2w5m2hg243-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Fri, 08 Nov 2019 18:49:51 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kZNM5SRqF1DA6DDrp7Eue8ufddgTKemRChSHbOWSn6SLUcd0muxI/EoHH3cco4D8F49wFtH+rrw1LBv1BJxjwbOzGNdLL54aRUlVgUuuYQYfzXbnFbS575owtFnaY7TrjLse3ly886gNrYxAq1fXlylhgZnfrbUzGe3L717UGlWWvWzU4pJsUjaavs+pfeRXNRnX7sDlyzWF2E/m7K3HXZOcmRvgqrlqt+A2z5VeMnn2hy3/nu2OBYfDvf97gl9D222bbXozaruVFUj3u45KAqD0j720+zQIClhPZ2uhPu+rz+qf1oO5JQajFMDECubUSr5yMvPsrrkg55yIFVFbRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Yw6lkYuhqErd/7CCN8FrpZj+uGJJt4GuBSc6oN4YlAY=; b=ZiprhIzm23JDcaK9COs3azRxS7cYzBNzQBXRso2L03GiUEuuwAE/z7deftCoebbF5VXfz9egsjTRG59VdaE+UaahxGMdqx0++wwGLQPc1289Xw4a6uKzlgi5UFiSX9HoUL0/CHIKNGYgrTUnOehcOR8g6B4itjcGj4aL9SM3qCQYGipUbuHe7gOIGenKTDY/X1Ux2EgL0X3BsQUC9+dqaLmb1/CtheuEGAEYblXrB5MSGa4GxQe7nnJnnadDfu2UcDkAz3wT2xFe3YMp20p4RCUMQsDe8W7C0Zrf2TwdGeoLow1NUbzRKbZ+ao0BJ9wLxnmgT+VWNMwhl0Ri36/NMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none Received: from MW2PR02MB3899.namprd02.prod.outlook.com (52.132.177.158) by MW2PR02MB3803.namprd02.prod.outlook.com (52.132.177.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2430.20; Sat, 9 Nov 2019 02:49:48 +0000 Received: from MW2PR02MB3899.namprd02.prod.outlook.com ([fe80::f097:1b5f:8315:3bcd]) by MW2PR02MB3899.namprd02.prod.outlook.com ([fe80::f097:1b5f:8315:3bcd%5]) with mapi id 15.20.2430.020; Sat, 9 Nov 2019 02:49:48 +0000 From: Ankur Sharma To: "ovs-dev@openvswitch.org" Thread-Topic: [PATCH v4 1/3 ovn] OVN ACL: Replace the usage of ct_label with ct_mark Thread-Index: AQHVlqhZUlOGpsnieU+vD153hTfKXg== Date: Sat, 9 Nov 2019 02:49:48 +0000 Message-ID: <1573267855-102768-2-git-send-email-ankur.sharma@nutanix.com> References: <1573267855-102768-1-git-send-email-ankur.sharma@nutanix.com> In-Reply-To: <1573267855-102768-1-git-send-email-ankur.sharma@nutanix.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BY5PR16CA0022.namprd16.prod.outlook.com (2603:10b6:a03:1a0::35) To MW2PR02MB3899.namprd02.prod.outlook.com (2603:10b6:907:3::30) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 1.8.3.1 x-originating-ip: [192.146.154.98] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: db1cd745-875a-41d3-7511-08d764bf7c3b x-ms-traffictypediagnostic: MW2PR02MB3803: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-proofpoint-crosstenant: true x-ms-oob-tlc-oobclassifiers: OLM:7219; x-forefront-prvs: 021670B4D2 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(346002)(396003)(136003)(376002)(39860400002)(189003)(199004)(478600001)(6486002)(81166006)(81156014)(446003)(4720700003)(476003)(30864003)(66446008)(50226002)(6436002)(8676002)(486006)(86362001)(2616005)(2906002)(14454004)(6916009)(2501003)(11346002)(5640700003)(36756003)(14444005)(66066001)(44832011)(256004)(52116002)(6512007)(66556008)(99286004)(386003)(64756008)(2351001)(66946007)(8936002)(76176011)(186003)(66476007)(6506007)(66574012)(316002)(4326008)(3846002)(7736002)(71190400001)(5660300002)(26005)(107886003)(25786009)(305945005)(6116002)(102836004)(71200400001)(64030200001)(579004); DIR:OUT; SFP:1102; SCL:1; SRVR:MW2PR02MB3803; H:MW2PR02MB3899.namprd02.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nutanix.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: mtos1Ap9SzoVZChOwfQLgFuWg1A4dTRWXkJPeKXKUqCR5+UVBGWpRQz/v69C32Uc+gIsDJ1Umqel3vvqROXgu8rynvYgZMetdWFjyOE6r5SxJOiXSCv+tvrkx2yw3XhfZ7ybVFN8njxEpUb7YTtNSOfFXXqM2Wi/DQlZw2AYZsb9njuuq/7PzbDmyErlw/6jzCu3nJrTUbQVcikGmYGB8XAE3Nk7O/g/kA0fLQRE4PZ1Ebiaa6X9H19nE7Oc2Z5K1QEkXbVozZ+Ia/3LrTIczXLhm13FdpB4e2XAKzKd8GbKoqyaw50S8gq0b9zY9DLLi7LSvYHJ8j31WtTrN7GHhzRJNWkxUkaJ62njXrLqQClVpGWs4ArpPnt0NGqo28t0YV3WwHnBAUoX3ZD5yWuxaPd+EYqAM0BB9H80JuCH2M251hYfx2qoeZVs25NurBwQ MIME-Version: 1.0 X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: db1cd745-875a-41d3-7511-08d764bf7c3b X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Nov 2019 02:49:48.3835 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: hiGJM3A6FyfDjA+sdp0d0jbmQyVXR1AmpkRjHxBCbUkVQ3IlLZ+QldXhqjvOMVL3WMQzqQboSXhm/a6ygNY76wcUv4aOqUvCaLP+cEGyIg8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR02MB3803 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95, 18.0.572 definitions=2019-11-08_09:2019-11-08, 2019-11-08 signatures=0 X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v4 1/3 ovn] OVN ACL: Replace the usage of ct_label with ct_mark X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org OVN ACL implementation used ct_label to indicate if a previosuly allowed connection should not be allowed anymore and vice versa. However, ct_label is a 128 bit value and we should rather leverage on ct_mark which is a 32 bit value. Using ct_mark for this purpose, allows us to use ct_label for storing other values like, identifier for corresponidng OVN ACL/Security group etc. Signed-off-by: Ankur Sharma --- Documentation/tutorials/ovn-openstack.rst | 14 ++++----- lib/logical-fields.c | 3 ++ northd/ovn-northd.8.xml | 14 ++++----- northd/ovn-northd.c | 50 ++++++++++++++++--------------- tests/ovn.at | 11 +++---- 5 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Documentation/tutorials/ovn-openstack.rst b/Documentation/tutorials/ovn-openstack.rst index 3ef0523..5134406 100644 --- a/Documentation/tutorials/ovn-openstack.rst +++ b/Documentation/tutorials/ovn-openstack.rst @@ -60,7 +60,7 @@ packaging for developers, in a way that allows you to follow along with the tutorial in full. Unless you have a spare computer laying about, it's easiest to install -DevStacck in a virtual machine. This tutorial was built using a VM +DevStack in a virtual machine. This tutorial was built using a VM implemented by KVM and managed by virt-manager. I recommend configuring the VM configured for the x86-64 architecture, 6 GB RAM, 2 VCPUs, and a 20 GB virtual disk. @@ -1228,7 +1228,7 @@ as the output port:: ct_next(ct_state=est|trk /* default (use --ct to customize) */) --------------------------------------------------------------- - 6. ls_in_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (inport == "ap" && ip4), priority 2002, uuid a12b39f0 + 6. ls_in_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct.blocked == 0 && (inport == "ap" && ip4), priority 2002, uuid a12b39f0 next; 13. ls_in_l2_lkup (ovn-northd.c:3529): eth.dst == fa:16:3e:f6:e2:8f, priority 50, uuid c43ead31 outport = "17d870"; @@ -1297,7 +1297,7 @@ Finally the logical switch for ``n2`` runs through the same logic as ct_next(ct_state=est|trk /* default (use --ct to customize) */) --------------------------------------------------------------- - 4. ls_out_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (outport == "cp" && ip4 && ip4.src == $as_ip4_0fc1b6cf_f925_49e6_8f00_6dd13beca9dc), priority 2002, uuid a746fa0d + 4. ls_out_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct.blocked == 0 && (outport == "cp" && ip4 && ip4.src == $as_ip4_0fc1b6cf_f925_49e6_8f00_6dd13beca9dc), priority 2002, uuid a746fa0d next; 7. ls_out_port_sec_ip (ovn-northd.c:2364): outport == "cp" && eth.dst == fa:16:3e:89:f2:36 && ip4.dst == {255.255.255.255, 224.0.0.0/4, 10.1.2.7}, priority 90, uuid 4d9862b5 next; @@ -1537,7 +1537,7 @@ firewall and is output to ``d``:: ct_next(ct_state=est|trk /* default (use --ct to customize) */) --------------------------------------------------------------- - 4. ls_out_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (outport == "dp" && ip4 && ip4.src == 0.0.0.0/0 && icmp4), priority 2002, uuid b860fc9f + 4. ls_out_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct.blocked == 0 && (outport == "dp" && ip4 && ip4.src == 0.0.0.0/0 && icmp4), priority 2002, uuid b860fc9f next; 7. ls_out_port_sec_ip (ovn-northd.c:2364): outport == "dp" && eth.dst == fa:16:3e:c1:f5:a2 && ip4.dst == {255.255.255.255, 224.0.0.0/4, 10.0.0.6}, priority 90, uuid 15655a98 next; @@ -1649,7 +1649,7 @@ closely to those for IPv4 which we already discussed back under ct_next(ct_state=est|trk /* default (use --ct to customize) */) --------------------------------------------------------------- - 6. ls_in_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (inport == "ap" && ip6), priority 2002, uuid 7fdd607e + 6. ls_in_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct.blocked == 0 && (inport == "ap" && ip6), priority 2002, uuid 7fdd607e next; 13. ls_in_l2_lkup (ovn-northd.c:3529): eth.dst == fa:16:3e:ef:2f:8b, priority 50, uuid e1d87fc5 outport = "ad952e"; @@ -1707,7 +1707,7 @@ closely to those for IPv4 which we already discussed back under ct_next(ct_state=est|trk /* default (use --ct to customize) */) --------------------------------------------------------------- - 4. ls_out_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (outport == "cp" && ip6 && ip6.src == $as_ip6_0fc1b6cf_f925_49e6_8f00_6dd13beca9dc), priority 2002, uuid 12fc96f9 + 4. ls_out_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct.blocked == 0 && (outport == "cp" && ip6 && ip6.src == $as_ip6_0fc1b6cf_f925_49e6_8f00_6dd13beca9dc), priority 2002, uuid 12fc96f9 next; 7. ls_out_port_sec_ip (ovn-northd.c:2390): outport == "cp" && eth.dst == fa:16:3e:89:f2:36 && ip6.dst == {fe80::f816:3eff:fe89:f236, ff00::/8, fc22::7}, priority 90, uuid c622596a next; @@ -1913,7 +1913,7 @@ action replaces a DHCPDISCOVER or DHCPREQUEST packet by a reply. Table 12 flips the packet's source and destination and sends it back the way it came in:: - 6. ls_in_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct_label.blocked == 0 && (inport == "ap" && ip4 && ip4.dst == {255.255.255.255, 10.1.1.0/24} && udp && udp.src == 68 && udp.dst == 67), priority 2002, uuid 9c90245d + 6. ls_in_acl (ovn-northd.c:2925): !ct.new && ct.est && !ct.rpl && ct.blocked == 0 && (inport == "ap" && ip4 && ip4.dst == {255.255.255.255, 10.1.1.0/24} && udp && udp.src == 68 && udp.dst == 67), priority 2002, uuid 9c90245d next; 11. ls_in_dhcp_options (ovn-northd.c:3409): inport == "ap" && eth.src == fa:16:3e:a9:4c:c7 && ip4.src == 0.0.0.0 && ip4.dst == 255.255.255.255 && udp.src == 68 && udp.dst == 67, priority 100, uuid 8d63f29c reg0[3] = put_dhcp_opts(offerip = 10.1.1.5, lease_time = 43200, mtu = 1442, netmask = 255.255.255.0, router = 10.1.1.1, server_id = 10.1.1.1); diff --git a/lib/logical-fields.c b/lib/logical-fields.c index 8fb591c..ba109d0 100644 --- a/lib/logical-fields.c +++ b/lib/logical-fields.c @@ -120,8 +120,11 @@ ovn_init_symtab(struct shash *symtab) /* Connection tracking state. */ expr_symtab_add_field(symtab, "ct_mark", MFF_CT_MARK, NULL, false); + expr_symtab_add_subfield(symtab, "ct.blocked", NULL, "ct_mark[0]"); expr_symtab_add_field(symtab, "ct_label", MFF_CT_LABEL, NULL, false); + + /* ct_label.blocked has been kept for backward compatibility. */ expr_symtab_add_subfield(symtab, "ct_label.blocked", NULL, "ct_label[0]"); expr_symtab_add_field(symtab, "ct_state", MFF_CT_STATE, NULL, false); diff --git a/northd/ovn-northd.8.xml b/northd/ovn-northd.8.xml index 0a33dcd..cf39d6c 100644 --- a/northd/ovn-northd.8.xml +++ b/northd/ovn-northd.8.xml @@ -339,14 +339,14 @@
  • allow-related ACLs translate into logical - flows with the ct_commit(ct_label=0/1); next; actions + flows with the ct_commit(ct_mark=0/1); next; actions for new connections and reg0[1] = 1; next; for existing connections.
  • Other ACLs translate to drop; for new or untracked - connections and ct_commit(ct_label=1/1); for known - connections. Setting ct_label marks a connection + connections and ct_commit(ct_mark=1/1); for known + connections. Setting ct_mark marks a connection as one that was previously allowed, but should no longer be allowed due to a policy change.
    • @@ -372,12 +372,12 @@ A priority-65535 flow that allows any traffic in the reply direction for a connection that has been committed to the connection tracker (i.e., established flows), as long as - the committed flow does not have ct_label.blocked set. + the committed flow does not have ct.blocked set. We only handle traffic in the reply direction here because we want all packets going in the request direction to still go through the flows that implement the currently defined policy based on ACLs. If a connection is no longer allowed by - policy, ct_label.blocked will get set and packets in the + policy, ct.blocked will get set and packets in the reply direction will no longer be allowed, either. @@ -385,7 +385,7 @@ A priority-65535 flow that allows any traffic that is considered related to a committed flow in the connection tracker (e.g., an ICMP Port Unreachable from a non-listening UDP port), as long - as the committed flow does not have ct_label.blocked set. + as the committed flow does not have ct.blocked set.
  • @@ -395,7 +395,7 @@
  • A priority-65535 flow that drops all traffic in the reply direction - with ct_label.blocked set meaning that the connection + with ct.blocked set meaning that the connection should no longer be allowed due to a policy change. Packets in the request direction are skipped here to let a newly created ACL re-allow this connection. diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index c23c270..dcd975d 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -4542,13 +4542,13 @@ consider_acl(struct hmap *lflows, struct ovn_datapath *od, * It's also possible that a known connection was marked for * deletion after a policy was deleted, but the policy was * re-added while that connection is still known. We catch - * that case here and un-set ct_label.blocked (which will be done + * that case here and un-set ct.blocked (which will be done * by ct_commit in the "stateful" stage) to indicate that the * connection should be allowed to resume. */ ds_put_format(&match, "((ct.new && !ct.est)" " || (!ct.new && ct.est && !ct.rpl " - "&& ct_label.blocked == 1)) " + "&& ct.blocked == 1)) " "&& (%s)", acl->match); ds_put_cstr(&actions, REGBIT_CONNTRACK_COMMIT" = 1; "); build_acl_log(&actions, acl); @@ -4569,7 +4569,7 @@ consider_acl(struct hmap *lflows, struct ovn_datapath *od, ds_clear(&actions); ds_put_format(&match, "!ct.new && ct.est && !ct.rpl" - " && ct_label.blocked == 0 && (%s)", + " && ct.blocked == 0 && (%s)", acl->match); build_acl_log(&actions, acl); @@ -4595,7 +4595,7 @@ consider_acl(struct hmap *lflows, struct ovn_datapath *od, /* If the packet is not part of an established connection, then * we can simply reject/drop it. */ ds_put_cstr(&match, - "(!ct.est || (ct.est && ct_label.blocked == 1))"); + "(!ct.est || (ct.est && ct.blocked == 1))"); if (!strcmp(acl->action, "reject")) { build_reject_acl_rules(od, lflows, stage, acl, &match, &actions); @@ -4607,11 +4607,11 @@ consider_acl(struct hmap *lflows, struct ovn_datapath *od, acl->priority + OVN_ACL_PRI_OFFSET, ds_cstr(&match), ds_cstr(&actions)); } - /* For an existing connection without ct_label set, we've + /* For an existing connection without ct_mark set, we've * encountered a policy change. ACLs previously allowed * this connection and we committed the connection tracking * entry. Current policy says that we should drop this - * connection. First, we set bit 0 of ct_label to indicate + * connection. First, we set bit 0 of ct_mark to indicate * that this connection is set for deletion. By not * specifying "next;", we implicitly drop the packet after * updating conntrack state. We would normally defer @@ -4620,8 +4620,8 @@ consider_acl(struct hmap *lflows, struct ovn_datapath *od, */ ds_clear(&match); ds_clear(&actions); - ds_put_cstr(&match, "ct.est && ct_label.blocked == 0"); - ds_put_cstr(&actions, "ct_commit(ct_label=1/1); "); + ds_put_cstr(&match, "ct.est && ct.blocked == 0"); + ds_put_cstr(&actions, "ct_commit(ct_mark=1/1); "); if (!strcmp(acl->action, "reject")) { build_reject_acl_rules(od, lflows, stage, acl, &match, &actions); @@ -4744,56 +4744,56 @@ build_acls(struct ovn_datapath *od, struct hmap *lflows, * subsequent packets will hit the flow at priority 0 that just * uses "next;" * - * We also check for established connections that have ct_label.blocked + * We also check for established connections that have ct.blocked * set on them. That's a connection that was disallowed, but is * now allowed by policy again since it hit this default-allow flow. - * We need to set ct_label.blocked=0 to let the connection continue, + * We need to set ct.blocked=0 to let the connection continue, * which will be done by ct_commit() in the "stateful" stage. * Subsequent packets will hit the flow at priority 0 that just * uses "next;". */ ovn_lflow_add(lflows, od, S_SWITCH_IN_ACL, 1, - "ip && (!ct.est || (ct.est && ct_label.blocked == 1))", + "ip && (!ct.est || (ct.est && ct.blocked == 1))", REGBIT_CONNTRACK_COMMIT" = 1; next;"); ovn_lflow_add(lflows, od, S_SWITCH_OUT_ACL, 1, - "ip && (!ct.est || (ct.est && ct_label.blocked == 1))", + "ip && (!ct.est || (ct.est && ct.blocked == 1))", REGBIT_CONNTRACK_COMMIT" = 1; next;"); /* Ingress and Egress ACL Table (Priority 65535). * * Always drop traffic that's in an invalid state. Also drop * reply direction packets for connections that have been marked - * for deletion (bit 0 of ct_label is set). + * for deletion (bit 0 of ct_mark is set). * * This is enforced at a higher priority than ACLs can be defined. */ ovn_lflow_add(lflows, od, S_SWITCH_IN_ACL, UINT16_MAX, - "ct.inv || (ct.est && ct.rpl && ct_label.blocked == 1)", + "ct.inv || (ct.est && ct.rpl && ct.blocked == 1)", "drop;"); ovn_lflow_add(lflows, od, S_SWITCH_OUT_ACL, UINT16_MAX, - "ct.inv || (ct.est && ct.rpl && ct_label.blocked == 1)", + "ct.inv || (ct.est && ct.rpl && ct.blocked == 1)", "drop;"); /* Ingress and Egress ACL Table (Priority 65535). * * Allow reply traffic that is part of an established * conntrack entry that has not been marked for deletion - * (bit 0 of ct_label). We only match traffic in the + * (bit 0 of ct_mark). We only match traffic in the * reply direction because we want traffic in the request * direction to hit the currently defined policy from ACLs. * * This is enforced at a higher priority than ACLs can be defined. */ ovn_lflow_add(lflows, od, S_SWITCH_IN_ACL, UINT16_MAX, "ct.est && !ct.rel && !ct.new && !ct.inv " - "&& ct.rpl && ct_label.blocked == 0", + "&& ct.rpl && ct.blocked == 0", "next;"); ovn_lflow_add(lflows, od, S_SWITCH_OUT_ACL, UINT16_MAX, "ct.est && !ct.rel && !ct.new && !ct.inv " - "&& ct.rpl && ct_label.blocked == 0", + "&& ct.rpl && ct.blocked == 0", "next;"); /* Ingress and Egress ACL Table (Priority 65535). * * Allow traffic that is related to an existing conntrack entry that - * has not been marked for deletion (bit 0 of ct_label). + * has not been marked for deletion (bit 0 of ct_mark). * * This is enforced at a higher priority than ACLs can be defined. * @@ -4803,11 +4803,11 @@ build_acls(struct ovn_datapath *od, struct hmap *lflows, * that's generated from a non-listening UDP port. */ ovn_lflow_add(lflows, od, S_SWITCH_IN_ACL, UINT16_MAX, "!ct.est && ct.rel && !ct.new && !ct.inv " - "&& ct_label.blocked == 0", + "&& ct.blocked == 0", "next;"); ovn_lflow_add(lflows, od, S_SWITCH_OUT_ACL, UINT16_MAX, "!ct.est && ct.rel && !ct.new && !ct.inv " - "&& ct_label.blocked == 0", + "&& ct.blocked == 0", "next;"); /* Ingress and Egress ACL Table (Priority 65535). @@ -4989,13 +4989,15 @@ build_stateful(struct ovn_datapath *od, struct hmap *lflows) ovn_lflow_add(lflows, od, S_SWITCH_OUT_STATEFUL, 0, "1", "next;"); /* If REGBIT_CONNTRACK_COMMIT is set as 1, then the packets should be - * committed to conntrack. We always set ct_label.blocked to 0 here as + * committed to conntrack. We always set ct.blocked to 0 here as * any packet that makes it this far is part of a connection we * want to allow to continue. */ ovn_lflow_add(lflows, od, S_SWITCH_IN_STATEFUL, 100, - REGBIT_CONNTRACK_COMMIT" == 1", "ct_commit(ct_label=0/1); next;"); + REGBIT_CONNTRACK_COMMIT" == 1", + "ct_commit(ct_mark=0/1); next;"); ovn_lflow_add(lflows, od, S_SWITCH_OUT_STATEFUL, 100, - REGBIT_CONNTRACK_COMMIT" == 1", "ct_commit(ct_label=0/1); next;"); + REGBIT_CONNTRACK_COMMIT" == 1", + "ct_commit(ct_mark=0/1); next;"); /* If REGBIT_CONNTRACK_NAT is set as 1, then packets should just be sent * through nat (without committing). diff --git a/tests/ovn.at b/tests/ovn.at index 410f4b5..3e20c84 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -176,7 +176,8 @@ AT_CLEANUP dnl Check that the OVN conntrack field definitions are correct. AT_SETUP([ovn -- conntrack fields]) AT_CHECK([ovstest test-ovn dump-symtab | grep ^ct | sort], [0], -[[ct.dnat = ct_state[7] +[[ct.blocked = ct_mark[0] +ct.dnat = ct_state[7] ct.est = ct_state[1] ct.inv = ct_state[4] ct.new = ct_state[0] @@ -372,7 +373,7 @@ eth.src == {$set3, badmac, 00:00:00:00:00:01} => Syntax error at `badmac' expect ((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((())))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) => Parentheses nested too deeply. -ct_label > $set4 => Only == and != operators may be used to compare a field against an empty value set. +ct_mark > $set4 => Only == and != operators may be used to compare a field against an empty value set. ]]) sed 's/ =>.*//' test-cases.txt > input.txt sed 's/.* => //' test-cases.txt > expout @@ -719,10 +720,10 @@ ip,nw_src=10.0.0.2: conjunction(1, 1/2) ip,nw_src=10.0.0.3: conjunction(1, 1/2) ]) -lflow="ip && (!ct.est || (ct.est && ct_label.blocked == 1))" +lflow="ip && (!ct.est || (ct.est && ct.blocked == 1))" AT_CHECK([expr_to_flow "$lflow"], [0], [dnl -ct_state=+est+trk,ct_label=0x1/0x1,ip -ct_state=+est+trk,ct_label=0x1/0x1,ipv6 +ct_state=+est+trk,ct_mark=0x1/0x1,ip +ct_state=+est+trk,ct_mark=0x1/0x1,ipv6 ct_state=-est+trk,ip ct_state=-est+trk,ipv6 ]) From patchwork Sat Nov 9 02:49:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Sharma X-Patchwork-Id: 1192356 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.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nutanix.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nutanix.com header.i=@nutanix.com header.b="QLLWtyn5"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4791rb3bf2z9sPF for ; Sat, 9 Nov 2019 13:52:15 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id EA41FC87; Sat, 9 Nov 2019 02:49:57 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 14F52C9F for ; Sat, 9 Nov 2019 02:49:56 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx0b-002c1b01.pphosted.com (mx0b-002c1b01.pphosted.com [148.163.155.12]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 078445F4 for ; Sat, 9 Nov 2019 02:49:52 +0000 (UTC) Received: from pps.filterd (m0127842.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xA92i1mk005578 for ; Fri, 8 Nov 2019 18:49:52 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=proofpoint20171006; bh=yi6Z3KtpM9c2p4SSxVqSMpHPItWgEFg/eaU3sESseaw=; b=QLLWtyn5+dJpNLTE899c9qe0ucr5NXd3Gc7/1DQWHcVxVBPTCVyQb5qgLiXcPo6OCdcU AHxEBjub/sG49TBgj5Rv25ZqIIUtm5YwXZ+FsUMxDdh3mUiyDUn2j6vmpBRDp5sppd+b GLx4aPe/Cg9Py8EgpFCer9JRXT5rL9hJQLKhq3/miyrbkfZoWiCqyfslUPqEOqm1ZuB4 HFhJ1oYZclId7l45TV8P6i7yEeyDaoq+cLQz10QRF5MW7gGL51wP4Jv8AaSQl7mzEzJU zxOFm9NsFPawbCXJdotb0hS65SbXEd2MTCv2rEgsk736LcpLHZ84CCON159a+epq4MCm HQ== Received: from nam03-dm3-obe.outbound.protection.outlook.com (mail-dm3nam03lp2057.outbound.protection.outlook.com [104.47.41.57]) by mx0b-002c1b01.pphosted.com with ESMTP id 2w5m2hg243-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Fri, 08 Nov 2019 18:49:52 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TlMwb3noHQM5nSU4zPy04aP5EDiFvA25IjvEcEt5veR/Ln8pTCsSrTSI2bwgBP4JuMiuhQKRZiP40OUqrJZx4Yco/SwaAreIKuElMTZWM2Cq7MGsXAAEvSE1Uzrx2qxqT315j0wjOn+UedcfKRPW/6apEDdKVPbMaEwypWZQJlPJyu7jzJtih+qq6iuwk/xz+28/2hL0JzdrJ6hINjiIL8puZP815FPUwsREaeF4pVC5fcbtQ45edjm55bqpKL62LXzIsNykkf1yxHczmIsn7YC0edfAjAsu7piEyKga/RapvWxlz7AkWXMkFDydVOni3euT64SmaQZtR+ODUlVEbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yi6Z3KtpM9c2p4SSxVqSMpHPItWgEFg/eaU3sESseaw=; b=f2DwHYu0WDxgNmEaUMyHccLRCGoAbcPM/Zh0PFF51g786P45OUXjaPZB6xJJdCdswYIxchF2oK1aE2BwNyFmDoXdZObCCa8alrYiup6Ld6yQQ/qdpjFUnXe4wKZokOg5xP1vzBwVy0jCMzADV44TCrTc9jlILCh8SzCCZh6awBy6l7WzEywpvlLzs7Lq5mSSYAvgTt7zhQPOyHyzetODwiQU03CvaAB3QtMh+pSquM9dpEBiCCLn8f6WadHEe8SzO5qqYR1d2kQ+VkRjhLp6IN3w6uzjVJARKnOsh0cfMWp79dNq3dqbCjPKkiB5Bxi/HPTE1XOmrK7V0AaeS1BYzg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none Received: from MW2PR02MB3899.namprd02.prod.outlook.com (52.132.177.158) by MW2PR02MB3803.namprd02.prod.outlook.com (52.132.177.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2430.20; Sat, 9 Nov 2019 02:49:50 +0000 Received: from MW2PR02MB3899.namprd02.prod.outlook.com ([fe80::f097:1b5f:8315:3bcd]) by MW2PR02MB3899.namprd02.prod.outlook.com ([fe80::f097:1b5f:8315:3bcd%5]) with mapi id 15.20.2430.020; Sat, 9 Nov 2019 02:49:50 +0000 From: Ankur Sharma To: "ovs-dev@openvswitch.org" Thread-Topic: [PATCH v4 2/3 ovn] OVN ACL: Allow ct_mark and ct_label values to be set from register as well Thread-Index: AQHVlqha20VPO0TkbkSG5o0AWO6oqg== Date: Sat, 9 Nov 2019 02:49:49 +0000 Message-ID: <1573267855-102768-3-git-send-email-ankur.sharma@nutanix.com> References: <1573267855-102768-1-git-send-email-ankur.sharma@nutanix.com> In-Reply-To: <1573267855-102768-1-git-send-email-ankur.sharma@nutanix.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BY5PR16CA0022.namprd16.prod.outlook.com (2603:10b6:a03:1a0::35) To MW2PR02MB3899.namprd02.prod.outlook.com (2603:10b6:907:3::30) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 1.8.3.1 x-originating-ip: [192.146.154.98] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1a4f68cc-4b15-4f1c-6284-08d764bf7d03 x-ms-traffictypediagnostic: MW2PR02MB3803: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-proofpoint-crosstenant: true x-ms-oob-tlc-oobclassifiers: OLM:411; x-forefront-prvs: 021670B4D2 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(346002)(396003)(136003)(376002)(39860400002)(189003)(199004)(478600001)(6486002)(81166006)(81156014)(446003)(4720700003)(476003)(66446008)(50226002)(6436002)(8676002)(486006)(86362001)(2616005)(2906002)(14454004)(6916009)(2501003)(11346002)(5640700003)(36756003)(66066001)(44832011)(256004)(52116002)(6512007)(66556008)(99286004)(386003)(64756008)(2351001)(66946007)(8936002)(76176011)(186003)(66476007)(6506007)(316002)(4326008)(3846002)(7736002)(71190400001)(5660300002)(26005)(107886003)(25786009)(305945005)(6116002)(102836004)(71200400001)(64030200001); DIR:OUT; SFP:1102; SCL:1; SRVR:MW2PR02MB3803; H:MW2PR02MB3899.namprd02.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nutanix.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 5MLUIsAQF5NYzWkTDRGl/mBvss5bkK4C6UHiRE7IwgUKF2F78PSfUvE/Zs7RU8tUQlofnRQAiWuqJ7uue1pAX8hLFCJsP7uA/EEL4krVJGPsx/ZwwQBtXUa6J5/RE0Rn3ReL+/J2DIWXpMQlVSxiU/HgEEcXCEvgCY1DehapHeKpJL41LfPq2lQVmP/WzYr75seo5PiZdHgLoBSTn0to5shx6q8ggblCH+6aV311zEqdYjewjjm+eWbmn+P3Mz7zSGt0oZzReQ3e3gOfVTFeDAHicAe0oWe6vRa2WxBu2kCmGEYe0ahYBJTT8/UKQGUgwDxx6ABQ3eq037lJzkKjbfpMHhkmauI//b7ogsAw9CP28DLjyPuVPq6Giusg6SK6+hH63FI1VT3/br6BiQPWpExDj6kw8mSZ3KCDceG2IJVTv8d2N9xjUjPpcYcXuzFK MIME-Version: 1.0 X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1a4f68cc-4b15-4f1c-6284-08d764bf7d03 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Nov 2019 02:49:49.7678 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: b3+o5QNLQfaRk5tvLCMPKwQylUOY4DMZAEcGFGZtL4yFvPDyaYzCK3GRqLvleGkjZoICcHcaeZp7lsIc/GJz+WBq/679EbC0dSJat2qv3IU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR02MB3803 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95, 18.0.572 definitions=2019-11-08_09:2019-11-08, 2019-11-08 signatures=0 X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v4 2/3 ovn] OVN ACL: Allow ct_mark and ct_label values to be set from register as well X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org OVN allows only an integer (or masked integer) to be assigned to ct_mark and ct_label. This patch, enhances the parser code to allow ct_mark and ct_label to be assigned from registers as well. Signed-off-by: Ankur Sharma --- include/ovn/actions.h | 3 +++ lib/actions.c | 72 ++++++++++++++++++++++++++++++++++++++++++++------- ovn-sb.xml | 41 +++++++++++++++++++++-------- tests/ovn.at | 31 ++++++++++++++++++++++ 4 files changed, 126 insertions(+), 21 deletions(-) diff --git a/include/ovn/actions.h b/include/ovn/actions.h index f4997e9..dda9a66 100644 --- a/include/ovn/actions.h +++ b/include/ovn/actions.h @@ -218,8 +218,11 @@ struct ovnact_ct_next { /* OVNACT_CT_COMMIT. */ struct ovnact_ct_commit { struct ovnact ovnact; + bool is_ct_mark_reg, is_ct_label_reg; /* If the value is from a register */ uint32_t ct_mark, ct_mark_mask; ovs_be128 ct_label, ct_label_mask; + enum mf_field_id ct_mark_reg, ct_label_reg; + uint16_t ct_mark_reg_bits, ct_label_reg_bits; }; /* OVNACT_CT_DNAT, OVNACT_CT_SNAT. */ diff --git a/lib/actions.c b/lib/actions.c index a999a4f..2b00469 100644 --- a/lib/actions.c +++ b/lib/actions.c @@ -634,8 +634,21 @@ parse_ct_commit_arg(struct action_context *ctx, } else if (ctx->lexer->token.type == LEX_T_MASKED_INTEGER) { cc->ct_mark = ntohll(ctx->lexer->token.value.integer); cc->ct_mark_mask = ntohll(ctx->lexer->token.mask.integer); + } else if (ctx->lexer->token.type == LEX_T_ID) { + + cc->ct_mark_mask = UINT32_MAX; + + const struct mf_field *mf = mf_from_name(ctx->lexer->token.s); + if (mf && mf_is_register(mf->id)) { + cc->is_ct_mark_reg = true; + cc->ct_mark_reg = mf->id; + } else { + lexer_syntax_error(ctx->lexer, "invalid field name: %s", + ctx->lexer->token.s); + return; + } } else { - lexer_syntax_error(ctx->lexer, "expecting integer"); + lexer_syntax_error(ctx->lexer, "invalid token type"); return; } lexer_get(ctx->lexer); @@ -649,9 +662,21 @@ parse_ct_commit_arg(struct action_context *ctx, } else if (ctx->lexer->token.type == LEX_T_MASKED_INTEGER) { cc->ct_label = ctx->lexer->token.value.be128_int; cc->ct_label_mask = ctx->lexer->token.mask.be128_int; + } else if (ctx->lexer->token.type == LEX_T_ID) { + + const struct mf_field *mf = mf_from_name(ctx->lexer->token.s); + if (mf && mf_is_register(mf->id)) { + cc->is_ct_label_reg = true; + cc->ct_label_reg = mf->id; + } else { + lexer_syntax_error(ctx->lexer, "invalid field name: %s", + ctx->lexer->token.s); + return; + } + } else { - lexer_syntax_error(ctx->lexer, "expecting integer"); - return; + lexer_syntax_error(ctx->lexer, "invalid token type"); + return; } lexer_get(ctx->lexer); } else { @@ -719,15 +744,42 @@ encode_CT_COMMIT(const struct ovnact_ct_commit *cc, size_t set_field_offset = ofpacts->size; ofpbuf_pull(ofpacts, set_field_offset); - if (cc->ct_mark_mask) { + if (cc->is_ct_mark_reg) { + struct ofpact_reg_move *move = ofpact_put_REG_MOVE(ofpacts); + const struct mf_field *src_reg = mf_from_id(cc->ct_mark_reg); + const struct mf_field *ct_mark = mf_from_id(MFF_CT_MARK); + + move->src.field = src_reg; + move->src.ofs = 0; + move->src.n_bits = src_reg->n_bits < ct_mark->n_bits ? + src_reg->n_bits : ct_mark->n_bits; + move->dst.field = mf_from_id(MFF_CT_MARK); + move->dst.ofs = 0; + move->dst.n_bits = src_reg->n_bits < ct_mark->n_bits ? + src_reg->n_bits : ct_mark->n_bits; + } else if (cc->ct_mark_mask) { const ovs_be32 value = htonl(cc->ct_mark); const ovs_be32 mask = htonl(cc->ct_mark_mask); - ofpact_put_set_field(ofpacts, mf_from_id(MFF_CT_MARK), &value, &mask); - } - - if (!ovs_be128_is_zero(cc->ct_label_mask)) { - ofpact_put_set_field(ofpacts, mf_from_id(MFF_CT_LABEL), &cc->ct_label, - &cc->ct_label_mask); + ofpact_put_set_field(ofpacts, mf_from_id(MFF_CT_MARK), &value, + &mask); + } + + if (cc->is_ct_label_reg) { + struct ofpact_reg_move *move = ofpact_put_REG_MOVE(ofpacts); + const struct mf_field *src_reg = mf_from_id(cc->ct_label_reg); + const struct mf_field *ct_label = mf_from_id(MFF_CT_LABEL); + + move->src.field = src_reg; + move->src.ofs = 0; + move->src.n_bits = src_reg->n_bits < ct_label->n_bits ? + src_reg->n_bits : ct_label->n_bits; + move->dst.field = ct_label; + move->dst.ofs = 0; + move->dst.n_bits = src_reg->n_bits < ct_label->n_bits ? + src_reg->n_bits : ct_label->n_bits; + } else if (!ovs_be128_is_zero(cc->ct_label_mask)) { + ofpact_put_set_field(ofpacts, mf_from_id(MFF_CT_LABEL), + &cc->ct_label, &cc->ct_label_mask); } ofpacts->header = ofpbuf_push_uninit(ofpacts, set_field_offset); diff --git a/ovn-sb.xml b/ovn-sb.xml index e5fb51a..c8306ab 100644 --- a/ovn-sb.xml +++ b/ovn-sb.xml @@ -1243,20 +1243,39 @@
    ct_commit;
    -
    ct_commit(ct_mark=value[/mask]);
    -
    ct_commit(ct_label=value[/mask]);
    -
    ct_commit(ct_mark=value[/mask], ct_label=value[/mask]);
    +
    + + ct_commit(ct_mark=(value[/mask] OR regX OR xregX OR xxregX)); + +
    +
    + + ct_commit(ct_label=(value[/mask] OR regX OR xregX OR xxregX)); + +
    +
    + + ct_commit(ct_mark=(value[/mask] OR regX OR xregX OR xxregX), + ct_label=(value[/mask] OR regX OR xregX OR xxregX )); + +

    Commit the flow to the connection tracking entry associated with it - by a previous call to ct_next. When - ct_mark=value[/mask] and/or - ct_label=value[/mask] are supplied, - ct_mark and/or ct_label will be set to the - values indicated by value[/mask] on the connection - tracking entry. ct_mark is a 32-bit field. - ct_label is a 128-bit field. The value[/mask] - should be specified in hex string if more than 64bits are to be used. + by a previous call to ct_next. When + ct_mark=value[/mask] OR regX OR + xregX OR xxregX and/or + ct_label=value[/mask] OR regX + OR xregX OR xxregX are + supplied, ct_mark and/or ct_label + will be set to the values indicated by value[/mask] + or 32 bit/128 bit registers on the connection tracking entry. + ct_mark is a 32-bit field and hence will read + value only from a 32 bit register (reg0 - reg9). + ct_label is a 128-bit field and hence + will read value only from a 128 bit register (xxreg0 - xxreg1). + The value[/mask] should be specified in hex string if + more than 64bits are to be used.

    diff --git a/tests/ovn.at b/tests/ovn.at index 3e20c84..042abee 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -1037,6 +1037,37 @@ ct_commit(ct_label=18446744073709551615); ct_commit(ct_label=18446744073709551616); Decimal constants must be less than 2**64. +ct_commit(ct_label=xxreg1); + formats as ct_commit; + encodes as ct(commit,zone=NXM_NX_REG13[0..15],exec(move:NXM_NX_XXREG1[]->NXM_NX_CT_LABEL[])) + has prereqs ip + +ct_commit(ct_label=xreg1); + formats as ct_commit; + encodes as ct(commit,zone=NXM_NX_REG13[0..15],exec(move:OXM_OF_PKT_REG1[]->NXM_NX_CT_LABEL[0..63])) + has prereqs ip + +ct_commit(ct_label=reg1); + formats as ct_commit; + encodes as ct(commit,zone=NXM_NX_REG13[0..15],exec(move:NXM_NX_REG1[]->NXM_NX_CT_LABEL[0..31])) + has prereqs ip + +ct_commit(ct_mark=xxreg1); + formats as ct_commit(ct_mark=0); + encodes as ct(commit,zone=NXM_NX_REG13[0..15],exec(move:NXM_NX_XXREG1[0..31]->NXM_NX_CT_MARK[])) + has prereqs ip + +ct_commit(ct_mark=xreg1); + formats as ct_commit(ct_mark=0); + encodes as ct(commit,zone=NXM_NX_REG13[0..15],exec(move:OXM_OF_PKT_REG1[0..31]->NXM_NX_CT_MARK[])) + has prereqs ip + +ct_commit(ct_mark=reg1); + formats as ct_commit(ct_mark=0); + encodes as ct(commit,zone=NXM_NX_REG13[0..15],exec(move:NXM_NX_REG1[]->NXM_NX_CT_MARK[])) + has prereqs ip + + # ct_dnat ct_dnat; encodes as ct(table=19,zone=NXM_NX_REG11[0..15],nat) From patchwork Sat Nov 9 02:49:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Sharma X-Patchwork-Id: 1192354 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.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nutanix.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nutanix.com header.i=@nutanix.com header.b="in/HDsaf"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4791pY61Xvz9sPF for ; Sat, 9 Nov 2019 13:50:29 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 58F9EC6E; Sat, 9 Nov 2019 02:49:55 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id B837FC6D for ; Sat, 9 Nov 2019 02:49:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx0b-002c1b01.pphosted.com (mx0b-002c1b01.pphosted.com [148.163.155.12]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 5B264712 for ; Sat, 9 Nov 2019 02:49:53 +0000 (UTC) Received: from pps.filterd (m0127842.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xA92i1ml005578 for ; Fri, 8 Nov 2019 18:49:52 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=proofpoint20171006; bh=JuJCEUBe+uoN+mnWZyCViCOPzBtcK8V1RnNgk/0Gc5M=; b=in/HDsaf4vo8mrpCnsGCDqe0wu1WC8jhzfktQq6iUpmMw+MTxvVg800ZZLsv1tn0D0mq 1trB+/BLYOsKx9rsCAo5Vxw+m1qew0Xbwe/lZ1sR9o8A/4w8oD4I6wNWVkAfXx8yxgnr 7+GF4Gc8q56YPmu27iqoqB1mk5GrJzhaCE2DdQ2jG1Da90lpXg7nz/yF/qfW9g4KHBEO 92I7zxRhOyVEvLeeSUtP0GtkiwuA4a5SjStWppy8TX3IHYDZd3py5lZ8gsWhNO6aLf3e tMZwIAvvkdIF14rpsBaGCRPEvensF7mcL0UU7AFeo70nuPMQo9su7aS4eU/OOhjhV3pn mA== Received: from nam03-dm3-obe.outbound.protection.outlook.com (mail-dm3nam03lp2057.outbound.protection.outlook.com [104.47.41.57]) by mx0b-002c1b01.pphosted.com with ESMTP id 2w5m2hg243-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Fri, 08 Nov 2019 18:49:52 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I8s+Eq6kpCp4RQUhn4U34A2pFMU1K9Csos4WmFJ7Az4K37XQvyJfCZ57z6Z2IEgqZw0qj+e5fuYQnniVHQNtMFUX8G96P5jDCP4jJhgEqi/YQ0pVZFRi2VEJ0BPnPCcP6Tp907PLjlfaBhtj2lEfwcM8ugCsiQwqfCp8h2so8XShKz6ezMsyqBtGT0duD9K0OnPYap1GHNzuHNrFfN4+/CrraLbWVWb9E4l1GzYp6qe7nkAE/HpJ+PIzi4S7DDMXiMc5mjKJN5xqc/1stVIdojzNKhMeUKKApYbsRnJMpDofUMhieDNwFOyPbu06b17jbshO/mLQyIVzxsRYv1dJkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JuJCEUBe+uoN+mnWZyCViCOPzBtcK8V1RnNgk/0Gc5M=; b=HmSExD4ykXHk7oJm4pphYV79BoPtqYMbyldOTLP7s+qpqRet3oNVEjYNkGMUROnTrSItRLT83Ffi8/qGus6l/A54ROXz7QVIIvfIOeDtLuVNEvsbBY5PcaccILkQ67zpSq77sbvMdvRppF9vPxfZunym1COxK88fCopzkyG6iAr2wr6mRqLBrSHIgRv3yC+dOlEdcZwljjStSmH8mA2RoC0oDGHBBVNHum0e7p0MgRlOTUk7vKSSg+EThxeYuP9Er1h5NncWGnmltCQ8VPpPAFnBPCCGmR9WyQeoIlJvjGoahPQxuZ6NgtDoRlPwe7umHaxaX/w3wJbRrjRp6IofXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none Received: from MW2PR02MB3899.namprd02.prod.outlook.com (52.132.177.158) by MW2PR02MB3803.namprd02.prod.outlook.com (52.132.177.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2430.20; Sat, 9 Nov 2019 02:49:51 +0000 Received: from MW2PR02MB3899.namprd02.prod.outlook.com ([fe80::f097:1b5f:8315:3bcd]) by MW2PR02MB3899.namprd02.prod.outlook.com ([fe80::f097:1b5f:8315:3bcd%5]) with mapi id 15.20.2430.020; Sat, 9 Nov 2019 02:49:51 +0000 From: Ankur Sharma To: "ovs-dev@openvswitch.org" Thread-Topic: [PATCH v4 3/3 ovn] OVN ACL: Allow a user to input ct.label value for an acl Thread-Index: AQHVlqhb5w9Xi/HkjUuGtoEtNXvaWA== Date: Sat, 9 Nov 2019 02:49:51 +0000 Message-ID: <1573267855-102768-4-git-send-email-ankur.sharma@nutanix.com> References: <1573267855-102768-1-git-send-email-ankur.sharma@nutanix.com> In-Reply-To: <1573267855-102768-1-git-send-email-ankur.sharma@nutanix.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BY5PR16CA0022.namprd16.prod.outlook.com (2603:10b6:a03:1a0::35) To MW2PR02MB3899.namprd02.prod.outlook.com (2603:10b6:907:3::30) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 1.8.3.1 x-originating-ip: [192.146.154.98] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3eeede89-8fe1-42e9-efff-08d764bf7dd2 x-ms-traffictypediagnostic: MW2PR02MB3803: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-proofpoint-crosstenant: true x-ms-oob-tlc-oobclassifiers: OLM:411; x-forefront-prvs: 021670B4D2 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(346002)(396003)(136003)(376002)(39860400002)(189003)(199004)(478600001)(6486002)(81166006)(81156014)(446003)(4720700003)(476003)(66446008)(50226002)(5024004)(6436002)(8676002)(486006)(86362001)(2616005)(2906002)(14454004)(6916009)(2501003)(11346002)(5640700003)(36756003)(14444005)(66066001)(44832011)(256004)(52116002)(6512007)(66556008)(99286004)(386003)(64756008)(2351001)(66946007)(8936002)(76176011)(186003)(66476007)(6506007)(316002)(4326008)(3846002)(7736002)(71190400001)(5660300002)(26005)(107886003)(25786009)(305945005)(6116002)(102836004)(71200400001)(64030200001); DIR:OUT; SFP:1102; SCL:1; SRVR:MW2PR02MB3803; H:MW2PR02MB3899.namprd02.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nutanix.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: JAqHKD+/gSlpEXi3dJT1Wxo2jo/9RzmzGildSlrkJcfPCmYiFxkujaLTamkCgzVewZxJiu682NLlSLwf60XOaLEeCzNL/Mpq2/WVkgFntsdKXrjRBylDcZNBdwEv4AuFlQl4eWV2dvzhH6Xvm4rZ07o1NL+j/l3Sa50DhKThfFH0o0mtTbGkvEYcfbNc3Q3SXibRqc3IdxJMJ89T+aeqwMyWANxw5+tRVceAjhKIb2IqwttUp3fWJdCtzGKSERRqdG0z2MxmvDx/akY+KUy9Hv/RvmdzyVk/mjJkBfahkjxphL3wWuhnom3hteZUJUxvgMTE0jKHS/RcnP72XwIq/o+C5VZmuJSFIQhcPaEEqKWycybdmAh43BcWrDNPYIl4c9wGAPl6ktErjTj2zsXU6AGkRHj3Zxueoklt9V6XxofTnxizfTr+H/zNnYX1jJZE MIME-Version: 1.0 X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3eeede89-8fe1-42e9-efff-08d764bf7dd2 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Nov 2019 02:49:51.1570 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: ApMwrhhkeFWvEV7iDPw1OwJi135x0TosrLBHHvv5rnNUKJDGCB59P7R+YMkwni1KiiSu/RJ5COOs/0WXuwv9o70bEKTDfnRWEF8Wj76WSb0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR02MB3803 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95, 18.0.572 definitions=2019-11-08_09:2019-11-08, 2019-11-08 signatures=0 X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v4 3/3 ovn] OVN ACL: Allow a user to input ct.label value for an acl X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org This patch allows user to associate a value with acl, which will be assigned to ct.label of the corresponding connection tracking entry. This value can be used to map a ct entry with corresponding OVN ACL or higher level constructs like security group. Signed-off-by: Ankur Sharma --- northd/ovn-northd.c | 37 ++++++++++++++++++++++++++------- ovn-nb.ovsschema | 5 +++-- ovn-nb.xml | 12 +++++++++++ tests/ovn-nbctl.at | 12 +++++++++-- tests/ovn.at | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++ utilities/ovn-nbctl.c | 24 +++++++++++++++++++++- 6 files changed, 135 insertions(+), 12 deletions(-) diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c index dcd975d..226882e 100644 --- a/northd/ovn-northd.c +++ b/northd/ovn-northd.c @@ -190,12 +190,13 @@ enum ovn_stage { #define OVN_ACL_PRI_OFFSET 1000 /* Register definitions specific to switches. */ -#define REGBIT_CONNTRACK_DEFRAG "reg0[0]" -#define REGBIT_CONNTRACK_COMMIT "reg0[1]" -#define REGBIT_CONNTRACK_NAT "reg0[2]" -#define REGBIT_DHCP_OPTS_RESULT "reg0[3]" -#define REGBIT_DNS_LOOKUP_RESULT "reg0[4]" -#define REGBIT_ND_RA_OPTS_RESULT "reg0[5]" +#define REGBIT_CONNTRACK_DEFRAG "reg0[0]" +#define REGBIT_CONNTRACK_COMMIT "reg0[1]" +#define REGBIT_CONNTRACK_NAT "reg0[2]" +#define REGBIT_CONNTRACK_SET_LABEL "reg0[3]" +#define REGBIT_DHCP_OPTS_RESULT "reg0[4]" +#define REGBIT_DNS_LOOKUP_RESULT "reg0[5]" +#define REGBIT_ND_RA_OPTS_RESULT "reg0[6]" /* Register definitions for switches and routers. */ #define REGBIT_NAT_REDIRECT "reg9[0]" @@ -4550,7 +4551,14 @@ consider_acl(struct hmap *lflows, struct ovn_datapath *od, " || (!ct.new && ct.est && !ct.rpl " "&& ct.blocked == 1)) " "&& (%s)", acl->match); - ds_put_cstr(&actions, REGBIT_CONNTRACK_COMMIT" = 1; "); + if (acl->label) { + ds_put_format(&actions, REGBIT_CONNTRACK_COMMIT" = 1; " + ""REGBIT_CONNTRACK_SET_LABEL" = 1; " + "xxreg1 = %s; ", acl->label); + } else { + ds_put_cstr(&actions, REGBIT_CONNTRACK_COMMIT" = 1; "); + } + build_acl_log(&actions, acl); ds_put_cstr(&actions, "next;"); ovn_lflow_add_with_hint(lflows, od, stage, @@ -4988,6 +4996,21 @@ build_stateful(struct ovn_datapath *od, struct hmap *lflows) ovn_lflow_add(lflows, od, S_SWITCH_IN_STATEFUL, 0, "1", "next;"); ovn_lflow_add(lflows, od, S_SWITCH_OUT_STATEFUL, 0, "1", "next;"); + /* If REGBIT_CONNTRACK_COMMIT is set as 1 and + * REGBIT_CONNTRACK_SET_LABEL is set to 1, then the packets should be + * committed to conntrack. + * We always set ct_mark.blocked to 0 here as + * any packet that makes it this far is part of a connection we + * want to allow to continue. */ + ovn_lflow_add(lflows, od, S_SWITCH_IN_STATEFUL, 150, + REGBIT_CONNTRACK_COMMIT" == 1 && " + ""REGBIT_CONNTRACK_SET_LABEL" == 1", + "ct_commit(ct_mark=0/1, ct_label=xxreg1); next;"); + ovn_lflow_add(lflows, od, S_SWITCH_OUT_STATEFUL, 150, + REGBIT_CONNTRACK_COMMIT" == 1 && " + ""REGBIT_CONNTRACK_SET_LABEL" == 1", + "ct_commit(ct_mark=0/1, ct_label=xxreg1); next;"); + /* If REGBIT_CONNTRACK_COMMIT is set as 1, then the packets should be * committed to conntrack. We always set ct.blocked to 0 here as * any packet that makes it this far is part of a connection we diff --git a/ovn-nb.ovsschema b/ovn-nb.ovsschema index 084305b..4e8a279 100644 --- a/ovn-nb.ovsschema +++ b/ovn-nb.ovsschema @@ -1,7 +1,7 @@ { "name": "OVN_Northbound", - "version": "5.17.0", - "cksum": "1128988054 23237", + "version": "5.18.0", + "cksum": "1553853266 23311", "tables": { "NB_Global": { "columns": { @@ -177,6 +177,7 @@ "debug"]]}, "min": 0, "max": 1}}, "meter": {"type": {"key": "string", "min": 0, "max": 1}}, + "label": {"type": {"key": "string", "min": 0, "max": 1}}, "external_ids": { "type": {"key": "string", "value": "string", "min": 0, "max": "unlimited"}}}, diff --git a/ovn-nb.xml b/ovn-nb.xml index d8f3237..57faee4 100644 --- a/ovn-nb.xml +++ b/ovn-nb.xml @@ -1438,6 +1438,18 @@ default, log messages are not rate-limited.

    + + +

    + Associates an identifier with the ACL. + Same value will be written to corresponding connection + tracker entry. Value should be in hex, for example: 0x1234. + This value can help in debugging from connection tracker side, + for example, through this "label" we can backtrack to the ACL rule + which is causing a "leaked" connection. +

    +     + diff --git a/tests/ovn-nbctl.at b/tests/ovn-nbctl.at index 2679f1f..a9766ae 100644 --- a/tests/ovn-nbctl.at +++ b/tests/ovn-nbctl.at @@ -210,19 +210,27 @@ ovn_nbctl_test_acl() { AT_CHECK([ovn-nbctl $2 acl-add $1 from-lport 400 tcp drop]) AT_CHECK([ovn-nbctl $2 acl-add $1 to-lport 300 tcp drop]) AT_CHECK([ovn-nbctl $2 acl-add $1 from-lport 200 ip drop]) - AT_CHECK([ovn-nbctl $2 acl-add $1 to-lport 100 ip drop]) + AT_CHECK([ovn-nbctl $2 --label=0x1234 acl-add $1 to-lport 100 ip drop]) + dnl Add duplicated ACL AT_CHECK([ovn-nbctl $2 acl-add $1 to-lport 100 ip drop], [1], [], [stderr]) AT_CHECK([grep 'already existed' stderr], [0], [ignore]) AT_CHECK([ovn-nbctl $2 --may-exist acl-add $1 to-lport 100 ip drop]) + dnl Add invalid ACL label + AT_CHECK([ovn-nbctl $2 --label=1234 acl-add $1 to-lport 50 ip drop], [1], [], [stderr]) + AT_CHECK([grep 'should start with "0x"' stderr], [0], [ignore]) + + AT_CHECK([ovn-nbctl $2 --label=0xagh acl-add $1 to-lport 50 ip drop], [1], [], [stderr]) + AT_CHECK([grep 'should be in hex format' stderr], [0], [ignore]) + AT_CHECK([ovn-nbctl $2 acl-list $1], [0], [dnl from-lport 600 (udp) drop log() from-lport 400 (tcp) drop from-lport 200 (ip) drop to-lport 500 (udp) drop log(name=test,severity=info) to-lport 300 (tcp) drop - to-lport 100 (ip) drop + to-lport 100 (ip) drop label=0x1234 ]) dnl Delete in one direction. diff --git a/tests/ovn.at b/tests/ovn.at index 042abee..7ecd83d 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -12393,6 +12393,63 @@ AT_CHECK([cat 2.packets], [0], []) AT_CLEANUP +AT_SETUP([ovn -- ACL label]) +AT_KEYWORDS([ovn]) +ovn_start + +net_add n1 + +sim_add hv +as hv +ovs-vsctl add-br br-phys +ovn_attach n1 br-phys 192.168.0.1 +for i in lp1 lp2; do + ovs-vsctl -- add-port br-int $i -- \ + set interface $i external-ids:iface-id=$i \ + options:tx_pcap=hv/$i-tx.pcap \ + options:rxq_pcap=hv/$i-rx.pcap +done + +lp1_mac="f0:00:00:00:00:01" +lp1_ip="192.168.1.2" + +lp2_mac="f0:00:00:00:00:02" +lp2_ip="192.168.1.3" + +ovn-nbctl ls-add lsw0 +ovn-nbctl --wait=sb lsp-add lsw0 lp1 +ovn-nbctl --wait=sb lsp-add lsw0 lp2 +ovn-nbctl lsp-set-addresses lp1 $lp1_mac +ovn-nbctl lsp-set-addresses lp2 $lp2_mac +ovn-nbctl --wait=sb sync + +ovn-nbctl --label=0x1234 acl-add lsw0 to-lport 1000 'tcp.dst==82' allow-related + +ovn-sbctl dump-flows + +# Check logical flow +AT_CHECK([ovn-sbctl dump-flows | grep ls_out_acl | grep "xxreg1 = 0x1234;" | wc -l], [0], [dnl +1 +]) + +AT_CHECK([ovn-sbctl dump-flows | grep ls_out_stateful | grep "ct_label=xxreg1" | wc -l], [0], [dnl +1 +]) + +# Send packet. +packet="inport==\"lp1\" && eth.src==$lp1_mac && eth.dst==$lp2_mac && + ip4 && ip.ttl==64 && ip4.src==$lp1_ip && ip4.dst==$lp2_ip && + tcp && tcp.flags==2 && tcp.src==4362 && tcp.dst==82" +as hv ovs-appctl -t ovn-controller inject-pkt "$packet" + +# Check connection tracker state +AT_CHECK([ovs-appctl dpctl/dump-conntrack | grep labels=0x1234 | wc -l], [0], [dnl +1 +]) + +OVN_CLEANUP([hv]) +AT_CLEANUP + AT_SETUP([ovn -- TTL exceeded]) AT_KEYWORDS([ttl-exceeded]) AT_SKIP_IF([test $HAVE_PYTHON = no]) diff --git a/utilities/ovn-nbctl.c b/utilities/ovn-nbctl.c index 8188948..b74bd8d 100644 --- a/utilities/ovn-nbctl.c +++ b/utilities/ovn-nbctl.c @@ -2088,6 +2088,11 @@ nbctl_acl_list(struct ctl_context *ctx) ds_chomp(&ctx->output, ','); ds_put_cstr(&ctx->output, ")"); } + + if (acl->label) { + ds_put_format(&ctx->output, " label=%s", acl->label); + } + ds_put_cstr(&ctx->output, "\n"); } @@ -2209,6 +2214,23 @@ nbctl_acl_add(struct ctl_context *ctx) nbrec_acl_set_meter(acl, meter); } + /* Label */ + const char *label = shash_find_data(&ctx->options, "--label"); + if (label) { + /* Validate that label is in the hex format (for example: 0x1234) */ + if (strncmp(label, "0x", 2)) { + ctl_error(ctx, "Label: %s, should start with \"0x\"", label); + return; + } + + if (label[strspn(label + 2, "0123456789abcdefABCDEF") + 2]) { + ctl_error(ctx, "Label: %s, should be in hex format", label); + return; + } + + nbrec_acl_set_label(acl, label); + } + /* Check if same acl already exists for the ls/portgroup */ size_t n_acls = pg ? pg->n_acls : ls->n_acls; struct nbrec_acl **acls = pg ? pg->acls : ls->acls; @@ -5640,7 +5662,7 @@ static const struct ctl_command_syntax nbctl_commands[] = { /* acl commands. */ { "acl-add", 5, 6, "{SWITCH | PORTGROUP} DIRECTION PRIORITY MATCH ACTION", NULL, nbctl_acl_add, NULL, - "--log,--may-exist,--type=,--name=,--severity=,--meter=", RW }, + "--log,--may-exist,--type=,--name=,--severity=,--meter=,--label=", RW }, { "acl-del", 1, 4, "{SWITCH | PORTGROUP} [DIRECTION [PRIORITY MATCH]]", NULL, nbctl_acl_del, NULL, "--type=", RW }, { "acl-list", 1, 1, "{SWITCH | PORTGROUP}",