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 C0DADA0093 for ; Tue, 19 May 2020 15:08:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B9A421D633; Tue, 19 May 2020 15:08:38 +0200 (CEST) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by dpdk.org (Postfix) with ESMTP id 39D041D687 for ; Tue, 19 May 2020 15:08:37 +0200 (CEST) Received: by mail-wm1-f50.google.com with SMTP id m12so3018822wmc.0 for ; Tue, 19 May 2020 06:08:37 -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=cbC4gKJKYflK535Anq+bcz+6YD2V9fmxeljWu+swFDc=; b=QzLCzSVwS5iK/zGdOjtjnsV+DmZqBnQ3lVuFWhGdFV1LL9Ohafu3bhq0LVyP/DrkOW GITSH0e7uZuNdXuiK5s00ovux7WCJEB63ug3kWtUbzmEb9IHXBet3iCyb8CGJVx0cD0m ndJUbtKGPuhADRmOtaBOTKX7ZseoMZG8wzi8f64t0NFLkrHKqfHiXpe+A/O1imMSYsn/ 3vbb9FaQ8C4LkTLHP+u2Sm51U5E+aBCc0rLRsF/Yd/WmtTt1NeiyhkKxUBOmnwc3iKiY SKDLROyUleY0JU4Wy+jzbAhPW8GfSdY9DnWevCYsu/ZBrUWpDc5bOZHxbvjLKxypKqSM QKxg== 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=cbC4gKJKYflK535Anq+bcz+6YD2V9fmxeljWu+swFDc=; b=MfzQ5gnanmxoMVomSbM1p2lCIuw6dfS1FnJf2EeOAsjTb3j7zChwcUsXGfMgL2vNT2 zIq7EP9s7J/D8EeXspHm+uY21hPHYQkPunj8o8ypme9ufxyJdly+E0JgkbsTPS+BIs9F MakxZzo7M0spfhd0wB7KXABeLJ4P/LmAzVxurkW1mNnFG0o8vvhlHhj0H5uNHGVMXCgG Wj+KC8Sv3o7LSp6bYeaBCrGsBz9TQOF8MCHzvVtHzFjdqt6RhmInGVnK0gRkqDMq3QUn YmkLsl9Rfag+Jiy5eVJF0mFgG0RR2RIH22WA1htG4RgOKE7ASDGMHR/BF1NFnbSGRaQu i2ow== X-Gm-Message-State: AOAM530vPorxkvR2asyvSRjM8BHZIE2O5U5Y/eFIzSvAcVU8GOhoNMHH ii0zB7BKTlRRgzy3B8vXHP0= X-Google-Smtp-Source: ABdhPJy9UUSxZbAwi1yTY5LsUx1ksHp7gWhuGFcHL9UPpe5FBAXsDmnxYyoT7hjuuQyBC+SLWtEl5g== X-Received: by 2002:a1c:80d0:: with SMTP id b199mr5320701wmd.93.1589893716907; Tue, 19 May 2020 06:08:36 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id e22sm21422635wrc.41.2020.05.19.06.08.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:08:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: Heinrich Kuhn , dpdk stable Date: Tue, 19 May 2020 14:03:07 +0100 Message-Id: <20200519130549.112823-52-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/nfp: fix log format specifiers' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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 d027444df507853a6548484dd04cddc2340155e3 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Tue, 3 Mar 2020 13:36:46 +0000 Subject: [PATCH] net/nfp: fix log format specifiers [ upstream commit 735d826e6c19c4ab8025876ee4bfb60a96cdbc34 ] Changing format specifier for the 'size_t' as '%z' and for 'off_t' as '%jd'. Also this fix enables compiling PMD for 32bit architecture. Fixes: 29a62d1476b6 ("net/nfp: add CPP bridge as service") Signed-off-by: Ferruh Yigit Acked-by: Heinrich Kuhn --- drivers/net/nfp/nfp_net.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index 3aafa7f80f..afcf072339 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -3014,7 +3014,7 @@ nfp_cpp_bridge_serve_write(int sockfd, struct nfp_cpp *cpp) size_t count, curlen, totlen = 0; int err = 0; - PMD_CPP_LOG(DEBUG, "%s: offset size %lu, count_size: %lu\n", __func__, + PMD_CPP_LOG(DEBUG, "%s: offset size %zu, count_size: %zu\n", __func__, sizeof(off_t), sizeof(size_t)); /* Reading the count param */ @@ -3033,9 +3033,9 @@ nfp_cpp_bridge_serve_write(int sockfd, struct nfp_cpp *cpp) cpp_id = (offset >> 40) << 8; nfp_offset = offset & ((1ull << 40) - 1); - PMD_CPP_LOG(DEBUG, "%s: count %lu and offset %ld\n", __func__, count, + PMD_CPP_LOG(DEBUG, "%s: count %zu and offset %jd\n", __func__, count, offset); - PMD_CPP_LOG(DEBUG, "%s: cpp_id %08x and nfp_offset %ld\n", __func__, + PMD_CPP_LOG(DEBUG, "%s: cpp_id %08x and nfp_offset %jd\n", __func__, cpp_id, nfp_offset); /* Adjust length if not aligned */ @@ -3067,12 +3067,12 @@ nfp_cpp_bridge_serve_write(int sockfd, struct nfp_cpp *cpp) if (len > sizeof(tmpbuf)) len = sizeof(tmpbuf); - PMD_CPP_LOG(DEBUG, "%s: Receive %u of %lu\n", __func__, + PMD_CPP_LOG(DEBUG, "%s: Receive %u of %zu\n", __func__, len, count); err = recv(sockfd, tmpbuf, len, MSG_WAITALL); if (err != (int)len) { RTE_LOG(ERR, PMD, - "%s: error when receiving, %d of %lu\n", + "%s: error when receiving, %d of %zu\n", __func__, err, count); nfp_cpp_area_release(area); nfp_cpp_area_free(area); @@ -3116,7 +3116,7 @@ nfp_cpp_bridge_serve_read(int sockfd, struct nfp_cpp *cpp) size_t count, curlen, totlen = 0; int err = 0; - PMD_CPP_LOG(DEBUG, "%s: offset size %lu, count_size: %lu\n", __func__, + PMD_CPP_LOG(DEBUG, "%s: offset size %zu, count_size: %zu\n", __func__, sizeof(off_t), sizeof(size_t)); /* Reading the count param */ @@ -3135,9 +3135,9 @@ nfp_cpp_bridge_serve_read(int sockfd, struct nfp_cpp *cpp) cpp_id = (offset >> 40) << 8; nfp_offset = offset & ((1ull << 40) - 1); - PMD_CPP_LOG(DEBUG, "%s: count %lu and offset %ld\n", __func__, count, + PMD_CPP_LOG(DEBUG, "%s: count %zu and offset %jd\n", __func__, count, offset); - PMD_CPP_LOG(DEBUG, "%s: cpp_id %08x and nfp_offset %ld\n", __func__, + PMD_CPP_LOG(DEBUG, "%s: cpp_id %08x and nfp_offset %jd\n", __func__, cpp_id, nfp_offset); /* Adjust length if not aligned */ @@ -3174,13 +3174,13 @@ nfp_cpp_bridge_serve_read(int sockfd, struct nfp_cpp *cpp) nfp_cpp_area_free(area); return -EIO; } - PMD_CPP_LOG(DEBUG, "%s: sending %u of %lu\n", __func__, + PMD_CPP_LOG(DEBUG, "%s: sending %u of %zu\n", __func__, len, count); err = send(sockfd, tmpbuf, len, 0); if (err != (int)len) { RTE_LOG(ERR, PMD, - "%s: error when sending: %d of %lu\n", + "%s: error when sending: %d of %zu\n", __func__, err, count); nfp_cpp_area_release(area); nfp_cpp_area_free(area); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:46.631885138 +0100 +++ 0052-net-nfp-fix-log-format-specifiers.patch 2020-05-19 14:04:44.188647865 +0100 @@ -1,15 +1,16 @@ -From 735d826e6c19c4ab8025876ee4bfb60a96cdbc34 Mon Sep 17 00:00:00 2001 +From d027444df507853a6548484dd04cddc2340155e3 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Tue, 3 Mar 2020 13:36:46 +0000 Subject: [PATCH] net/nfp: fix log format specifiers +[ upstream commit 735d826e6c19c4ab8025876ee4bfb60a96cdbc34 ] + Changing format specifier for the 'size_t' as '%z' and for 'off_t' as '%jd'. Also this fix enables compiling PMD for 32bit architecture. Fixes: 29a62d1476b6 ("net/nfp: add CPP bridge as service") -Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit Acked-by: Heinrich Kuhn @@ -18,7 +19,7 @@ 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c -index 64d9d218d6..bce4d96468 100644 +index 3aafa7f80f..afcf072339 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -3014,7 +3014,7 @@ nfp_cpp_bridge_serve_write(int sockfd, struct nfp_cpp *cpp)