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 1CD43A04F0 for ; Tue, 10 Dec 2019 16:01:10 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 120021B13C; Tue, 10 Dec 2019 16:01:10 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 9CF2B1BE82 for ; Tue, 10 Dec 2019 16:01:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990068; 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=N82E9VGbxEKf9xruP0vrymhx5z6Pjk1k+dkWpuaW1F4=; b=XwfE2Ar3Ej3LTSx8mJhecuQdmuldtkgNfAyVboRnvJEDzDvusUFFj1dULkHRsFAmqKoDK8 AZVbJJaw62cG2wEktgxp/F+GnDWvak5v+bdFxTMEqLs7/RvEdMcTVMHLN/Vu4WuaZQ8VXH U3y+jSvZg+mdwr4QG2xY+KjOh17CiC0= 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-366-UWW_4JTyP3utwy3JwPNRmQ-1; Tue, 10 Dec 2019 10:01:04 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DFE44800D53; Tue, 10 Dec 2019 15:01:03 +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 C08BC5D9C5; Tue, 10 Dec 2019 15:01:02 +0000 (UTC) From: Kevin Traynor To: David Christensen Cc: Tiwei Bie , dpdk stable Date: Tue, 10 Dec 2019 14:59:13 +0000 Message-Id: <20191210145937.32755-39-ktraynor@redhat.com> In-Reply-To: <20191210145937.32755-1-ktraynor@redhat.com> References: <20191210145937.32755-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: UWW_4JTyP3utwy3JwPNRmQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'vhost: fix build on RHEL 7.6 for Power' 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/16/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/035fed4684cb38eea4= a406f7d594618b4d99f5b7 Thanks. Kevin. --- >From 035fed4684cb38eea4a406f7d594618b4d99f5b7 Mon Sep 17 00:00:00 2001 From: David Christensen Date: Wed, 14 Aug 2019 13:36:41 -0500 Subject: [PATCH] vhost: fix build on RHEL 7.6 for Power [ upstream commit 4b462021b4c8b3fc4d01839761ed8dfaae4b39e4 ] Use of %llx print formatting causes meson build error on Power systems with RHEL 7.6 and gcc 4.8.5. Replace with PRIx64 macro. Fixes: 9b62e2da1844 ("vhost: register new regions with userfaultfd") Signed-off-by: David Christensen Reviewed-by: Tiwei Bie --- lib/librte_vhost/vhost_user.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 1e148fb45..b5de73b4f 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1207,8 +1207,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev, st= ruct VhostUserMsg *msg, =09=09=09} =09=09=09RTE_LOG(INFO, VHOST_CONFIG, -=09=09=09=09"\t userfaultfd registered for range : %llx - %llx\n", -=09=09=09=09reg_struct.range.start, -=09=09=09=09reg_struct.range.start + -=09=09=09=09reg_struct.range.len - 1); +=09=09=09=09"\t userfaultfd registered for range : " +=09=09=09=09"%" PRIx64 " - %" PRIx64 "\n", +=09=09=09=09(uint64_t)reg_struct.range.start, +=09=09=09=09(uint64_t)reg_struct.range.start + +=09=09=09=09(uint64_t)reg_struct.range.len - 1); #else =09=09=09goto err_mmap; --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:41.722668600 +0000 +++ 0039-vhost-fix-build-on-RHEL-7.6-for-Power.patch=092019-12-10 14:49:39.= 070457432 +0000 @@ -1 +1 @@ -From 4b462021b4c8b3fc4d01839761ed8dfaae4b39e4 Mon Sep 17 00:00:00 2001 +From 035fed4684cb38eea4a406f7d594618b4d99f5b7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4b462021b4c8b3fc4d01839761ed8dfaae4b39e4 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 61ef699ac..2a9fa7c6c 100644 +index 1e148fb45..b5de73b4f 100644 @@ -22 +23 @@ -@@ -1164,8 +1164,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev, s= truct VhostUserMsg *msg, +@@ -1207,8 +1207,9 @@ vhost_user_set_mem_table(struct virtio_net **pdev, s= truct VhostUserMsg *msg,