From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4BD5EA0555 for ; Thu, 9 Jun 2022 13:37:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 46AB2427F9; Thu, 9 Jun 2022 13:37:26 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 9065640220 for ; Thu, 9 Jun 2022 13:37:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654774643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2WABfFGyDUpxpW2tis1ZRSBVeRUsaX2TddCkT/ZITSU=; b=C8iceuzh5S4zEWVoULWZrepKv7HQWvgKgx1uIFbCJJd/5dQGoLvOO9bXeNj04UEP1lrVps Cmd+z3+dMmTKkZjVzPjozH7ga2YgKr/XFT/glNmAk1zojcIEl1n9WnASPCz4o94qFcGJoJ LSDXy14m9GcBtS+SwLMSxodqxMmYpuI= 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-371-krqZlB79MCetrGtjfj_CMw-1; Thu, 09 Jun 2022 07:37:17 -0400 X-MC-Unique: krqZlB79MCetrGtjfj_CMw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7B9FC185A7A4; Thu, 9 Jun 2022 11:37:17 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id A93A918EA6; Thu, 9 Jun 2022 11:37:16 +0000 (UTC) From: Kevin Traynor To: Konstantin Ananyev Cc: Ido Goshen , dpdk stable Subject: patch 'acl: fix rules with 8-byte field size' has been queued to stable release 21.11.2 Date: Thu, 9 Jun 2022 12:35:52 +0100 Message-Id: <20220609113701.386938-5-ktraynor@redhat.com> In-Reply-To: <20220609113701.386938-1-ktraynor@redhat.com> References: <20220609113701.386938-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/13/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/7bbf330ca1699c46309144027c93471a18929eec Thanks. Kevin --- >From 7bbf330ca1699c46309144027c93471a18929eec Mon Sep 17 00:00:00 2001 From: Konstantin Ananyev Date: Sun, 15 May 2022 21:03:18 +0100 Subject: [PATCH] acl: fix rules with 8-byte field size [ upstream commit 451098159c2209bc5c395a30d2dae325af93e8c2 ] In theory ACL library allows fields with 8B long. Though in practice they usually not used, not tested, and as was revealed by Ido, this functionality is not working properly. There are few places inside ACL build code-path that need to be addressed. Bugzilla ID: 673 Fixes: dc276b5780c2 ("acl: new library") Reported-by: Ido Goshen Signed-off-by: Konstantin Ananyev Tested-by: Ido Goshen --- lib/acl/acl_bld.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/acl/acl_bld.c b/lib/acl/acl_bld.c index 7ea30f4186..2816632803 100644 --- a/lib/acl/acl_bld.c +++ b/lib/acl/acl_bld.c @@ -13,4 +13,7 @@ #define ACL_PTR_ALLOC 32 +/* account for situation when all fields are 8B long */ +#define ACL_MAX_INDEXES (2 * RTE_ACL_MAX_FIELDS) + /* macros for dividing rule sets heuristics */ #define NODE_MAX 0x4000 @@ -81,5 +84,5 @@ struct acl_build_context { struct rte_acl_trie tries[RTE_ACL_MAX_TRIES]; struct rte_acl_bld_trie bld_tries[RTE_ACL_MAX_TRIES]; - uint32_t data_indexes[RTE_ACL_MAX_TRIES][RTE_ACL_MAX_FIELDS]; + uint32_t data_indexes[RTE_ACL_MAX_TRIES][ACL_MAX_INDEXES]; /* memory free lists for nodes and blocks used for node ptrs */ @@ -989,5 +992,5 @@ build_trie(struct acl_build_context *context, struct rte_acl_build_rule *head, uint64_t mask; mask = RTE_ACL_MASKLEN_TO_BITMASK( - fld->mask_range.u32, + fld->mask_range.u64, rule->config->defs[n].size); @@ -1302,4 +1305,7 @@ acl_build_index(const struct rte_acl_config *config, uint32_t *data_index) last_header = config->defs[n].input_index; data_index[m++] = config->defs[n].offset; + if (config->defs[n].size > sizeof(uint32_t)) + data_index[m++] = config->defs[n].offset + + sizeof(uint32_t); } } @@ -1488,5 +1494,5 @@ acl_set_data_indexes(struct rte_acl_ctx *ctx) n * sizeof(ctx->data_indexes[0])); ctx->trie[i].data_index = ctx->data_indexes + ofs; - ofs += RTE_ACL_MAX_FIELDS; + ofs += ACL_MAX_INDEXES; } } @@ -1644,5 +1650,5 @@ rte_acl_build(struct rte_acl_ctx *ctx, const struct rte_acl_config *cfg) rc = rte_acl_gen(ctx, bcx.tries, bcx.bld_tries, bcx.num_tries, bcx.cfg.num_categories, - RTE_ACL_MAX_FIELDS * RTE_DIM(bcx.tries) * + ACL_MAX_INDEXES * RTE_DIM(bcx.tries) * sizeof(ctx->data_indexes[0]), max_size); if (rc == 0) { -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-09 12:34:29.913213048 +0100 +++ 0005-acl-fix-rules-with-8-byte-field-size.patch 2022-06-09 12:34:29.611980412 +0100 @@ -1 +1 @@ -From 451098159c2209bc5c395a30d2dae325af93e8c2 Mon Sep 17 00:00:00 2001 +From 7bbf330ca1699c46309144027c93471a18929eec Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 451098159c2209bc5c395a30d2dae325af93e8c2 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org