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 ADED543C60 for ; Thu, 7 Mar 2024 02:35:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A894642EF8; Thu, 7 Mar 2024 02:35:53 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 36D6042EE3 for ; Thu, 7 Mar 2024 02:35:52 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-412f8bf3718so3692185e9.0 for ; Wed, 06 Mar 2024 17:35:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775352; x=1710380152; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4D6SmbtlLXb8561QNBohppeRXVifkYl1aJClWq43rUI=; b=ZkkGmes5Z8hWQ03Bi8EFHhw+MwJ6tqOpIiXE3pE1xblckNHeFqc1dyXCGTD2Qlf9nV q9bcV2OcCNmY3KvxV6T2kXzgXkKb/9JSxQcBi7FP4fjVHAZ95dH7rLcikiH0OkpUG+iy XI1s2+OAcUl7kMwsih2bAaBTHL5SQiFl1Z0z6WkhdwFQPrdJKEl7MH4BrQH3x3OVyfsd oA+BlBKWjSnCloBzcpkEVyVn+FaRhPSrWWz+XCcmh2zjM/SlZzmKtxiGwPfrLLziW2Io d635tqy6vcAhT41CtMGkDxSoyfbY+tbVsDcbK/xKfp4aagTxTTdLD2x5uwH6eIGDfOwC VUOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775352; x=1710380152; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4D6SmbtlLXb8561QNBohppeRXVifkYl1aJClWq43rUI=; b=fDoB975F9fjlAwEo7iO9ujFurAojC2grVX2GJvb+hnp7Wxh/Gysb4FFiD1bnmrF45j LpcobyUU9OsePrvuIQHclPP4yMcFh0o+ZpY0/Mgt9YlWTSpZa8Uxk4efw8/FkrhWtmMB ykF8hlMpHLejIP3FQ8EtxxQut50CL/DSJhYev9bZQWlmxAypoy89m003QqcbCpjwgy5T jBC+RpAlFUUSHPq9h5EYcIGptjyBCH26WBAVbGN6nUfQJhAuHgg0vZH1ZT6v8uvc+IjV bckej43QnvjYiEoGTh4ef4oGtLkbOXmVmBQdw4VpxYHrfOV1JjbN18TsvwYAjTsQVsq8 JVFQ== X-Forwarded-Encrypted: i=1; AJvYcCWvsAWSsU05wzuRDRx1mZywpGX/vChG7f/VoWvxHEUe+HA0JUylOcEThKST0E1p/6hQ07s+DiuayR7OB/pVo8M= X-Gm-Message-State: AOJu0Yw5n1XR12rwQGnPHfLrVAnje5wC8wdIVIdJvMhSBhpbFpJJHXJn +Vax8hyc2O4scEEuwCvmXOzBG129eFP804C8hD0RvYtNucXZucuJnmc+W0nXvKI= X-Google-Smtp-Source: AGHT+IGg60XLWibf4jteAGOfxWO7TLu86ridjwQ5EeYhbzDh830JvELyJXV6oVjcL3UaSR7bJmk5MQ== X-Received: by 2002:a05:600c:19d2:b0:412:f915:6b46 with SMTP id u18-20020a05600c19d200b00412f9156b46mr1823443wmq.20.1709775351843; Wed, 06 Mar 2024 17:35:51 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id k16-20020a05600c1c9000b004130e0906dfsm740049wms.33.2024.03.06.17.35.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:35:51 -0800 (PST) From: luca.boccassi@gmail.com To: Dengdui Huang Cc: Jie Hai , dpdk stable Subject: patch 'net/hns3: refactor handle mailbox function' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:31:21 +0000 Message-Id: <20240307013159.1735343-64-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-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 22.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/09/24. 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/f644df1142f05b7d6903d7a3c73bf4b5bc6471a8 Thanks. Luca Boccassi --- >From f644df1142f05b7d6903d7a3c73bf4b5bc6471a8 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Fri, 8 Dec 2023 14:55:08 +0800 Subject: [PATCH] net/hns3: refactor handle mailbox function [ upstream commit 277d522ae39f6c9daa38c5ad5d3b94f632f9cf49 ] The mailbox messages of the PF and VF are processed in the same function. The PF and VF call the same function to process the messages. This code is excessive coupling and isn't good for maintenance. Therefore, this patch separates the interfaces that handle PF mailbox message and handle VF mailbox message. Fixes: 463e748964f5 ("net/hns3: support mailbox") Fixes: 109e4dd1bd7a ("net/hns3: get link state change through mailbox") Signed-off-by: Dengdui Huang Signed-off-by: Jie Hai --- drivers/net/hns3/hns3_ethdev.c | 2 +- drivers/net/hns3/hns3_ethdev_vf.c | 4 +- drivers/net/hns3/hns3_mbx.c | 69 ++++++++++++++++++++++++------- drivers/net/hns3/hns3_mbx.h | 3 +- 4 files changed, 58 insertions(+), 20 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 27f9dd2eb2..db596493db 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -384,7 +384,7 @@ hns3_interrupt_handler(void *param) hns3_warn(hw, "received reset interrupt"); hns3_schedule_reset(hns); } else if (event_cause == HNS3_VECTOR0_EVENT_MBX) { - hns3_dev_handle_mbx_msg(hw); + hns3pf_handle_mbx_msg(hw); } else if (event_cause != HNS3_VECTOR0_EVENT_PTP) { hns3_warn(hw, "received unknown event: vector0_int_stat:0x%x " "ras_int_stat:0x%x cmdq_int_stat:0x%x", diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index acf33db542..27b890b37f 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -699,7 +699,7 @@ hns3vf_interrupt_handler(void *param) hns3_schedule_reset(hns); break; case HNS3VF_VECTOR0_EVENT_MBX: - hns3_dev_handle_mbx_msg(hw); + hns3vf_handle_mbx_msg(hw); break; default: break; @@ -751,7 +751,7 @@ hns3vf_get_push_lsc_cap(struct hns3_hw *hw) * driver has to actively handle the HNS3_MBX_LINK_STAT_CHANGE * mailbox from PF driver to get this capability. */ - hns3_dev_handle_mbx_msg(hw); + hns3vf_handle_mbx_msg(hw); if (__atomic_load_n(&vf->pf_push_lsc_cap, __ATOMIC_ACQUIRE) != HNS3_PF_PUSH_LSC_CAP_UNKNOWN) break; diff --git a/drivers/net/hns3/hns3_mbx.c b/drivers/net/hns3/hns3_mbx.c index 43195ff184..9cdbc1668a 100644 --- a/drivers/net/hns3/hns3_mbx.c +++ b/drivers/net/hns3/hns3_mbx.c @@ -78,7 +78,7 @@ hns3_get_mbx_resp(struct hns3_hw *hw, uint16_t code, uint16_t subcode, return -EIO; } - hns3_dev_handle_mbx_msg(hw); + hns3vf_handle_mbx_msg(hw); rte_delay_us(HNS3_WAIT_RESP_US); if (hw->mbx_resp.received_match_resp) @@ -372,9 +372,57 @@ scan_next: } void -hns3_dev_handle_mbx_msg(struct hns3_hw *hw) +hns3pf_handle_mbx_msg(struct hns3_hw *hw) +{ + struct hns3_cmq_ring *crq = &hw->cmq.crq; + struct hns3_mbx_vf_to_pf_cmd *req; + struct hns3_cmd_desc *desc; + uint16_t flag; + + rte_spinlock_lock(&hw->cmq.crq.lock); + + while (!hns3_cmd_crq_empty(hw)) { + if (__atomic_load_n(&hw->reset.disable_cmd, __ATOMIC_RELAXED)) { + rte_spinlock_unlock(&hw->cmq.crq.lock); + return; + } + desc = &crq->desc[crq->next_to_use]; + req = (struct hns3_mbx_vf_to_pf_cmd *)desc->data; + + flag = rte_le_to_cpu_16(crq->desc[crq->next_to_use].flag); + if (unlikely(!hns3_get_bit(flag, HNS3_CMDQ_RX_OUTVLD_B))) { + hns3_warn(hw, + "dropped invalid mailbox message, code = %u", + req->msg.code); + + /* dropping/not processing this invalid message */ + crq->desc[crq->next_to_use].flag = 0; + hns3_mbx_ring_ptr_move_crq(crq); + continue; + } + + switch (req->msg.code) { + case HNS3_MBX_PUSH_LINK_STATUS: + hns3pf_handle_link_change_event(hw, req); + break; + default: + hns3_err(hw, "received unsupported(%u) mbx msg", + req->msg.code); + break; + } + crq->desc[crq->next_to_use].flag = 0; + hns3_mbx_ring_ptr_move_crq(crq); + } + + /* Write back CMDQ_RQ header pointer, IMP need this pointer */ + hns3_write_dev(hw, HNS3_CMDQ_RX_HEAD_REG, crq->next_to_use); + + rte_spinlock_unlock(&hw->cmq.crq.lock); +} + +void +hns3vf_handle_mbx_msg(struct hns3_hw *hw) { - struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw); struct hns3_cmq_ring *crq = &hw->cmq.crq; struct hns3_mbx_pf_to_vf_cmd *req; struct hns3_cmd_desc *desc; @@ -385,7 +433,7 @@ hns3_dev_handle_mbx_msg(struct hns3_hw *hw) rte_spinlock_lock(&hw->cmq.crq.lock); handle_out = (rte_eal_process_type() != RTE_PROC_PRIMARY || - !rte_thread_is_intr()) && hns->is_vf; + !rte_thread_is_intr()); if (handle_out) { /* * Currently, any threads in the primary and secondary processes @@ -430,8 +478,7 @@ hns3_dev_handle_mbx_msg(struct hns3_hw *hw) continue; } - handle_out = hns->is_vf && desc->opcode == 0; - if (handle_out) { + if (desc->opcode == 0) { /* Message already processed by other thread */ crq->desc[crq->next_to_use].flag = 0; hns3_mbx_ring_ptr_move_crq(crq); @@ -448,16 +495,6 @@ hns3_dev_handle_mbx_msg(struct hns3_hw *hw) case HNS3_MBX_ASSERTING_RESET: hns3_handle_asserting_reset(hw, req); break; - case HNS3_MBX_PUSH_LINK_STATUS: - /* - * This message is reported by the firmware and is - * reported in 'struct hns3_mbx_vf_to_pf_cmd' format. - * Therefore, we should cast the req variable to - * 'struct hns3_mbx_vf_to_pf_cmd' and then process it. - */ - hns3pf_handle_link_change_event(hw, - (struct hns3_mbx_vf_to_pf_cmd *)req); - break; case HNS3_MBX_PUSH_VLAN_INFO: /* * When the PVID configuration status of VF device is diff --git a/drivers/net/hns3/hns3_mbx.h b/drivers/net/hns3/hns3_mbx.h index 2952b96ab6..2b6cb8f513 100644 --- a/drivers/net/hns3/hns3_mbx.h +++ b/drivers/net/hns3/hns3_mbx.h @@ -207,7 +207,8 @@ struct hns3_pf_rst_done_cmd { ((crq)->next_to_use = ((crq)->next_to_use + 1) % (crq)->desc_num) struct hns3_hw; -void hns3_dev_handle_mbx_msg(struct hns3_hw *hw); +void hns3pf_handle_mbx_msg(struct hns3_hw *hw); +void hns3vf_handle_mbx_msg(struct hns3_hw *hw); void hns3vf_mbx_setup(struct hns3_vf_to_pf_msg *req, uint8_t code, uint8_t subcode); int hns3vf_mbx_send(struct hns3_hw *hw, -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:40.290128595 +0000 +++ 0064-net-hns3-refactor-handle-mailbox-function.patch 2024-03-07 01:05:34.854941205 +0000 @@ -1 +1 @@ -From 277d522ae39f6c9daa38c5ad5d3b94f632f9cf49 Mon Sep 17 00:00:00 2001 +From f644df1142f05b7d6903d7a3c73bf4b5bc6471a8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 277d522ae39f6c9daa38c5ad5d3b94f632f9cf49 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index ae81368f68..bccd9db0dd 100644 +index 27f9dd2eb2..db596493db 100644 @@ -30 +31 @@ -@@ -380,7 +380,7 @@ hns3_interrupt_handler(void *param) +@@ -384,7 +384,7 @@ hns3_interrupt_handler(void *param) @@ -40 +41 @@ -index b0d0c29df1..f5a7a2b1f4 100644 +index acf33db542..27b890b37f 100644 @@ -43 +44 @@ -@@ -618,7 +618,7 @@ hns3vf_interrupt_handler(void *param) +@@ -699,7 +699,7 @@ hns3vf_interrupt_handler(void *param) @@ -52 +53 @@ -@@ -670,7 +670,7 @@ hns3vf_get_push_lsc_cap(struct hns3_hw *hw) +@@ -751,7 +751,7 @@ hns3vf_get_push_lsc_cap(struct hns3_hw *hw)