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 976EFA04F0 for ; Tue, 10 Dec 2019 16:01:17 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8EF421BC25; Tue, 10 Dec 2019 16:01:17 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id DD1FB1BF71 for ; Tue, 10 Dec 2019 16:01:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990075; 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=wB0crArx36LMS08HiEa6TVE4j8yv8v57e6VpQ+sRw78=; b=dJHQX0XMXovwyxjUYH1s/LDhCmhaA8sKjxganexzExHpJWtMmK9cO0N5gKHsBftx1EItNg 41m5Wx1dl4mx7K0xplmWn63A1xxmbcq6ajqRF5AAF4BVu857usYlA5uvid7pv1dI8f2N/2 QrrmGo8eIUE6zrguqJxMnduV09jZb7Y= 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-300-N3wmlN71M9a8wbeM7xxJ6w-1; Tue, 10 Dec 2019 10:01:14 -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 49E1E800D4E; Tue, 10 Dec 2019 15:01:13 +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 5E28E5D9C5; Tue, 10 Dec 2019 15:01:09 +0000 (UTC) From: Kevin Traynor To: Marcin Hajkowski Cc: Maxime Coquelin , Anatoly Burakov , dpdk stable Date: Tue, 10 Dec 2019 14:59:17 +0000 Message-Id: <20191210145937.32755-43-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: N3wmlN71M9a8wbeM7xxJ6w-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'power: fix socket indicator value' 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/69d685054d2787da28= 7b98f81c9855e6eeda230f Thanks. Kevin. --- >From 69d685054d2787da287b98f81c9855e6eeda230f Mon Sep 17 00:00:00 2001 From: Marcin Hajkowski Date: Fri, 27 Sep 2019 09:42:13 +0100 Subject: [PATCH] power: fix socket indicator value [ upstream commit b4b2f84a5970709e7fb060e3bcd4afb7c19b0121 ] Currently 0 is being used for not connected slot indication. This is not consistent with linux doc which identifies 0 as valid (connected) slot, thus modification was done to change it. Fixes: cd0d5547 ("power: vm communication channels in guest") Signed-off-by: Marcin Hajkowski Reviewed-by: Maxime Coquelin Acked-by: Anatoly Burakov --- lib/librte_power/guest_channel.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/librte_power/guest_channel.c b/lib/librte_power/guest_chan= nel.c index c17ea46b4..9cf7d2cb2 100644 --- a/lib/librte_power/guest_channel.c +++ b/lib/librte_power/guest_channel.c @@ -20,5 +20,5 @@ #define RTE_LOGTYPE_GUEST_CHANNEL RTE_LOGTYPE_USER1 =20 -static int global_fds[RTE_MAX_LCORE]; +static int global_fds[RTE_MAX_LCORE] =3D { [0 ... RTE_MAX_LCORE-1] =3D -1 = }; =20 int @@ -36,5 +36,5 @@ guest_channel_host_connect(const char *path, unsigned int= lcore_id) =09} =09/* check if path is already open */ -=09if (global_fds[lcore_id] !=3D 0) { +=09if (global_fds[lcore_id] !=3D -1) { =09=09RTE_LOG(ERR, GUEST_CHANNEL, "Channel(%u) is already open with fd %d\= n", =09=09=09=09lcore_id, global_fds[lcore_id]); @@ -85,5 +85,5 @@ guest_channel_host_connect(const char *path, unsigned int= lcore_id) error: =09close(fd); -=09global_fds[lcore_id] =3D 0; +=09global_fds[lcore_id] =3D -1; =09return -1; } @@ -101,5 +101,5 @@ guest_channel_send_msg(struct channel_packet *pkt, unsi= gned int lcore_id) =09} =20 -=09if (global_fds[lcore_id] =3D=3D 0) { +=09if (global_fds[lcore_id] < 0) { =09=09RTE_LOG(ERR, GUEST_CHANNEL, "Channel is not connected\n"); =09=09return -1; @@ -135,7 +135,7 @@ guest_channel_host_disconnect(unsigned int lcore_id) =09=09return; =09} -=09if (global_fds[lcore_id] =3D=3D 0) +=09if (global_fds[lcore_id] < 0) =09=09return; =09close(global_fds[lcore_id]); -=09global_fds[lcore_id] =3D 0; +=09global_fds[lcore_id] =3D -1; } --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:41.966700696 +0000 +++ 0043-power-fix-socket-indicator-value.patch=092019-12-10 14:49:39.07445= 7357 +0000 @@ -1 +1 @@ -From b4b2f84a5970709e7fb060e3bcd4afb7c19b0121 Mon Sep 17 00:00:00 2001 +From 69d685054d2787da287b98f81c9855e6eeda230f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b4b2f84a5970709e7fb060e3bcd4afb7c19b0121 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org