From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id F1D4AA00C3; Fri, 15 May 2020 21:18:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 72F811DB2C; Fri, 15 May 2020 21:18:09 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id F1E361DB1C for ; Fri, 15 May 2020 21:18:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589570287; 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:autocrypt:autocrypt; bh=vHrVTP1hPvUQ8bExx1q9rUoaODd6Ov6GS53JHJYhVqg=; b=XwDdgAE5SoR5U46U6q+FPZLE8HNMbcdYVMiIVbzxVKHp0cmbgk8Vc3/s2bGr3Cs63Pqvnq Q3pkzPoG0OMqLVuKH2pLFXOrm15DGids7f+rRpK+xkt7CfzZITv5GLD1PKMOQhj4CgoXM8 l5s+wslPwdZ4Nl7KZsMH/s1dbxnFQVc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-419-AZ5NVjS3PRuldwz3cBr1zQ-1; Fri, 15 May 2020 15:18:03 -0400 X-MC-Unique: AZ5NVjS3PRuldwz3cBr1zQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 626038005AD; Fri, 15 May 2020 19:18:02 +0000 (UTC) Received: from [10.33.36.145] (unknown [10.33.36.145]) by smtp.corp.redhat.com (Postfix) with ESMTP id 798B478B22; Fri, 15 May 2020 19:17:57 +0000 (UTC) To: "Wang, Yipeng1" , "dev@dpdk.org" , "Gobriel, Sameh" , "Richardson, Bruce" Cc: "honnappa.nagarahalli@arm.com" , "Yigit, Ferruh" , "david.marchand@redhat.com" , "stable@dpdk.org" References: <20200515142808.14064-1-ktraynor@redhat.com> From: Kevin Traynor Autocrypt: addr=ktraynor@redhat.com; keydata= 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 Message-ID: <5dfbc47f-93eb-cc49-98eb-7c3375e08cae@redhat.com> Date: Fri, 15 May 2020 20:17:56 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-dev] [PATCH] hash: fix gcc 10 maybe-uninitialized warning 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" On 15/05/2020 20:06, Wang, Yipeng1 wrote: >> -----Original Message----- >> From: Kevin Traynor >> Sent: Friday, May 15, 2020 7:28 AM >> To: dev@dpdk.org; Wang, Yipeng1 ; Gobriel, >> Sameh ; Richardson, Bruce >> >> Cc: honnappa.nagarahalli@arm.com; Yigit, Ferruh ; >> david.marchand@redhat.com; Kevin Traynor ; >> stable@dpdk.org >> Subject: [PATCH] hash: fix gcc 10 maybe-uninitialized warning >> >> gcc 10.1.1 reports a warning for the ext_bkt_id variable: >> >> ../lib/librte_hash/rte_cuckoo_hash.c: >> In function ‘__rte_hash_add_key_with_hash’: >> ../lib/librte_hash/rte_cuckoo_hash.c:1104:29: >> warning: ‘ext_bkt_id’ may be used uninitialized in this function [-Wmaybe- >> uninitialized] >> 1104 | (h->buckets_ext[ext_bkt_id - 1]).sig_current[0] = short_sig; >> | ~~~~~~~~~~~^~~ >> >> The return value of rte_ring_sc_dequeue_elem() is already checked, but >> also initialize ext_bkt_id to zero (invalid value) and check that it also >> overwritten. >> >> Fixes: fbfe568103b0 ("hash: use 32-bit elements rings to save memory") >> Cc: stable@dpdk.org >> >> Signed-off-by: Kevin Traynor >> --- >> lib/librte_hash/rte_cuckoo_hash.c | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/lib/librte_hash/rte_cuckoo_hash.c >> b/lib/librte_hash/rte_cuckoo_hash.c >> index 38767a8a1..90cb99b0e 100644 >> --- a/lib/librte_hash/rte_cuckoo_hash.c >> +++ b/lib/librte_hash/rte_cuckoo_hash.c >> @@ -940,6 +940,6 @@ __rte_hash_add_key_with_hash(const struct >> rte_hash *h, const void *key, >> struct rte_hash_bucket *prim_bkt, *sec_bkt, *cur_bkt; >> struct rte_hash_key *new_k, *keys = h->key_store; >> + uint32_t ext_bkt_id = 0; >> uint32_t slot_id; >> - uint32_t ext_bkt_id; >> int ret; >> unsigned n_slots; >> @@ -1096,5 +1096,6 @@ __rte_hash_add_key_with_hash(const struct >> rte_hash *h, const void *key, >> */ >> if (rte_ring_sc_dequeue_elem(h->free_ext_bkts, &ext_bkt_id, >> - sizeof(uint32_t)) != 0) { >> + sizeof(uint32_t)) != 0 || >> + ext_bkt_id == 0) { > [Wang, Yipeng] > If convenient, it would be better to make the two lines aligned with same indent... > Hi Yipeng, I had checked the coding style [1] about this and I think it's correct as 'sizeof..' is a wrap from the first condition so gets a second tab to indicate that, whereas 'ext_bkt_id..' is the second condition with no wrap. Fine to change it, if I interpret incorrectly. [1] third bullet, http://doc.dpdk.org/guides/contributing/coding_style.html#general >> ret = -ENOSPC; >> goto failure; >> -- >> 2.21.3 > [Wang, Yipeng] > Thanks for the fix. I think It is also better code in general. > > Acked-by: Yipeng Wang >