From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3D76C61DE2 for ; Mon, 31 Aug 2026 02:43:52 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 664F940611; Mon, 31 Aug 2026 04:43:49 +0200 (CEST) Received: from cstnet.cn (smtp81.cstnet.cn [159.226.251.81]) by mails.dpdk.org (Postfix) with ESMTP id 02EAB40264; Mon, 31 Aug 2026 04:43:46 +0200 (CEST) Received: from localhost.localdomain (unknown [118.112.177.181]) by APP-03 (Coremail) with SMTP id rQCowABXXDpc6pRqSdejBg--.40314S2; Mon, 31 Aug 2026 10:43:40 +0800 (CST) From: liujie5@linkdatatechnology.com To: stephen@networkplumber.org Cc: dev@dpdk.org, Jie Liu , stable@dpdk.org Subject: [PATCH v7 27/47] net/sxe2: refactor primary process MP message handling Date: Mon, 31 Aug 2026 10:43:40 +0800 Message-ID: <20260831024340.3230938-1-liujie5@linkdatatechnology.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260828074056.2250222-1-liujie5@linkdatatechnology.com> References: <20260828074056.2250222-1-liujie5@linkdatatechnology.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: rQCowABXXDpc6pRqSdejBg--.40314S2 X-Coremail-Antispam: 1UD129KBjvJXoWxXw47Kr1xCF48ury5ZrW8Zwb_yoWrXFy3pF 1fKr1rXF1xXw129r13Ja1kZFn0krWxJr1UCFZxt34ftw15tF18CF45tr90y3WFk3sxAr1F ka17tF98G3W2vaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkK14x267AKxVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4U JVWxJr1l84ACjcxK6I8E87Iv67AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv6xkF7I0E14v26r 4UJVWxJr1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2Wl Yx0E2Ix0cI8IcVAFwI0_Jw0_WrylYx0Ex4A2jsIE14v26r4j6F4UMcvjeVCFs4IE7xkEbV WUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lw4CEc2x0rVAK j4xxMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI 0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y 0x0EwIxGrwCI42IY6xIIjxv20xvE14v26F1j6w1UMIIF0xvE2Ix0cI8IcVCY1x0267AKxV W8Jr0_Cr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWx JwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7VUjwID7 UUUUU== X-Originating-IP: [118.112.177.181] X-CM-SenderInfo: xolxyxrhv6zxpqngt3pdwhux5qro0w31of0z/ X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Jie Liu Extract the multi-process work logic into the sxe2_mp_do_primary_work helper and operate on a copy of the request in the primary handler so the original message is not modified. Simplify the reply construction and return -ENOENT instead of -EINVAL when no response is received from the primary process. Fixes: 5db446ba97b0 ("net/sxe2: support statistics and multi-process") Cc: stable@dpdk.org Cc: stephen@networkplumber.org Signed-off-by: Jie Liu --- drivers/net/sxe2/sxe2_mp.c | 59 ++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/drivers/net/sxe2/sxe2_mp.c b/drivers/net/sxe2/sxe2_mp.c index a4a5c76495..93a11150a9 100644 --- a/drivers/net/sxe2/sxe2_mp.c +++ b/drivers/net/sxe2/sxe2_mp.c @@ -29,16 +29,11 @@ static int32_t sxe2_mp_secondary_handle(const struct rte_mp_msg *mp_msg, const void *peer); static int32_t -sxe2_mp_primary_handle(const struct rte_mp_msg *mp_msg, const void *peer) +sxe2_mp_do_primary_work(struct sxe2_mp_param *param) { - struct rte_mp_msg reply; - const struct sxe2_mp_param *param = - (const struct sxe2_mp_param *)mp_msg->param; - struct sxe2_mp_param *reply_param = (struct sxe2_mp_param *)reply.param; struct rte_eth_dev *dev; - int32_t ret = 0; struct sxe2_mp_shared_data *mz_data; - int32_t send_reply = 0; + int32_t ret = 0; int32_t cnt = 0; if (!rte_eth_dev_is_valid_port(param->port_id)) { @@ -49,24 +44,21 @@ sxe2_mp_primary_handle(const struct rte_mp_msg *mp_msg, const void *peer) } dev = &rte_eth_devices[param->port_id]; - sxe2_mp_mz = rte_memzone_lookup(SXE2_MP_MZ_NAME); + if (sxe2_mp_mz == NULL) { - PMD_LOG_ERR(DRV, "Failed to lookup memzone %s", SXE2_MP_MZ_NAME); - ret = -ENOENT; - goto out; + sxe2_mp_mz = rte_memzone_lookup(SXE2_MP_MZ_NAME); + if (sxe2_mp_mz == NULL) { + PMD_LOG_ERR(DRV, "Failed to lookup memzone %s", + SXE2_MP_MZ_NAME); + ret = -ENOENT; + goto out; + } } mz_data = (struct sxe2_mp_shared_data *)sxe2_mp_mz->addr; - send_reply = 1; - - memset(&reply, 0, sizeof(reply)); - (void)strlcpy(reply.name, SXE2_MP_NAME, sizeof(reply.name)); - reply.len_param = sizeof(*reply_param); - switch (param->type) { case SXE2_MP_REQ_GET_STATS: - ret = sxe2_stats_info_get(dev, - &mz_data->payload.stats_blk.stats, + ret = sxe2_stats_info_get(dev, &mz_data->payload.stats_blk.stats, &mz_data->payload.stats_blk.qstats); break; case SXE2_MP_REQ_GET_XSTATS: @@ -88,15 +80,32 @@ sxe2_mp_primary_handle(const struct rte_mp_msg *mp_msg, const void *peer) default: PMD_LOG_ERR(DRV, "primary process: unrecognized msg type: %d", param->type); - send_reply = false; ret = -EINVAL; - goto out; + break; } + out: - if (!send_reply) - return ret; + param->result = ret; + return ret; +} - reply_param->result = ret; +static int32_t +sxe2_mp_primary_handle(const struct rte_mp_msg *mp_msg, const void *peer) +{ + struct rte_mp_msg reply; + struct sxe2_mp_param *reply_param = (struct sxe2_mp_param *)reply.param; + const struct sxe2_mp_param *param = + (const struct sxe2_mp_param *)mp_msg->param; + struct sxe2_mp_param param_copy; + + memset(&reply, 0, sizeof(reply)); + (void)strlcpy(reply.name, SXE2_MP_NAME, sizeof(reply.name)); + reply.len_param = sizeof(*reply_param); + + param_copy = *param; + (void)sxe2_mp_do_primary_work(¶m_copy); + + reply_param->result = param_copy.result; reply_param->type = param->type; reply_param->port_id = param->port_id; @@ -275,7 +284,7 @@ int32_t sxe2_mp_request_simple(struct rte_eth_dev *dev, if (reply.nb_received == 0) { PMD_LOG_ERR(DRV, "No response received from primary for type=%d, port %u", type, dev->data->port_id); - ret = -EINVAL; + ret = -ENOENT; goto out; } -- 2.52.0