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 D5223A04B1 for ; Thu, 5 Nov 2020 13:41:16 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CC26CC31D; Thu, 5 Nov 2020 13:41:15 +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 CD923C800 for ; Thu, 5 Nov 2020 13:41:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580072; 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=Tj3K9H2LgEhhhAfAfD0SXIMgABKnKjm4K5GTJTKz/zk=; b=LQWBwuzwSuZ7QyfX3YM5aIPVF7Cg9yIdbVZbn9BA/OTVrU2nQnSG5ErV7ut3rNz7IxsUSd ZeWO3tiWhw0WjGLl+CO2ToDape4r1bQXMa89G031Gf9E6zpcb2FseYnXPUJNmrf2wmgGjz TuTYLjCLu0mLsWR/DHyIULfE+Z4UnWE= 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-320-BMk6uSUpOTeJ2fTjTZUxvQ-1; Thu, 05 Nov 2020 07:41:09 -0500 X-MC-Unique: BMk6uSUpOTeJ2fTjTZUxvQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4590F186DD31; Thu, 5 Nov 2020 12:41:08 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id DC15B5C5DE; Thu, 5 Nov 2020 12:41:06 +0000 (UTC) From: Kevin Traynor To: Michal Krawczyk Cc: Igor Chauskin , Guy Tzalik , Stephen Hemminger , dpdk stable Date: Thu, 5 Nov 2020 12:39:28 +0000 Message-Id: <20201105124015.306404-21-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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 'net/ena/base: use min/max macros with type conversion' 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/10/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/a06872eda4afa2edb994217df942053caf33290e Thanks. Kevin. --- >From a06872eda4afa2edb994217df942053caf33290e Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Thu, 17 Sep 2020 07:30:16 +0200 Subject: [PATCH] net/ena/base: use min/max macros with type conversion [ upstream commit 8478f502f844ca0055a313609a58d80d30a0bdfd ] Usage of RTE_MIN(MAX) in ENA_MIN32, ENA_MIN16, ENA_MIN8 (and same for the MAX), was not enough, as the HAL code is assuming that those macros will convert both arguments to the specified uintX_t type. As RTE_MIN(MAX) is using 'typeof' operator, the behavior won't be the same, especially if arguments has different types (and it could cause compilation warnings). To satisfy that, the ENA_MIN_T and ENA_MAX_T macros were added, which are converting both arguments to the type which is being passed as an argument. Fixes: 9ba7981ec992 ("ena: add communication layer for DPDK") Signed-off-by: Michal Krawczyk Reviewed-by: Igor Chauskin Reviewed-by: Guy Tzalik Reviewed-by: Stephen Hemminger --- drivers/net/ena/base/ena_plat_dpdk.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h index 03ea2cd0dd..63d6db5b8a 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h @@ -82,10 +82,12 @@ typedef uint64_t dma_addr_t; #endif -#define ENA_MAX32(x, y) RTE_MAX((x), (y)) -#define ENA_MAX16(x, y) RTE_MAX((x), (y)) -#define ENA_MAX8(x, y) RTE_MAX((x), (y)) -#define ENA_MIN32(x, y) RTE_MIN((x), (y)) -#define ENA_MIN16(x, y) RTE_MIN((x), (y)) -#define ENA_MIN8(x, y) RTE_MIN((x), (y)) +#define ENA_MAX_T(type, x, y) RTE_MAX((type)(x), (type)(y)) +#define ENA_MAX32(x, y) ENA_MAX_T(uint32_t, (x), (y)) +#define ENA_MAX16(x, y) ENA_MAX_T(uint16_t, (x), (y)) +#define ENA_MAX8(x, y) ENA_MAX_T(uint8_t, (x), (y)) +#define ENA_MIN_T(type, x, y) RTE_MIN((type)(x), (type)(y)) +#define ENA_MIN32(x, y) ENA_MIN_T(uint32_t, (x), (y)) +#define ENA_MIN16(x, y) ENA_MIN_T(uint16_t, (x), (y)) +#define ENA_MIN8(x, y) ENA_MIN_T(uint8_t, (x), (y)) #define BITS_PER_LONG_LONG (__SIZEOF_LONG_LONG__ * 8) -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.650330649 +0000 +++ 0021-net-ena-base-use-min-max-macros-with-type-conversion.patch 2020-11-05 12:38:54.181895974 +0000 @@ -1 +1 @@ -From 8478f502f844ca0055a313609a58d80d30a0bdfd Mon Sep 17 00:00:00 2001 +From a06872eda4afa2edb994217df942053caf33290e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8478f502f844ca0055a313609a58d80d30a0bdfd ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index 595967e6e3..ba7a098f59 100644 +index 03ea2cd0dd..63d6db5b8a 100644 @@ -33 +34 @@ -@@ -87,10 +87,12 @@ extern int ena_logtype_com; +@@ -82,10 +82,12 @@ typedef uint64_t dma_addr_t;