From patchwork Thu Oct 18 03:37:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Honnappa Nagarahalli X-Patchwork-Id: 149084 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp1453653lji; Wed, 17 Oct 2018 20:38:41 -0700 (PDT) X-Google-Smtp-Source: ACcGV62I3Gu7Jrgg8CIUdkta/w9Qd6jn/YZtQ0gCWGZ3wb4AhDRE8JBh5EqGiKGNBsLaIgiHWcFC X-Received: by 2002:adf:f08a:: with SMTP id n10-v6mr913912wro.15.1539833921204; Wed, 17 Oct 2018 20:38:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539833921; cv=none; d=google.com; s=arc-20160816; b=eMwx8n7vmaZAWYhBmeQEhyN6QrgSGxaphpNyjCDMxDOFinNltW2bcw67L3Yx2j05yB KD5XoLaipLEj9I8v3s5jgIUhpIL2uI+VBIMdmE+aWXQ/iJoSzpeslJIEMBo3MOf4e4Xt zIyP23Hwrk0/urIa5RlUTdC3/e46BcmgPLyE6YT2GSNxeVWWtUDxPVAz5rTlWBKcuU/x h6dg4i861STHqWyaXgnD0Re4FlKp/HfBLZYCzqJHwtcPA6quN1HluV0CgNSPqXDVJW+R Fk471Y/ks3doT6QcdiQ2sA36BC2vuKMf8p1iI1JSCjHRWNfro1Mhm1Y+Zj2wV8uHRgGE s4VA== 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=6enSbH+9B0DfQ/Vw9+vWdqMJj8yvIziMFtGVW3QL9kw=; b=rc0EGSq+JIVvXSGVhBewKH49igWupvTp93+o1hilD6IXbdka5A+I3m8xNHPaUz8Q8/ XhjsPFk9RKJiDCCvOccWVGwN41PVrG+dBqoSg88jgsddeJNlDseFzBf/tBtfQ4sz/CSr zsUX3g/msKxQdEWq5Gz1NgGbIYe5z/n4CThI/Dy0s4LV5orwG8wCe48iTgHv2MfsEYiY rd6swC6h/xp1ugxSiXi214yEzZcFptwvIHhXirnVlYl6kOQSNKNzWpuVokn3OMtY0ItP 0pRZyUwT0KIiY4OY10GuOQSbkmyEIIWsF2EKPKuqZP0AoYbh7waz7B4rTs+qZrhfi9R5 /vRA== 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 t12-v6si2996516wmi.101.2018.10.17.20.38.40; Wed, 17 Oct 2018 20:38:41 -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 4CF3E1B123; Thu, 18 Oct 2018 05:38:20 +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 6DD035F3B for ; Thu, 18 Oct 2018 05:38:15 +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 9E923EBD; Wed, 17 Oct 2018 20:38:14 -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 38DC93F5D3; Wed, 17 Oct 2018 20:38:14 -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, gavin.hu@arm.com, dharmik.thakkar@arm.com, nd@arm.com Date: Wed, 17 Oct 2018 22:37:59 -0500 Message-Id: <1539833881-589-4-git-send-email-honnappa.nagarahalli@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539833881-589-1-git-send-email-honnappa.nagarahalli@arm.com> References: <1539833881-589-1-git-send-email-honnappa.nagarahalli@arm.com> Subject: [dpdk-dev] [PATCH v4 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: Pablo de Lara Signed-off-by: Honnappa Nagarahalli Reviewed-by: Gavin Hu Reviewed-by: Ola Liljedahl Reviewed-by: Steve Capper Reviewed-by: Yipeng Wang --- 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 05eab60..a539531 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 {