From patchwork Fri Jan 11 00:16:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Sharma X-Patchwork-Id: 1023286 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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="GfNTmh/Q"; 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 43bNjN5LD6z9sLw for ; Fri, 11 Jan 2019 11:17:28 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 4FEBE15A2; Fri, 11 Jan 2019 00:16:43 +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 C20641598 for ; Fri, 11 Jan 2019 00:16:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx0a-002c1b01.pphosted.com (mx0a-002c1b01.pphosted.com [148.163.151.68]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 4621A82C for ; Fri, 11 Jan 2019 00:16:41 +0000 (UTC) Received: from pps.filterd (m0127837.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x0B0FRpH003625 for ; Thu, 10 Jan 2019 16:16:40 -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=xJE+QlJ8QAa2a+/OAYRqjfeO2+8K5wXlTOvt7lAps4U=; b=GfNTmh/Qf3lnIpMQvSeVjYvKoUuXrT4SXUWdOj2nKfROJQf30E3xB7XIjR6ydqAQdyIl Fv7EpNO+4doZbjSnzL8bCgY17rgcBbC7mlyq+yrBlTbtwb405RfhmwZFAu/WfLqZfmTc EGmWQrANnpZItWucHkjG9Jig1tuBhbf8tceKlK+waLhKztUdS5fHNUJEtpV1uTrWIsz7 +dN9MRM9c77sbFEi4aBLNcvo5GHI3wGvpTAa0dzoD2rRd+ja2ghccwPAJNoJGeCg5yrY NRBhBZUvHgOzg577r27c7Au4dSD8DCfLr16a3qXOCCn2Rptm8pR40mFI/hT0YJtBOlhw 3g== Received: from nam02-bl2-obe.outbound.protection.outlook.com (mail-bl2nam02lp2051.outbound.protection.outlook.com [104.47.38.51]) by mx0a-002c1b01.pphosted.com with ESMTP id 2pu4fa7r0b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Thu, 10 Jan 2019 16:16:40 -0800 Received: from MW2PR02MB3899.namprd02.prod.outlook.com (52.132.178.28) by MW2PR02MB3658.namprd02.prod.outlook.com (52.132.177.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1495.8; Fri, 11 Jan 2019 00:16:38 +0000 Received: from MW2PR02MB3899.namprd02.prod.outlook.com ([fe80::a90d:65fc:4096:c260]) by MW2PR02MB3899.namprd02.prod.outlook.com ([fe80::a90d:65fc:4096:c260%5]) with mapi id 15.20.1495.011; Fri, 11 Jan 2019 00:16:38 +0000 From: Ankur Sharma To: "ovs-dev@openvswitch.org" Thread-Topic: [RFC PATCH v1 2/3] OVN ACL: Allow ct_mark and ct_label values to be set from register as well Thread-Index: AQHUqULriDMjU2485E2vzl1/WI8F4Q== Date: Fri, 11 Jan 2019 00:16:38 +0000 Message-ID: <1547165793-14659-3-git-send-email-ankur.sharma@nutanix.com> References: <1547165793-14659-1-git-send-email-ankur.sharma@nutanix.com> In-Reply-To: <1547165793-14659-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: BYAPR08CA0012.namprd08.prod.outlook.com (2603:10b6:a03:100::25) To MW2PR02MB3899.namprd02.prod.outlook.com (2603:10b6:907:4::28) x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [192.146.154.1] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; MW2PR02MB3658; 6:c4xeVhl33jmrfZTCkRTsHtt5hja5StKt3HUqNQXxO3v0OZnunSp19KYTLmC74302YKCakGAk3Am/sosPbrcAiJ2KA3qwZkoFugrsUFuTxzThaJD7fDVXPwmJ0zNeXTrSuWhyL/oXcODsMng+TmV0DOpzjvSeMQJCam/2LcDG4Y34iMzpxtmjHoLDxmZ8wA1BYfv3KbewAniXUAiMd8zMwSHTVB39N1aRhuycmN86w1x8qk1MpmkCd2N20bkWzz3fI1fMhlnvkF/KrbcLt6he9JcipioOTUHoThMEKD3JBG0fyWmazVqej0Fc4rL4w8LNi5jz+BmmoMM9EiZZ4HUVnjq3l/f0xR4I69u+Cj16yatqdKOnFzszAQjA8ZfJcX8tfiCaBN4NdIB7AKHTAvsPX+XcXev8/0o0Hw8oNoetPhPX4DiipwoQjJt9ek6aD6k4lk4G64aNaQki/apMveEhRQ==; 5:XdpC00au6z4PsEMUaJ3rwp8+htD2nZ4sVELEl05oBB6T2c7GJKInJmidZP86ML7Vd97ivHegx4y70ANdPL3HwwMrljfELA8CCrUzmBfiYCJDYNz9uJsVfVQP1a+8eYDHEyM9/9CGPt6Pv4E1a4y7SnynoeCc/94FXgGV5Eh31YV9VwamHeKFJfSk8kwykxChA4xruyAswWw2GGDo0VabiA==; 7:JCX/6ijvLn51BQ403LfgB9zBcgcwTQ1bkNv0/m1OeksY2NYEk611gGVbSwQnC/KJFh4qQax23wxi2x602s2umMqdrxc6EvJXDgVwqq+t/90PVWNwPcNftcFlvPeh+ERqty2iouJqFZDqfkucD1QMHA== x-ms-office365-filtering-correlation-id: 96c1e06d-dd44-4909-3edd-08d6775a0db0 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(2017052603328)(7153060)(7193020); SRVR:MW2PR02MB3658; x-ms-traffictypediagnostic: MW2PR02MB3658: x-microsoft-antispam-prvs: x-forefront-prvs: 09144DB0F7 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(366004)(346002)(136003)(39860400002)(396003)(199004)(189003)(71190400001)(2351001)(102836004)(25786009)(68736007)(2906002)(106356001)(14454004)(53936002)(386003)(446003)(575784001)(5660300001)(11346002)(71200400001)(107886003)(476003)(186003)(6506007)(8936002)(26005)(52116002)(217873002)(256004)(6916009)(76176011)(2616005)(478600001)(105586002)(7736002)(305945005)(97736004)(99286004)(44832011)(8676002)(316002)(6512007)(3846002)(86362001)(486006)(81156014)(6116002)(6486002)(36756003)(66066001)(5640700003)(4326008)(2501003)(6436002)(81166006)(64030200001); DIR:OUT; SFP:1102; SCL:1; SRVR:MW2PR02MB3658; H:MW2PR02MB3899.namprd02.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nutanix.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: w95tHwXvrFKt0suuJS1Sd9Sa5ps/dmvzMr8FmKjUbmb77ae5ZTyGkRPX/zSmjl94ing0YaIqWxK7Yrqsk9iQwkqOiGkDU8GdpVkzP3r+IneZFcob7cV9aio3x3nAAlLg0x+7ZyIlcVtcrYeLW7z1WnUUSwPnq6sR0EsHkrSn4Dj5QdB5owXwUeXsMyzZxwoCew5KsKMScopBJPlA5lTu1tJDOLvmjgHv6vuUQieLOJ2g8HDpBVVyxpZQcbdB6hrmKaMHwqM33bcV/oJdIEftfAxjY0JSsYrmWK8ZLXG+kXuDRn1l5PzlJ9IWPIg6KVFYDP8bziCmJOALkPJGW+KVgrjmUJnBm5jwFuWKDDL4tZu3/DoXFzaQ4BSuMLWf5zi4uaruKd9N0o6gnsUfQfvrINU8pOe4TxuK42NGDfgEO/I= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96c1e06d-dd44-4909-3edd-08d6775a0db0 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Jan 2019 00:16:38.3462 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR02MB3658 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-01-10_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901110000 X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, KHOP_DYNAMIC, RCVD_IN_DNSWL_LOW autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [RFC PATCH v1 2/3] 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 32 bit registers (MFF_REG0 - MFF_REG15) and 128 bit registers (MFF_XXREG0 - MFF_XXREG3) respectively. signed-off-by: Ankur Sharma --- include/ovn/actions.h | 3 +++ ovn/lib/actions.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 70 insertions(+), 6 deletions(-) diff --git a/include/ovn/actions.h b/include/ovn/actions.h index 1c0c67c..58b96a1 100644 --- a/include/ovn/actions.h +++ b/include/ovn/actions.h @@ -24,6 +24,7 @@ #include "openvswitch/dynamic-string.h" #include "openvswitch/hmap.h" #include "openvswitch/uuid.h" +#include "openvswitch/meta-flow.h" #include "util.h" struct expr; @@ -196,8 +197,10 @@ 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; }; /* OVNACT_CT_DNAT, OVNACT_CT_SNAT. */ diff --git a/ovn/lib/actions.c b/ovn/lib/actions.c index 7b7a894..c0c8da7 100644 --- a/ovn/lib/actions.c +++ b/ovn/lib/actions.c @@ -627,8 +627,28 @@ 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) { + + if (mf->id >= MFF_REG0 && mf->id <= MFF_REG15) { + cc->is_ct_mark_reg = true; + cc->ct_mark_reg = mf->id; + } else { + lexer_syntax_error(ctx->lexer, "input: %s, not a 32 bit " + "register", mf->name); + return; + } + } 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); @@ -642,9 +662,28 @@ 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) { + + cc->ct_label_mask = OVS_BE128_MAX; + const struct mf_field *mf = mf_from_name(ctx->lexer->token.s); + if (mf) { + if (mf->id >= MFF_XXREG0 && mf->id <= MFF_XXREG3) { + cc->is_ct_label_reg = true; + cc->ct_label_reg = mf->id; + } else { + lexer_syntax_error(ctx->lexer, "input: %s, not a 128 bit " + "register", mf->name); + return; + } + } 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 { @@ -713,14 +752,36 @@ encode_CT_COMMIT(const struct ovnact_ct_commit *cc, ofpbuf_pull(ofpacts, set_field_offset); 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 (cc->is_ct_mark_reg) { + struct ofpact_reg_move *move = ofpact_put_REG_MOVE(ofpacts); + + move->src.field = mf_from_id(cc->ct_mark_reg); + move->src.ofs = 0; + move->src.n_bits = 32; + move->dst.field = mf_from_id(MFF_CT_MARK); + move->dst.ofs = 0; + move->dst.n_bits = 32; + } else { + 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)) { + if (cc->is_ct_label_reg) { + struct ofpact_reg_move *move = ofpact_put_REG_MOVE(ofpacts); + + move->src.field = mf_from_id(cc->ct_label_reg); + move->src.ofs = 0; + move->src.n_bits = 128; + move->dst.field = mf_from_id(MFF_CT_LABEL); + move->dst.ofs = 0; + move->dst.n_bits = 128; + } else { 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);