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 C59B7A04F5 for ; Wed, 11 Dec 2019 22:28:32 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B79871B994; Wed, 11 Dec 2019 22:28:32 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id DD7A31B994 for ; Wed, 11 Dec 2019 22:28:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576099711; 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=KE+8ZU77YRLbqwwhpyycqyyWqKjrD44WIH/31OH7QWQ=; b=V3K6uUFVNgz9Xma+td8RNduJSJsJHt6BLMfE2pFF6s1DlVKvT4eaCsneNtyxNha0V+Ji7S 8dYGHu6oh80KCkbdHF06CNBQIBPpus9JxOSgDMU8fnDyrvpcBi6h4kmAFoH6higPFzi5p3 rN1ygebTYzl9OLOQ0WHvihehPMAcPnE= 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-325-COdH0wgkOjqKba75NL4bBA-1; Wed, 11 Dec 2019 16:28:30 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 33E9418543A4 for ; Wed, 11 Dec 2019 21:28:29 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 449F610013A1; Wed, 11 Dec 2019 21:28:28 +0000 (UTC) From: Kevin Traynor To: Kevin Traynor Cc: David Marchand , dpdk stable Date: Wed, 11 Dec 2019 21:26:23 +0000 Message-Id: <20191211212702.27851-31-ktraynor@redhat.com> In-Reply-To: <20191211212702.27851-1-ktraynor@redhat.com> References: <20191211212702.27851-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: COdH0wgkOjqKba75NL4bBA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'lib: fix log typos' has been queued to LTS release 18.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 LTS release 18.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 12/17/19. 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 rebasi= ng (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/e62ce0a96ac0121554= d84ffbdd9f5baea17c7925 Thanks. Kevin. --- >From e62ce0a96ac0121554d84ffbdd9f5baea17c7925 Mon Sep 17 00:00:00 2001 From: Kevin Traynor Date: Wed, 13 Nov 2019 16:10:14 +0000 Subject: [PATCH] lib: fix log typos [ upstream commit 0411d61fa96093e6c3a2a817ca68ca7ac3019a1d ] Fix these as they are user visible. Found with codespell. Fixes: bacaa2754017 ("eal: add channel for multi-process communication") Fixes: f05e26051c15 ("eal: add IPC asynchronous request") Fixes: 0cbce3a167f1 ("vfio: skip DMA map failure if already mapped") Fixes: 445c6528b55f ("power: common interface for guest and host") Fixes: e6c6dc0f96c8 ("power: add p-state driver compatibility") Fixes: 8f972312b8f4 ("vhost: support vhost-user") Signed-off-by: Kevin Traynor Reviewed-by: David Marchand --- lib/librte_eal/common/eal_common_proc.c | 4 ++-- lib/librte_power/power_acpi_cpufreq.c | 4 ++-- lib/librte_vhost/socket.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/librte_eal/commo= n/eal_common_proc.c index 852e52e02..35e574393 100644 --- a/lib/librte_eal/common/eal_common_proc.c +++ b/lib/librte_eal/common/eal_common_proc.c @@ -273,5 +273,5 @@ read_msg(struct mp_msg_internal *m, struct sockaddr_un = *s) =20 =09if (msglen !=3D buflen || (msgh.msg_flags & (MSG_TRUNC | MSG_CTRUNC))) = { -=09=09RTE_LOG(ERR, EAL, "truncted msg\n"); +=09=09RTE_LOG(ERR, EAL, "truncated msg\n"); =09=09return -1; =09} @@ -1052,5 +1052,5 @@ rte_mp_request_async(struct rte_mp_msg *req, const st= ruct timespec *ts, =20 =09if (gettimeofday(&now, NULL) < 0) { -=09=09RTE_LOG(ERR, EAL, "Faile to get current time\n"); +=09=09RTE_LOG(ERR, EAL, "Failed to get current time\n"); =09=09rte_errno =3D errno; =09=09return -1; diff --git a/lib/librte_power/power_acpi_cpufreq.c b/lib/librte_power/power= _acpi_cpufreq.c index f7d3f9ca9..6051e02d9 100644 --- a/lib/librte_power/power_acpi_cpufreq.c +++ b/lib/librte_power/power_acpi_cpufreq.c @@ -30,5 +30,5 @@ #define FOPEN_OR_ERR_RET(f, retval) do { \ =09=09if ((f) =3D=3D NULL) { \ -=09=09=09RTE_LOG(ERR, POWER, "File not openned\n"); \ +=09=09=09RTE_LOG(ERR, POWER, "File not opened\n"); \ =09=09=09return retval; \ =09=09} \ @@ -109,5 +109,5 @@ set_freq_internal(struct rte_power_info *pi, uint32_t i= dx) =09=09return 0; =20 -=09POWER_DEBUG_TRACE("Freqency[%u] %u to be set for lcore %u\n", +=09POWER_DEBUG_TRACE("Frequency[%u] %u to be set for lcore %u\n", =09=09=09idx, pi->freqs[idx], pi->lcore_id); =09if (fseek(pi->f, 0, SEEK_SET) < 0) { diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c index 9a674956f..5e422335c 100644 --- a/lib/librte_vhost/socket.c +++ b/lib/librte_vhost/socket.c @@ -131,5 +131,5 @@ read_fd_message(int sockfd, char *buf, int buflen, int = *fds, int max_fds, =20 =09if (msgh.msg_flags & (MSG_TRUNC | MSG_CTRUNC)) { -=09=09RTE_LOG(ERR, VHOST_CONFIG, "truncted msg\n"); +=09=09RTE_LOG(ERR, VHOST_CONFIG, "truncated msg\n"); =09=09return -1; =09} --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-11 21:24:15.196356929 +0000 +++ 0031-lib-fix-log-typos.patch=092019-12-11 21:24:12.660651362 +0000 @@ -1 +1 @@ -From 0411d61fa96093e6c3a2a817ca68ca7ac3019a1d Mon Sep 17 00:00:00 2001 +From e62ce0a96ac0121554d84ffbdd9f5baea17c7925 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0411d61fa96093e6c3a2a817ca68ca7ac3019a1d ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -20 +20,0 @@ - lib/librte_eal/linux/eal/eal_vfio.c | 4 ++-- @@ -22 +21,0 @@ - lib/librte_power/power_pstate_cpufreq.c | 6 +++--- @@ -24 +23 @@ - 5 files changed, 10 insertions(+), 10 deletions(-) + 3 files changed, 5 insertions(+), 5 deletions(-) @@ -27 +26 @@ -index cbe8d10fc..935e8fefe 100644 +index 852e52e02..35e574393 100644 @@ -30 +29 @@ -@@ -284,5 +284,5 @@ read_msg(struct mp_msg_internal *m, struct sockaddr_un= *s) +@@ -273,5 +273,5 @@ read_msg(struct mp_msg_internal *m, struct sockaddr_un= *s) @@ -37 +36 @@ -@@ -1072,5 +1072,5 @@ rte_mp_request_async(struct rte_mp_msg *req, const s= truct timespec *ts, +@@ -1052,5 +1052,5 @@ rte_mp_request_async(struct rte_mp_msg *req, const s= truct timespec *ts, @@ -44,18 +42,0 @@ -diff --git a/lib/librte_eal/linux/eal/eal_vfio.c b/lib/librte_eal/linux/ea= l/eal_vfio.c -index 28e10cdc4..95f615c2e 100644 ---- a/lib/librte_eal/linux/eal/eal_vfio.c -+++ b/lib/librte_eal/linux/eal/eal_vfio.c -@@ -1295,5 +1295,5 @@ vfio_type1_dma_mem_map(int vfio_container_fd, uint64= _t vaddr, uint64_t iova, - =09=09=09if (errno =3D=3D EEXIST) { - =09=09=09=09RTE_LOG(DEBUG, EAL, --=09=09=09=09=09" Memory segment is allready mapped," -+=09=09=09=09=09" Memory segment is already mapped," - =09=09=09=09=09" skipping"); - =09=09=09} else { -@@ -1380,5 +1380,5 @@ vfio_spapr_dma_do_map(int vfio_container_fd, uint64_= t vaddr, uint64_t iova, - =09=09=09if (errno =3D=3D EBUSY) { - =09=09=09=09RTE_LOG(DEBUG, EAL, --=09=09=09=09=09" Memory segment is allready mapped," -+=09=09=09=09=09" Memory segment is already mapped," - =09=09=09=09=09" skipping"); - =09=09=09} else { @@ -63 +44 @@ -index 7c386f891..22989244a 100644 +index f7d3f9ca9..6051e02d9 100644 @@ -66 +47 @@ -@@ -31,5 +31,5 @@ +@@ -30,5 +30,5 @@ @@ -73 +54 @@ -@@ -110,5 +110,5 @@ set_freq_internal(struct rte_power_info *pi, uint32_t = idx) +@@ -109,5 +109,5 @@ set_freq_internal(struct rte_power_info *pi, uint32_t = idx) @@ -80,25 +60,0 @@ -diff --git a/lib/librte_power/power_pstate_cpufreq.c b/lib/librte_power/po= wer_pstate_cpufreq.c -index ecbcb3ac9..8f095e0ab 100644 ---- a/lib/librte_power/power_pstate_cpufreq.c -+++ b/lib/librte_power/power_pstate_cpufreq.c -@@ -34,5 +34,5 @@ - #define FOPEN_OR_ERR_RET(f, retval) do { \ - =09=09if ((f) =3D=3D NULL) { \ --=09=09=09RTE_LOG(ERR, POWER, "File not openned\n"); \ -+=09=09=09RTE_LOG(ERR, POWER, "File not opened\n"); \ - =09=09=09return retval; \ - =09=09} \ -@@ -288,5 +288,5 @@ set_freq_internal(struct pstate_power_info *pi, uint32= _t idx) - =09=09} -=20 --=09=09POWER_DEBUG_TRACE("Freqency '%u' to be set for lcore %u\n", -+=09=09POWER_DEBUG_TRACE("Frequency '%u' to be set for lcore %u\n", - =09=09=09=09 target_freq, pi->lcore_id); -=20 -@@ -311,5 +311,5 @@ set_freq_internal(struct pstate_power_info *pi, uint32= _t idx) - =09=09} -=20 --=09=09POWER_DEBUG_TRACE("Freqency '%u' to be set for lcore %u\n", -+=09=09POWER_DEBUG_TRACE("Frequency '%u' to be set for lcore %u\n", - =09=09=09=09 target_freq, pi->lcore_id); -=20 @@ -106 +62 @@ -index a34bc7f9a..ebb2ff6c2 100644 +index 9a674956f..5e422335c 100644 @@ -109 +65 @@ -@@ -133,5 +133,5 @@ read_fd_message(int sockfd, char *buf, int buflen, int= *fds, int max_fds, +@@ -131,5 +131,5 @@ read_fd_message(int sockfd, char *buf, int buflen, int= *fds, int max_fds,