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 8FA64A04DD for ; Wed, 28 Oct 2020 11:49:34 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8871B2C2A; Wed, 28 Oct 2020 11:49:33 +0100 (CET) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id D5ADEC9D6 for ; Wed, 28 Oct 2020 11:49:29 +0100 (CET) Received: by mail-wr1-f67.google.com with SMTP id t9so5117352wrq.11 for ; Wed, 28 Oct 2020 03:49:29 -0700 (PDT) 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=iU2BAE9RSDsHZ+rHbqPASwhuHVSElEO1zJoDcquVKrI=; b=GD/p/8kJ6txEoCJcQEm/UI0B8rZwMmseQgQcbGq7MyRW3cgSoA/Wq3ZfncoQ7DawFa AJOGQ2WH86pDMKCmrhRro9GT+7paIyAVFaVbjmjuBYWVDVacwiQZyA7qv5SyDRQMw5Ru b314yB+fa8WxzrWa2Es4vbioFLDozXJZpqbBTIiLSCDc4QTKaecRVT4W1UvkiJdq4LtY NviPitszYlAnCYGqMJ5tQZiJrcRtwsuNXjzr2i3dzI7RfkL5rB3PFgQeJ2VFmAAJ5eHW nr0voYIvjuAbeBj4jm21E866Ab3jG0i19v0yM+WqR/qO2ao6BA2+s/kqCO1nVYd9ngLj KSLw== 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=iU2BAE9RSDsHZ+rHbqPASwhuHVSElEO1zJoDcquVKrI=; b=q8REks4e1W95DfI4KVwMRaAY+mZNwZUXLHcB6ltVBgqfOW2RPMNqCN0atG6FIwWrHM 0wQ/7PhJRTB8cps77kX9udpm54anmXJ/Z+Vrs2btgS6XeFO5KRYxHe/OHUybw3SVGSg7 +oDf1cbBt+4ExQEslPVOm9uHzWKmdbaRhlKbPvIsIbkQ6KJc/9QvKprNNOXrY4v/MiEv Z2zwos8qJZvvtpBRDCfkJxlG4STeev58Vg69JuHn/VKoiPddADV2Frt4CMuTe4dm7oUD yxc5wJPWwTr35CgwJXQ8PRai4V8bkrLDbeABeSK3r3ycn+fYMqNmaVxS/8Xq0cweBTuq +ghg== X-Gm-Message-State: AOAM531jX9uDbmRs0bbgpLAIMJfxVmL2s9ha5pJYgv8ip5ICzUxxewyc F9h3brNfUl/JJIDbGpr9kd8/M0Jy3fR/pVhD X-Google-Smtp-Source: ABdhPJxjjAN9FBvPrh31xMpCRXK9qr0EtOEUeVrqt/5cbSgarYCO1t7xvxYn1CBWK8WhAsxNifvx6A== X-Received: by 2002:adf:ed07:: with SMTP id a7mr8541157wro.326.1603882169619; Wed, 28 Oct 2020 03:49:29 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i126sm6094439wmi.0.2020.10.28.03.49.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:49:29 -0700 (PDT) From: luca.boccassi@gmail.com To: Michal Krawczyk Cc: Igor Chauskin , Guy Tzalik , Stephen Hemminger , dpdk stable Date: Wed, 28 Oct 2020 10:43:44 +0000 Message-Id: <20201028104606.3504127-65-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ena/base: use min/max macros with type conversion' 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 10/30/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. Thanks. Luca Boccassi --- >From cd266c8c5572699f8496bd05b3b142ef6f0ddce8 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 da97efca46..2090e34adf 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h @@ -85,12 +85,14 @@ extern int ena_logtype_com; #define ENA_ASSERT(cond, format, arg...) do {} while (0) #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) #define U64_C(x) x ## ULL -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:13.788652801 +0000 +++ 0065-net-ena-base-use-min-max-macros-with-type-conversion.patch 2020-10-28 10:35:11.536830495 +0000 @@ -1,8 +1,10 @@ -From 8478f502f844ca0055a313609a58d80d30a0bdfd Mon Sep 17 00:00:00 2001 +From cd266c8c5572699f8496bd05b3b142ef6f0ddce8 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. @@ -16,7 +18,6 @@ argument. Fixes: 9ba7981ec992 ("ena: add communication layer for DPDK") -Cc: stable@dpdk.org Signed-off-by: Michal Krawczyk Reviewed-by: Igor Chauskin @@ -27,10 +28,10 @@ 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 595967e6e3..ba7a098f59 100644 +index da97efca46..2090e34adf 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h -@@ -86,12 +86,14 @@ extern int ena_logtype_com; +@@ -85,12 +85,14 @@ extern int ena_logtype_com; #define ENA_ASSERT(cond, format, arg...) do {} while (0) #endif