From patchwork Thu Oct 11 04:59:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Honnappa Nagarahalli X-Patchwork-Id: 148600 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp1682407lji; Wed, 10 Oct 2018 22:00:11 -0700 (PDT) X-Google-Smtp-Source: ACcGV61tZxkBdsjIIAwplcNDyFq0yd4+pN7YqxTy17n8rCgpZYU5uGzs3dMKzmuXWGNZIGFuGB2P X-Received: by 2002:a17:906:4b0f:: with SMTP id y15-v6mr426318eju.64.1539234011184; Wed, 10 Oct 2018 22:00:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539234011; cv=none; d=google.com; s=arc-20160816; b=XLBnTRoOfAjQCC+7TSsSvb8u1S7wpDEM65rsFD62AHe0+84/X9MditX6TVALQw1Swx l6a5G+5oIHI1V5krD4V3hZ93x5PDFc+0xz8Td2QtExaWJg20pUlC5bslFXHT3xoqTMnh QHq12gMMqarXVNEaAj6PnqyUN0lURqXP2oK/Ktp3cAc7KrZl4OZympHnvtkjXObcHtv9 cYm3ny2IoY742kRq+SAMrFdOKutR8ucBGOmfBq/0evBduKbgLMdQBZsGdnreqKZeRVrj xy46jkvdXMw/MBIJ1maGLlxFp2aPUj9HN+hKiF4ARgrm+/vWFG6cbJUJGNTCIaWrWINZ e9eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:cc:to:from; bh=vOyqsLv5cJiprZLwNLwqDOBFpfVWsVkuqB7P7C7IMos=; b=Q1RXDbiNu64nEY40k4xkKdAbnC3tV/ncnQcZHuCgNBGz3v3GHSpa6NwIn/p5BjrUec w1uQFhsZBxZfeE/Y76walQyX1TyRzOsfqzlCShVmTab7BiO9LnORExvZSy5K6CKRtG00 zXVPrNUcvSadkPPAQh1iSCTYiaP83zPUyNpJNPaWrCR6NqaKCS/ByYx2BcJIO1MGMF+V f3KVYzVCh1ZFZiprJRE0DD6x4K6jr2LvZnoX+tmC1oUJi4B/TZ/ZdLaIWic2gKdue2C7 7LaoXkuNx8w5jDuE7WD1OBWtdUTwkBRXCI8cqMO2dVfqOHJJ81YgSinF/um8WBVGhNjd Qy3Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id b11-v6si7693484edj.131.2018.10.10.22.00.11; Wed, 10 Oct 2018 22:00:11 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9FFBC1B415; Thu, 11 Oct 2018 06:59:50 +0200 (CEST) Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by dpdk.org (Postfix) with ESMTP id 257AD1B3AC for ; Thu, 11 Oct 2018 06:59:46 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9061B7A9; Wed, 10 Oct 2018 21:59:45 -0700 (PDT) Received: from 2p2660v4-1.austin.arm.com (2p2660v4-1.austin.arm.com [10.118.12.190]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 34C803F5B3; Wed, 10 Oct 2018 21:59:45 -0700 (PDT) From: Honnappa Nagarahalli To: bruce.richardson@intel.com, pablo.de.lara.guarch@intel.com Cc: dev@dpdk.org, yipeng1.wang@intel.com, honnappa.nagarahalli@arm.com, Dharmik.Thakkar@arm.com, nd@arm.com Date: Wed, 10 Oct 2018 23:59:28 -0500 Message-Id: <1539233972-49860-4-git-send-email-honnappa.nagarahalli@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539233972-49860-1-git-send-email-honnappa.nagarahalli@arm.com> References: <1539233972-49860-1-git-send-email-honnappa.nagarahalli@arm.com> Subject: [dpdk-dev] [PATCH v2 3/7] hash: correct key store element alignment X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Correct the key store array element alignment. This is required to make 'pdata' in 'struct rte_hash_key' align on the correct boundary. Signed-off-by: Honnappa Nagarahalli Reviewed-by: Gavin Hu Reviewed-by: Ola Liljedahl Reviewed-by: Steve Capper --- lib/librte_hash/rte_cuckoo_hash.c | 4 +++- lib/librte_hash/rte_cuckoo_hash.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/lib/librte_hash/rte_cuckoo_hash.c b/lib/librte_hash/rte_cuckoo_hash.c index 50d632e..f3e95f2 100644 --- a/lib/librte_hash/rte_cuckoo_hash.c +++ b/lib/librte_hash/rte_cuckoo_hash.c @@ -196,7 +196,9 @@ rte_hash_create(const struct rte_hash_parameters *params) goto err_unlock; } - const uint32_t key_entry_size = sizeof(struct rte_hash_key) + params->key_len; + const uint32_t key_entry_size = + RTE_ALIGN(sizeof(struct rte_hash_key) + params->key_len, + KEY_ALIGNMENT); const uint64_t key_tbl_size = (uint64_t) key_entry_size * num_key_slots; k = rte_zmalloc_socket(NULL, key_tbl_size, diff --git a/lib/librte_hash/rte_cuckoo_hash.h b/lib/librte_hash/rte_cuckoo_hash.h index 8627c80..a44c6be 100644 --- a/lib/librte_hash/rte_cuckoo_hash.h +++ b/lib/librte_hash/rte_cuckoo_hash.h @@ -125,7 +125,7 @@ struct rte_hash_key { }; /* Variable key size */ char key[0]; -} __attribute__((aligned(KEY_ALIGNMENT))); +}; /* All different signature compare functions */ enum rte_hash_sig_compare_function {