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 0CDBBA0524 for ; Fri, 5 Feb 2021 12:35:47 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 06FFD4067B; Fri, 5 Feb 2021 12:35:47 +0100 (CET) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mails.dpdk.org (Postfix) with ESMTP id C7E4F4067B for ; Fri, 5 Feb 2021 12:35:45 +0100 (CET) Received: by mail-wr1-f43.google.com with SMTP id m13so7277195wro.12 for ; Fri, 05 Feb 2021 03:35:45 -0800 (PST) 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=ZBFWKdAzcNrS/BT5W579ZZmiCWIOccmJLNTjeBpuJgA=; b=CsP1RC6eUd6mpqaKt4S1mYfVr3e5fs7O/Z1YPjEzRPcAxug4VZw7u/5cwBRzutBhCo sdFrO7SQico/TkqmCTPB4mBHjNYFQtYFyon3eM2NrSp5EGKKgNegVv7I6Ni7vuEmNfaT LVyTR8sZmKDmtEI5VNPEUUoJOsLvz1m5epKmjLoHVwyDhBL2Iz83FTb5ggxzxq7EiIwX YEU0+loOHSoC2MuHlwQngZNjWPlfXE2hxXncnh3aWJP3FxdNM6w//sPIFywbW9A+/N4j WN1i0q0TS0+ScZozi4ZZx6sHQSAKGvtYFlex+3zRV1j41tEfAZ9hSKwPZQuXD+fVOW3d UrCA== 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=ZBFWKdAzcNrS/BT5W579ZZmiCWIOccmJLNTjeBpuJgA=; b=unQCeKnl6KR/ubMqs447UcuntAZC6jxRiUcvFgrcKEhuF8ImFbnwaJSFpZuRIGUgGF m7aKnUnPOE44s9iUhHgPTSPp2jlC8Tn7OXqLMzVo57Gt+TaU8/sEF02bGNuz2DYmcRAc DZmifE4uQBxAV61n3uJDXBRKiFsAwD+zj6RXNya8MFWuHFR89rXsQ5RiWRqL/Dtx6ISC jrX9kl0cdHgg13qdTA4ivoMK3fyEQgVCXqi15bJUmlY5P7pjCgWf+/Kb2ha/vfbJBBzD Z7B/uV0lysND4PiSoDPHXqnDJNc72Ge4LzsRWRX+ocYV71UyZlFZljFVE5UdBQI2pdu9 Wrig== X-Gm-Message-State: AOAM532BOY74VZTQ2nXsXvGFInFR+3O0K7Cce/WzpbY2TH9Ga+myLu/Q VClFbSI5nAHAp+xiFBjuHSxz2SpH1jOF5+nX X-Google-Smtp-Source: ABdhPJzY53i0sVktuFDSsO5snwv9wCB2AmMJndjNG20GtOJM5oPB3Jz+/XEE/Y1yIDR2p3Ngvtp8pg== X-Received: by 2002:a5d:5502:: with SMTP id b2mr4550253wrv.245.1612524945598; Fri, 05 Feb 2021 03:35:45 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id n4sm11665832wrt.47.2021.02.05.03.35.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:35:44 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: David Hunt , Anatoly Burakov , dpdk stable Date: Fri, 5 Feb 2021 11:18:05 +0000 Message-Id: <20210205111920.1272063-199-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'power: make channel message functions public' has been queued to stable release 20.11.1 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/0823ac52bfb4d7023ef9b8f30df267878204872a Thanks. Luca Boccassi --- >From 0823ac52bfb4d7023ef9b8f30df267878204872a Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 21 Jan 2021 17:21:57 +0000 Subject: [PATCH] power: make channel message functions public [ upstream commit 4d3892dcd77b2f9dc657b426f4871f703cb819b6 ] Move the 2 public functions into rte_power_guest_channel.h Fixes: 210c383e247b ("power: packet format for vm power management") Fixes: cd0d5547e873 ("power: vm communication channels in guest") Signed-off-by: Bruce Richardson Signed-off-by: David Hunt Acked-by: Anatoly Burakov --- lib/librte_power/guest_channel.h | 40 ----------------- lib/librte_power/rte_power_guest_channel.h | 50 ++++++++++++++++++++++ lib/librte_power/version.map | 4 ++ 3 files changed, 54 insertions(+), 40 deletions(-) diff --git a/lib/librte_power/guest_channel.h b/lib/librte_power/guest_channel.h index d3d87f0ae2..83186cfbba 100644 --- a/lib/librte_power/guest_channel.h +++ b/lib/librte_power/guest_channel.h @@ -65,22 +65,6 @@ void guest_channel_host_disconnect(unsigned int lcore_id); */ int guest_channel_send_msg(struct channel_packet *pkt, unsigned int lcore_id); -/** - * Send a message contained in pkt over the Virtio-Serial to the host endpoint. - * - * @param pkt - * Pointer to a populated struct channel_packet - * - * @param lcore_id - * lcore_id. - * - * @return - * - 0 on success. - * - Negative on error. - */ -int rte_power_guest_channel_send_msg(struct channel_packet *pkt, - unsigned int lcore_id); - /** * Read a message contained in pkt over the Virtio-Serial * from the host endpoint. @@ -103,30 +87,6 @@ int power_guest_channel_read_msg(void *pkt, size_t pkt_len, unsigned int lcore_id); -/** - * Receive a message contained in pkt over the Virtio-Serial - * from the host endpoint. - * - * @param pkt - * Pointer to channel_packet or - * channel_packet_freq_list struct. - * - * @param pkt_len - * Size of expected data packet. - * - * @param lcore_id - * lcore_id. - * - * @return - * - 0 on success. - * - Negative on error. - */ -__rte_experimental -int -rte_power_guest_channel_receive_msg(void *pkt, - size_t pkt_len, - unsigned int lcore_id); - #ifdef __cplusplus } diff --git a/lib/librte_power/rte_power_guest_channel.h b/lib/librte_power/rte_power_guest_channel.h index ef3b064a85..c500c0cda6 100644 --- a/lib/librte_power/rte_power_guest_channel.h +++ b/lib/librte_power/rte_power_guest_channel.h @@ -116,6 +116,56 @@ struct channel_packet_caps_list { uint8_t num_vcpu; }; +/** + * @internal + * + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Send a message contained in pkt over the Virtio-Serial to the host endpoint. + * + * @param pkt + * Pointer to a populated struct channel_packet. + * + * @param lcore_id + * Use channel specific to this lcore_id. + * + * @return + * - 0 on success. + * - Negative on error. + */ +__rte_experimental +int rte_power_guest_channel_send_msg(struct channel_packet *pkt, + unsigned int lcore_id); + +/** + * @internal + * + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Receive a message contained in pkt over the Virtio-Serial + * from the host endpoint. + * + * @param pkt + * Pointer to channel_packet or + * channel_packet_freq_list struct. + * + * @param pkt_len + * Size of expected data packet. + * + * @param lcore_id + * Use channel specific to this lcore_id. + * + * @return + * - 0 on success. + * - Negative on error. + */ +__rte_experimental +int rte_power_guest_channel_receive_msg(void *pkt, + size_t pkt_len, + unsigned int lcore_id); + #ifdef __cplusplus } diff --git a/lib/librte_power/version.map b/lib/librte_power/version.map index 69ca9af616..13f0af3b2d 100644 --- a/lib/librte_power/version.map +++ b/lib/librte_power/version.map @@ -34,4 +34,8 @@ EXPERIMENTAL { rte_power_guest_channel_receive_msg; rte_power_poll_stat_fetch; rte_power_poll_stat_update; + + # added in 21.02 + rte_power_guest_channel_receive_msg; + rte_power_guest_channel_send_msg; }; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:38.056006117 +0000 +++ 0199-power-make-channel-message-functions-public.patch 2021-02-05 11:18:29.154697738 +0000 @@ -1 +1 @@ -From 4d3892dcd77b2f9dc657b426f4871f703cb819b6 Mon Sep 17 00:00:00 2001 +From 0823ac52bfb4d7023ef9b8f30df267878204872a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4d3892dcd77b2f9dc657b426f4871f703cb819b6 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org