From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D8013A0540 for ; Wed, 6 Jul 2022 22:36:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D26BA4069D; Wed, 6 Jul 2022 22:36:04 +0200 (CEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id F14E74069D for ; Wed, 6 Jul 2022 22:36:03 +0200 (CEST) Received: by mail-wr1-f41.google.com with SMTP id o4so23615039wrh.3 for ; Wed, 06 Jul 2022 13:36:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2wleuUjL9+nlPGBwmDdUW0gFFGn39KZ2oLTYCBnSXPE=; b=X2zr/47rWT2/Gw2oUs00RdPC9KlhCv4Vtd5j0KlEXLOU+5Yr0ChAxQYMYuUoHAbKZ1 D1Kngnueys0B/lXkV4veKM0MZn/9AgA5ME/OOaB9Q883x/xzNcIfG9sid1YR6NAgzwQ5 5AJbfbVf0duoOhaOKYerFcE9ql3w30lY1BEZJKt2La4ytANk2AFQ2L3zamUkXn2lwYf3 w8/EdPReTEInfer8NcKlD1LHAnH+U8QesEumtwNu/BxgAGTBl0gcWlCwPhD0BLYAKRUn 30OctrGDcaQP3e/LNiT4m5R8fP9prAN/gj3aT8yo0XZVR9TPOQIGgoxD/ESmV5/RwcTG BBYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2wleuUjL9+nlPGBwmDdUW0gFFGn39KZ2oLTYCBnSXPE=; b=AEvmBXb5NPf4gitaYsF9O41nFuuebfIntHKC41H6Pg0lTw8k7dc7Y1CyzQeqHuXlID fy5Szcxe9cq2fSsbB4yoKmQDoGIo5gC3F+Ww5wkQ/wTwUKzDxXunnPnn1AwCtTAAQp43 9zvw3JwMLmXGiVpKDMxF2lXdKhIHpSzTSPnpyL4B4ubJpP7CBmzejszucahOfi9/MUZm gSi6lVSMvtlM92T0GZ2vW0fcOZVtpjjeLBn2VkoMDX941UlI6tR4IAWKwq4TRPiRlWFT +8FPdArqPgmxV6KA1lGoDRU2uDcLZTEelMaFX+qjKKS1GJWoxVxE1LhJFVX5CH3Uzi1e VjTg== X-Gm-Message-State: AJIora/FED0n88CBetRDFc0ubLBp/+DmRDfA6PzlDVEnIyU3PGbOYUkP +Q8Oer/X6Whn2bUSTv9AnqDwRa4HDTe8GQ== X-Google-Smtp-Source: AGRyM1uOScYFx5n7bEiTfSM1WkE7QkHvCxfP7R3t+7BI93CkJ0cSyB9k3qsYBavszro2ycIYLeS3gQ== X-Received: by 2002:a05:6000:1889:b0:21d:28e8:b6a with SMTP id a9-20020a056000188900b0021d28e80b6amr37997926wri.14.1657139763670; Wed, 06 Jul 2022 13:36:03 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id b7-20020a5d45c7000000b0021d6f03b524sm6669055wrs.48.2022.07.06.13.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 13:36:03 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Chenbo Xia , dpdk stable Subject: patch 'vhost: restore device information in log messages' has been queued to stable release 21.11.2 Date: Wed, 6 Jul 2022 21:34:51 +0100 Message-Id: <20220706203506.3422496-16-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220706203506.3422496-1-luca.boccassi@gmail.com> References: <20220628151938.2278711-26-ktraynor@redhat.com> <20220706203506.3422496-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/08/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/c353b1de9ffb95000d021ab6b80e9584fa78012b Thanks. Luca Boccassi --- >From c353b1de9ffb95000d021ab6b80e9584fa78012b Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 1 Jul 2022 09:55:09 +0200 Subject: [PATCH] vhost: restore device information in log messages [ upstream commit bb15129da98aa4cfa34a5a33a443436e5cdb18ea ] device information in the log messages was dropped. Fixes: 52ade97e3641 ("vhost: fix physical address mapping") Signed-off-by: David Marchand Reviewed-by: Chenbo Xia --- lib/vhost/vhost_user.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index ff47247d2b..df780fd7d6 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -174,7 +174,8 @@ async_dma_map(struct virtio_net *dev, bool do_map) return; /* DMA mapping errors won't stop VHOST_USER_SET_MEM_TABLE. */ - VHOST_LOG_CONFIG(ERR, "DMA engine map failed\n"); + VHOST_LOG_CONFIG(ERR, "(%s) DMA engine map failed\n", + dev->ifname); } } @@ -190,7 +191,8 @@ async_dma_map(struct virtio_net *dev, bool do_map) if (rte_errno == EINVAL) return; - VHOST_LOG_CONFIG(ERR, "DMA engine unmap failed\n"); + VHOST_LOG_CONFIG(ERR, "(%s) DMA engine unmap failed\n", + dev->ifname); } } } @@ -990,7 +992,8 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr, dev->max_guest_pages * sizeof(*page), RTE_CACHE_LINE_SIZE); if (dev->guest_pages == NULL) { - VHOST_LOG_CONFIG(ERR, "cannot realloc guest_pages\n"); + VHOST_LOG_CONFIG(ERR, "(%s) cannot realloc guest_pages\n", + dev->ifname); rte_free(old_pages); return -1; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-06 21:07:54.113017809 +0100 +++ 0016-vhost-restore-device-information-in-log-messages.patch 2022-07-06 21:07:53.547518784 +0100 @@ -1 +1 @@ -From bb15129da98aa4cfa34a5a33a443436e5cdb18ea Mon Sep 17 00:00:00 2001 +From c353b1de9ffb95000d021ab6b80e9584fa78012b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bb15129da98aa4cfa34a5a33a443436e5cdb18ea ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index cc03f679a3..4b25512f91 100644 +index ff47247d2b..df780fd7d6 100644 @@ -21 +22 @@ -@@ -144,7 +144,8 @@ async_dma_map(struct virtio_net *dev, bool do_map) +@@ -174,7 +174,8 @@ async_dma_map(struct virtio_net *dev, bool do_map) @@ -31 +32 @@ -@@ -160,7 +161,8 @@ async_dma_map(struct virtio_net *dev, bool do_map) +@@ -190,7 +191,8 @@ async_dma_map(struct virtio_net *dev, bool do_map) @@ -41 +42 @@ -@@ -945,7 +947,8 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr, +@@ -990,7 +992,8 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,