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 35B0FA055A for ; Thu, 27 Feb 2020 10:35:06 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2CA6E1C01; Thu, 27 Feb 2020 10:35:06 +0100 (CET) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 4CA721C01 for ; Thu, 27 Feb 2020 10:35:05 +0100 (CET) Received: by mail-wm1-f65.google.com with SMTP id m10so6544755wmc.0 for ; Thu, 27 Feb 2020 01:35:05 -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=kIb3l7Al9TaYVd2OSzJx6LJxU0HDBt1etpnU17ZS7cQ=; b=GlOEK7qsSAiGOWcKU4i6kwqex1upIqaPg4GYx55H4kCoYryJHxAYzLyeeYDaPTGdtX YrgwSwL64UiIo9+4sZJpjrSlE64/uzhxU105DfyaAgn3Oj8435q0Yk0QXPS3hbAhMaob g7p4r6pUjfQ+3e524adYlMMzl5GI3rpjYQ9cr4A4LS6XYEhgt1tg7yXEXY4gyK+wRC3k ZrxKUYOC3mvMyYppHZna4YUmFJ2SuyNZnONSW+KpLFnKuo2nzzG3QrtN4Fd/6onzeTlW l17ZL1nTgHyeaTDPylQpbREyolJfMj1favmvHyhFSAzAFB+ZZrDX8FVbDT0OtdB2u8Y7 As8w== 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=kIb3l7Al9TaYVd2OSzJx6LJxU0HDBt1etpnU17ZS7cQ=; b=UmwWccXmzZxXsA4U3ty6jquxEpqXCSCIA+9Jm4rqeSLtB5euxLuXrrueTqO7s4QcHR whCUeI9xPez+fg+STn1jgUkNm4rde4OcOM8Xbe/+3gxGqymN89M9TaVwVsri+bhFAlq9 d7GcAoHj+pB/4lmNbRgGEU2/snSuPHTaRv/dPE6osvzvUBB6BTIHOkwic72FsGVEP76y be7P7lIvMOM/vNHxXkor801MSjilvRYqpAaOWkl5pYzCz+BYu9QCjZ77cqTeCUFcJ7w1 KSQ8kevjswD5lJsnycFQLFVEzpzv+qK9pvMNn9baWyaj2Gzjv8yDC/h862tAwksyC4Zr /0hA== X-Gm-Message-State: APjAAAXlMPDVBIgTO67hZzpuytorpoPJpvnnJTXztZX3kcAhb8mQSuaY AJDjIx+IZBzpNA3JUOkJwVs= X-Google-Smtp-Source: APXvYqxgIUUPsWolTqnkOX0Eax7QGjiLkLAREp89Yq41kf1a82a7wG5OCTLEvMDNCKbyjbBFuHKqNA== X-Received: by 2002:a1c:48c1:: with SMTP id v184mr4106605wma.5.1582796104956; Thu, 27 Feb 2020 01:35:04 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t187sm7304062wmt.25.2020.02.27.01.35.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 01:35:04 -0800 (PST) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: Andrew Rybchenko , dpdk stable Date: Thu, 27 Feb 2020 09:33:40 +0000 Message-Id: <20200227093402.17690-20-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200227093402.17690-1-luca.boccassi@gmail.com> References: <20200217174546.25334-54-luca.boccassi@gmail.com> <20200227093402.17690-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/sfc: fix log format specifiers' has been queued to stable release 19.11.1 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/29/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 ee28c99af06906940710a339254063cbb08354e1 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Wed, 19 Feb 2020 14:04:57 +0000 Subject: [PATCH] net/sfc: fix log format specifiers [ upstream commit 6b9a30d9e93da9f6c167249ba4d79fd5470b7e17 ] The format specifier for the 'size_t' format should be '%z'. Also this fix enables compiling PMD for 32bit architecture. Fixes: ba641f207642 ("net/sfc: add init on attach") Fixes: 82faef507608 ("net/sfc: set RSS key and hash types config") Fixes: 7803554a9e38 ("net/sfc: process RSS settings on Rx configure step") Signed-off-by: Ferruh Yigit Reviewed-by: Andrew Rybchenko --- drivers/net/sfc/sfc.c | 2 +- drivers/net/sfc/sfc_ethdev.c | 2 +- drivers/net/sfc/sfc_rx.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c index 141c767f09..c6b514ac2f 100644 --- a/drivers/net/sfc/sfc.c +++ b/drivers/net/sfc/sfc.c @@ -30,7 +30,7 @@ sfc_dma_alloc(const struct sfc_adapter *sa, const char *name, uint16_t id, { const struct rte_memzone *mz; - sfc_log_init(sa, "name=%s id=%u len=%lu socket_id=%d", + sfc_log_init(sa, "name=%s id=%u len=%zu socket_id=%d", name, id, len, socket_id); mz = rte_eth_dma_zone_reserve(sa->eth_dev, name, id, len, diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c index 454b8956a2..098038fbc0 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -1520,7 +1520,7 @@ sfc_dev_rss_hash_update(struct rte_eth_dev *dev, if ((rss_conf->rss_key != NULL) && (rss_conf->rss_key_len != sizeof(rss->key))) { - sfc_err(sa, "RSS key size is wrong (should be %lu)", + sfc_err(sa, "RSS key size is wrong (should be %zu)", sizeof(rss->key)); return -EINVAL; } diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c index 74218296cd..7afd2c8b33 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -1403,7 +1403,7 @@ sfc_rx_process_adv_conf_rss(struct sfc_adapter *sa, if (conf->rss_key != NULL) { if (conf->rss_key_len != sizeof(rss->key)) { - sfc_err(sa, "RSS key size is wrong (should be %lu)", + sfc_err(sa, "RSS key size is wrong (should be %zu)", sizeof(rss->key)); return EINVAL; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-27 09:31:56.487412817 +0000 +++ 0020-net-sfc-fix-log-format-specifiers.patch 2020-02-27 09:31:55.739945903 +0000 @@ -1,8 +1,10 @@ -From 6b9a30d9e93da9f6c167249ba4d79fd5470b7e17 Mon Sep 17 00:00:00 2001 +From ee28c99af06906940710a339254063cbb08354e1 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Wed, 19 Feb 2020 14:04:57 +0000 Subject: [PATCH] net/sfc: fix log format specifiers +[ upstream commit 6b9a30d9e93da9f6c167249ba4d79fd5470b7e17 ] + The format specifier for the 'size_t' format should be '%z'. Also this fix enables compiling PMD for 32bit architecture. @@ -10,7 +12,6 @@ Fixes: ba641f207642 ("net/sfc: add init on attach") Fixes: 82faef507608 ("net/sfc: set RSS key and hash types config") Fixes: 7803554a9e38 ("net/sfc: process RSS settings on Rx configure step") -Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit Reviewed-by: Andrew Rybchenko