From patchwork Fri Oct 26 05:37:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Honnappa Nagarahalli X-Patchwork-Id: 149579 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp341633ljp; Thu, 25 Oct 2018 22:38:07 -0700 (PDT) X-Google-Smtp-Source: AJdET5ehOymJJXL1z9qSj6FZcgUvjuZ56PDbbfcaSJ4GfNvJaFUBZsrCwOVwwDBHiVhTv/8RjIzc X-Received: by 2002:a1c:5e07:: with SMTP id s7-v6mr4048879wmb.91.1540532287898; Thu, 25 Oct 2018 22:38:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540532287; cv=none; d=google.com; s=arc-20160816; b=bir4zPYR2QZk+QshUDm91Bnvjw0Gfy60FickiUHcw2R5aIR2XDVNcrv0cDUF6HgsiH pd73/sW5nix1t7NU5uGuyn9h/zd0I7e8gEteHg5UtLu+9JJmS+plzbb9cUpxytPjB++m 2x6HDiyjYDbJHDerF7I6772MXeic1UTpUOiEXOgks87ptUF4C12O+Vwv4/5hNKVtiM6E Q8P4zTQGbCzGvVUu1ILz05xnNjpiCT1VxhZMCwtmiQQTvDVyVfJafLp2pjvftMXd8QJ/ TV387mq83nX/jP5Sc5w/czK7YRMeL3JtZ4pDQt/Utm6PxWPVGEWUaBOECf59PP3Y57EX S3+A== 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=BiteWHIZHdPmLavF0MhHZEISfdoAcQOmJORoPLXTkeU=; b=EJXim+wsnIUzRLv39kCATLeFGLnmA6ogNJtaLxwt2e1/bZ3DdLzRACxpXmc4htL5VN +feoJR+LoIrK6vaq+w2WxNDCp4odawJDMUd6kQZ0/dF2RGDe4sEFyrcDeRxayKpW3j1g uMSLb5A+RHiKhKuQt4YoDdZ/IkilgcX8CT4NBD8rw0QiuaD6Osta1RINm6+vn6ZHyioR mxJP5N0WCAzFYI2nl2no7vR+CfJWFtvHuHrEenaEFE56+sJSWU/50H7ttCogIeU/NwtK AAXa3/gUzgSX5+FwK9e/eJnUag2ajq+p9dvdjCOe0C3KjMueN5G/fT8ongZsxJsSaIBo iGnQ== 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 t9-v6si7559047wrq.111.2018.10.25.22.38.07; Thu, 25 Oct 2018 22:38:07 -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 B7A417D4A; Fri, 26 Oct 2018 07:37:53 +0200 (CEST) Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by dpdk.org (Postfix) with ESMTP id 3A93B58EC; Fri, 26 Oct 2018 07:37:45 +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 8EA91165C; Thu, 25 Oct 2018 22:37:44 -0700 (PDT) Received: from 2p2660v4-1.austin.arm.com (2p2660v4-1.austin.arm.com [10.118.14.139]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 205C03F71D; Thu, 25 Oct 2018 22:37:44 -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, gavin.hu@arm.com, nd@arm.com, stable@dpdk.org Date: Fri, 26 Oct 2018 00:37:31 -0500 Message-Id: <1540532253-112591-4-git-send-email-honnappa.nagarahalli@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1540532253-112591-1-git-send-email-honnappa.nagarahalli@arm.com> References: <1540532253-112591-1-git-send-email-honnappa.nagarahalli@arm.com> Subject: [dpdk-dev] [PATCH v7 3/5] hash: fix 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" Fix the key store array element alignment such that every array element is aligned on KEY_ALIGNMENT boundary. This is required to make 'pdata' in 'struct rte_hash_key' align on its natural boundary for atomic load/store. Fixes: 473d1bebce43 ("hash: allow to store data in hash table") Cc: stable@dpdk.org Signed-off-by: Honnappa Nagarahalli Reviewed-by: Gavin Hu Reviewed-by: Ola Liljedahl Reviewed-by: Steve Capper Reviewed-by: Yipeng Wang Acked-by: Bruce Richardson --- 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 e087393..d79ba68 100644 --- a/lib/librte_hash/rte_cuckoo_hash.c +++ b/lib/librte_hash/rte_cuckoo_hash.c @@ -279,7 +279,9 @@ rte_hash_create(const struct rte_hash_parameters *params) rte_ring_sp_enqueue(r_ext, (void *)((uintptr_t) i)); } - 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 ff95181..601b2ce 100644 --- a/lib/librte_hash/rte_cuckoo_hash.h +++ b/lib/librte_hash/rte_cuckoo_hash.h @@ -123,7 +123,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 {