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 E4CAEA0527 for ; Wed, 25 Nov 2020 10:03:43 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DF879C95C; Wed, 25 Nov 2020 10:03:42 +0100 (CET) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 7F735C970 for ; Wed, 25 Nov 2020 10:03:41 +0100 (CET) Received: by mail-wm1-f66.google.com with SMTP id p22so1289055wmg.3 for ; Wed, 25 Nov 2020 01:03:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VtmPpruuu59ce6Aj1JnEj4zaDFON6uOtIr8+T2ppUt4=; b=gDdApwM50nkO+uDuiRiAaM73XPizAjeawyeagqf+YlqVYHD36F4/lPUBmGPiHekNY7 z2Qj789tqHGjijL8mbitfVCe5Ij9eiH2NVAmt3M77/gPsYPC24eTCOHAIGp09fw4No9/ lzyKUGl/b4atMRrywzYiC83CTNpMzGfGUshqBcF2Vt+csKCfyrcLrTGfrzQvBJ2PF29i nOSfUHBhHFhZ690k8Fv+jkwQ2Kf98TkRf3ayb+1+xvJ5MSZkFlNfIGnQ8nNGyU+UYibq Hd9fmMwKQ6F9x4ODUCy6Pkuj4SCO3SYVSr3HZQ45pUxNJ5OVCQklBmvxT38DY2FULWNB cxZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VtmPpruuu59ce6Aj1JnEj4zaDFON6uOtIr8+T2ppUt4=; b=sEAxnwOfx/378CpwjO8V4kqzC9hwPW1eG4nBIA/sytimK5UqyntYci6dKPl7qrsO9+ DXxOm6asGsyfpfzgX4oztBjDFoKakI5KRudEpaI5lgEjCKy++JrcKnTX5s79+9muT27o 1wWzQDOBqE+NrLyR4iVo6u2gqNAyNOVBjEiQwz2/aC+DpcxwVB6VenE0R52HrstebrQR 2+9nJ3H+Vdb5Tb03rs2MI0vna2MbXMu5PEiBr1VgaeXzlKxHRgeAUWw5nGJzg9YZGw98 RXlN9GQvcT7dsRVr7Svv6gVIG4ojB4IkdUJz+nehjuX8JeV+9Qqg6tPl5B9Wh3vbP29H TgPQ== X-Gm-Message-State: AOAM533Q8oB0MFQaXlvnXkW1hQZPl9Zin7gT+42nmSVupJA5G71QOTOV V7fToYd8HQ8uJunPpTqVevc= X-Google-Smtp-Source: ABdhPJyEB55i8VRRP1+Mrv7b5vQw2nFhf3fxILzp/Q4EYY9cuBGcfLtZzbpJnYb+IGh3clDfZXKPAg== X-Received: by 2002:a1c:1f08:: with SMTP id f8mr2823429wmf.30.1606295020271; Wed, 25 Nov 2020 01:03:40 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id d17sm3433301wro.62.2020.11.25.01.03.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 01:03:39 -0800 (PST) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Anatoly Burakov , dpdk stable Date: Wed, 25 Nov 2020 09:02:56 +0000 Message-Id: <20201125090258.21457-14-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201125090258.21457-1-luca.boccassi@gmail.com> References: <20201117111416.1961049-42-luca.boccassi@gmail.com> <20201125090258.21457-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'malloc: fix style in free list index computation' has been queued to stable release 19.11.6 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 stable release 19.11.6 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/26/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/6cd180318fe67a6d9fc0d0eb307f38d1a254374b Thanks. Luca Boccassi --- >From 6cd180318fe67a6d9fc0d0eb307f38d1a254374b 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 51cdfc5d59..a0f2d22774 100644 --- a/lib/librte_eal/common/malloc_elem.c +++ b/lib/librte_eal/common/malloc_elem.c @@ -382,14 +382,14 @@ malloc_elem_free_list_index(size_t size) return 0; /* 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.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-24 16:50:37.146359551 +0000 +++ 0014-malloc-fix-style-in-free-list-index-computation.patch 2020-11-24 16:50:36.577496485 +0000 @@ -1 +1 @@ -From a99d2521a3b8e33c34eb8fdf5719c0e8f0cf07a7 Mon Sep 17 00:00:00 2001 +From 6cd180318fe67a6d9fc0d0eb307f38d1a254374b 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 51cdfc5d59..a0f2d22774 100644 @@ -24 +25 @@ -@@ -391,14 +391,14 @@ malloc_elem_free_list_index(size_t size) +@@ -382,14 +382,14 @@ malloc_elem_free_list_index(size_t size)