Re: [dpdk-dev] [RFC PATCH 5/5] mk/windows: add virtio-net PMD
On Sat, Aug 14, 2021 at 10:01 AM Dmitry Kozlyuk wrote: > > 2021-08-14 08:55 (UTC-0700), William Tu: > > Hi Dmitry, > > > > I'm looking at this patch and have some questions. > > > > On Thu, Feb 27, 2020 at 10:08 PM Dmitry Kozlyuk > > wrote: > > > > > > Signed-off-by: Dmitry Kozlyuk > > > --- > > > drivers/net/virtio/virtio_ethdev.c| 4 + > > > kernel/windows/netuio/netuio.inf | 6 + > > > lib/librte_eal/windows/eal/eal.c | 4 + > > > > Why do we need these change below? > > 1. At the time of the patch there was no dpdk-kmods repo. > > 2. The patch is for dpdk-draft-windows repo, >which was using Vistual Studio projects instead of meson. > > > I thought to add a new Windows driver support, we only need to > > compile the drivers/net/xxx, and add the device ID to netuio.inf, > > at the dpdk-kmod repo? > > Yes. > Particularly for virtio it would also be required to support reading PCI > config space in bus/pci/windows (netuio already provides the support). > Now I understand, thanks. William
[dpdk-dev] [PATCH RFC] net/virtio: Add virtio support for Windows.
I looked at Dmitry's patch [1] a while ago and found
that now it's not much work to enable the virtio support.
Pass build, but I haven't tested it yet. I plan to try it on GCP.
[1] http://inbox.dpdk.org/dev/20200228060727.192491-1-dmitry.kozl...@gmail.com/
Signed-off-by: William Tu
---
drivers/net/virtio/meson.build | 6 --
drivers/net/virtio/virtio_ethdev.c | 4 ++--
drivers/net/virtio/virtio_pci_ethdev.c | 2 ++
drivers/net/virtio/virtio_user/virtio_user_dev.h | 4
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/virtio/meson.build b/drivers/net/virtio/meson.build
index 01a333ada2..14c02ee671 100644
--- a/drivers/net/virtio/meson.build
+++ b/drivers/net/virtio/meson.build
@@ -1,12 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation
-if is_windows
-build = false
-reason = 'not supported on Windows'
-subdir_done()
-endif
-
sources += files(
'virtio.c',
'virtio_ethdev.c',
diff --git a/drivers/net/virtio/virtio_ethdev.c
b/drivers/net/virtio/virtio_ethdev.c
index e58085a2c9..7dbf6d0ea7 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -198,7 +198,7 @@ virtio_send_command_packed(struct virtnet_ctl *cvq,
* desc_is_used has a load-acquire or rte_io_rmb inside
*/
while (!desc_is_used(&desc[head], vq))
- usleep(100);
+ rte_delay_us_sleep(100);
/* now get used descriptors */
vq->vq_free_cnt += nb_descs;
@@ -274,7 +274,7 @@ virtio_send_command_split(struct virtnet_ctl *cvq,
virtqueue_notify(vq);
while (virtqueue_nused(vq) == 0)
- usleep(100);
+ rte_delay_us_sleep(100);
while (virtqueue_nused(vq)) {
uint32_t idx, desc_idx, used_idx;
diff --git a/drivers/net/virtio/virtio_pci_ethdev.c
b/drivers/net/virtio/virtio_pci_ethdev.c
index 4083853c48..03e9dfab71 100644
--- a/drivers/net/virtio/virtio_pci_ethdev.c
+++ b/drivers/net/virtio/virtio_pci_ethdev.c
@@ -220,7 +220,9 @@ static struct rte_pci_driver rte_virtio_net_pci_pmd = {
RTE_INIT(rte_virtio_net_pci_pmd_init)
{
+#if !(defined(_WIN32) || defined(_WIN64))
rte_eal_iopl_init();
+#endif
rte_pci_register(&rte_virtio_net_pci_pmd);
}
diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h
b/drivers/net/virtio/virtio_user/virtio_user_dev.h
index 819f6463ba..01cb962770 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.h
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h
@@ -11,6 +11,10 @@
#include "../virtio.h"
#include "../virtio_ring.h"
+#if defined(_WIN32) || defined(_WIN64)
+#define PATH_MAX MAX_PATH
+#endif
+
enum virtio_user_backend_type {
VIRTIO_USER_BACKEND_UNKNOWN,
VIRTIO_USER_BACKEND_VHOST_USER,
--
2.30.2
Re: [dpdk-dev] [PATCH RFC] net/virtio: Add virtio support for Windows.
2021-08-15 14:56 (UTC+), William Tu:
> I looked at Dmitry's patch [1] a while ago and found
> that now it's not much work to enable the virtio support.
> Pass build, but I haven't tested it yet. I plan to try it on GCP.
1. Build fails, the reason is `__rte_weak`: there are no weak symbols on
Windows. The best solution to this I came up with so far is to create a file
with stubs for weak functions. The `-fno-asynchronous-unwind-tables` flag
will also be required for MinGW to link SSE files.
2. I can say in advance it won't work without an ability to read
capabilities form PCI configuration space (`rte_pci_read_config`).
This requires adding support in bus/pci.
>
> [1]
> http://inbox.dpdk.org/dev/20200228060727.192491-1-dmitry.kozl...@gmail.com/
>
> Signed-off-by: William Tu
> ---
> drivers/net/virtio/meson.build | 6 --
> drivers/net/virtio/virtio_ethdev.c | 4 ++--
> drivers/net/virtio/virtio_pci_ethdev.c | 2 ++
> drivers/net/virtio/virtio_user/virtio_user_dev.h | 4
> 4 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/virtio/meson.build b/drivers/net/virtio/meson.build
> index 01a333ada2..14c02ee671 100644
> --- a/drivers/net/virtio/meson.build
> +++ b/drivers/net/virtio/meson.build
> @@ -1,12 +1,6 @@
> # SPDX-License-Identifier: BSD-3-Clause
> # Copyright(c) 2018 Intel Corporation
>
> -if is_windows
> -build = false
> -reason = 'not supported on Windows'
> -subdir_done()
> -endif
> -
> sources += files(
> 'virtio.c',
> 'virtio_ethdev.c',
> diff --git a/drivers/net/virtio/virtio_ethdev.c
> b/drivers/net/virtio/virtio_ethdev.c
> index e58085a2c9..7dbf6d0ea7 100644
> --- a/drivers/net/virtio/virtio_ethdev.c
> +++ b/drivers/net/virtio/virtio_ethdev.c
> @@ -198,7 +198,7 @@ virtio_send_command_packed(struct virtnet_ctl *cvq,
>* desc_is_used has a load-acquire or rte_io_rmb inside
>*/
> while (!desc_is_used(&desc[head], vq))
> - usleep(100);
> + rte_delay_us_sleep(100);
>
> /* now get used descriptors */
> vq->vq_free_cnt += nb_descs;
> @@ -274,7 +274,7 @@ virtio_send_command_split(struct virtnet_ctl *cvq,
> virtqueue_notify(vq);
>
> while (virtqueue_nused(vq) == 0)
> - usleep(100);
> + rte_delay_us_sleep(100);
>
> while (virtqueue_nused(vq)) {
> uint32_t idx, desc_idx, used_idx;
> diff --git a/drivers/net/virtio/virtio_pci_ethdev.c
> b/drivers/net/virtio/virtio_pci_ethdev.c
> index 4083853c48..03e9dfab71 100644
> --- a/drivers/net/virtio/virtio_pci_ethdev.c
> +++ b/drivers/net/virtio/virtio_pci_ethdev.c
> @@ -220,7 +220,9 @@ static struct rte_pci_driver rte_virtio_net_pci_pmd = {
>
> RTE_INIT(rte_virtio_net_pci_pmd_init)
> {
> +#if !(defined(_WIN32) || defined(_WIN64))
> rte_eal_iopl_init();
> +#endif
I think rte_eal_iopl_init() should not be called from this PMD at all,
because it is allready called by PCI bus driver before probing.
Also, DPDK code should use #ifdef RTE_EXEC_ENV_WINDOWS, etc. to test
if it is building for a specific execution environment.
> rte_pci_register(&rte_virtio_net_pci_pmd);
> }
>
> diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h
> b/drivers/net/virtio/virtio_user/virtio_user_dev.h
> index 819f6463ba..01cb962770 100644
> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.h
> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h
> @@ -11,6 +11,10 @@
> #include "../virtio.h"
> #include "../virtio_ring.h"
>
> +#if defined(_WIN32) || defined(_WIN64)
> +#define PATH_MAX MAX_PATH
> +#endif
> +
There's rte_os_shim.h for that.
> enum virtio_user_backend_type {
> VIRTIO_USER_BACKEND_UNKNOWN,
> VIRTIO_USER_BACKEND_VHOST_USER,
Re: [dpdk-dev] [PATCH v13 09/10] eal: add EAL argument for setting thread priority
2021-08-03 12:01 (UTC-0700), Narcisa Ana Maria Vasile:
> From: Narcisa Vasile
>
> Allow the user to choose the thread priority through an EAL
> command line argument.
EAL options documentation update is needed.
With current wording the user may ask: the priority of which thread?
> The user can choose thread priority through an EAL parameter,
> when starting an application. If EAL parameter is not used,
> the per-platform default value for thread priority is used.
> Otherwise administrator has an option to set one of available options:
> --thread-prio normal
> --thread-prio realtime
>
> Example:
> ./dpdk-l2fwd -l 0-3 -n 4 --thread-prio normal -- -q 8 -p
IIUC, with this patch --thread-prio affects nothing,
because the value it fills is not used anywhere.
Why is it needed in this patchset then?
>
> Signed-off-by: Narcisa Vasile
> ---
> lib/eal/common/eal_common_options.c | 28 +++-
> lib/eal/common/eal_internal_cfg.h | 2 ++
> lib/eal/common/eal_options.h| 2 ++
> 3 files changed, 31 insertions(+), 1 deletion(-)
>
> diff --git a/lib/eal/common/eal_common_options.c
> b/lib/eal/common/eal_common_options.c
> index ff5861b5f3..9d29696b84 100644
> --- a/lib/eal/common/eal_common_options.c
> +++ b/lib/eal/common/eal_common_options.c
> @@ -107,6 +107,7 @@ eal_long_options[] = {
> {OPT_TELEMETRY, 0, NULL, OPT_TELEMETRY_NUM},
> {OPT_NO_TELEMETRY, 0, NULL, OPT_NO_TELEMETRY_NUM },
> {OPT_FORCE_MAX_SIMD_BITWIDTH, 1, NULL, OPT_FORCE_MAX_SIMD_BITWIDTH_NUM},
> + {OPT_THREAD_PRIORITY, 1, NULL, OPT_THREAD_PRIORITY_NUM},
>
> /* legacy options that will be removed in future */
> {OPT_PCI_BLACKLIST, 1, NULL, OPT_PCI_BLACKLIST_NUM},
> @@ -1412,6 +1413,24 @@ eal_parse_simd_bitwidth(const char *arg)
> return 0;
> }
>
> +static int
> +eal_parse_thread_priority(const char *arg)
> +{
> + struct internal_config *internal_conf =
> + eal_get_internal_configuration();
> + enum rte_thread_priority priority;
> +
> + if (!strncmp("normal", arg, sizeof("normal")))
> + priority = RTE_THREAD_PRIORITY_NORMAL;
> + else if (!strncmp("realtime", arg, sizeof("realtime")))
> + priority = RTE_THREAD_PRIORITY_REALTIME_CRITICAL;
> + else
> + return -1;
Why not just `strcmp()`?
> +
> + internal_conf->thread_priority = priority;
> + return 0;
> +}
> +
> static int
> eal_parse_base_virtaddr(const char *arg)
> {
> @@ -1825,7 +1844,13 @@ eal_parse_common_option(int opt, const char *optarg,
> return -1;
> }
> break;
> -
> + case OPT_THREAD_PRIORITY_NUM:
> + if (eal_parse_thread_priority(optarg) < 0) {
> + RTE_LOG(ERR, EAL, "invalid parameter for --"
> + OPT_THREAD_PRIORITY "\n");
> + return -1;
> + }
> + break;
> /* don't know what to do, leave this to caller */
> default:
> return 1;
> @@ -2088,6 +2113,7 @@ eal_common_usage(void)
> " (can be used multiple times)\n"
> " --"OPT_VMWARE_TSC_MAP"Use VMware TSC map instead of
> native RDTSC\n"
> " --"OPT_PROC_TYPE" Type of this process
> (primary|secondary|auto)\n"
> +" --"OPT_THREAD_PRIORITY" Set threads priority
> (normal|realtime)\n"
> #ifndef RTE_EXEC_ENV_WINDOWS
> " --"OPT_SYSLOG"Set syslog facility\n"
> #endif
> diff --git a/lib/eal/common/eal_internal_cfg.h
> b/lib/eal/common/eal_internal_cfg.h
> index d6c0470eb8..b2996cd65b 100644
> --- a/lib/eal/common/eal_internal_cfg.h
> +++ b/lib/eal/common/eal_internal_cfg.h
> @@ -94,6 +94,8 @@ struct internal_config {
> unsigned int no_telemetry; /**< true to disable Telemetry */
> struct simd_bitwidth max_simd_bitwidth;
> /**< max simd bitwidth path to use */
> + enum rte_thread_priority thread_priority;
> + /**< thread priority to configure */
Where is the default set?
If you remove RTE_THREAD_PRIORITY_UNDEFINED in patch 2/10,
it will be RTE_THREAD_PRIORITY_NORMAL in zeroed-out structure, which is OK.
> };
>
> void eal_reset_internal_config(struct internal_config *internal_cfg);
> diff --git a/lib/eal/common/eal_options.h b/lib/eal/common/eal_options.h
> index 7b348e707f..9f5b209f64 100644
> --- a/lib/eal/common/eal_options.h
> +++ b/lib/eal/common/eal_options.h
> @@ -93,6 +93,8 @@ enum {
> OPT_NO_TELEMETRY_NUM,
> #define OPT_FORCE_MAX_SIMD_BITWIDTH "force-max-simd-bitwidth"
> OPT_FORCE_MAX_SIMD_BITWIDTH_NUM,
> +#define OPT_THREAD_PRIORITY "thread-prio"
> + OPT_THREAD_PRIORITY_NUM,
>
> /* legacy option that will be removed in future */
> #define OPT_PCI_BLACKLIST "pci-blacklist"
[dpdk-dev] [PATCH 0/3] support reading NPA/SSO PF function
This series adds support for retrieving NPA/SSO PF function which is then used by a baseband PSM job scheduler block to access NPA/SSO. While at it also push out some device removal fix. Tomasz Duszynski (3): raw/cnxk_bphy: fix device lookup common/cnxk: support reading NPA/SSO PF function raw/cnxk_bphy: support reading NPA/SSO PF function drivers/common/cnxk/roc_bphy.c | 12 +++ drivers/common/cnxk/roc_bphy.h | 2 ++ drivers/common/cnxk/version.map | 2 ++ drivers/raw/cnxk_bphy/cnxk_bphy.c| 19 +-- drivers/raw/cnxk_bphy/rte_pmd_bphy.h | 50 5 files changed, 83 insertions(+), 2 deletions(-) -- 2.25.1
[dpdk-dev] [PATCH 1/3] raw/cnxk_bphy: fix device lookup
Name needs to be prepared before the lookup otherwise
PMD will not be released.
Fixes: 24d9c5d59d5d ("raw/cnxk_bphy: add baseband PHY skeleton driver")
Signed-off-by: Tomasz Duszynski
Reviewed-by: Jerin Jacob Kollanukkaran
---
drivers/raw/cnxk_bphy/cnxk_bphy.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/raw/cnxk_bphy/cnxk_bphy.c
b/drivers/raw/cnxk_bphy/cnxk_bphy.c
index 9cb3f8d332..8a0d2224c0 100644
--- a/drivers/raw/cnxk_bphy/cnxk_bphy.c
+++ b/drivers/raw/cnxk_bphy/cnxk_bphy.c
@@ -306,14 +306,13 @@ bphy_rawdev_remove(struct rte_pci_device *pci_dev)
return -EINVAL;
}
+ bphy_rawdev_get_name(name, pci_dev);
rawdev = rte_rawdev_pmd_get_named_dev(name);
if (rawdev == NULL) {
plt_err("invalid device name (%s)", name);
return -EINVAL;
}
- bphy_rawdev_get_name(name, pci_dev);
-
return rte_rawdev_pmd_release(rawdev);
}
--
2.25.1
[dpdk-dev] [PATCH 3/3] raw/cnxk_bphy: support reading NPA/SSO PF function
Add support for reading NPA/SSO pf_func which will be used
by a PSM to access NPA/SSO. PSM is a hardware block capable
of dispatching jobs to different blocks within a baseband
module.
Signed-off-by: Tomasz Duszynski
Reviewed-by: Jerin Jacob Kollanukkaran
---
drivers/raw/cnxk_bphy/cnxk_bphy.c| 16 +
drivers/raw/cnxk_bphy/rte_pmd_bphy.h | 50
2 files changed, 66 insertions(+)
diff --git a/drivers/raw/cnxk_bphy/cnxk_bphy.c
b/drivers/raw/cnxk_bphy/cnxk_bphy.c
index 8a0d2224c0..8e7b714ba1 100644
--- a/drivers/raw/cnxk_bphy/cnxk_bphy.c
+++ b/drivers/raw/cnxk_bphy/cnxk_bphy.c
@@ -67,6 +67,14 @@ bphy_rawdev_selftest(uint16_t dev_id)
goto err_desc;
}
+ ret = rte_pmd_bphy_npa_pf_func_get(dev_id);
+ if (ret == 0)
+ plt_warn("NPA pf_func is invalid");
+
+ ret = rte_pmd_bphy_sso_pf_func_get(dev_id);
+ if (ret == 0)
+ plt_warn("SSO pf_func is invalid");
+
ret = rte_pmd_bphy_intr_init(dev_id);
if (ret) {
plt_err("intr init failed");
@@ -190,6 +198,14 @@ cnxk_bphy_irq_enqueue_bufs(struct rte_rawdev *dev,
case CNXK_BPHY_IRQ_MSG_TYPE_MEM_GET:
bphy_dev->queues[queue].rsp = &bphy_dev->mem;
break;
+ case CNXK_BPHY_MSG_TYPE_NPA_PF_FUNC:
+ bphy_dev->queues[queue].rsp =
+ (void *)(size_t)roc_bphy_npa_pf_func_get();
+ break;
+ case CNXK_BPHY_MSG_TYPE_SSO_PF_FUNC:
+ bphy_dev->queues[queue].rsp =
+ (void *)(size_t)roc_bphy_sso_pf_func_get();
+ break;
default:
ret = -EINVAL;
}
diff --git a/drivers/raw/cnxk_bphy/rte_pmd_bphy.h
b/drivers/raw/cnxk_bphy/rte_pmd_bphy.h
index d459c3a862..bcd165f41c 100644
--- a/drivers/raw/cnxk_bphy/rte_pmd_bphy.h
+++ b/drivers/raw/cnxk_bphy/rte_pmd_bphy.h
@@ -114,6 +114,8 @@ enum cnxk_bphy_irq_msg_type {
CNXK_BPHY_IRQ_MSG_TYPE_REGISTER,
CNXK_BPHY_IRQ_MSG_TYPE_UNREGISTER,
CNXK_BPHY_IRQ_MSG_TYPE_MEM_GET,
+ CNXK_BPHY_MSG_TYPE_NPA_PF_FUNC,
+ CNXK_BPHY_MSG_TYPE_SSO_PF_FUNC,
};
struct cnxk_bphy_irq_msg {
@@ -232,4 +234,52 @@ rte_pmd_bphy_intr_mem_get(uint16_t dev_id)
return buf.buf_addr;
}
+static __rte_always_inline uint16_t
+rte_pmd_bphy_npa_pf_func_get(uint16_t dev_id)
+{
+ struct cnxk_bphy_irq_msg msg = {
+ .type = CNXK_BPHY_MSG_TYPE_NPA_PF_FUNC,
+ };
+ struct rte_rawdev_buf *bufs[1];
+ struct rte_rawdev_buf buf;
+ int ret;
+
+ buf.buf_addr = &msg;
+ bufs[0] = &buf;
+
+ ret = rte_rawdev_enqueue_buffers(dev_id, bufs, 1, CNXK_BPHY_DEF_QUEUE);
+ if (ret)
+ return 0;
+
+ ret = rte_rawdev_dequeue_buffers(dev_id, bufs, 1, CNXK_BPHY_DEF_QUEUE);
+ if (ret)
+ return 0;
+
+ return (uint16_t)(size_t)buf.buf_addr;
+}
+
+static __rte_always_inline uint16_t
+rte_pmd_bphy_sso_pf_func_get(uint16_t dev_id)
+{
+ struct cnxk_bphy_irq_msg msg = {
+ .type = CNXK_BPHY_MSG_TYPE_SSO_PF_FUNC,
+ };
+ struct rte_rawdev_buf *bufs[1];
+ struct rte_rawdev_buf buf;
+ int ret;
+
+ buf.buf_addr = &msg;
+ bufs[0] = &buf;
+
+ ret = rte_rawdev_enqueue_buffers(dev_id, bufs, 1, CNXK_BPHY_DEF_QUEUE);
+ if (ret)
+ return 0;
+
+ ret = rte_rawdev_dequeue_buffers(dev_id, bufs, 1, CNXK_BPHY_DEF_QUEUE);
+ if (ret)
+ return 0;
+
+ return (uint16_t)(size_t)buf.buf_addr;
+}
+
#endif /* _CNXK_BPHY_H_ */
--
2.25.1
[dpdk-dev] [PATCH 2/3] common/cnxk: support reading NPA/SSO PF function
Add support for reading NPA/SSO pf_func which will be used
by a PSM to access NPA/SSO. PSM is a hardware block capable
of dispatching jobs to different blocks within a baseband
module.
Signed-off-by: Tomasz Duszynski
Reviewed-by: Jerin Jacob Kollanukkaran
---
drivers/common/cnxk/roc_bphy.c | 12
drivers/common/cnxk/roc_bphy.h | 2 ++
drivers/common/cnxk/version.map | 2 ++
3 files changed, 16 insertions(+)
diff --git a/drivers/common/cnxk/roc_bphy.c b/drivers/common/cnxk/roc_bphy.c
index 77606d6465..12234c5dcc 100644
--- a/drivers/common/cnxk/roc_bphy.c
+++ b/drivers/common/cnxk/roc_bphy.c
@@ -38,3 +38,15 @@ roc_bphy_dev_fini(struct roc_bphy *roc_bphy)
return 0;
}
+
+uint16_t
+roc_bphy_npa_pf_func_get(void)
+{
+ return idev_npa_pffunc_get();
+}
+
+uint16_t
+roc_bphy_sso_pf_func_get(void)
+{
+ return idev_sso_pffunc_get();
+}
diff --git a/drivers/common/cnxk/roc_bphy.h b/drivers/common/cnxk/roc_bphy.h
index 0579c6c443..0032829c8d 100644
--- a/drivers/common/cnxk/roc_bphy.h
+++ b/drivers/common/cnxk/roc_bphy.h
@@ -13,5 +13,7 @@ struct roc_bphy {
int __roc_api roc_bphy_dev_init(struct roc_bphy *roc_bphy);
int __roc_api roc_bphy_dev_fini(struct roc_bphy *roc_bphy);
+__roc_api uint16_t roc_bphy_npa_pf_func_get(void);
+__roc_api uint16_t roc_bphy_sso_pf_func_get(void);
#endif /* _ROC_BPHY_ */
diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map
index 2cbcc4b93a..bcbeaf5e7e 100644
--- a/drivers/common/cnxk/version.map
+++ b/drivers/common/cnxk/version.map
@@ -46,6 +46,8 @@ INTERNAL {
roc_bphy_irq_handler_set;
roc_bphy_irq_stack_get;
roc_bphy_irq_stack_remove;
+ roc_bphy_npa_pf_func_get;
+ roc_bphy_sso_pf_func_get;
roc_clk_freq_get;
roc_cpt_afs_print;
roc_cpt_dev_clear;
--
2.25.1
Re: [dpdk-dev] [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
Hi Andrew,
> -Original Message-
> From: Andrew Rybchenko
> Sent: Friday, August 13, 2021 5:31 PM
> To: Xia, Chenbo ; Vijay Srivastava
> ; dev@dpdk.org
> Cc: maxime.coque...@redhat.com; Vijay Kumar Srivastava
> Subject: Re: [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
>
> On 8/13/21 12:23 PM, Xia, Chenbo wrote:
> > Hi Andrew,
> >
> >> -Original Message-
> >> From: Andrew Rybchenko
> >> Sent: Friday, August 13, 2021 4:39 PM
> >> To: Xia, Chenbo ; Vijay Srivastava
> >> ; dev@dpdk.org
> >> Cc: maxime.coque...@redhat.com; Vijay Kumar Srivastava
> >>
> >> Subject: Re: [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
> >>
> >> Hi Chenbo,
> >>
> >> many thanks for review. See few questions/notes below.
> >>
> >> On 8/11/21 5:26 AM, Xia, Chenbo wrote:
> >>> Hi Vijay,
> >>>
> -Original Message-
> From: Vijay Srivastava
> Sent: Wednesday, July 7, 2021 12:44 AM
> To: dev@dpdk.org
> Cc: maxime.coque...@redhat.com; Xia, Chenbo ;
> andrew.rybche...@oktetlabs.ru; Vijay Kumar Srivastava
>
> Subject: [PATCH 01/10] vdpa/sfc: introduce Xilinx vDPA driver
>
> From: Vijay Kumar Srivastava
>
> Add new vDPA PMD to support vDPA operation by Xilinx devices.
> >>>
> >>> vDPA operations of Xilinx devices
> >>>
> This patch implements probe and remove functions.
>
> Signed-off-by: Vijay Kumar Srivastava
>
> [snip]
>
> diff --git a/drivers/vdpa/sfc/sfc_vdpa_log.h
> >> b/drivers/vdpa/sfc/sfc_vdpa_log.h
> new file mode 100644
> index 000..0a3d6ad
> --- /dev/null
> +++ b/drivers/vdpa/sfc/sfc_vdpa_log.h
> @@ -0,0 +1,77 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright(c) 2020-2021 Xilinx, Inc.
> + */
> +
> +#ifndef _SFC_VDPA_LOG_H_
> +#define _SFC_VDPA_LOG_H_
> +
> +/** Generic driver log type */
> +extern int sfc_vdpa_logtype_driver;
> +
> +/** Common log type name prefix */
> +#define SFC_VDPA_LOGTYPE_PREFIX "pmd.vdpa.sfc."
> +
> +/** Log PMD generic message, add a prefix and a line break */
> +#define SFC_VDPA_GENERIC_LOG(level, ...) \
> +rte_log(RTE_LOG_ ## level, sfc_vdpa_logtype_driver,
> \
> +RTE_FMT("PMD: " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n",
> \
> +RTE_FMT_TAIL(__VA_ARGS__ ,)))
> +
> +/** Name prefix for the per-device log type used to report basic
> >> information
> */
> +#define SFC_VDPA_LOGTYPE_MAIN_STR SFC_VDPA_LOGTYPE_PREFIX "main"
> +
> +#define SFC_VDPA_LOG_PREFIX_MAX 32
> +
> +/* Log PMD message, automatically add prefix and \n */
> +#define SFC_VDPA_LOG(sva, level, type, ...) \
> +rte_log(level, type,\
> +RTE_FMT("%s" RTE_FMT_HEAD(__VA_ARGS__ ,) "\n", \
> +sva->log_prefix,\
> +RTE_FMT_TAIL(__VA_ARGS__ ,)))
> +
> +#define sfc_vdpa_err(sva, ...) \
> +do {\
> +const struct sfc_vdpa_adapter *_sva = (sva);\
> +\
> +SFC_VDPA_LOG(_sva, RTE_LOG_ERR, \
> +_sva->logtype_main, __VA_ARGS__); \
> +} while (0)
> +
> +#define sfc_vdpa_warn(sva, ...) \
> +do {\
> +const struct sfc_vdpa_adapter *_sva = (sva);\
> +\
> +SFC_VDPA_LOG(_sva, RTE_LOG_WARNING, \
> +_sva->logtype_main, __VA_ARGS__); \
> +} while (0)
> +
> +#define sfc_vdpa_notice(sva, ...) \
> +do {\
> +const struct sfc_vdpa_adapter *_sva = (sva);\
> +\
> +SFC_VDPA_LOG(_sva, RTE_LOG_NOTICE, \
> +_sva->logtype_main, __VA_ARGS__); \
> +} while (0)
> +
> +#define sfc_vdpa_info(sva, ...) \
> +do {\
> +const struct sfc_vdpa_adapter *_sva = (sva);\
> +\
> +SFC_VDPA_LOG(_sva, RTE_LOG_INFO,\
> +_sva->logtype_main, __VA_ARGS__); \
> +} while (0)
> +
> >>>
> >>> For above log, can't we make log level a parameter?
> >>> Then above four define can be one.
> >>
[dpdk-dev] [PATCH v2] app/crypto-perf: add throughput test for asymmetric crypto
From: Kiran Kumar K
Adding support for asymmetric crypto perf test.
Only modex is supported for now.
Signed-off-by: Kiran Kumar K
---
app/test-crypto-perf/cperf_ops.c | 59 ++-
app/test-crypto-perf/cperf_options.h | 3 +-
app/test-crypto-perf/cperf_options_parsing.c | 4 +
app/test-crypto-perf/cperf_test_common.c | 16 +++
app/test-crypto-perf/cperf_test_throughput.c | 24 +++--
app/test-crypto-perf/cperf_test_vectors.c| 36 +++
app/test-crypto-perf/cperf_test_vectors.h| 11 ++
app/test-crypto-perf/main.c | 105 +--
8 files changed, 242 insertions(+), 16 deletions(-)
diff --git a/app/test-crypto-perf/cperf_ops.c b/app/test-crypto-perf/cperf_ops.c
index 0d7baf214b..4b7d66edb2 100644
--- a/app/test-crypto-perf/cperf_ops.c
+++ b/app/test-crypto-perf/cperf_ops.c
@@ -8,6 +8,33 @@
#include "cperf_ops.h"
#include "cperf_test_vectors.h"
+static int
+cperf_set_ops_asym(struct rte_crypto_op **ops,
+ uint32_t src_buf_offset __rte_unused,
+ uint32_t dst_buf_offset __rte_unused, uint16_t nb_ops,
+ struct rte_cryptodev_sym_session *sess,
+ const struct cperf_options *options __rte_unused,
+ const struct cperf_test_vector *test_vector __rte_unused,
+ uint16_t iv_offset __rte_unused,
+ uint32_t *imix_idx __rte_unused)
+{
+ uint16_t i;
+ uint8_t result[sizeof(perf_mod_p)] = { 0 };
+ struct rte_cryptodev_asym_session *asym_sess = (void *)sess;
+
+ for (i = 0; i < nb_ops; i++) {
+ struct rte_crypto_asym_op *asym_op = ops[i]->asym;
+
+ ops[i]->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
+ asym_op->modex.base.data = perf_base;
+ asym_op->modex.base.length = sizeof(perf_base);
+ asym_op->modex.result.data = result;
+ asym_op->modex.result.length = sizeof(result);
+ rte_crypto_op_attach_asym_session(ops[i], asym_sess);
+ }
+ return 0;
+}
+
#ifdef RTE_LIB_SECURITY
static int
cperf_set_ops_security(struct rte_crypto_op **ops,
@@ -550,7 +577,32 @@ cperf_create_session(struct rte_mempool *sess_mp,
struct rte_crypto_sym_xform auth_xform;
struct rte_crypto_sym_xform aead_xform;
struct rte_cryptodev_sym_session *sess = NULL;
-
+ struct rte_crypto_asym_xform xform = {0};
+ int rc;
+
+ if (options->op_type == CPERF_ASYM_MODEX) {
+ xform.next = NULL;
+ xform.xform_type = RTE_CRYPTO_ASYM_XFORM_MODEX;
+ xform.modex.modulus.data = perf_mod_p;
+ xform.modex.modulus.length = sizeof(perf_mod_p);
+ xform.modex.exponent.data = perf_mod_e;
+ xform.modex.exponent.length = sizeof(perf_mod_e);
+
+ sess = (void *)rte_cryptodev_asym_session_create(sess_mp);
+ if (sess == NULL)
+ return NULL;
+ rc = rte_cryptodev_asym_session_init(dev_id, (void *)sess,
+&xform, priv_mp);
+ if (rc < 0) {
+ if (sess != NULL) {
+ rte_cryptodev_asym_session_clear(dev_id,
+(void *)sess);
+ rte_cryptodev_asym_session_free((void *)sess);
+ }
+ return NULL;
+ }
+ return sess;
+ }
#ifdef RTE_LIB_SECURITY
/*
* security only
@@ -820,6 +872,11 @@ cperf_get_op_functions(const struct cperf_options *options,
op_fns->sess_create = cperf_create_session;
+ if (options->op_type == CPERF_ASYM_MODEX) {
+ op_fns->populate_ops = cperf_set_ops_asym;
+ return 0;
+ }
+
if (options->op_type == CPERF_AEAD) {
op_fns->populate_ops = cperf_set_ops_aead;
return 0;
diff --git a/app/test-crypto-perf/cperf_options.h
b/app/test-crypto-perf/cperf_options.h
index 9664a4b343..f5ea2b90a5 100644
--- a/app/test-crypto-perf/cperf_options.h
+++ b/app/test-crypto-perf/cperf_options.h
@@ -79,7 +79,8 @@ enum cperf_op_type {
CPERF_AUTH_THEN_CIPHER,
CPERF_AEAD,
CPERF_PDCP,
- CPERF_DOCSIS
+ CPERF_DOCSIS,
+ CPERF_ASYM_MODEX
};
extern const char *cperf_op_type_strs[];
diff --git a/app/test-crypto-perf/cperf_options_parsing.c
b/app/test-crypto-perf/cperf_options_parsing.c
index e84f56cfaa..fcff187257 100644
--- a/app/test-crypto-perf/cperf_options_parsing.c
+++ b/app/test-crypto-perf/cperf_options_parsing.c
@@ -457,6 +457,10 @@ parse_op_type(struct cperf_options *opts, const char *arg)
{
cperf_op_type_strs[CPERF_DOCSIS],
CPERF_DOCSIS
+ },
+ {
+
[dpdk-dev] [PATCH 0/3] Add user specified IV with lookaside IPsec
Add support for using user provided IV with lookaside protocol (IPsec). Using this option, application can provide IV to be used per operation. This option can be used for knownn vector tests (which is otherwise impossible due to random nature of IV) as well as if application wishes to use its own random generator source. Depends on 1. http://patches.dpdk.org/project/dpdk/list/?series=18253 Anoob Joseph (2): security: support user specified IV test/crypto: add outbound known vector tests Tejasree Kondoj (1): crypto/cnxk: add IV in SA in lookaside IPsec debug mode app/test/test_cryptodev.c | 44 +++ app/test/test_cryptodev_security_ipsec.c | 16 - drivers/crypto/cnxk/cn10k_ipsec.c | 16 + drivers/crypto/cnxk/cn10k_ipsec.h | 2 ++ drivers/crypto/cnxk/cn10k_ipsec_la_ops.h | 24 + drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c | 16 - drivers/crypto/cnxk/meson.build | 6 lib/security/rte_security.h | 14 8 files changed, 136 insertions(+), 2 deletions(-) -- 2.7.4
[dpdk-dev] [PATCH 1/3] security: support user specified IV
Enable user to provide IV to be used per security operation. This
would be used with lookaside protocol offload for comparing
against known vectors.
By default, PMD would generate IV internally and would be random.
Signed-off-by: Anoob Joseph
Signed-off-by: Tejasree Kondoj
---
lib/security/rte_security.h | 14 ++
1 file changed, 14 insertions(+)
diff --git a/lib/security/rte_security.h b/lib/security/rte_security.h
index 88d31de..b4b6776 100644
--- a/lib/security/rte_security.h
+++ b/lib/security/rte_security.h
@@ -181,6 +181,20 @@ struct rte_security_ipsec_sa_options {
* * 0: Disable per session security statistics collection for this SA.
*/
uint32_t stats : 1;
+
+ /** Disable IV generation in PMD
+*
+* * 1: Disable IV generation in PMD. When disabled, IV provided in
+* rte_crypto_op will be used by the PMD.
+*
+* * 0: Enable IV generation in PMD. When enabled, PMD generated random
+* value would be used and application is not required to provide
+* IV.
+*
+* Note: For inline cases, IV generation would always need to be handled
+* by the PMD.
+*/
+ uint32_t iv_gen_disable : 1;
};
/** IPSec security association direction */
--
2.7.4
[dpdk-dev] [PATCH 2/3] crypto/cnxk: add IV in SA in lookaside IPsec debug mode
From: Tejasree Kondoj
Adding IV in SA in lookaside IPsec debug mode. It helps
to verify lookaside PMD using known outbound vectors in
lookaside autotest.
Signed-off-by: Anoob Joseph
Signed-off-by: Tejasree Kondoj
---
drivers/crypto/cnxk/cn10k_ipsec.c | 16 +++
drivers/crypto/cnxk/cn10k_ipsec.h | 2 ++
drivers/crypto/cnxk/cn10k_ipsec_la_ops.h | 24 +++
drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c | 16 ++-
drivers/crypto/cnxk/meson.build | 6 ++
5 files changed, 63 insertions(+), 1 deletion(-)
diff --git a/drivers/crypto/cnxk/cn10k_ipsec.c
b/drivers/crypto/cnxk/cn10k_ipsec.c
index 1d567bf..3ce25f2 100644
--- a/drivers/crypto/cnxk/cn10k_ipsec.c
+++ b/drivers/crypto/cnxk/cn10k_ipsec.c
@@ -110,6 +110,22 @@ cn10k_ipsec_outb_sa_create(struct roc_cpt *roc_cpt,
sa->inst.w7 = ipsec_cpt_inst_w7_get(roc_cpt, sa);
+#ifdef LA_IPSEC_DEBUG
+ /* Use IV from application in debug mode */
+ if (ipsec_xfrm->options.iv_gen_disable == 1) {
+ out_sa->w2.s.iv_src = ROC_IE_OT_SA_IV_SRC_FROM_SA;
+ if (crypto_xfrm->type == RTE_CRYPTO_SYM_XFORM_AEAD) {
+ sa->iv_offset = crypto_xfrm->aead.iv.offset;
+ sa->iv_length = crypto_xfrm->aead.iv.length;
+ }
+ }
+#else
+ if (ipsec_xfrm->options.iv_gen_disable != 0) {
+ plt_err("Application provided IV not supported");
+ return -ENOTSUP;
+ }
+#endif
+
/* Get Rlen calculation data */
ret = cnxk_ipsec_outb_rlens_get(&rlens, ipsec_xfrm, crypto_xfrm);
if (ret)
diff --git a/drivers/crypto/cnxk/cn10k_ipsec.h
b/drivers/crypto/cnxk/cn10k_ipsec.h
index 668282f..25fc2ee 100644
--- a/drivers/crypto/cnxk/cn10k_ipsec.h
+++ b/drivers/crypto/cnxk/cn10k_ipsec.h
@@ -20,6 +20,8 @@ struct cn10k_ipsec_sa {
};
/** Pre-populated CPT inst words */
struct cnxk_cpt_inst_tmpl inst;
+ uint16_t iv_offset;
+ uint8_t iv_length;
uint8_t partial_len;
uint8_t roundup_len;
uint8_t roundup_byte;
diff --git a/drivers/crypto/cnxk/cn10k_ipsec_la_ops.h
b/drivers/crypto/cnxk/cn10k_ipsec_la_ops.h
index 1e9ebb5..1c142d2 100644
--- a/drivers/crypto/cnxk/cn10k_ipsec_la_ops.h
+++ b/drivers/crypto/cnxk/cn10k_ipsec_la_ops.h
@@ -23,6 +23,25 @@ ipsec_po_out_rlen_get(struct cn10k_ipsec_sa *sess, uint32_t
plen)
return sess->partial_len + enc_payload_len;
}
+static inline void
+ipsec_po_sa_iv_set(struct cn10k_ipsec_sa *sess, struct rte_crypto_op *cop)
+{
+ uint8_t *iv = &sess->out_sa.iv.s.iv_dbg1[0];
+ uint32_t *tmp_iv;
+
+ memcpy(iv, rte_crypto_op_ctod_offset(cop, uint8_t *, sess->iv_offset),
+ 4);
+ tmp_iv = (uint32_t *)iv;
+ *tmp_iv = rte_be_to_cpu_32(*tmp_iv);
+
+ iv = &sess->out_sa.iv.s.iv_dbg2[0];
+ memcpy(iv,
+ rte_crypto_op_ctod_offset(cop, uint8_t *, sess->iv_offset + 4),
+ 4);
+ tmp_iv = (uint32_t *)iv;
+ *tmp_iv = rte_be_to_cpu_32(*tmp_iv);
+}
+
static __rte_always_inline int
process_outb_sa(struct rte_crypto_op *cop, struct cn10k_ipsec_sa *sess,
struct cpt_inst_s *inst)
@@ -43,6 +62,11 @@ process_outb_sa(struct rte_crypto_op *cop, struct
cn10k_ipsec_sa *sess,
return -ENOMEM;
}
+#ifdef LA_IPSEC_DEBUG
+ if (sess->out_sa.w2.s.iv_src == ROC_IE_OT_SA_IV_SRC_FROM_SA)
+ ipsec_po_sa_iv_set(sess, cop);
+#endif
+
/* Prepare CPT instruction */
inst->w4.u64 = sess->inst.w4;
inst->w4.s.dlen = dlen;
diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c
b/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c
index ab37f9c..8ec1e9d 100644
--- a/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c
+++ b/drivers/crypto/cnxk/cnxk_cryptodev_capabilities.c
@@ -776,7 +776,21 @@ static const struct rte_security_capability
sec_caps_templ[] = {
.proto = RTE_SECURITY_IPSEC_SA_PROTO_ESP,
.mode = RTE_SECURITY_IPSEC_SA_MODE_TUNNEL,
.direction = RTE_SECURITY_IPSEC_SA_DIR_EGRESS,
- .options = { 0 }
+ .options = {
+ .esn = 0,
+ .udp_encap = 0,
+ .copy_dscp = 0,
+ .copy_flabel = 0,
+ .copy_df = 0,
+ .dec_ttl = 0,
+ .ecn = 0,
+ .stats = 0,
+#ifdef LA_IPSEC_DEBUG
+ .iv_gen_disable = 1,
+#else
+ .iv_gen_disable = 0,
+#endif
+ }
},
.crypto_capabilities = NULL,
.ol_flags = RTE_SECURITY_TX_OLOAD_NEED_MDATA
diff --git a/drivers/crypto/cnxk/meson
[dpdk-dev] [PATCH 3/3] test/crypto: add outbound known vector tests
Add outbound known vector tests. The tests would be skipped on PMDs
which do not support IV provided by application.
Signed-off-by: Anoob Joseph
Signed-off-by: Tejasree Kondoj
---
app/test/test_cryptodev.c| 44
app/test/test_cryptodev_security_ipsec.c | 16 +++-
2 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 71e6c1a..dfc49e0 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -8975,6 +8975,22 @@ test_ipsec_proto_process(const struct ipsec_test_data
td[],
ut_params->op->sym->m_src = ut_params->ibuf;
ut_params->op->sym->m_dst = NULL;
+ /* Copy IV in crypto operation when IV generation is disabled */
+ if (dir == RTE_SECURITY_IPSEC_SA_DIR_EGRESS &&
+ ipsec_xform.options.iv_gen_disable == 1) {
+ uint8_t *iv = rte_crypto_op_ctod_offset(ut_params->op,
+ uint8_t *,
+ IV_OFFSET);
+ int len;
+
+ if (td[i].aead)
+ len = td[i].xform.aead.aead.iv.length;
+ else
+ len = td[i].xform.chain.cipher.cipher.iv.length;
+
+ memcpy(iv, td[i].iv.data, len);
+ }
+
/* Process crypto operation */
process_crypto_request(dev_id, ut_params->op);
@@ -9012,6 +9028,22 @@ test_ipsec_proto_process(const struct ipsec_test_data
td[],
}
static int
+test_ipsec_proto_known_vec(const void *test_data)
+{
+ struct ipsec_test_data td_outb;
+ struct ipsec_test_flags flags;
+
+ memset(&flags, 0, sizeof(flags));
+
+ memcpy(&td_outb, test_data, sizeof(td_outb));
+
+ /* Disable IV gen to be able to test with known vectors */
+ td_outb.ipsec_xform.options.iv_gen_disable = 1;
+
+ return test_ipsec_proto_process(&td_outb, NULL, 1, false, &flags);
+}
+
+static int
test_ipsec_proto_known_vec_inb(const void *td_outb)
{
struct ipsec_test_flags flags;
@@ -14003,6 +14035,18 @@ static struct unit_test_suite ipsec_proto_testsuite =
{
.setup = ipsec_proto_testsuite_setup,
.unit_test_cases = {
TEST_CASE_NAMED_WITH_DATA(
+ "Outbound known vector (ESP tunnel mode IPv4 AES-GCM
128)",
+ ut_setup_security, ut_teardown,
+ test_ipsec_proto_known_vec, &pkt_aes_128_gcm),
+ TEST_CASE_NAMED_WITH_DATA(
+ "Outbound known vector (ESP tunnel mode IPv4 AES-GCM
192)",
+ ut_setup_security, ut_teardown,
+ test_ipsec_proto_known_vec, &pkt_aes_192_gcm),
+ TEST_CASE_NAMED_WITH_DATA(
+ "Outbound known vector (ESP tunnel mode IPv4 AES-GCM
256)",
+ ut_setup_security, ut_teardown,
+ test_ipsec_proto_known_vec, &pkt_aes_256_gcm),
+ TEST_CASE_NAMED_WITH_DATA(
"Inbound known vector (ESP tunnel mode IPv4 AES-GCM
128)",
ut_setup_security, ut_teardown,
test_ipsec_proto_known_vec_inb, &pkt_aes_128_gcm),
diff --git a/app/test/test_cryptodev_security_ipsec.c
b/app/test/test_cryptodev_security_ipsec.c
index 78c7f3a..a0b37e7 100644
--- a/app/test/test_cryptodev_security_ipsec.c
+++ b/app/test/test_cryptodev_security_ipsec.c
@@ -76,6 +76,15 @@ test_ipsec_sec_caps_verify(struct rte_security_ipsec_xform
*ipsec_xform,
return -ENOTSUP;
}
+ if ((ipsec_xform->direction == RTE_SECURITY_IPSEC_SA_DIR_EGRESS) &&
+ (ipsec_xform->options.iv_gen_disable == 1) &&
+ (sec_cap->ipsec.options.iv_gen_disable != 1)) {
+ if (!silent)
+ RTE_LOG(INFO, USER1,
+ "Application provided IV is not supported\n");
+ return -ENOTSUP;
+ }
+
return 0;
}
@@ -160,9 +169,11 @@ test_ipsec_td_prepare(const struct crypto_param *param1,
td->xform.aead.aead.algo = param1->alg.aead;
td->xform.aead.aead.key.length = param1->key_length;
+
+ if (flags->iv_gen)
+ td->ipsec_xform.options.iv_gen_disable = 0;
}
- RTE_SET_USED(flags);
RTE_SET_USED(param2);
}
@@ -183,6 +194,9 @@ test_ipsec_td_update(struct ipsec_test_data td_inb[],
int icv_pos = td_inb[i].input_text.len - 4;
td_inb[i].input_text.data[icv_pos] += 1;
}
+
+ /* Clear outbound specific flags */
+ td_inb[i].ipsec_xform.options.iv_gen_disable = 0;
}
}
--
2.7.4
Re: [dpdk-dev] [PATCH] vhost: fix crash on port deletion
Hi Gaoxiang,
> -Original Message-
> From: Gaoxiang Liu
> Sent: Friday, August 13, 2021 10:23 PM
> To: maxime.coque...@redhat.com; Xia, Chenbo
> Cc: dev@dpdk.org; liugaoxi...@huawei.com; Gaoxiang Liu
> Subject: [PATCH] vhost: fix crash on port deletion
>
> The rte_vhost_driver_unregister() and vhost_user_read_cb()
> can be called at the same time by 2 threads.
> Eg thread1 calls rte_vhost_driver_unregister() and frees memory of
> "conn".
> Because socket fd has not been deleted from poll waiting fds,
> "vhost-events" thread calls fdset_event_dispatch, then calls
> vhost_user_read_cb(),
> and accesses invalid memory of "conn".
>
> The fix is to move the "fdset_try_del" in front of free memory of conn,
> then avoid the race condition.
I'm a bit confused here.
First, are you talking about vhost as server or client? I guess it's server but
you'd better clarify it's a bug of both mode or one mode.
Based on we are talking about vhost as server:
we both know there are two types of socket fd. One for new connections coming,
let's call it listen fd. The other is one per connection for send/recv messages,
let's call it conn fd. And vhost_user_read_cb is called when conn fd gets some
messages. The original code first delete the conn fd from fd_set so that
vhost_user_read_cb will not be called, then free the 'conn'. This seems correct
to me.
You are moving the code of deleting the listen fd here. It's for trigger of
callback
vhost_user_server_new_connection but not vhost_user_read_cb. So I don't
understand
your point. Do I miss something here?
BTW, note two things:
1. please add correct prefix when 'git send-email'. E.g., for this patch, you
should
add --subject-prefix="PATCH v3"
2. the version change description should be after signed-off tag, for example:
Signed-off-by: Gaoxiang Liu
---
V2:
XXX
V3:
XXX
---
lib/vhost/socket.c | 27 ++-
1 file changed, 14 insertions(+), 13 deletions(-)
Thanks,
Chenbo
>
> The core trace is:
> Program terminated with signal 11, Segmentation fault.
>
> Fixes: 52d874dc6705 ("vhost: fix crash on closing in client mode")
>
> v2:
> fix coding style issues
>
> v3:
> add detailed log
>
> Signed-off-by: Gaoxiang Liu
> ---
> lib/vhost/socket.c | 27 ++-
> 1 file changed, 14 insertions(+), 13 deletions(-)
>
> diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c
> index 5d0d728d5..2eb8fcadd 100644
> --- a/lib/vhost/socket.c
> +++ b/lib/vhost/socket.c
> @@ -1024,6 +1024,20 @@ rte_vhost_driver_unregister(const char *path)
> for (i = 0; i < vhost_user.vsocket_cnt; i++) {
> struct vhost_user_socket *vsocket = vhost_user.vsockets[i];
>
> + if (vsocket->is_server) {
> + /*
> + * If r/wcb is executing, release vhost_user's
> + * mutex lock, and try again since the r/wcb
> + * may use the mutex lock.
> + */
> + if (fdset_try_del(&vhost_user.fdset,
> vsocket->socket_fd) ==
> -1) {
> + pthread_mutex_unlock(&vhost_user.mutex);
> + goto again;
> + }
> + } else if (vsocket->reconnect) {
> + vhost_user_remove_reconnect(vsocket);
> + }
> +
> if (!strcmp(vsocket->path, path)) {
> pthread_mutex_lock(&vsocket->conn_mutex);
> for (conn = TAILQ_FIRST(&vsocket->conn_list);
> @@ -1056,21 +1070,8 @@ rte_vhost_driver_unregister(const char *path)
> pthread_mutex_unlock(&vsocket->conn_mutex);
>
> if (vsocket->is_server) {
> - /*
> - * If r/wcb is executing, release vhost_user's
> - * mutex lock, and try again since the r/wcb
> - * may use the mutex lock.
> - */
> - if (fdset_try_del(&vhost_user.fdset,
> - vsocket->socket_fd) == -1) {
> - pthread_mutex_unlock(&vhost_user.mutex);
> - goto again;
> - }
> -
> close(vsocket->socket_fd);
> unlink(path);
> - } else if (vsocket->reconnect) {
> - vhost_user_remove_reconnect(vsocket);
> }
>
> pthread_mutex_destroy(&vsocket->conn_mutex);
> --
> 2.32.0
