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 BE68EA04B1 for ; Mon, 23 Nov 2020 18:13:43 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B6177C8F4; Mon, 23 Nov 2020 18:13:42 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 224F8C912 for ; Mon, 23 Nov 2020 18:13:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606151617; 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=PESDTRQjl31RbYDal5WqdUKYhx2cLys9UomEgyXB4Is=; b=N6miBECr2n+qvz/DSBo5kVE95khUfhZhA94T0x0ch3k9kLS2GQ1aiT6fTzevg6mHIXijYC VohlazQOa/ka+dWmbDJLJWreeQhk/7Z3Uz5JIu9HMfrWtMiPwChSqI46JbnEF4UmDpwP0h 2rD+Mg/ZmCIepNZHxHKqr0vPLwlh3iM= 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-102-Pc5MxpevPl-pdtAXQyZg7A-1; Mon, 23 Nov 2020 12:13:34 -0500 X-MC-Unique: Pc5MxpevPl-pdtAXQyZg7A-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5B6401034B22; Mon, 23 Nov 2020 17:13:33 +0000 (UTC) Received: from rh.redhat.com (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 740BD60C04; Mon, 23 Nov 2020 17:13:32 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Anatoly Burakov , dpdk stable Date: Mon, 23 Nov 2020 17:12:21 +0000 Message-Id: <20201123171222.79398-29-ktraynor@redhat.com> In-Reply-To: <20201123171222.79398-1-ktraynor@redhat.com> References: <20201123171222.79398-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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" Subject: [dpdk-stable] patch 'malloc: fix style in free list index computation' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/27/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/98b43ae0db82af30b98cd81eba0f5b9b0bdddfcd Thanks. Kevin. --- >From 98b43ae0db82af30b98cd81eba0f5b9b0bdddfcd Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Thu, 12 Nov 2020 17:31:15 +0800 Subject: [PATCH] malloc: fix style in free list index computation [ upstream commit a99d2521a3b8e33c34eb8fdf5719c0e8f0cf07a7 ] Cleanup code style issue reported by kernel checkpatch. As follows: * ERROR:CODE_INDENT: code indent should use tabs where possible * ERROR:SPACING: spaces required around that '?' (ctx:VxE) * WARNING:INDENTED_LABEL: labels should not be indented Fixes: b0489e7bca2f ("malloc: fix linear complexity") Signed-off-by: Yunjian Wang Acked-by: Anatoly Burakov --- lib/librte_eal/common/malloc_elem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/common/malloc_elem.c b/lib/librte_eal/common/malloc_elem.c index 69ff063883..48cdc48756 100644 --- a/lib/librte_eal/common/malloc_elem.c +++ b/lib/librte_eal/common/malloc_elem.c @@ -364,12 +364,12 @@ malloc_elem_free_list_index(size_t size) /* Find next power of 2 >= size. */ - log2 = sizeof(size) * 8 - __builtin_clzl(size-1); + log2 = sizeof(size) * 8 - __builtin_clzl(size - 1); /* Compute freelist index, based on log2(size). */ index = (log2 - MALLOC_MINSIZE_LOG2 + MALLOC_LOG2_INCREMENT - 1) / - MALLOC_LOG2_INCREMENT; + MALLOC_LOG2_INCREMENT; - return index <= RTE_HEAP_NUM_FREELISTS-1? - index: RTE_HEAP_NUM_FREELISTS-1; + return index <= RTE_HEAP_NUM_FREELISTS - 1 ? + index : RTE_HEAP_NUM_FREELISTS - 1; } -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-23 17:10:14.678244606 +0000 +++ 0029-malloc-fix-style-in-free-list-index-computation.patch 2020-11-23 17:10:14.017061612 +0000 @@ -1 +1 @@ -From a99d2521a3b8e33c34eb8fdf5719c0e8f0cf07a7 Mon Sep 17 00:00:00 2001 +From 98b43ae0db82af30b98cd81eba0f5b9b0bdddfcd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a99d2521a3b8e33c34eb8fdf5719c0e8f0cf07a7 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index c70112f84d..c2c9461f1d 100644 +index 69ff063883..48cdc48756 100644 @@ -24 +25 @@ -@@ -392,12 +392,12 @@ malloc_elem_free_list_index(size_t size) +@@ -364,12 +364,12 @@ malloc_elem_free_list_index(size_t size)