nvme-tcp receive offloads
Subsystems (13)
v20 cover nvme-tcp receive offloads
Hi,
The next iteration of our nvme-tcp receive offload series.
Previous submission (v19):
https://lore.kernel.org/netdev/[email protected]/
The changes are also available through git:
Repo: https://github.com/aaptel/linux.git branch nvme-rx-offload-v20
Web: https://github.com/aaptel/linux/tree/nvme-rx-offload-v20
The NVMe-TCP offload was presented in netdev 0x16 (video available):
- https://netdevconf.info/0x16/session.html?NVMeTCP-Offload-%E2%80%93-Implementation-and-Performance-Gains
- https://youtu.be/W74TR-SNgi4
From: Aurelien Aptel <[email protected]>
From: Shai Malin <[email protected]>
From: Boris Pismenny <[email protected]>
From: Or Gerlitz <[email protected]>
From: Yoray Zack <[email protected]>
From: Max Gurtovoy <[email protected]>
=========================================
This series adds support for NVMe-TCP receive offloads. The method here does not mandate the offload of the network stack to the device. Instead, these work together with TCP to offload:
1. copy from SKB to the block layer buffers.
2. CRC calculation and verification for received PDU.
The series implements these as a generic offload infrastructure for storage protocols, which calls TCP Direct Data Placement and TCP Offload CRC respectively. We use this infrastructure to implement NVMe-TCP offload for copy and CRC.
Future implementations can reuse the same infrastructure for other protocols such as iSCSI.
Note:
These offloads are similar in nature to the packet-based NIC TLS offloads, which are already upstream (see net/tls/tls_device.c).
You can read more about TLS offload here:
https://www.kernel.org/doc/html/latest/networking/tls-offload.html
Queue Level
===========
The offload for IO queues is initialized after the handshake of the NVMe-TCP protocol is finished by calling nvme_tcp_offload_socket with the tcp socket of the nvme_tcp_queue:
This operation sets all relevant hardware contexts in
hardware. If it fails, then the IO queue proceeds as usual with no offload. If it succeeds then nvme_tcp_setup_ddp and nvme_tcp_teardown_ddp may be called to perform copy offload, and crc offload will be used. This initialization does not change the normal operation of NVMe-TCP in any way besides adding the option to call the above mentioned NDO operations.
For the admin queue, NVMe-TCP does not initialize the offload. Instead, NVMe-TCP calls the driver to configure limits for the controller, such as max_hw_sectors and max_segments, these must be limited to accommodate potential HW resource limits, and to improve performance.
If some error occurs, and the IO queue must be closed or reconnected, then offload is teardown and initialized again. Additionally, we handle netdev down events via the existing error recovery flow.
IO Level
========
The NVMe-TCP layer calls the NIC driver to map block layer buffers to CID using nvme_tcp_setup_ddp before sending the read request. When the response is received, then the NIC HW will write the PDU payload directly into the designated buffer, and build an SKB such that it points into the destination buffer. This SKB represents the entire packet received on the wire, but it points to the block layer buffers. Once NVMe-TCP attempts to copy data from this SKB to the block layer buffer it can skip the copy by checking in the copying function: if (src == dst) -> skip copy
Finally, when the PDU has been processed to completion, the NVMe-TCP layer releases the NIC HW context by calling nvme_tcp_teardown_ddp which asynchronously unmaps the buffers from NIC HW.
The NIC must release its mapping between command IDs and the target buffers. This mapping is released when NVMe-TCP calls the NIC
driver (nvme_tcp_offload_socket).
As completing IOs is performance critical, we introduce asynchronous completions for NVMe-TCP, i.e. NVMe-TCP calls the NIC, which will later call NVMe-TCP to complete the IO (nvme_tcp_ddp_teardown_done).
On the IO level, and in order to use the offload only when a clear performance improvement is expected, the offload is used only for IOs which are bigger than io_threshold.
SKB
===
The DDP (zero-copy) and CRC offloads require two additional bits in the SKB. The ddp bit is useful to prevent condensing of SKBs which are targeted for zero-copy. The crc bit is useful to prevent GRO coalescing SKBs with different offload values. This bit is similar in concept to the "decrypted" bit.
After offload is initialized, we use the SKB's crc bit to indicate that:
"there was no problem with the verification of all CRC fields in this packet's payload". The bit is set to zero if there was an error, or if HW skipped offload for some reason. If *any* SKB in a PDU has (crc != 1), then the calling driver must compute the CRC, and check it. We perform this check, and accompanying software fallback at the end of the processing of a received PDU.
Resynchronization flow
======================
The resynchronization flow is performed to reset the hardware tracking of NVMe-TCP PDUs within the TCP stream. The flow consists of a request from the hardware proxied by the driver, regarding a possible location of a PDU header. Followed by a response from the NVMe-TCP driver.
This flow is rare, and it should happen only after packet loss or reordering events that involve NVMe-TCP PDU headers.
CID Mapping
===========
ConnectX-7 assumes linear CID (0...N-1 for queue of size N) where the Linux NVMe driver uses part of the 16 bit CCID for generation counter.
To address that, we use the existing quirk in the NVMe layer when the HW driver advertises that they don't support the full 16 bit CCID range.
Enablement on ConnectX-7
========================
By default, NVMeTCP offload is disabled in the mlx driver and in the nvme-tcp host. In order to enable it:
# Disable CQE compression (specific for ConnectX) ethtool --set-priv-flags <device> rx_cqe_compress off
# Enable the ULP-DDP
./tools/net/ynl/cli.py \
--spec Documentation/netlink/specs/ulp_ddp.yaml --do caps-set \
--json '{"ifindex": <device index>, "wanted": 3, "wanted_mask": 3}'
# Enable ULP offload in nvme-tcp
modprobe nvme-tcp ddp_offload=1
Following the device ULP-DDP enablement, all the IO queues/sockets which are running on the device are offloaded.
Performance
===========
With this implementation, using the ConnectX-7 NIC, we were able to demonstrate the following CPU utilization improvement:
Without data digest:
For 64K queued read IOs – up to 32% improvement in the BW/IOPS (111 Gbps vs. 84 Gbps). For 512K queued read IOs – up to 55% improvement in the BW/IOPS (148 Gbps vs. 98 Gbps).
With data digest:
For 64K queued read IOs – up to 107% improvement in the BW/IOPS (111 Gbps vs. 53 Gbps). For 512K queued read IOs – up to 138% improvement in the BW/IOPS (146 Gbps vs. 61 Gbps).
With small IOs we are not expecting that the offload will show a performance gain.
The test configuration:
- fio command: qd=128, jobs=8.
- Server: Intel(R) Xeon(R) Platinum 8380 CPU @ 2.30GHz, 160 cores.
Patches
=======
Patch 1: Introduce the infrastructure for all ULP DDP and ULP DDP CRC offloads. Patch 2: Add netlink family to manage ULP DDP capabilities & stats. Patch 3: The iov_iter change to skip copy if (src == dst). Patch 4: Export the get_netdev_for_sock function from TLS to generic location. Patch 5: NVMe-TCP changes to call NIC driver on queue init/teardown and resync. Patch 6: NVMe-TCP changes to call NIC driver on IO operation
setup/teardown, and support async completions.
Patch 7: NVMe-TCP changes to support CRC offload on receive
Also, this patch moves CRC calculation to the end of PDU in case offload requires software fallback.
Patch 8: NVMe-TCP handling of netdev events: stop the offload if netdev is
going down.
Patch 9: Documentation of ULP DDP offloads.
The rest of the series is the mlx5 implementation of the offload.
Testing
=======
This series was tested on ConnectX-7 HW using various configurations of IO sizes, queue depths, MTUs, and with both the SPDK and kernel NVMe-TCP targets.
Compatibility
=============
* The offload works with bare-metal or SRIOV.
* The HW can support up to 64K connections per device (assuming no other HW accelerations are used). In this series, we will introduce the support for up to 4k connections, and we have plans to increase it.
* In the current HW implementation, the combination of NVMeTCP offload with TLS is not supported. In the future, if it will be implemented, the impact on the NVMe/TCP layer will be minimal.
* The NVMeTCP offload ConnectX 7 HW can support tunneling, but we don't see the need for this feature yet.
* NVMe poll queues are not in the scope of this series.
Future Work
===========
* NVMeTCP transmit offload.
* NVMeTCP offloads incremental features.
Changes since v19:
=================
- rebase against net-next.
- fix ulp_ddp_is_cap_active() error reported by the kernel test bot.
Changes since v18:
=================
- rebase against net-next.
- integrate with nvme-tcp tls.
- add const in parameter for skb_is_no_condense() and skb_is_ulp_crc().
- update documentation.
Changes since v17:
=================
- move capabilities from netdev to driver and add get_caps() op (Jiri).
- set stats by name explicitly, remove dump ops (Jiri).
- rename struct, functions, YAML attributes, reuse caps enum (Jiri).
- use uint instead of u64 in YAML spec (Jakub).
Changes since v16:
=================
- rebase against net-next
- minor whitespace changes
- updated CC list
Changes since v15:
=================
- add API func to get netdev & limits together (Sagi).
- add nvme_tcp_stop_admin_queue()
- hide config.io_cpu in the interface (Sagi).
- rename skb->ulp_ddp to skb->no_condense (David).
Changes since v14:
=================
- Added dumpit op for ULP_DDP_CMD_{GET,STATS} (Jakub).
- Remove redundant "-ddp-" fom stat names.
- Fix checkpatch/sparse warnings.
Changes since v13:
=================
- Replace ethtool interface with a new netlink family (Jakub).
- Simplify and squash mlx5e refactoring changes.
Changes since v12:
=================
- Rebase on top of NVMe-TCP kTLS v10 patches.
- Add ULP DDP wrappers for common code and ref accounting (Sagi).
- Fold modparam and tls patches into control-path patch (Sagi).
- Take one netdev ref for the admin queue (Sagi).
- Simplify start_queue() logic (Sagi).
- Rename
* modparam ulp_offload modparam -> ddp_offload (Sagi).
* queue->offload_xxx to queue->ddp_xxx (Sagi).
* queue->resync_req -> resync_tcp_seq (Sagi).
- Use SECTOR_SHIFT (Sagi).
- Use nvme_cid(rq) (Sagi).
- Use sock->sk->sk_incoming_cpu instead of queue->io_cpu (Sagi).
- Move limits results to ctrl struct.
- Add missing ifdefs.
- Fix docs and reverse xmas tree (Simon).
Changes since v11:
=================
- Rebase on top of NVMe-TCP kTLS offload.
- Add tls support bit in struct ulp_ddp_limits.
- Simplify logic in NVMe-TCP queue init.
- Use new page pool in mlx5 driver.
Changes since v10:
=================
- Pass extack to drivers for better error reporting in the .set_caps callback (Jakub).
- netlink: use new callbacks, existing macros, padding, fix size add notifications, update specs (Jakub).
Changes since v9:
=================
- Add missing crc checks in tcp_try_coalesce() (Paolo).
- Add missing ifdef guard for socket ops (Paolo).
- Remove verbose netlink format for statistics (Jakub).
- Use regular attributes for statistics (Jakub).
- Expose and document individual stats to uAPI (Jakub).
- Move ethtool ops for caps&stats to netdev_ops->ulp_ddp_ops (Jakub).
Changes since v8:
=================
- Make stats stringset global instead of per-device (Jakub).
- Remove per-queue stats (Jakub).
- Rename ETH_SS_ULP_DDP stringset to ETH_SS_ULP_DDP_CAPS.
- Update & fix kdoc comments.
- Use 80 columns limit for nvme code.
Changes since v7:
=================
- Remove ULP DDP netdev->feature bit (Jakub).
- Expose ULP DDP capabilities to userspace via ethtool netlink messages (Jakub).
- Move ULP DDP stats to dedicated stats group (Jakub).
- Add ethtool_ops operations for setting capabilities and getting stats (Jakub).
- Move ulp_ddp_netdev_ops into net_device_ops (Jakub).
- Use union for protocol-specific struct instances (Jakub).
- Fold netdev_sk_get_lowest_dev() into get_netdev_for_sock (Christoph).
- Rename memcpy skip patch to something more obvious (Christoph).
- Move capabilities from ulp_ddp.h to ulp_ddp_caps.h.
- Add "Compatibility" section on the cover letter (Sagi).
Changes since v6:
=================
- Moved IS_ULP_{DDP,CRC} macros to skb_is_ulp_{ddp,crc} inline functions (Jakub).
- Fix copyright notice (Leon).
- Added missing ifdef to allow build with MLX5_EN_TLS disabled.
- Fix space alignment, indent and long lines (max 99 columns).
- Add missing field documentation in ulp_ddp.h.
Changes since v5:
=================
- Limit the series to RX offloads.
- Added two separated skb indications to avoid wrong flushing of GRO when aggerating offloaded packets.
- Use accessor functions for skb->ddp and skb->crc (Eric D) bits.
- Add kernel-doc for get_netdev_for_sock (Christoph).
- Remove ddp_iter* routines and only modify _copy_to_iter (Al Viro, Christoph).
- Remove consume skb (Sagi).
- Add a knob in the ddp limits struct for the HW driver to advertise if they need the nvme-tcp driver to apply the generation counter quirk. Use this knob for the mlx5 CX7 offload.
- bugfix: use u8 flags instead of bool in mlx5e_nvmeotcp_queue->dgst.
- bugfix: use sg_dma_len(sgl) instead of sgl->length.
- bugfix: remove sgl leak in nvme_tcp_setup_ddp().
- bugfix: remove sgl leak when only using DDGST_RX offload.
- Add error check for dma_map_sg().
- Reduce #ifdef by using dummy macros/functions.
- Remove redundant netdev null check in nvme_tcp_pdu_last_send().
- Rename ULP_DDP_RESYNC_{REQ -> PENDING}.
- Add per-ulp limits struct (Sagi).
- Add ULP DDP capabilities querying (Sagi).
- Simplify RX DDGST logic (Sagi).
- Document resync flow better.
- Add ulp_offload param to nvme-tcp module to enable ULP offload (Sagi).
- Add a revert commit to reintroduce nvme_tcp_queue->queue_size.
Changes since v4:
=================
- Add transmit offload patches.
- Use one feature bit for both receive and transmit offload.
Changes since v3:
=================
- Use DDP_TCP ifdefs in iov_iter and skb iterators to minimize impact when compiled out (Christoph).
- Simplify netdev references and reduce the use of get_netdev_for_sock (Sagi).
- Avoid "static" in it's own line, move it one line down (Christoph)
- Pass (queue, skb, *offset) and retrieve the pdu_seq in nvme_tcp_resync_response (Sagi).
- Add missing assignment of offloading_netdev to null in offload_limits error case (Sagi).
- Set req->offloaded = false once -- the lifetime rules are:
set to false on cmd_setup / set to true when ddp setup succeeds (Sagi).
- Replace pr_info_ratelimited with dev_info_ratelimited (Sagi).
- Add nvme_tcp_complete_request and invoke it from two similar call sites (Sagi).
- Introduce nvme_tcp_req_map_sg earlier in the series (Sagi).
- Add nvme_tcp_consume_skb and put into it a hunk from nvme_tcp_recv_data to handle copy with and without offload.
Changes since v2:
=================
- Use skb->ddp_crc for copy offload to avoid skb_condense.
- Default mellanox driver support to no (experimental feature).
- In iov_iter use non-ddp functions for kvec and iovec.
- Remove typecasting in NVMe-TCP.
Changes since v1:
=================
- Rework iov_iter copy skip if src==dst to be less intrusive (David Ahern).
- Add tcp-ddp documentation (David Ahern).
- Refactor mellanox driver patches into more patches (Saeed Mahameed).
- Avoid pointer casting (David Ahern).
- Rename NVMe-TCP offload flags (Shai Malin).
- Update cover-letter according to the above.
Changes since RFC v1:
=====================
- Split mlx5 driver patches to several commits.
- Fix NVMe-TCP handling of recovery flows. In particular, move queue offload. init/teardown to the start/stop functions.
Aurelien Aptel (3):
netlink: add new family to manage ULP_DDP enablement and stats net/tls,core: export get_netdev_for_sock
net/mlx5e: NVMEoTCP, statistics
Ben Ben-Ishay (8):
iov_iter: skip copy if src == dst for direct data placement net/mlx5: Add NVMEoTCP caps, HW bits, 128B CQE and enumerations net/mlx5e: NVMEoTCP, offload initialization net/mlx5e: NVMEoTCP, use KLM UMRs for buffer registration net/mlx5e: NVMEoTCP, queue init/teardown
net/mlx5e: NVMEoTCP, ddp setup and resync
net/mlx5e: NVMEoTCP, async ddp invalidation net/mlx5e: NVMEoTCP, data-path for DDP+DDGST offload
Boris Pismenny (4):
net: Introduce direct data placement tcp offload
nvme-tcp: Add DDP offload control path
nvme-tcp: Add DDP data-path
net/mlx5e: TCP flow steering for nvme-tcp acceleration
Or Gerlitz (3):
nvme-tcp: Deal with netdevice DOWN events net/mlx5e: Rename from tls to transport static params net/mlx5e: Refactor ico sq polling to get budget
Yoray Zack (2):
nvme-tcp: RX DDGST offload
Documentation: add ULP DDP offload documentation
Documentation/netlink/specs/ulp_ddp.yaml | 172 +++ Documentation/networking/index.rst | 1 + Documentation/networking/ulp-ddp-offload.rst | 374 ++++++ .../net/ethernet/mellanox/mlx5/core/Kconfig | 11 + .../net/ethernet/mellanox/mlx5/core/Makefile | 3 + drivers/net/ethernet/mellanox/mlx5/core/en.h | 9 + .../net/ethernet/mellanox/mlx5/core/en/fs.h | 4 +- .../ethernet/mellanox/mlx5/core/en/params.c | 12 +- .../ethernet/mellanox/mlx5/core/en/params.h | 3 + .../mellanox/mlx5/core/en/reporter_rx.c | 4 +- .../ethernet/mellanox/mlx5/core/en/rx_res.c | 28 + .../ethernet/mellanox/mlx5/core/en/rx_res.h | 4 + .../net/ethernet/mellanox/mlx5/core/en/tir.c | 15 + .../net/ethernet/mellanox/mlx5/core/en/tir.h | 2 + .../net/ethernet/mellanox/mlx5/core/en/txrx.h | 34 +- .../mlx5/core/en_accel/common_utils.h | 32 + .../mellanox/mlx5/core/en_accel/en_accel.h | 3 + .../mellanox/mlx5/core/en_accel/fs_tcp.c | 12 +- .../mellanox/mlx5/core/en_accel/fs_tcp.h | 2 +- .../mellanox/mlx5/core/en_accel/ktls.c | 2 +- .../mellanox/mlx5/core/en_accel/ktls_rx.c | 8 +- .../mellanox/mlx5/core/en_accel/ktls_tx.c | 8 +- .../mellanox/mlx5/core/en_accel/ktls_txrx.c | 36 +- .../mellanox/mlx5/core/en_accel/ktls_utils.h | 17 +- .../mellanox/mlx5/core/en_accel/nvmeotcp.c | 1118 +++++++++++++++++ .../mellanox/mlx5/core/en_accel/nvmeotcp.h | 141 +++ .../mlx5/core/en_accel/nvmeotcp_rxtx.c | 354 ++++++ .../mlx5/core/en_accel/nvmeotcp_rxtx.h | 37 + .../mlx5/core/en_accel/nvmeotcp_stats.c | 66 + .../mlx5/core/en_accel/nvmeotcp_utils.h | 66 + .../ethernet/mellanox/mlx5/core/en_ethtool.c | 6 + .../net/ethernet/mellanox/mlx5/core/en_fs.c | 4 +- .../net/ethernet/mellanox/mlx5/core/en_main.c | 29 +- .../net/ethernet/mellanox/mlx5/core/en_rx.c | 71 +- .../ethernet/mellanox/mlx5/core/en_stats.h | 8 + .../net/ethernet/mellanox/mlx5/core/en_txrx.c | 4 +- drivers/net/ethernet/mellanox/mlx5/core/fw.c | 6 + .../net/ethernet/mellanox/mlx5/core/main.c | 1 + drivers/nvme/host/tcp.c | 495 +++++++- include/linux/mlx5/device.h | 59 +- include/linux/mlx5/mlx5_ifc.h | 83 +- include/linux/mlx5/qp.h | 1 + include/linux/netdevice.h | 8 +- include/linux/skbuff.h | 25 +- include/net/inet_connection_sock.h | 6 + include/net/ulp_ddp.h | 326 +++++ include/uapi/linux/ulp_ddp.h | 61 + lib/iov_iter.c | 9 +- net/Kconfig | 20 + net/core/Makefile | 1 + net/core/dev.c | 26 +- net/core/skbuff.c | 3 +- net/core/ulp_ddp.c | 84 ++ net/core/ulp_ddp_gen_nl.c | 75 ++ net/core/ulp_ddp_gen_nl.h | 30 + net/core/ulp_ddp_nl.c | 335 +++++ net/ipv4/tcp_input.c | 13 +- net/ipv4/tcp_ipv4.c | 3 + net/ipv4/tcp_offload.c | 3 + net/tls/tls_device.c | 16 - 60 files changed, 4233 insertions(+), 156 deletions(-) create mode 100644 Documentation/netlink/specs/ulp_ddp.yaml create mode 100644 Documentation/networking/ulp-ddp-offload.rst create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/common_utils.h create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp.c create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp.h create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp_rxtx.c create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp_rxtx.h create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp_stats.c create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp_utils.h create mode 100644 include/net/ulp_ddp.h create mode 100644 include/uapi/linux/ulp_ddp.h create mode 100644 net/core/ulp_ddp.c create mode 100644 net/core/ulp_ddp_gen_nl.c create mode 100644 net/core/ulp_ddp_gen_nl.h create mode 100644 net/core/ulp_ddp_nl.c
Signature · 1 line
2.34.1
PATCH v20 1/20 net: Introduce direct data placement tcp offload
From: Boris Pismenny <[email protected]>
This commit introduces direct data placement (DDP) offload for TCP.
The motivation is saving compute resources/cycles that are spent to copy data from SKBs to the block layer buffers and CRC calculation/verification for received PDUs (Protocol Data Units).
The DDP capability is accompanied by new net_device operations that configure hardware contexts.
There is a context per socket, and a context per DDP operation. Additionally, a resynchronization routine is used to assist hardware handle TCP OOO, and continue the offload. Furthermore, we let the offloading driver advertise what is the max hw sectors/segments.
The interface includes the following net-device ddp operations:
1. sk_add - add offload for the queue represented by socket+config pair
2. sk_del - remove the offload for the socket/queue
3. ddp_setup - request copy offload for buffers associated with an IO
4. ddp_teardown - release offload resources for that IO
5. limits - query NIC driver for quirks and limitations (e.g. max number of scatter gather entries per IO)
6. set_caps - request ULP DDP capabilities enablement
7. get_caps - request current ULP DDP capabilities
8. get_stats - query NIC driver for ULP DDP stats
Using this interface, the NIC hardware will scatter TCP payload directly to the BIO pages according to the command_id.
To maintain the correctness of the network stack, the driver is expected to construct SKBs that point to the BIO pages.
The SKB passed to the network stack from the driver represents data as it is on the wire, while it is pointing directly to data in destination buffers.
As a result, data from page frags should not be copied out to the linear part. To avoid needless copies, such as when using skb_condense, we mark the skb->no_condense bit.
In addition, the skb->ulp_crc will be used by the upper layers to determine if CRC re-calculation is required. The two separated skb indications are needed to avoid false positives GRO flushing events.
Follow-up patches will use this interface for DDP in NVMe-TCP.
Capability bits stored in net_device allow drivers to report which ULP DDP capabilities a device supports. Control over these capabilities will be exposed to userspace in later patches.
--- include/linux/netdevice.h | 5 + include/linux/skbuff.h | 25 ++- include/net/inet_connection_sock.h | 6 + include/net/ulp_ddp.h | 325 +++++++++++++++++++++++++++++ net/Kconfig | 20 ++ net/core/Makefile | 1 + net/core/skbuff.c | 3 +- net/core/ulp_ddp.c | 84 ++++++++ net/ipv4/tcp_input.c | 13 +- net/ipv4/tcp_ipv4.c | 3 + net/ipv4/tcp_offload.c | 3 + 11 files changed, 485 insertions(+), 3 deletions(-) create mode 100644 include/net/ulp_ddp.h create mode 100644 net/core/ulp_ddp.c
include/linux/netdevice.h +5 -0
@@ -1427,6 +1427,8 @@ struct netdev_net_notifier {* struct kernel_hwtstamp_config *kernel_config, * struct netlink_ext_ack *extack); * Change the hardware timestamping parameters for NIC device. +* struct ulp_ddp_dev_ops *ulp_ddp_ops; +* ULP DDP operations (see include/net/ulp_ddp.h) */ struct net_device_ops {int (*ndo_init)(struct net_device *dev);
@@ -1668,6 +1670,9 @@ struct net_device_ops {int (*ndo_hwtstamp_set)(struct net_device *dev,struct kernel_hwtstamp_config *kernel_config,struct netlink_ext_ack *extack); +#if IS_ENABLED (CONFIG_ULP_DDP ) +const struct ulp_ddp_dev_ops *ulp_ddp_ops; +#endif };/**
include/linux/skbuff.h +24 -1
@@ -810,6 +810,8 @@ typedef unsigned char *sk_buff_data_t;* delivery_time in mono clock base (i.e. EDT). Otherwise, the * skb->tstamp has the (rcv) timestamp at ingress and * delivery_time at egress. +* @no_condense: When set, don't condense fragments (DDP offloaded) +* @ulp_crc: CRC offloaded * @napi_id: id of the NAPI struct this skb came from * @sender_cpu: (aka @napi_id) source CPU in XPS * @alloc_cpu: CPU which did the skb allocation.
@@ -989,7 +991,10 @@ struct sk_buff {#if IS_ENABLED (CONFIG_IP_SCTP ) __u8 csum_not_inet:1;#endif - +#ifdef CONFIG_ULP_DDP + __u8 no_condense:1; + __u8 ulp_crc:1; +#endif #if defined(CONFIG_NET_SCHED ) || defined(CONFIG_NET_XGRESS )__u16 tc_index;/* traffic control index */ #endif
@@ -5066,5 +5071,23 @@ static inline void skb_mark_for_recycle(struct sk_buff *skb)ssize_t skb_splice_from_iter (struct sk_buff *skb,struct iov_iter *iter,ssize_t maxsize,gfp_t gfp); +static inline bool skb_is_no_condense (const struct sk_buff *skb) +{ +#ifdef CONFIG_ULP_DDP +return skb->no_condense; +#else +return 0 ; +#endif +} + +static inline bool skb_is_ulp_crc (const struct sk_buff *skb) +{ +#ifdef CONFIG_ULP_DDP +return skb->ulp_crc; +#else +return 0 ; +#endif +} +#endif /* __KERNEL__ */ #endif /* _LINUX_SKBUFF_H */
include/net/inet_connection_sock.h +6 -0
@@ -67,6 +67,8 @@ struct inet_connection_sock_af_ops {* @icsk_ulp_ops Pluggable ULP control hook * @icsk_ulp_data ULP private data * @icsk_clean_acked Clean acked data hook +* @icsk_ulp_ddp_ops Pluggable ULP direct data placement control hook +* @icsk_ulp_ddp_data ULP direct data placement private data * @icsk_ca_state: Congestion control state * @icsk_retransmits: Number of unrecovered [RTO] timeouts * @icsk_pending: Scheduled timer event
@@ -97,6 +99,10 @@ struct inet_connection_sock {const struct tcp_ulp_ops *icsk_ulp_ops;void __rcu *icsk_ulp_data;void (*icsk_clean_acked)(struct sock *sk,u32 acked_seq); +#ifdef CONFIG_ULP_DDP +const struct ulp_ddp_ulp_ops *icsk_ulp_ddp_ops; +void __rcu *icsk_ulp_ddp_data; +#endif unsigned int (*icsk_sync_mss)(struct sock *sk,u32 pmtu); __u8 icsk_ca_state:5, icsk_ca_initialized:1,
include/net/ulp_ddp.h new file +325 -0
325 lines not on this page · raw message
net/Kconfig +20 -0
@@ -517,4 +517,24 @@ config NET_TEST If unsure, say N. +config ULP_DDP + bool "ULP direct data placement offload" + help + This feature provides a generic infrastructure for Direct + Data Placement (DDP) offload for Upper Layer Protocols (ULP, + such as NVMe-TCP). + + If the ULP and NIC driver supports it, the ULP code can + request the NIC to place ULP response data directly + into application memory, avoiding a costly copy. + + This infrastructure also allows for offloading the ULP data + integrity checks (e.g. data digest) that would otherwise + require another costly pass on the data we managed to avoid + copying. + + For more information, see + <file:Documentation/networking/ulp-ddp-offload.rst>. + + endif # if NET
net/core/Makefile +1 -0
@@ -18,6 +18,7 @@ obj-y += dev.o dev_addr_lists.o dst.o netevent.o \ obj-$(CONFIG_NETDEV_ADDR_LIST_TEST) += dev_addr_lists_test.o obj-y += net-sysfs.o +obj-$(CONFIG_ULP_DDP) += ulp_ddp.o obj-$(CONFIG_PAGE_POOL) += page_pool.o obj-$(CONFIG_PROC_FS) += net-procfs.o obj-$(CONFIG_NET_PKTGEN) += pktgen.o
net/core/skbuff.c +2 -1
@@ -76,6 +76,7 @@#include <net/mctp.h> #include <net/page_pool/helpers.h> #include <net/dropreason.h> +#include <net/ulp_ddp.h> #include <linux/uaccess.h> #include <trace/events/skb.h>
@@ -6606,7 +6607,7 @@ void skb_condense(struct sk_buff *skb) {if (skb->data_len) {if (skb->data_len > skb->end - skb->tail || -skb_cloned (skb)) +skb_cloned (skb) ||skb_is_no_condense (skb))return ;/* Nice, we can free page frag(s) right now */
net/core/ulp_ddp.c new file +84 -0
84 lines not on this page · raw message
net/ipv4/tcp_input.c +12 -1
@@ -4792,7 +4792,10 @@ static bool tcp_try_coalesce(struct sock *sk,if (from->decrypted != to->decrypted)return false;#endif - +#ifdef CONFIG_ULP_DDP +if (skb_is_ulp_crc (from) !=skb_is_ulp_crc (to)) +return false; +#endif if (!skb_try_coalesce (to, from, fragstolen, &delta))return false;
@@ -5362,6 +5365,10 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, struct rb_root *root,memcpy (nskb->cb, skb->cb,sizeof (skb->cb));#ifdef CONFIG_TLS_DEVICE nskb->decrypted = skb->decrypted; +#endif +#ifdef CONFIG_ULP_DDP + nskb->no_condense = skb->no_condense; + nskb->ulp_crc = skb->ulp_crc;#endif TCP_SKB_CB (nskb)->seq =TCP_SKB_CB (nskb)->end_seq = start;if (list)
@@ -5395,6 +5402,10 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, struct rb_root *root,#ifdef CONFIG_TLS_DEVICE if (skb->decrypted != nskb->decrypted) goto end; +#endif +#ifdef CONFIG_ULP_DDP +if (skb_is_ulp_crc (skb) !=skb_is_ulp_crc (nskb)) + goto end;#endif } }
net/ipv4/tcp_ipv4.c +3 -0
@@ -2054,6 +2054,9 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb, tail->decrypted != skb->decrypted || #endif !mptcp_skb_can_collapse(tail, skb) || +#ifdef CONFIG_ULP_DDP + skb_is_ulp_crc(tail) != skb_is_ulp_crc(skb) || +#endif thtail->doff != th->doff || memcmp(thtail + 1, th + 1, hdrlen - sizeof(*th))) goto no_coalesce;
net/ipv4/tcp_offload.c +3 -0
@@ -268,6 +268,9 @@ struct sk_buff *tcp_gro_receive(struct list_head *head, struct sk_buff *skb)#ifdef CONFIG_TLS_DEVICE flush |= p->decrypted ^ skb->decrypted;#endif +#ifdef CONFIG_ULP_DDP + flush |=skb_is_ulp_crc (p) ^skb_is_ulp_crc (skb); +#endif if (flush ||skb_gro_receive (p, skb)) { mss =1 ;
Signature · 1 line
2.34.1
PATCH v20 2/20 netlink: add new family to manage ULP_DDP enablement and stats
In reply to Aurelien AptelAdd a new netlink family to get/set ULP DDP capabilities on a network device and to retrieve statistics.
The messages use the genetlink infrastructure and are specified in a YAML file which was used to generate some of the files in this commit:
./tools/net/ynl/ynl-gen-c.py --mode kernel \
--spec ./Documentation/netlink/specs/ulp_ddp.yaml --header \
-o net/core/ulp_ddp_gen_nl.h
./tools/net/ynl/ynl-gen-c.py --mode kernel \
--spec ./Documentation/netlink/specs/ulp_ddp.yaml --source \
-o net/core/ulp_ddp_gen_nl.c
./tools/net/ynl/ynl-gen-c.py --mode uapi \
--spec ./Documentation/netlink/specs/ulp_ddp.yaml --header \
> include/uapi/linux/ulp_ddp.h--- Documentation/netlink/specs/ulp_ddp.yaml | 172 ++++++++++++ include/net/ulp_ddp.h | 3 +- include/uapi/linux/ulp_ddp.h | 61 +++++ net/core/Makefile | 2 +- net/core/ulp_ddp_gen_nl.c | 75 +++++ net/core/ulp_ddp_gen_nl.h | 30 ++ net/core/ulp_ddp_nl.c | 335 +++++++++++++++++++++++ 7 files changed, 676 insertions(+), 2 deletions(-) create mode 100644 Documentation/netlink/specs/ulp_ddp.yaml create mode 100644 include/uapi/linux/ulp_ddp.h create mode 100644 net/core/ulp_ddp_gen_nl.c create mode 100644 net/core/ulp_ddp_gen_nl.h create mode 100644 net/core/ulp_ddp_nl.c
Documentation/netlink/specs/ulp_ddp.yaml new file +172 -0
@@ -0,0 +1,172 @@ +# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) +# +# Author: Aurelien Aptel <[email protected]> +# +# Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# + +name: ulp_ddp + +protocol: genetlink + +doc: Netlink protocol to manage ULP DPP on network devices. + +definitions: + - + type: enum + name: cap + render-max: true + entries: + - nvme-tcp + - nvme-tcp-ddgst-rx + +attribute-sets: + - + name: stats + attributes: + - + name: ifindex + doc: interface index of the net device. + type: u32 + - + name: rx-nvme-tcp-sk-add + doc: Sockets successfully configured for NVMeTCP offloading. + type: uint + - + name: rx-nvme-tcp-sk-add-fail + doc: Sockets failed to be configured for NVMeTCP offloading. + type: uint + - + name: rx-nvme-tcp-sk-del + doc: Sockets with NVMeTCP offloading configuration removed. + type: uint + - + name: rx-nvme-tcp-setup + doc: NVMe-TCP IOs successfully configured for Rx Direct Data Placement. + type: uint + - + name: rx-nvme-tcp-setup-fail + doc: NVMe-TCP IOs failed to be configured for Rx Direct Data Placement. + type: uint + - + name: rx-nvme-tcp-teardown + doc: NVMe-TCP IOs with Rx Direct Data Placement configuration removed. + type: uint + - + name: rx-nvme-tcp-drop + doc: Packets failed the NVMeTCP offload validation. + type: uint + - + name: rx-nvme-tcp-resync + doc: > + NVMe-TCP resync operations were processed due to Rx TCP packets + re-ordering. + type: uint + - + name: rx-nvme-tcp-packets + doc: TCP packets successfully processed by the NVMeTCP offload. + type: uint + - + name: rx-nvme-tcp-bytes + doc: Bytes were successfully processed by the NVMeTCP offload. + type: uint + - + name: caps + attributes: + - + name: ifindex + doc: interface index of the net device. + type: u32 + - + name: hw + doc: bitmask of the capabilities supported by the device. + type: uint + enum: cap + enum-as-flags: true + - + name: active + doc: bitmask of the capabilities currently enabled on the device. + type: uint + enum: cap + enum-as-flags: true + - + name: wanted + doc: > + new active bit values of the capabilities we want to set on the + device. + type: uint + enum: cap + enum-as-flags: true + - + name: wanted_mask + doc: bitmask of the meaningful bits in the wanted field. + type: uint + enum: cap + enum-as-flags: true + +operations: + list: + - + name: caps-get + doc: Get ULP DDP capabilities. + attribute-set: caps + do: + request: + attributes: + - ifindex + reply: + attributes: + - ifindex + - hw + - active + pre: ulp_ddp_get_netdev + post: ulp_ddp_put_netdev + - + name: stats-get + doc: Get ULP DDP stats. + attribute-set: stats + do: + request: + attributes: + - ifindex + reply: + attributes: + - ifindex + - rx-nvme-tcp-sk-add + - rx-nvme-tcp-sk-add-fail + - rx-nvme-tcp-sk-del + - rx-nvme-tcp-setup + - rx-nvme-tcp-setup-fail + - rx-nvme-tcp-teardown + - rx-nvme-tcp-drop + - rx-nvme-tcp-resync + - rx-nvme-tcp-packets + - rx-nvme-tcp-bytes + pre: ulp_ddp_get_netdev + post: ulp_ddp_put_netdev + - + name: caps-set + doc: Set ULP DDP capabilities. + attribute-set: caps + do: + request: + attributes: + - ifindex + - wanted + - wanted_mask + reply: + attributes: + - ifindex + - hw + - active + pre: ulp_ddp_get_netdev + post: ulp_ddp_put_netdev + - + name: caps-set-ntf + doc: Notification for change in ULP DDP capabilities. + notify: caps-get + +mcast-groups: + list: + - + name: mgmt
include/net/ulp_ddp.h +2 -1
@@ -10,6 +10,7 @@#include <linux/netdevice.h> #include <net/inet_connection_sock.h> #include <net/sock.h> +#include <uapi/linux/ulp_ddp.h> enum ulp_ddp_type {ULP_DDP_NVME =1 ,
@@ -128,7 +129,7 @@ struct ulp_ddp_stats {*/ }; -#define ULP_DDP_CAP_COUNT 1 +#define ULP_DDP_CAP_COUNT (ULP_DDP_CAP_MAX + 1)struct ulp_ddp_dev_caps { DECLARE_BITMAP(active, ULP_DDP_CAP_COUNT);
include/uapi/linux/ulp_ddp.h new file +61 -0
61 lines not on this page · raw message
net/core/Makefile +1 -1
@@ -18,7 +18,7 @@ obj-y += dev.o dev_addr_lists.o dst.o netevent.o \ obj-$(CONFIG_NETDEV_ADDR_LIST_TEST) += dev_addr_lists_test.o obj-y += net-sysfs.o -obj-$(CONFIG_ULP_DDP) += ulp_ddp.o +obj-$(CONFIG_ULP_DDP) += ulp_ddp.o ulp_ddp_nl.o ulp_ddp_gen_nl.o obj-$(CONFIG_PAGE_POOL) += page_pool.o obj-$(CONFIG_PROC_FS) += net-procfs.o obj-$(CONFIG_NET_PKTGEN) += pktgen.o
net/core/ulp_ddp_gen_nl.c new file +75 -0
75 lines not on this page · raw message
net/core/ulp_ddp_gen_nl.h new file +30 -0
@@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ +/* Do not edit directly, auto-generated from: */ +/* Documentation/netlink/specs/ulp_ddp.yaml */ +/* YNL-GEN kernel header */ + +#ifndef _LINUX_ULP_DDP_GEN_H +#define _LINUX_ULP_DDP_GEN_H + +#include <net/netlink.h> +#include <net/genetlink.h> + +#include <uapi/linux/ulp_ddp.h> + +int ulp_ddp_get_netdev (const struct genl_split_ops *ops,struct sk_buff *skb, +struct genl_info *info); +void +ulp_ddp_put_netdev (const struct genl_split_ops *ops,struct sk_buff *skb, +struct genl_info *info); + +int ulp_ddp_nl_caps_get_doit (struct sk_buff *skb,struct genl_info *info); +int ulp_ddp_nl_stats_get_doit (struct sk_buff *skb,struct genl_info *info); +int ulp_ddp_nl_caps_set_doit (struct sk_buff *skb,struct genl_info *info); + +enum { +ULP_DDP_NLGRP_MGMT , +}; + +extern struct genl_family ulp_ddp_nl_family; + +#endif /* _LINUX_ULP_DDP_GEN_H */
net/core/ulp_ddp_nl.c new file +335 -0
335 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v20 02/20] netlink: add new family to manage ULP_DDP enablement and stats
Quoted 16 lines · Wed, Nov 22, 2023 at 02:48:15PM CET, [email protected] wrote:
Add a new netlink family to get/set ULP DDP capabilities on a network device and to retrieve statistics.
The messages use the genetlink infrastructure and are specified in a YAML file which was used to generate some of the files in this commit:
./tools/net/ynl/ynl-gen-c.py --mode kernel \ --spec ./Documentation/netlink/specs/ulp_ddp.yaml --header \ -o net/core/ulp_ddp_gen_nl.h ./tools/net/ynl/ynl-gen-c.py --mode kernel \ --spec ./Documentation/netlink/specs/ulp_ddp.yaml --source \ -o net/core/ulp_ddp_gen_nl.c ./tools/net/ynl/ynl-gen-c.py --mode uapi \ --spec ./Documentation/netlink/specs/ulp_ddp.yaml --header \ > include/uapi/linux/ulp_ddp.h
Quoted 2 lines
Signed-off-by Shai Malin <[email protected]>Signed-off-by Aurelien Aptel <[email protected]>
Overall looks good to me, couple of nits below, take it or leave it.
Quoted 469 lines
---
Documentation/netlink/specs/ulp_ddp.yaml | 172 ++++++++++++ include/net/ulp_ddp.h | 3 +- include/uapi/linux/ulp_ddp.h | 61 +++++ net/core/Makefile | 2 +- net/core/ulp_ddp_gen_nl.c | 75 +++++ net/core/ulp_ddp_gen_nl.h | 30 ++ net/core/ulp_ddp_nl.c | 335 +++++++++++++++++++++++ 7 files changed, 676 insertions(+), 2 deletions(-)create mode 100644
Documentation/netlink/specs/ulp_ddp.yamlcreate mode 100644include/uapi/linux/ulp_ddp.hcreate mode 100644net/core/ulp_ddp_gen_nl.ccreate mode 100644net/core/ulp_ddp_gen_nl.hcreate mode 100644net/core/ulp_ddp_nl.cDocumentation/netlink/specs/ulp_ddp.yaml new file +172
-0@@ -0,0 +1,172 @@ +# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) +# +# Author: Aurelien Aptel <[email protected]> +# +# Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# + +name: ulp_ddp + +protocol: genetlink + +doc: Netlink protocol to manage ULP DPP on network devices. + +definitions: + - + type: enum + name: cap + render-max: true + entries: + - nvme-tcp + - nvme-tcp-ddgst-rx + +attribute-sets: + - + name: stats + attributes: + - + name: ifindex + doc: interface index of the net device. + type: u32 + - + name: rx-nvme-tcp-sk-add + doc: Sockets successfully configured for NVMeTCP offloading. + type: uint + - + name: rx-nvme-tcp-sk-add-fail + doc: Sockets failed to be configured for NVMeTCP offloading. + type: uint + - + name: rx-nvme-tcp-sk-del + doc: Sockets with NVMeTCP offloading configuration removed. + type: uint + - + name: rx-nvme-tcp-setup + doc: NVMe-TCP IOs successfully configured for Rx Direct Data Placement. + type: uint + - + name: rx-nvme-tcp-setup-fail + doc: NVMe-TCP IOs failed to be configured for Rx Direct Data Placement. + type: uint + - + name: rx-nvme-tcp-teardown + doc: NVMe-TCP IOs with Rx Direct Data Placement configuration removed. + type: uint + - + name: rx-nvme-tcp-drop + doc: Packets failed the NVMeTCP offload validation. + type: uint + - + name: rx-nvme-tcp-resync + doc: > + NVMe-TCP resync operations were processed due to Rx TCP packets + re-ordering. + type: uint + - + name: rx-nvme-tcp-packets + doc: TCP packets successfully processed by the NVMeTCP offload. + type: uint + - + name: rx-nvme-tcp-bytes + doc: Bytes were successfully processed by the NVMeTCP offload. + type: uint + - + name: caps + attributes: + - + name: ifindex + doc: interface index of the net device. + type: u32 + - + name: hw + doc: bitmask of the capabilities supported by the device. + type: uint + enum: cap + enum-as-flags: true + - + name: active + doc: bitmask of the capabilities currently enabled on the device. + type: uint + enum: cap + enum-as-flags: true + - + name: wanted + doc: > + new active bit values of the capabilities we want to set on the + device. + type: uint + enum: cap + enum-as-flags: true + - + name: wanted_mask + doc: bitmask of the meaningful bits in the wanted field. + type: uint + enum: cap + enum-as-flags: true + +operations: + list: + - + name: caps-get + doc: Get ULP DDP capabilities. + attribute-set: caps + do: + request: + attributes: + - ifindex + reply: + attributes: + - ifindex + - hw + - active + pre: ulp_ddp_get_netdev + post: ulp_ddp_put_netdev + - + name: stats-get + doc: Get ULP DDP stats. + attribute-set: stats + do: + request: + attributes: + - ifindex + reply: + attributes: + - ifindex + - rx-nvme-tcp-sk-add + - rx-nvme-tcp-sk-add-fail + - rx-nvme-tcp-sk-del + - rx-nvme-tcp-setup + - rx-nvme-tcp-setup-fail + - rx-nvme-tcp-teardown + - rx-nvme-tcp-drop + - rx-nvme-tcp-resync + - rx-nvme-tcp-packets + - rx-nvme-tcp-bytes + pre: ulp_ddp_get_netdev + post: ulp_ddp_put_netdev + - + name: caps-set + doc: Set ULP DDP capabilities. + attribute-set: caps + do: + request: + attributes: + - ifindex + - wanted + - wanted_mask + reply: + attributes: + - ifindex + - hw + - active + pre: ulp_ddp_get_netdev + post: ulp_ddp_put_netdev + - + name: caps-set-ntf + doc: Notification for change in ULP DDP capabilities. + notify: caps-get + +mcast-groups: + list: + - + name: mgmtinclude/net/ulp_ddp.h +2
-1@@ -10,6 +10,7 @@#include <linux/netdevice.h> #include <net/inet_connection_sock.h> #include <net/sock.h> +#include <uapi/linux/ulp_ddp.h> enum ulp_ddp_type {ULP_DDP_NVME =1 ,@@ -128,7 +129,7 @@ struct ulp_ddp_stats {*/ }; -#define ULP_DDP_CAP_COUNT 1 +#define ULP_DDP_CAP_COUNT (ULP_DDP_CAP_MAX + 1)struct ulp_ddp_dev_caps { DECLARE_BITMAP(active, ULP_DDP_CAP_COUNT);include/uapi/linux/ulp_ddp.h new file +61
-0@@ -0,0 +1,61 @@ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ +/* Do not edit directly, auto-generated from: */ +/* Documentation/netlink/specs/ulp_ddp.yaml */ +/* YNL-GEN uapi header */ + +#ifndef _UAPI_LINUX_ULP_DDP_H +#define _UAPI_LINUX_ULP_DDP_H + +#define ULP_DDP_FAMILY_NAME "ulp_ddp" +#define ULP_DDP_FAMILY_VERSION 1 + +enum ulp_ddp_cap { +ULP_DDP_CAP_NVME_TCP , +ULP_DDP_CAP_NVME_TCP_DDGST_RX , + +/* private: */ + __ULP_DDP_CAP_MAX, +ULP_DDP_CAP_MAX = (__ULP_DDP_CAP_MAX -1 ) +}; + +enum { +ULP_DDP_A_STATS_IFINDEX =1 , +ULP_DDP_A_STATS_RX_NVME_TCP_SK_ADD , +ULP_DDP_A_STATS_RX_NVME_TCP_SK_ADD_FAIL , +ULP_DDP_A_STATS_RX_NVME_TCP_SK_DEL , +ULP_DDP_A_STATS_RX_NVME_TCP_SETUP , +ULP_DDP_A_STATS_RX_NVME_TCP_SETUP_FAIL , +ULP_DDP_A_STATS_RX_NVME_TCP_TEARDOWN , +ULP_DDP_A_STATS_RX_NVME_TCP_DROP , +ULP_DDP_A_STATS_RX_NVME_TCP_RESYNC , +ULP_DDP_A_STATS_RX_NVME_TCP_PACKETS , +ULP_DDP_A_STATS_RX_NVME_TCP_BYTES , + + __ULP_DDP_A_STATS_MAX, +ULP_DDP_A_STATS_MAX = (__ULP_DDP_A_STATS_MAX -1 ) +}; + +enum { +ULP_DDP_A_CAPS_IFINDEX =1 , +ULP_DDP_A_CAPS_HW , +ULP_DDP_A_CAPS_ACTIVE , +ULP_DDP_A_CAPS_WANTED , +ULP_DDP_A_CAPS_WANTED_MASK , + + __ULP_DDP_A_CAPS_MAX, +ULP_DDP_A_CAPS_MAX = (__ULP_DDP_A_CAPS_MAX -1 ) +}; + +enum { +ULP_DDP_CMD_CAPS_GET =1 , +ULP_DDP_CMD_STATS_GET , +ULP_DDP_CMD_CAPS_SET , +ULP_DDP_CMD_CAPS_SET_NTF , + + __ULP_DDP_CMD_MAX, +ULP_DDP_CMD_MAX = (__ULP_DDP_CMD_MAX -1 ) +}; + +#define ULP_DDP_MCGRP_MGMT "mgmt" + +#endif /* _UAPI_LINUX_ULP_DDP_H */ net/core/Makefile +0
-0@@ -18,7 +18,7 @@ obj-y += dev.o dev_addr_lists.o dst.o netevent.o \obj-$(CONFIG_NETDEV_ADDR_LIST_TEST) += dev_addr_lists_test.o
obj-y += net-sysfs.o
net/core/Makefile +1
-1-obj-$(CONFIG_ULP_DDP) += ulp_ddp.o +obj-$(CONFIG_ULP_DDP) += ulp_ddp.o ulp_ddp_nl.o ulp_ddp_gen_nl.oobj-$(CONFIG_PAGE_POOL) += page_pool.o
obj-$(CONFIG_PROC_FS) += net-procfs.o
obj-$(CONFIG_NET_PKTGEN) += pktgen.onet/core/ulp_ddp_gen_nl.c new file +75
-0@@ -0,0 +1,75 @@ +// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) +/* Do not edit directly, auto-generated from: */ +/* Documentation/netlink/specs/ulp_ddp.yaml */ +/* YNL-GEN kernel source */ + +#include <net/netlink.h> +#include <net/genetlink.h> + +#include "ulp_ddp_gen_nl.h" + +#include <uapi/linux/ulp_ddp.h> + +/* ULP_DDP_CMD_CAPS_GET - do */ +static const struct nla_policy ulp_ddp_caps_get_nl_policy[ULP_DDP_A_CAPS_IFINDEX +1 ] = { + [ULP_DDP_A_CAPS_IFINDEX ] = { .type =NLA_U32 , }, +}; + +/* ULP_DDP_CMD_STATS_GET - do */ +static const struct nla_policy ulp_ddp_stats_get_nl_policy[ULP_DDP_A_STATS_IFINDEX +1 ] = { + [ULP_DDP_A_STATS_IFINDEX ] = { .type =NLA_U32 , }, +}; + +/* ULP_DDP_CMD_CAPS_SET - do */ +static const struct nla_policy ulp_ddp_caps_set_nl_policy[ULP_DDP_A_CAPS_WANTED_MASK +1 ] = { + [ULP_DDP_A_CAPS_IFINDEX ] = { .type =NLA_U32 , }, + [ULP_DDP_A_CAPS_WANTED ] =NLA_POLICY_MASK (NLA_UINT ,0x3 ), + [ULP_DDP_A_CAPS_WANTED_MASK ] =NLA_POLICY_MASK (NLA_UINT ,0x3 ), +}; + +/* Ops table for ulp_ddp */ +static const struct genl_split_ops ulp_ddp_nl_ops[] = { + { + .cmd =ULP_DDP_CMD_CAPS_GET , + .pre_doit = ulp_ddp_get_netdev, + .doit = ulp_ddp_nl_caps_get_doit, + .post_doit = ulp_ddp_put_netdev, + .policy = ulp_ddp_caps_get_nl_policy, + .maxattr =ULP_DDP_A_CAPS_IFINDEX , + .flags =GENL_CMD_CAP_DO , + }, + { + .cmd =ULP_DDP_CMD_STATS_GET , + .pre_doit = ulp_ddp_get_netdev, + .doit = ulp_ddp_nl_stats_get_doit, + .post_doit = ulp_ddp_put_netdev, + .policy = ulp_ddp_stats_get_nl_policy, + .maxattr =ULP_DDP_A_STATS_IFINDEX , + .flags =GENL_CMD_CAP_DO , + }, + { + .cmd =ULP_DDP_CMD_CAPS_SET , + .pre_doit = ulp_ddp_get_netdev, + .doit = ulp_ddp_nl_caps_set_doit, + .post_doit = ulp_ddp_put_netdev, + .policy = ulp_ddp_caps_set_nl_policy, + .maxattr =ULP_DDP_A_CAPS_WANTED_MASK , + .flags =GENL_CMD_CAP_DO , + }, +}; + +static const struct genl_multicast_group ulp_ddp_nl_mcgrps[] = { + [ULP_DDP_NLGRP_MGMT ] = {"mgmt" , }, +}; + +struct genl_family ulp_ddp_nl_family__ro_after_init = { + .name =ULP_DDP_FAMILY_NAME , + .version =ULP_DDP_FAMILY_VERSION , + .netnsok = true, + .parallel_ops = true, + .module =THIS_MODULE , + .split_ops = ulp_ddp_nl_ops, + .n_split_ops =ARRAY_SIZE (ulp_ddp_nl_ops), + .mcgrps = ulp_ddp_nl_mcgrps, + .n_mcgrps =ARRAY_SIZE (ulp_ddp_nl_mcgrps), +};net/core/ulp_ddp_gen_nl.h new file +30
-0@@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ +/* Do not edit directly, auto-generated from: */ +/* Documentation/netlink/specs/ulp_ddp.yaml */ +/* YNL-GEN kernel header */ + +#ifndef _LINUX_ULP_DDP_GEN_H +#define _LINUX_ULP_DDP_GEN_H + +#include <net/netlink.h> +#include <net/genetlink.h> + +#include <uapi/linux/ulp_ddp.h> + +int ulp_ddp_get_netdev (const struct genl_split_ops *ops,struct sk_buff *skb, +struct genl_info *info); +void +ulp_ddp_put_netdev (const struct genl_split_ops *ops,struct sk_buff *skb, +struct genl_info *info); + +int ulp_ddp_nl_caps_get_doit (struct sk_buff *skb,struct genl_info *info); +int ulp_ddp_nl_stats_get_doit (struct sk_buff *skb,struct genl_info *info); +int ulp_ddp_nl_caps_set_doit (struct sk_buff *skb,struct genl_info *info); + +enum { +ULP_DDP_NLGRP_MGMT , +}; + +extern struct genl_family ulp_ddp_nl_family; + +#endif /* _LINUX_ULP_DDP_GEN_H */ net/core/ulp_ddp_nl.c new file +52
-0@@ -0,0 +1,335 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* ulp_ddp_nl.c +* Author: Aurelien Aptel <[email protected]> +* Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +*/ +#include <net/ulp_ddp.h> +#include "ulp_ddp_gen_nl.h" + +#define ULP_DDP_STATS_CNT (sizeof(struct ulp_ddp_stats) / sizeof(u64)) + +struct ulp_ddp_reply_context { +struct net_device *dev; +netdevice_tracker tracker; +void *hdr; +u32 ifindex; +struct ulp_ddp_dev_caps caps; +struct ulp_ddp_stats stats; +}; + +static size_t ulp_ddp_reply_size (int cmd) +{ +size_t len =0 ; + +BUILD_BUG_ON (ULP_DDP_CAP_COUNT >64 ); + +/* ifindex */ + len +=nla_total_size (sizeof (u32)); + +switch (cmd) { +case ULP_DDP_CMD_CAPS_GET : +case ULP_DDP_CMD_CAPS_SET : +case ULP_DDP_CMD_CAPS_SET_NTF : +/* hw */ + len +=nla_total_size_64bit (sizeof (u64)); + +/* active */ + len +=nla_total_size_64bit (sizeof (u64)); +break ; +case ULP_DDP_CMD_STATS_GET : +/* stats */ + len +=nla_total_size_64bit (sizeof (u64)) *ULP_DDP_STATS_CNT ; +break ; + } + +return len; +} + +/* pre_doit */ +int ulp_ddp_get_netdev (const struct genl_split_ops *ops, +struct sk_buff *skb,struct genl_info *info) +{
net/core/ulp_ddp_nl.c line 62
Quoted 10 lines
net/core/ulp_ddp_nl.c new file +10
-0+struct ulp_ddp_reply_context *ctx; + +if (GENL_REQ_ATTR_CHECK (info,ULP_DDP_A_CAPS_IFINDEX )) +return -EINVAL ; + + ctx =kzalloc (sizeof (*ctx),GFP_KERNEL ); +if (!ctx) +return -ENOMEM ; + + ctx->ifindex =nla_get_u32 (info->attrs[ULP_DDP_A_CAPS_IFINDEX ]);
You don't need to store ifindex. You have ctx->dev->ifindex with the same value.
Quoted 33 lines
net/core/ulp_ddp_nl.c new file +33
-0+ ctx->dev =netdev_get_by_index (genl_info_net (info), + ctx->ifindex, + &ctx->tracker, +GFP_KERNEL ); +if (!ctx->dev) { +kfree (ctx); +NL_SET_ERR_MSG_ATTR (info->extack, + info->attrs[ULP_DDP_A_CAPS_IFINDEX ], +"Network interface does not exist" ); +return -ENODEV ; + } + +if (!ctx->dev->netdev_ops->ulp_ddp_ops) { +netdev_put (ctx->dev, &ctx->tracker); +kfree (ctx); +NL_SET_ERR_MSG_ATTR (info->extack, + info->attrs[ULP_DDP_A_CAPS_IFINDEX ], +"Network interface does not support ULP DDP" ); +return -EOPNOTSUPP ; + } + + info->user_ptr[0 ] = ctx; +return 0 ; +} + +/* post_doit */ +void ulp_ddp_put_netdev (const struct genl_split_ops *ops,struct sk_buff *skb, +struct genl_info *info) +{ +struct ulp_ddp_reply_context *ctx = info->user_ptr[0 ]; + +netdev_put (ctx->dev, &ctx->tracker); +kfree (ctx);
net/core/ulp_ddp_nl.c line 105
Quoted 10 lines
net/core/ulp_ddp_nl.c new file +10
-0+} + +static int ulp_ddp_prepare_context (struct ulp_ddp_reply_context *ctx,int cmd) +{ +const struct ulp_ddp_dev_ops *ops = ctx->dev->netdev_ops->ulp_ddp_ops; + +switch (cmd) { +case ULP_DDP_CMD_CAPS_GET : +case ULP_DDP_CMD_CAPS_SET : +case ULP_DDP_CMD_CAPS_SET_NTF :
Hmm, you never call ulp_ddp_prepare_context() with ULP_DDP_CMD_CAPS_SET_NTF. Perhaps just warn if this case is hit. IDK.
Quoted 6 lines
net/core/ulp_ddp_nl.c new file +6
-0+ ops->get_caps (ctx->dev, &ctx->caps); +break ; +case ULP_DDP_CMD_STATS_GET : + ops->get_stats (ctx->dev, &ctx->stats); +break ; + }
net/core/ulp_ddp_nl.c line 121
Quoted 10 lines
net/core/ulp_ddp_nl.c new file +10
-0+ +return 0 ; +} + +static int ulp_ddp_write_reply (struct sk_buff *rsp, +struct ulp_ddp_reply_context *ctx, +int cmd, +const struct genl_info *info) +{ + ctx->hdr =genlmsg_iput (rsp, info);
Interesting, you use "hdr" just in this fuction. Why isn't it a local variable?
Quoted 63 lines
net/core/ulp_ddp_nl.c new file +63
-0+if (!ctx->hdr) +return -EMSGSIZE ; + +switch (cmd) { +case ULP_DDP_CMD_CAPS_GET : +case ULP_DDP_CMD_CAPS_SET : +case ULP_DDP_CMD_CAPS_SET_NTF : +if (nla_put_u32 (rsp,ULP_DDP_A_CAPS_IFINDEX , ctx->ifindex) || +nla_put_uint (rsp,ULP_DDP_A_CAPS_HW , ctx->caps.hw[0 ]) || +nla_put_uint (rsp,ULP_DDP_A_CAPS_ACTIVE , + ctx->caps.active[0 ])) + goto err_cancel_msg; +break ; +case ULP_DDP_CMD_STATS_GET : +if (nla_put_u32 (rsp,ULP_DDP_A_STATS_IFINDEX , ctx->ifindex) || +nla_put_uint (rsp, +ULP_DDP_A_STATS_RX_NVME_TCP_SK_ADD , + ctx->stats.rx_nvmeotcp_sk_add) || +nla_put_uint (rsp, +ULP_DDP_A_STATS_RX_NVME_TCP_SK_ADD_FAIL , + ctx->stats.rx_nvmeotcp_sk_add_fail) || +nla_put_uint (rsp, +ULP_DDP_A_STATS_RX_NVME_TCP_SK_DEL , + ctx->stats.rx_nvmeotcp_sk_del) || +nla_put_uint (rsp, +ULP_DDP_A_STATS_RX_NVME_TCP_SETUP , + ctx->stats.rx_nvmeotcp_ddp_setup) || +nla_put_uint (rsp, +ULP_DDP_A_STATS_RX_NVME_TCP_SETUP_FAIL , + ctx->stats.rx_nvmeotcp_ddp_setup_fail) || +nla_put_uint (rsp, +ULP_DDP_A_STATS_RX_NVME_TCP_TEARDOWN , + ctx->stats.rx_nvmeotcp_ddp_teardown) || +nla_put_uint (rsp, +ULP_DDP_A_STATS_RX_NVME_TCP_DROP , + ctx->stats.rx_nvmeotcp_drop) || +nla_put_uint (rsp, +ULP_DDP_A_STATS_RX_NVME_TCP_RESYNC , + ctx->stats.rx_nvmeotcp_resync) || +nla_put_uint (rsp, +ULP_DDP_A_STATS_RX_NVME_TCP_PACKETS , + ctx->stats.rx_nvmeotcp_packets) || +nla_put_uint (rsp, +ULP_DDP_A_STATS_RX_NVME_TCP_BYTES , + ctx->stats.rx_nvmeotcp_bytes)) + goto err_cancel_msg; + } +genlmsg_end (rsp, ctx->hdr); + +return 0 ; + +err_cancel_msg: +genlmsg_cancel (rsp, ctx->hdr); + +return -EMSGSIZE ; +} + +int ulp_ddp_nl_caps_get_doit (struct sk_buff *req,struct genl_info *info) +{ +struct ulp_ddp_reply_context *ctx = info->user_ptr[0 ]; +struct sk_buff *rsp; +int ret =0 ; +
net/core/ulp_ddp_nl.c line 194
Quoted 10 lines
net/core/ulp_ddp_nl.c new file +10
-0+ ret =ulp_ddp_prepare_context (ctx,ULP_DDP_CMD_CAPS_GET ); +if (ret) +return ret; + + rsp =genlmsg_new (ulp_ddp_reply_size (ULP_DDP_CMD_CAPS_GET ),GFP_KERNEL ); +if (!rsp) +return -EMSGSIZE ; + + ret =ulp_ddp_write_reply (rsp, ctx,ULP_DDP_CMD_CAPS_GET , info); +if (ret <0 )
You mix "if (ret)" and "if (ret < 0)" in this code, I don't see any of the functions return positive value on success, so you can make it consistent to "if (ret)".
Quoted 14 lines
net/core/ulp_ddp_nl.c new file +14
-0+ goto err_rsp; + +return genlmsg_reply (rsp, info); + +err_rsp: +nlmsg_free (rsp); +return ret; +} + +static void ulp_ddp_nl_notify_dev (struct ulp_ddp_reply_context *ctx) +{ +struct genl_info info; +struct sk_buff *ntf; +
net/core/ulp_ddp_nl.c line 218
Quoted 10 lines
net/core/ulp_ddp_nl.c new file +10
-0+if (!genl_has_listeners (&ulp_ddp_nl_family,dev_net (ctx->dev), +ULP_DDP_NLGRP_MGMT )) +return ; + +genl_info_init_ntf (&info, &ulp_ddp_nl_family,ULP_DDP_CMD_CAPS_SET_NTF ); + ntf =genlmsg_new (ulp_ddp_reply_size (ULP_DDP_CMD_CAPS_GET ),GFP_KERNEL ); +if (!ntf) +return ; + +if (ulp_ddp_write_reply (ntf, ctx,ULP_DDP_CMD_CAPS_SET_NTF , &info)) {
Always use "ret" variable to store return value before you check it.
Quoted 49 lines
net/core/ulp_ddp_nl.c new file +49
-0+nlmsg_free (ntf); +return ; + } + +genlmsg_multicast_netns (&ulp_ddp_nl_family,dev_net (ctx->dev), ntf, +0 ,ULP_DDP_NLGRP_MGMT ,GFP_KERNEL ); +} + +static int ulp_ddp_apply_bits (struct ulp_ddp_reply_context *ctx, +unsigned long *req_wanted, +unsigned long *req_mask, +struct genl_info *info) +{ +DECLARE_BITMAP (old_active,ULP_DDP_CAP_COUNT ); +DECLARE_BITMAP (new_active,ULP_DDP_CAP_COUNT ); +const struct ulp_ddp_dev_ops *ops; +struct ulp_ddp_dev_caps caps; +int ret; + + ops = ctx->dev->netdev_ops->ulp_ddp_ops; + ops->get_caps (ctx->dev, &caps); + +/* new_active = (old_active & ~req_mask) | (wanted & req_mask) +* new_active &= caps_hw +*/ +bitmap_copy (old_active, caps.active,ULP_DDP_CAP_COUNT ); +bitmap_and (req_wanted, req_wanted, req_mask,ULP_DDP_CAP_COUNT ); +bitmap_andnot (new_active, old_active, req_mask,ULP_DDP_CAP_COUNT ); +bitmap_or (new_active, new_active, req_wanted,ULP_DDP_CAP_COUNT ); +bitmap_and (new_active, new_active, caps.hw,ULP_DDP_CAP_COUNT ); +if (!bitmap_equal (old_active, new_active,ULP_DDP_CAP_COUNT )) { + ret = ops->set_caps (ctx->dev, new_active, info->extack); +if (ret <0 ) +return ret; + ops->get_caps (ctx->dev, &caps); +bitmap_copy (new_active, caps.active,ULP_DDP_CAP_COUNT ); + } + +/* return 1 to notify */ +return !bitmap_equal (old_active, new_active,ULP_DDP_CAP_COUNT ); +} + +int ulp_ddp_nl_caps_set_doit (struct sk_buff *skb,struct genl_info *info) +{ +struct ulp_ddp_reply_context *ctx = info->user_ptr[0 ]; +unsigned long wanted, wanted_mask; +struct sk_buff *rsp; +bool notify; +int ret;
net/core/ulp_ddp_nl.c line 277
Quoted 10 lines
net/core/ulp_ddp_nl.c new file +10
-0+ +if (GENL_REQ_ATTR_CHECK (info,ULP_DDP_A_CAPS_WANTED ) || +GENL_REQ_ATTR_CHECK (info,ULP_DDP_A_CAPS_WANTED_MASK )) +return -EINVAL ; + + rsp =genlmsg_new (ulp_ddp_reply_size (ULP_DDP_CMD_STATS_GET ),GFP_KERNEL ); +if (!rsp) +return -EMSGSIZE ; + + wanted =nla_get_u64 (info->attrs[ULP_DDP_A_CAPS_WANTED ]);
nla_get_uint()
net/core/ulp_ddp_nl.c line 278
Quoted 1 line
net/core/ulp_ddp_nl.c new file +1
-0+ wanted_mask =nla_get_u64 (info->attrs[ULP_DDP_A_CAPS_WANTED_MASK ]);
nla_get_uint()
net/core/ulp_ddp_nl.c line 280
Quoted 2 lines
net/core/ulp_ddp_nl.c new file +2
-0+ + ret =ulp_ddp_apply_bits (ctx, &wanted, &wanted_mask, info);
ret = ulp_ddp_apply_bits(ctx, &wanted, &wanted_mask, info, ¬ify);
Would be a bit cleaner to read perhaps.
Quoted 59 lines
net/core/ulp_ddp_nl.c new file +55
-0+if (ret <0 ) + goto err_rsp; + + notify = !!ret; + ret =ulp_ddp_prepare_context (ctx,ULP_DDP_CMD_CAPS_SET ); +if (ret) + goto err_rsp; + + ret =ulp_ddp_write_reply (rsp, ctx,ULP_DDP_CMD_CAPS_SET , info); +if (ret <0 ) + goto err_rsp; + + ret =genlmsg_reply (rsp, info); +if (notify) +ulp_ddp_nl_notify_dev (ctx); + +return ret; + +err_rsp: +nlmsg_free (rsp); + +return ret; +} + +int ulp_ddp_nl_stats_get_doit (struct sk_buff *skb,struct genl_info *info) +{ +struct ulp_ddp_reply_context *ctx = info->user_ptr[0 ]; +struct sk_buff *rsp; +int ret =0 ; + + ret =ulp_ddp_prepare_context (ctx,ULP_DDP_CMD_STATS_GET ); +if (ret) +return ret; + + rsp =genlmsg_new (ulp_ddp_reply_size (ULP_DDP_CMD_STATS_GET ),GFP_KERNEL ); +if (!rsp) +return -EMSGSIZE ; + + ret =ulp_ddp_write_reply (rsp, ctx,ULP_DDP_CMD_STATS_GET , info); +if (ret <0 ) + goto err_rsp; + +return genlmsg_reply (rsp, info); + +err_rsp: +nlmsg_free (rsp); +return ret; +} + +static int __init ulp_ddp_init (void ) +{ +return genl_register_family (&ulp_ddp_nl_family); +} + +subsys_initcall (ulp_ddp_init);Signature · 1 line
2.34.1
Re: [PATCH v20 02/20] netlink: add new family to manage ULP_DDP enablement and stats
Quoted 1 line · Jiri Pirko
Overall looks good to me, couple of nits below, take it or leave it.
Glad to hear. We will send v21 with the changes below. Hopefully we can get a RB or Ack on this patch.
Quoted 5 lines
net/core/ulp_ddp_nl.c line 62
Quoted 2 lines
net/core/ulp_ddp_nl.c new file +2
-0+ + ctx->ifindex =nla_get_u32 (info->attrs[ULP_DDP_A_CAPS_IFINDEX ]);You don't need to store ifindex. You have
ctx->dev->ifindexwith the same value.
Ok, we will remove it from the context.
Quoted 7 lines
net/core/ulp_ddp_nl.c line 33
Quoted 4 lines
net/core/ulp_ddp_nl.c new file +4
-0+switch (cmd) { +case ULP_DDP_CMD_CAPS_GET : +case ULP_DDP_CMD_CAPS_SET : +case ULP_DDP_CMD_CAPS_SET_NTF :Hmm, you never call
ulp_ddp_prepare_context()withULP_DDP_CMD_CAPS_SET_NTF. Perhaps just warn if this case is hit. IDK.
While that is true it also reflects what the payload is and it mirrors ulp_ddp_reply_size(). We will keep it as is.
Quoted 9 lines
net/core/ulp_ddp_nl.c line 121
Quoted 6 lines
net/core/ulp_ddp_nl.c new file +6
-0+static int ulp_ddp_write_reply (struct sk_buff *rsp, +struct ulp_ddp_reply_context *ctx, +int cmd, +const struct genl_info *info) +{ + ctx->hdr =genlmsg_iput (rsp, info);Interesting, you use "hdr" just in this fuction. Why isn't it a local variable?
Good point, we will make it a local variable.
Quoted 6 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ ret = ulp_ddp_write_reply(rsp, ctx, ULP_DDP_CMD_CAPS_GET, info); + if (ret < 0)You mix "if (ret)" and "if (ret < 0)" in this code, I don't see any of the functions return positive value on success, so you can make it consistent to "if (ret)".
Ok, we will change the checks to "if (ret)" and change ulp_ddp_apply_bits() return the notify flag via an input parameter.
Quoted 4 lines
net/core/ulp_ddp_nl.c line 218
Quoted 2 lines
net/core/ulp_ddp_nl.c new file +2
-0+ +if (ulp_ddp_write_reply (ntf, ctx,ULP_DDP_CMD_CAPS_SET_NTF , &info)) {Always use "ret" variable to store return value before you check it.
Ok.
Quoted 10 lines
net/core/ulp_ddp_nl.c line 277
Quoted 6 lines
net/core/ulp_ddp_nl.c new file +6
-0+ + rsp =genlmsg_new (ulp_ddp_reply_size (ULP_DDP_CMD_STATS_GET ),GFP_KERNEL ); +if (!rsp) +return -EMSGSIZE ; + + wanted =nla_get_u64 (info->attrs[ULP_DDP_A_CAPS_WANTED ]);
nla_get_uint()
Quoted 4 lines
Quoted 1 line
+
wanted_mask=nla_get_u64(info->attrs[ULP_DDP_A_CAPS_WANTED_MASK]);
nla_get_uint()
Ok.
Quoted 8 lines
net/core/ulp_ddp_nl.c line 280
Quoted 3 lines
net/core/ulp_ddp_nl.c new file +2
-0+ + ret =ulp_ddp_apply_bits (ctx, &wanted, &wanted_mask, info);ret = ulp_ddp_apply_bits(ctx, &wanted,
&wanted_mask, info,
¬ify);Would be a bit cleaner to read perhaps.
True, we will change it to that.
Thanks
PATCH v20 3/20 iov_iter: skip copy if src == dst for direct data placement
In reply to Aurelien AptelFrom: Ben Ben-Ishay <[email protected]>
When using direct data placement (DDP) the NIC could write the payload directly into the destination buffer and constructs SKBs such that they point to this data. To skip copies when SKB data already resides in the destination buffer we check if (src == dst), and skip the copy when it's true.
--- lib/iov_iter.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
lib/iov_iter.c +8 -1
@@ -62,7 +62,14 @@ static __always_inlinesize_t memcpy_to_iter (void *iter_to,size_t progress,size_t len,void *from,void *priv2) { -memcpy (iter_to, from + progress, len); +/* +* When using direct data placement (DDP) the hardware writes +* data directly to the destination buffer, and constructs +* IOVs such that they point to this data. +* Thus, when the src == dst we skip the memcpy. +*/ +if (iter_to != from + progress) +memcpy (iter_to, from + progress, len);return 0 ; }
Signature · 1 line
2.34.1
PATCH v20 4/20 net/tls,core: export get_netdev_for_sock
In reply to Aurelien Aptel* remove netdev_sk_get_lowest_dev() from net/core
* move get_netdev_for_sock() from net/tls to net/core
get_netdev_for_sock() is a utility that is used to obtain the net_device structure from a connected socket.
Later patches will use this for nvme-tcp DDP and DDP DDGST offloads.
--- include/linux/netdevice.h | 3 +-- net/core/dev.c | 26 +++++++++++++------------- net/tls/tls_device.c | 16 ---------------- 3 files changed, 14 insertions(+), 31 deletions(-)
include/linux/netdevice.h +1 -2
@@ -3149,8 +3149,7 @@ int init_dummy_netdev(struct net_device *dev);struct net_device *netdev_get_xmit_slave (struct net_device *dev,struct sk_buff *skb,bool all_slaves); -struct net_device *netdev_sk_get_lowest_dev (struct net_device *dev, -struct sock *sk); +struct net_device *get_netdev_for_sock (struct sock *sk);struct net_device *dev_get_by_index (struct net *net,int ifindex);struct net_device *__dev_get_by_index (struct net *net,int ifindex); struct net_device *netdev_get_by_index(struct net *net, int ifindex,
net/core/dev.c +13 -13
@@ -8226,27 +8226,27 @@ static struct net_device *netdev_sk_get_lower_dev(struct net_device *dev, }/** -* netdev_sk_get_lowest_dev - Get the lowest device in chain given device and socket -* @dev: device +* get_netdev_for_sock - Get the lowest device in socket * @sk: the socket * -* %NULL is returned if no lower device is found. +* Assumes that the socket is already connected. +* Returns the lower device or %NULL if no lower device is found. */ - -struct net_device *netdev_sk_get_lowest_dev (struct net_device *dev, -struct sock *sk) +struct net_device *get_netdev_for_sock (struct sock *sk) { -struct net_device *lower; +struct dst_entry *dst =sk_dst_get (sk); +struct net_device *dev, *lower; - lower =netdev_sk_get_lower_dev (dev, sk); -while (lower) { +if (unlikely (!dst)) +return NULL ; + dev = dst->dev; +while ((lower =netdev_sk_get_lower_dev (dev, sk))) dev = lower; - lower =netdev_sk_get_lower_dev (dev, sk); - } - +dev_hold (dev); +dst_release (dst);return dev; } -EXPORT_SYMBOL (netdev_sk_get_lowest_dev); +EXPORT_SYMBOL_GPL (get_netdev_for_sock);static void netdev_adjacent_add_links (struct net_device *dev) {
net/tls/tls_device.c +0 -16
@@ -119,22 +119,6 @@ static void tls_device_queue_ctx_destruction(struct tls_context *ctx)tls_device_free_ctx (ctx); } -/* We assume that the socket is already connected */ -static struct net_device *get_netdev_for_sock (struct sock *sk) -{ -struct dst_entry *dst =sk_dst_get (sk); -struct net_device *netdev =NULL ; - -if (likely (dst)) { - netdev =netdev_sk_get_lowest_dev (dst->dev, sk); -dev_hold (netdev); - } - -dst_release (dst); - -return netdev; -} -static void destroy_record (struct tls_record_info *record) {int i;
Signature · 1 line
2.34.1
PATCH v20 5/20 nvme-tcp: Add DDP offload control path
In reply to Aurelien AptelFrom: Boris Pismenny <[email protected]>
This commit introduces direct data placement offload to NVME TCP. There is a context per queue, which is established after the handshake using the sk_add/del NDOs.
Additionally, a resynchronization routine is used to assist hardware recovery from TCP OOO, and continue the offload. Resynchronization operates as follows:
1. TCP OOO causes the NIC HW to stop the offload
2. NIC HW identifies a PDU header at some TCP sequence number, and asks NVMe-TCP to confirm it.
This request is delivered from the NIC driver to NVMe-TCP by first finding the socket for the packet that triggered the request, and then finding the nvme_tcp_queue that is used by this routine. Finally, the request is recorded in the nvme_tcp_queue.
3. When NVMe-TCP observes the requested TCP sequence, it will compare it with the PDU header TCP sequence, and report the result to the NIC driver (resync), which will update the HW, and resume offload when all is successful.
Some HW implementation such as ConnectX-7 assume linear CCID (0...N-1 for queue of size N) where the linux nvme driver uses part of the 16 bit CCID for generation counter. To address that, we use the existing quirk in the nvme layer when the HW driver advertises if the device is not supports the full 16 bit CCID range.
Furthermore, we let the offloading driver advertise what is the max hw sectors/segments via ulp_ddp_limits.
A follow-up patch introduces the data-path changes required for this offload.
Socket operations need a netdev reference. This reference is dropped on NETDEV_GOING_DOWN events to allow the device to go down in a follow-up patch.
--- drivers/nvme/host/tcp.c | 259 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 246 insertions(+), 13 deletions(-)
drivers/nvme/host/tcp.c +246 -13
@@ -21,6 +21,10 @@#include <net/busy_poll.h> #include <trace/events/sock.h> +#ifdef CONFIG_ULP_DDP +#include <net/ulp_ddp.h> +#endif +#include "nvme.h" #include "fabrics.h"
@@ -46,6 +50,16 @@ MODULE_PARM_DESC(tls_handshake_timeout, "nvme TLS handshake timeout in seconds (default 10)");#endif +#ifdef CONFIG_ULP_DDP +/* NVMeTCP direct data placement and data digest offload will not +* happen if this parameter false (default), regardless of what the +* underlying netdev capabilities are. +*/ +static bool ddp_offload; +module_param (ddp_offload, bool,0644 ); +MODULE_PARM_DESC (ddp_offload,"Enable or disable NVMeTCP direct data placement support" ); +#endif +#ifdef CONFIG_DEBUG_LOCK_ALLOC /* lockdep can detect a circular dependency of the form * sk_lock -> mmap_lock (page fault) -> fs locks -> sk_lock
@@ -119,6 +133,7 @@ enum nvme_tcp_queue_flags {NVME_TCP_Q_ALLOCATED =0 ,NVME_TCP_Q_LIVE =1 ,NVME_TCP_Q_POLLING =2 , + NVME_TCP_Q_OFF_DDP = 3, }; enum nvme_tcp_recv_state {
@@ -146,6 +161,18 @@ struct nvme_tcp_queue {size_t ddgst_remaining;unsigned int nr_cqe; +#ifdef CONFIG_ULP_DDP +/* +* resync_tcp_seq is a speculative PDU header tcp seq number (with +* an additional flag in the lower 32 bits) that the HW send to +* the SW, for the SW to verify. +* - The 32 high bits store the seq number +* - The 32 low bits are used as a flag to know if a request +* is pending (ULP_DDP_RESYNC_PENDING). +*/ +atomic64_t resync_tcp_seq; +#endif +/* send state */ struct nvme_tcp_request *request;
@@ -188,6 +215,12 @@ struct nvme_tcp_ctrl {struct delayed_work connect_work;struct nvme_tcp_request async_req;u32 io_queues[HCTX_MAX_TYPES ]; + +struct net_device *ddp_netdev; +u32 ddp_threshold; +#ifdef CONFIG_ULP_DDP +struct ulp_ddp_limits ddp_limits; +#endif };static LIST_HEAD (nvme_tcp_ctrl_list);
@@ -291,6 +324,166 @@ static inline size_t nvme_tcp_pdu_last_send(struct nvme_tcp_request *req,return nvme_tcp_pdu_data_left (req) <= len; } +#ifdef CONFIG_ULP_DDP + +static struct net_device * +nvme_tcp_get_ddp_netdev_with_limits (struct nvme_tcp_ctrl *ctrl) +{ +struct net_device *netdev; +bool ok; + +if (!ddp_offload) +return NULL ; + +/* netdev ref is put in nvme_tcp_stop_admin_queue() */ + netdev =get_netdev_for_sock (ctrl->queues[0 ].sock->sk); +if (!netdev) { +dev_dbg (ctrl->ctrl.device,"netdev not found\n" ); +return NULL ; + } + + ok =ulp_ddp_query_limits (netdev, &ctrl->ddp_limits, +ULP_DDP_NVME ,ULP_DDP_CAP_NVME_TCP , + ctrl->ctrl.opts->tls); +if (!ok) { +dev_put (netdev); +return NULL ; + } + +return netdev; +} + +static bool nvme_tcp_resync_request (struct sock *sk,u32 seq,u32 flags); +static const struct ulp_ddp_ulp_ops nvme_tcp_ddp_ulp_ops = { + .resync_request = nvme_tcp_resync_request, +}; + +static int nvme_tcp_offload_socket (struct nvme_tcp_queue *queue) +{ +struct ulp_ddp_config config = {.type =ULP_DDP_NVME }; +int ret; + + config.nvmeotcp.pfv =NVME_TCP_PFV_1_0 ; + config.nvmeotcp.cpda =0 ; + config.nvmeotcp.dgst = + queue->hdr_digest ?NVME_TCP_HDR_DIGEST_ENABLE :0 ; + config.nvmeotcp.dgst |= + queue->data_digest ?NVME_TCP_DATA_DIGEST_ENABLE :0 ; + config.nvmeotcp.queue_size = queue->ctrl->ctrl.sqsize +1 ; + config.nvmeotcp.queue_id =nvme_tcp_queue_id (queue); + + ret =ulp_ddp_sk_add (queue->ctrl->ddp_netdev, + queue->sock->sk, + &config, + &nvme_tcp_ddp_ulp_ops); +if (ret) +return ret; + +set_bit (NVME_TCP_Q_OFF_DDP , &queue->flags); + +return 0 ; +} + +static void nvme_tcp_unoffload_socket (struct nvme_tcp_queue *queue) +{ +clear_bit (NVME_TCP_Q_OFF_DDP , &queue->flags); +ulp_ddp_sk_del (queue->ctrl->ddp_netdev, queue->sock->sk); +} + +static void nvme_tcp_ddp_apply_limits (struct nvme_tcp_ctrl *ctrl) +{ + ctrl->ctrl.max_segments = ctrl->ddp_limits.max_ddp_sgl_len; + ctrl->ctrl.max_hw_sectors = + ctrl->ddp_limits.max_ddp_sgl_len << (ilog2 (SZ_4K ) -SECTOR_SHIFT ); + ctrl->ddp_threshold = ctrl->ddp_limits.io_threshold; + +/* offloading HW doesn't support full ccid range, apply the quirk */ + ctrl->ctrl.quirks |= + ctrl->ddp_limits.nvmeotcp.full_ccid_range ?0 :NVME_QUIRK_SKIP_CID_GEN ; +} + +/* In presence of packet drops or network packet reordering, the device may lose +* synchronization between the TCP stream and the L5P framing, and require a +* resync with the kernel's TCP stack. +* +* - NIC HW identifies a PDU header at some TCP sequence number, +* and asks NVMe-TCP to confirm it. +* - When NVMe-TCP observes the requested TCP sequence, it will compare +* it with the PDU header TCP sequence, and report the result to the +* NIC driver +*/ +static void nvme_tcp_resync_response (struct nvme_tcp_queue *queue, +struct sk_buff *skb,unsigned int offset) +{ +u64 pdu_seq =TCP_SKB_CB (skb)->seq + offset - queue->pdu_offset; +struct net_device *netdev = queue->ctrl->ddp_netdev; +u64 pdu_val = (pdu_seq <<32 ) |ULP_DDP_RESYNC_PENDING ; +u64 resync_val; +u32 resync_seq; + + resync_val =atomic64_read (&queue->resync_tcp_seq); +/* Lower 32 bit flags. Check validity of the request */ +if ((resync_val &ULP_DDP_RESYNC_PENDING ) ==0 ) +return ; + +/* +* Obtain and check requested sequence number: is this PDU header +* before the request? +*/ + resync_seq = resync_val >>32 ; +if (before (pdu_seq, resync_seq)) +return ; + +/* +* The atomic operation guarantees that we don't miss any NIC driver +* resync requests submitted after the above checks. +*/ +if (atomic64_cmpxchg (&queue->resync_tcp_seq, pdu_val, + pdu_val & ~ULP_DDP_RESYNC_PENDING ) != +atomic64_read (&queue->resync_tcp_seq)) +ulp_ddp_resync (netdev, queue->sock->sk, pdu_seq); +} + +static bool nvme_tcp_resync_request (struct sock *sk,u32 seq,u32 flags) +{ +struct nvme_tcp_queue *queue = sk->sk_user_data; + +/* +* "seq" (TCP seq number) is what the HW assumes is the +* beginning of a PDU. The nvme-tcp layer needs to store the +* number along with the "flags" (ULP_DDP_RESYNC_PENDING) to +* indicate that a request is pending. +*/ +atomic64_set (&queue->resync_tcp_seq, (((uint64_t )seq <<32 ) | flags)); + +return true; +} + +#else + +static struct net_device * +nvme_tcp_get_ddp_netdev_with_limits (struct nvme_tcp_ctrl *ctrl) +{ +return NULL ; +} + +static void nvme_tcp_ddp_apply_limits (struct nvme_tcp_ctrl *ctrl) +{} + +static int nvme_tcp_offload_socket (struct nvme_tcp_queue *queue) +{ +return 0 ; +} + +static void nvme_tcp_unoffload_socket (struct nvme_tcp_queue *queue) +{} + +static void nvme_tcp_resync_response (struct nvme_tcp_queue *queue, +struct sk_buff *skb,unsigned int offset) +{} + +#endif +static void nvme_tcp_init_iter (struct nvme_tcp_request *req,unsigned int dir) {
@@ -733,6 +926,9 @@ static int nvme_tcp_recv_pdu(struct nvme_tcp_queue *queue, struct sk_buff *skb,size_t rcv_len =min_t (size_t, *len, queue->pdu_remaining);int ret; +if (test_bit (NVME_TCP_Q_OFF_DDP , &queue->flags)) +nvme_tcp_resync_response (queue, skb, *offset); + ret =skb_copy_bits (skb, *offset, &pdu[queue->pdu_offset], rcv_len);if (unlikely (ret))
@@ -1807,6 +2003,8 @@ static void __nvme_tcp_stop_queue(struct nvme_tcp_queue *queue)kernel_sock_shutdown (queue->sock,SHUT_RDWR );nvme_tcp_restore_sock_ops (queue);cancel_work_sync (&queue->io_work); +if (test_bit (NVME_TCP_Q_OFF_DDP , &queue->flags)) +nvme_tcp_unoffload_socket (queue); }static void nvme_tcp_stop_queue (struct nvme_ctrl *nctrl,int qid)
@@ -1823,6 +2021,20 @@ static void nvme_tcp_stop_queue(struct nvme_ctrl *nctrl, int qid)mutex_unlock (&queue->queue_lock); } +static void nvme_tcp_stop_admin_queue (struct nvme_ctrl *nctrl) +{ +struct nvme_tcp_ctrl *ctrl =to_tcp_ctrl (nctrl); + +nvme_tcp_stop_queue (nctrl,0 ); + +/* +* We are called twice by nvme_tcp_teardown_admin_queue() +* Set ddp_netdev to NULL to avoid putting it twice +*/ +dev_put (ctrl->ddp_netdev); + ctrl->ddp_netdev =NULL ; +} +static void nvme_tcp_setup_sock_ops (struct nvme_tcp_queue *queue) {write_lock_bh (&queue->sock->sk->sk_callback_lock);
@@ -1849,19 +2061,37 @@ static int nvme_tcp_start_queue(struct nvme_ctrl *nctrl, int idx)nvme_tcp_init_recv_ctx (queue);nvme_tcp_setup_sock_ops (queue); -if (idx) +if (idx) { ret =nvmf_connect_io_queue (nctrl, idx); -else +if (ret) + goto err; + +if (ctrl->ddp_netdev) { + ret =nvme_tcp_offload_socket (queue); +if (ret) { +dev_info (nctrl->device, +"failed to setup offload on queue %d ret=%d\n" , + idx, ret); + } + } + }else { ret =nvmf_connect_admin_queue (nctrl); +if (ret) + goto err; + + ctrl->ddp_netdev =nvme_tcp_get_ddp_netdev_with_limits (ctrl); +if (ctrl->ddp_netdev) +nvme_tcp_ddp_apply_limits (ctrl); -if (!ret) { -set_bit (NVME_TCP_Q_LIVE , &queue->flags); - }else { -if (test_bit (NVME_TCP_Q_ALLOCATED , &queue->flags)) -__nvme_tcp_stop_queue (queue); -dev_err (nctrl->device, -"failed to connect queue: %d ret=%d\n" , idx, ret); } + +set_bit (NVME_TCP_Q_LIVE , &queue->flags); +return 0 ; +err: +if (test_bit (NVME_TCP_Q_ALLOCATED , &queue->flags)) +__nvme_tcp_stop_queue (queue); +dev_err (nctrl->device, +"failed to connect queue: %d ret=%d\n" , idx, ret);return ret; }
@@ -2073,7 +2303,7 @@ static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new)static void nvme_tcp_destroy_admin_queue (struct nvme_ctrl *ctrl,bool remove) { -nvme_tcp_stop_queue (ctrl,0 ); +nvme_tcp_stop_admin_queue (ctrl);if (remove)nvme_remove_admin_tag_set (ctrl);nvme_tcp_free_admin_queue (ctrl);
@@ -2116,7 +2346,7 @@ static int nvme_tcp_configure_admin_queue(struct nvme_ctrl *ctrl, bool new)nvme_quiesce_admin_queue (ctrl);blk_sync_queue (ctrl->admin_q); out_stop_queue: -nvme_tcp_stop_queue (ctrl,0 ); +nvme_tcp_stop_admin_queue (ctrl);nvme_cancel_admin_tagset (ctrl); out_cleanup_tagset:if (new)
@@ -2131,7 +2361,7 @@ static void nvme_tcp_teardown_admin_queue(struct nvme_ctrl *ctrl, {nvme_quiesce_admin_queue (ctrl);blk_sync_queue (ctrl->admin_q); -nvme_tcp_stop_queue (ctrl,0 ); +nvme_tcp_stop_admin_queue (ctrl);nvme_cancel_admin_tagset (ctrl);if (remove)nvme_unquiesce_admin_queue (ctrl);
@@ -2415,7 +2645,10 @@ static void nvme_tcp_complete_timed_out(struct request *rq)struct nvme_tcp_request *req =blk_mq_rq_to_pdu (rq);struct nvme_ctrl *ctrl = &req->queue->ctrl->ctrl; -nvme_tcp_stop_queue (ctrl,nvme_tcp_queue_id (req->queue)); +if (nvme_tcp_admin_queue (req->queue)) +nvme_tcp_stop_admin_queue (ctrl); +else +nvme_tcp_stop_queue (ctrl,nvme_tcp_queue_id (req->queue));nvmf_complete_timed_out_request (rq); }
Signature · 1 line
2.34.1
Sagi Grimberg
maintainerRe: [PATCH v20 05/20] nvme-tcp: Add DDP offload control path
Quoted 139 lines · Aurelien Aptel
From: Boris Pismenny <[email protected]>
This commit introduces direct data placement offload to NVME TCP. There is a context per queue, which is established after the handshake using the sk_add/del NDOs.
Additionally, a resynchronization routine is used to assist hardware recovery from TCP OOO, and continue the offload. Resynchronization operates as follows:
1. TCP OOO causes the NIC HW to stop the offload
2. NIC HW identifies a PDU header at some TCP sequence number, and asks NVMe-TCP to confirm it.
This request is delivered from the NIC driver to NVMe-TCP by first finding the socket for the packet that triggered the request, and then finding thenvme_tcp_queuethat is used by this routine. Finally, the request is recorded in thenvme_tcp_queue.3. When NVMe-TCP observes the requested TCP sequence, it will compare it with the PDU header TCP sequence, and report the result to the NIC driver (resync), which will update the HW, and resume offload when all is successful.
Some HW implementation such as ConnectX-7 assume linear CCID (0...N-1 for queue of size N) where the linux nvme driver uses part of the 16 bit CCID for generation counter. To address that, we use the existing quirk in the nvme layer when the HW driver advertises if the device is not supports the full 16 bit CCID range.
Furthermore, we let the offloading driver advertise what is the max hw sectors/segments via
ulp_ddp_limits.A follow-up patch introduces the data-path changes required for this offload.
Socket operations need a netdev reference. This reference is dropped on
NETDEV_GOING_DOWNevents to allow the device to go down in a follow-up patch.Signed-off-by Boris Pismenny <[email protected]>Signed-off-by Ben Ben-Ishay <[email protected]>Signed-off-by Or Gerlitz <[email protected]>Signed-off-by Yoray Zack <[email protected]>Signed-off-by Shai Malin <[email protected]>Signed-off-by Aurelien Aptel <[email protected]>Reviewed-by Chaitanya Kulkarni <[email protected]>--- drivers/nvme/host/tcp.c | 259 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 246 insertions(+), 13 deletions(-)drivers/nvme/host/tcp.c +45
-0@@ -21,6 +21,10 @@#include <net/busy_poll.h> #include <trace/events/sock.h> +#ifdef CONFIG_ULP_DDP +#include <net/ulp_ddp.h> +#endif +#include "nvme.h" #include "fabrics.h" @@ -46,6 +50,16 @@ MODULE_PARM_DESC(tls_handshake_timeout, "nvme TLS handshake timeout in seconds (default 10)");#endif +#ifdef CONFIG_ULP_DDP +/* NVMeTCP direct data placement and data digest offload will not +* happen if this parameter false (default), regardless of what the +* underlying netdev capabilities are. +*/ +static bool ddp_offload; +module_param (ddp_offload, bool,0644 ); +MODULE_PARM_DESC (ddp_offload,"Enable or disable NVMeTCP direct data placement support" ); +#endif +#ifdef CONFIG_DEBUG_LOCK_ALLOC /* lockdep can detect a circular dependency of the form * sk_lock -> mmap_lock (page fault) -> fs locks -> sk_lock @@ -119,6 +133,7 @@ enum nvme_tcp_queue_flags {NVME_TCP_Q_ALLOCATED =0 ,NVME_TCP_Q_LIVE =1 ,NVME_TCP_Q_POLLING =2 , + NVME_TCP_Q_OFF_DDP = 3, }; enum nvme_tcp_recv_state {@@ -146,6 +161,18 @@ struct nvme_tcp_queue {size_t ddgst_remaining;unsigned int nr_cqe; +#ifdef CONFIG_ULP_DDP +/* +* resync_tcp_seq is a speculative PDU header tcp seq number (with +* an additional flag in the lower 32 bits) that the HW send to +* the SW, for the SW to verify. +* - The 32 high bits store the seq number +* - The 32 low bits are used as a flag to know if a request +* is pending (ULP_DDP_RESYNC_PENDING). +*/ +atomic64_t resync_tcp_seq; +#endif +/* send state */ struct nvme_tcp_request *request;@@ -188,6 +215,12 @@ struct nvme_tcp_ctrl {struct delayed_work connect_work;struct nvme_tcp_request async_req;u32 io_queues[HCTX_MAX_TYPES ]; + +struct net_device *ddp_netdev; +u32 ddp_threshold; +#ifdef CONFIG_ULP_DDP +struct ulp_ddp_limits ddp_limits; +#endif };static LIST_HEAD (nvme_tcp_ctrl_list);@@ -291,6 +324,166 @@ static inline size_t nvme_tcp_pdu_last_send(struct nvme_tcp_request *req,return nvme_tcp_pdu_data_left (req) <= len; } +#ifdef CONFIG_ULP_DDP + +static struct net_device * +nvme_tcp_get_ddp_netdev_with_limits (struct nvme_tcp_ctrl *ctrl) +{ +struct net_device *netdev; +bool ok; + +if (!ddp_offload) +return NULL ; + +/* netdev ref is put in nvme_tcp_stop_admin_queue() */
drivers/nvme/host/tcp.c static inline size_t nvme_tcp_pdu_last_send(struct nvme_tcp_request *req, · line 348
Quoted 10 lines
drivers/nvme/host/tcp.c +10
-0+ netdev =get_netdev_for_sock (ctrl->queues[0 ].sock->sk); +if (!netdev) { +dev_dbg (ctrl->ctrl.device,"netdev not found\n" ); +return NULL ; + } + + ok =ulp_ddp_query_limits (netdev, &ctrl->ddp_limits, +ULP_DDP_NVME ,ULP_DDP_CAP_NVME_TCP , + ctrl->ctrl.opts->tls); +if (!ok) {
please use a normal name (ret).
Plus, its strange that a query function receives a feature and returns true/false based on this. The query should return the limits, and the caller should look at the limits and see if it is appropriately supported.
The rest looks fine I think.
Re: [PATCH v20 05/20] nvme-tcp: Add DDP offload control path
Hi Sagi,
Quoted 6 lines · Sagi Grimberg
drivers/nvme/host/tcp.c static inline size_t nvme_tcp_pdu_last_send(struct nvme_tcp_request *req, · line 348
Quoted 4 lines
drivers/nvme/host/tcp.c +4
-0+ ok =ulp_ddp_query_limits (netdev, &ctrl->ddp_limits, +ULP_DDP_NVME ,ULP_DDP_CAP_NVME_TCP , + ctrl->ctrl.opts->tls); +if (!ok) {please use a normal name (ret).
Ok, we will rename to ret and make ulp_ddp_query_limits() return int 0 on success to be consistent with the name.
Quoted 4 lines
Plus, its strange that a query function receives a feature and returns true/false based on this. The query should return the limits, and the caller should look at the limits and see if it is appropriately supported.
We are not sure how to proceed as this seems to conflict with what you suggested in v12 [1] about hiding the details of checking supports in the API. Limits just dictate some constants the nvme-layer should use once we know it is supported.
We can rename ulp_ddp_query_limits() to ulp_ddp_check_support(). This function checks the support of the specified offload capability and also returns the limitations of it.
Alternatively, we can split it in 2 API functions (check_support and query_limits).
Let us know what you prefer.
Thanks
Re: [PATCH v20 05/20] nvme-tcp: Add DDP offload control path
Hi Sagi,
Quoted 27 lines · Aurelien Aptel
Hi Sagi,
Quoted 6 lines · Sagi Grimberg
drivers/nvme/host/tcp.c static inline size_t nvme_tcp_pdu_last_send(struct nvme_tcp_request *req, · line 348
Quoted 4 lines
drivers/nvme/host/tcp.c +4
-0+ ok =ulp_ddp_query_limits (netdev, &ctrl->ddp_limits, +ULP_DDP_NVME ,ULP_DDP_CAP_NVME_TCP , + ctrl->ctrl.opts->tls); +if (!ok) {please use a normal name (ret).
Ok, we will rename to ret and make
ulp_ddp_query_limits()return int 0 on success to be consistent with the name.Quoted 4 lines
Plus, its strange that a query function receives a feature and returns true/false based on this. The query should return the limits, and the caller should look at the limits and see if it is appropriately supported.
We are not sure how to proceed as this seems to conflict with what you suggested in v12 [1] about hiding the details of checking supports in the API. Limits just dictate some constants the nvme-layer should use once we know it is supported.
We can rename
ulp_ddp_query_limits()toulp_ddp_check_support(). This function checks the support of the specified offload capability and also returns the limitations of it.
Quoted 8 lines
Alternatively, we can split it in 2 API functions (
check_supportandquery_limits).Let us know what you prefer.
Thanks
We would like to submit another version by the end of this week and hopefully progress with this series. To address your comment, I was thinking about something like:
+ if (!ulp_ddp_is_cap_active(netdev, ULP_DDP_CAP_NVME_TCP))
+ goto err;
+
+ ret = ulp_ddp_get_limits(netdev, &ctrl->ddp_limits, ULP_DDP_NVME);
+ if (ret)
+ goto err;
+
+ if (ctrl->ctrl.opts->tls && !ctrl->ddp_limits.tls)
+ goto err;
I would like to remind you that the community didn't want to add ulp_ddp caps and limits context to the netdev structure (as we have for example in the block layer q) and preferred the design of ops/cbs.
Sagi Grimberg
maintainerRe: [PATCH v20 05/20] nvme-tcp: Add DDP offload control path
Quoted 53 lines
Hi Sagi,
Quoted 27 lines · Aurelien Aptel
Hi Sagi,
Quoted 6 lines · Sagi Grimberg
Quoted 4 lines
+ ok = ulp_ddp_query_limits(netdev,
&ctrl->ddp_limits, +ULP_DDP_NVME,ULP_DDP_CAP_NVME_TCP, +ctrl->ctrl.opts->tls);
+ if (!ok) {please use a normal name (ret).
Ok, we will rename to ret and make
ulp_ddp_query_limits()return int 0 on success to be consistent with the name.Quoted 4 lines
Plus, its strange that a query function receives a feature and returns true/false based on this. The query should return the limits, and the caller should look at the limits and see if it is appropriately supported.
We are not sure how to proceed as this seems to conflict with what you suggested in v12 [1] about hiding the details of checking supports in the API. Limits just dictate some constants the nvme-layer should use once we know it is supported.
We can rename
ulp_ddp_query_limits()toulp_ddp_check_support(). This function checks the support of the specified offload capability and also returns the limitations of it.Quoted 8 lines
Alternatively, we can split it in 2 API functions (
check_supportandquery_limits).Let us know what you prefer.
Thanks
We would like to submit another version by the end of this week and hopefully progress with this series. To address your comment, I was thinking about something like:
+ if (!ulp_ddp_is_cap_active(netdev,
ULP_DDP_CAP_NVME_TCP)) + goto err;drivers/nvme/host/tcp.c +7
-0+ + ret = ulp_ddp_get_limits(netdev, &ctrl->ddp_limits, ULP_DDP_NVME); + if (ret) + goto err; + + if (ctrl->ctrl.opts->tls && !ctrl->ddp_limits.tls) + goto err;
Quoted 1 line
I would like to remind you that the community didn't want to add
ulp_ddpcaps and limits context to the netdev structure (as we have for example in the block layer q) and preferred the design of ops/cbs.
Seems fine to me.
PATCH v20 6/20 nvme-tcp: Add DDP data-path
In reply to Aurelien AptelFrom: Boris Pismenny <[email protected]>
Introduce the NVMe-TCP DDP data-path offload.
Using this interface, the NIC hardware will scatter TCP payload directly to the BIO pages according to the command_id in the PDU.
To maintain the correctness of the network stack, the driver is expected to construct SKBs that point to the BIO pages.
The data-path interface contains two routines: setup/teardown. The setup provides the mapping from command_id to the request buffers, while the teardown removes this mapping.
For efficiency, we introduce an asynchronous nvme completion, which is split between NVMe-TCP and the NIC driver as follows:
NVMe-TCP performs the specific completion, while NIC driver performs the generic mq_blk completion.
--- drivers/nvme/host/tcp.c | 111 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 106 insertions(+), 5 deletions(-)
drivers/nvme/host/tcp.c +106 -5
@@ -127,6 +127,13 @@ struct nvme_tcp_request {size_t offset;size_t data_sent;enum nvme_tcp_send_state state; + +#ifdef CONFIG_ULP_DDP +bool offloaded; +struct ulp_ddp_io ddp; +__le16 ddp_status; +union nvme_result result; +#endif };enum nvme_tcp_queue_flags {
@@ -354,10 +361,72 @@ nvme_tcp_get_ddp_netdev_with_limits(struct nvme_tcp_ctrl *ctrl) }static bool nvme_tcp_resync_request (struct sock *sk,u32 seq,u32 flags); +static void nvme_tcp_ddp_teardown_done (void *ddp_ctx);static const struct ulp_ddp_ulp_ops nvme_tcp_ddp_ulp_ops = { .resync_request = nvme_tcp_resync_request, + .ddp_teardown_done = nvme_tcp_ddp_teardown_done, }; +static void nvme_tcp_teardown_ddp (struct nvme_tcp_queue *queue, +struct request *rq) +{ +struct net_device *netdev = queue->ctrl->ddp_netdev; +struct nvme_tcp_request *req =blk_mq_rq_to_pdu (rq); + +ulp_ddp_teardown (netdev, queue->sock->sk, &req->ddp, rq); +sg_free_table_chained (&req->ddp.sg_table,SG_CHUNK_SIZE ); +} + +static void nvme_tcp_ddp_teardown_done (void *ddp_ctx) +{ +struct request *rq = ddp_ctx; +struct nvme_tcp_request *req =blk_mq_rq_to_pdu (rq); + +if (!nvme_try_complete_req (rq, req->ddp_status, req->result)) +nvme_complete_rq (rq); +} + +static void nvme_tcp_setup_ddp (struct nvme_tcp_queue *queue, +struct request *rq) +{ +struct net_device *netdev = queue->ctrl->ddp_netdev; +struct nvme_tcp_request *req =blk_mq_rq_to_pdu (rq); +int ret; + +if (rq_data_dir (rq) !=READ || + queue->ctrl->ddp_threshold >blk_rq_payload_bytes (rq)) +return ; + +/* +* DDP offload is best-effort, errors are ignored. +*/ + + req->ddp.command_id =nvme_cid (rq); + req->ddp.sg_table.sgl = req->ddp.first_sgl; + ret =sg_alloc_table_chained (&req->ddp.sg_table, +blk_rq_nr_phys_segments (rq), + req->ddp.sg_table.sgl,SG_CHUNK_SIZE ); +if (ret) + goto err; + req->ddp.nents =blk_rq_map_sg (rq->q, rq, req->ddp.sg_table.sgl); + + ret =ulp_ddp_setup (netdev, queue->sock->sk, &req->ddp); +if (ret) { +sg_free_table_chained (&req->ddp.sg_table,SG_CHUNK_SIZE ); + goto err; + } + +/* if successful, sg table is freed in nvme_tcp_teardown_ddp() */ + req->offloaded = true; + +return ; +err: +WARN_ONCE (ret,"ddp setup failed (queue 0x%x, cid 0x%x, ret=%d)" , +nvme_tcp_queue_id (queue), +nvme_cid (rq), + ret); +} +static int nvme_tcp_offload_socket (struct nvme_tcp_queue *queue) {struct ulp_ddp_config config = {.type =ULP_DDP_NVME };
@@ -478,6 +547,10 @@ static int nvme_tcp_offload_socket(struct nvme_tcp_queue *queue)static void nvme_tcp_unoffload_socket (struct nvme_tcp_queue *queue) {} +static void nvme_tcp_setup_ddp (struct nvme_tcp_queue *queue, +struct request *rq) +{} +static void nvme_tcp_resync_response (struct nvme_tcp_queue *queue,struct sk_buff *skb,unsigned int offset) {}
@@ -753,6 +826,26 @@ static void nvme_tcp_error_recovery(struct nvme_ctrl *ctrl)queue_work (nvme_reset_wq, &to_tcp_ctrl (ctrl)->err_work); } +static void nvme_tcp_complete_request (struct request *rq, +__le16 status, +union nvme_result result, +__u16 command_id) +{ +#ifdef CONFIG_ULP_DDP +struct nvme_tcp_request *req =blk_mq_rq_to_pdu (rq); + +if (req->offloaded) { + req->ddp_status = status; + req->result = result; +nvme_tcp_teardown_ddp (req->queue, rq); +return ; + } +#endif + +if (!nvme_try_complete_req (rq, status, result)) +nvme_complete_rq (rq); +} +static int nvme_tcp_process_nvme_cqe (struct nvme_tcp_queue *queue,struct nvme_completion *cqe) {
@@ -772,10 +865,9 @@ static int nvme_tcp_process_nvme_cqe(struct nvme_tcp_queue *queue,if (req->status ==cpu_to_le16 (NVME_SC_SUCCESS )) req->status = cqe->status; -if (!nvme_try_complete_req (rq, req->status, cqe->result)) -nvme_complete_rq (rq); +nvme_tcp_complete_request (rq, req->status, cqe->result, + cqe->command_id); queue->nr_cqe++; -return 0 ; }
@@ -973,10 +1065,13 @@ static int nvme_tcp_recv_pdu(struct nvme_tcp_queue *queue, struct sk_buff *skb,static inline void nvme_tcp_end_request (struct request *rq,u16 status) { +struct nvme_tcp_request *req =blk_mq_rq_to_pdu (rq); +struct nvme_tcp_queue *queue = req->queue; +struct nvme_tcp_data_pdu *pdu = (void *)queue->pdu;union nvme_result res = {}; -if (!nvme_try_complete_req (rq,cpu_to_le16 (status <<1 ), res)) -nvme_complete_rq (rq); +nvme_tcp_complete_request (rq,cpu_to_le16 (status <<1 ), res, + pdu->command_id); } static int nvme_tcp_recv_data(struct nvme_tcp_queue *queue, struct sk_buff *skb,
@@ -1283,6 +1378,9 @@ static int nvme_tcp_try_send_cmd_pdu(struct nvme_tcp_request *req)else msg.msg_flags |=MSG_EOR ; +if (test_bit (NVME_TCP_Q_OFF_DDP , &queue->flags)) +nvme_tcp_setup_ddp (queue,blk_mq_rq_from_pdu (req)); +if (queue->hdr_digest && !req->offset)nvme_tcp_hdgst (queue->snd_hash, pdu,sizeof (*pdu));
@@ -2724,6 +2822,9 @@ static blk_status_t nvme_tcp_setup_cmd_pdu(struct nvme_ns *ns,if (ret)return ret; +#ifdef CONFIG_ULP_DDP + req->offloaded = false; +#endif req->state =NVME_TCP_SEND_CMD_PDU ; req->status =cpu_to_le16 (NVME_SC_SUCCESS ); req->offset =0 ;
Signature · 1 line
2.34.1
Sagi Grimberg
maintainerRe: [PATCH v20 06/20] nvme-tcp: Add DDP data-path
drivers/nvme/host/tcp.c static void nvme_tcp_error_recovery(struct nvme_ctrl *ctrl) · line 838
Quoted 11 lines
drivers/nvme/host/tcp.c +10
-0+static void nvme_tcp_complete_request (struct request *rq, +__le16 status, +union nvme_result result, +__u16 command_id) +{ +#ifdef CONFIG_ULP_DDP +struct nvme_tcp_request *req =blk_mq_rq_to_pdu (rq); + +if (req->offloaded) { + req->ddp_status = status;
unless this is really a ddp_status, don't name it as such. afiact it is the nvme status, so lets stay consistent with the naming.
btw, for making the code simpler we can promote the request status/result capture out of CONFIG_ULP_DDP to the general logic and then I think the code will look slightly simpler.
This will be consistent with what we do in nvme-rdma and PI.
Quoted 43 lines
drivers/nvme/host/tcp.c +17
-5+ req->result = result; +nvme_tcp_teardown_ddp (req->queue, rq); + return; + } +#endif + +if (!nvme_try_complete_req (rq, status, result)) +nvme_complete_rq (rq); +} +static int nvme_tcp_process_nvme_cqe (struct nvme_tcp_queue *queue,struct nvme_completion *cqe) {@@ -772,10 +865,9 @@ static int nvme_tcp_process_nvme_cqe(struct nvme_tcp_queue *queue,if (req->status ==cpu_to_le16 (NVME_SC_SUCCESS )) req->status = cqe->status; -if (!nvme_try_complete_req (rq, req->status, cqe->result)) -nvme_complete_rq (rq); +nvme_tcp_complete_request (rq, req->status, cqe->result, + cqe->command_id); queue->nr_cqe++; -return 0 ; }@@ -973,10 +1065,13 @@ static int nvme_tcp_recv_pdu(struct nvme_tcp_queue *queue, struct sk_buff *skb,static inline void nvme_tcp_end_request (struct request *rq,u16 status) { +struct nvme_tcp_request *req =blk_mq_rq_to_pdu (rq); +struct nvme_tcp_queue *queue = req->queue; +struct nvme_tcp_data_pdu *pdu = (void *)queue->pdu;union nvme_result res = {}; -if (!nvme_try_complete_req (rq,cpu_to_le16 (status <<1 ), res)) -nvme_complete_rq (rq); +nvme_tcp_complete_request (rq,cpu_to_le16 (status <<1 ), res, + pdu->command_id); } static int nvme_tcp_recv_data(struct nvme_tcp_queue *queue, struct sk_buff *skb,
drivers/nvme/host/tcp.c static int nvme_tcp_try_send_cmd_pdu(struct nvme_tcp_request *req) · line 1383
Quoted 6 lines
drivers/nvme/host/tcp.c +3
-0@@ -1283,6 +1378,9 @@ static int nvme_tcp_try_send_cmd_pdu(struct nvme_tcp_request *req)else msg.msg_flags |=MSG_EOR ; +if (test_bit (NVME_TCP_Q_OFF_DDP , &queue->flags)) +nvme_tcp_setup_ddp (queue,blk_mq_rq_from_pdu (req)); +
We keep coming back to this. Why isn't setup done at setup time?
Re: [PATCH v20 06/20] nvme-tcp: Add DDP data-path
Quoted 14 lines · Sagi Grimberg
drivers/nvme/host/tcp.c static void nvme_tcp_error_recovery(struct nvme_ctrl *ctrl) · line 838
Quoted 10 lines
drivers/nvme/host/tcp.c +10
-0+static void nvme_tcp_complete_request (struct request *rq, +__le16 status, +union nvme_result result, +__u16 command_id) +{ +#ifdef CONFIG_ULP_DDP +struct nvme_tcp_request *req =blk_mq_rq_to_pdu (rq); + +if (req->offloaded) { + req->ddp_status = status;unless this is really a
ddp_status, don't name it as such. afiact it is the nvme status, so lets stay consistent with the naming.
Quoted 5 lines
btw, for making the code simpler we can promote the request status/result capture out of
CONFIG_ULP_DDPto the general logic and then I think the code will look slightly simpler.This will be consistent with what we do in nvme-rdma and PI.
Ok, we will rename satuts to nvme_status and move it and result out of the ifdef.
Quoted 9 lines
drivers/nvme/host/tcp.c static int nvme_tcp_try_send_cmd_pdu(struct nvme_tcp_request *req) · line 1383
Quoted 7 lines
drivers/nvme/host/tcp.c +3
-0@@ -1283,6 +1378,9 @@ static int nvme_tcp_try_send_cmd_pdu(struct nvme_tcp_request *req)else msg.msg_flags |=MSG_EOR ; +if (test_bit (NVME_TCP_Q_OFF_DDP , &queue->flags)) +nvme_tcp_setup_ddp (queue,blk_mq_rq_from_pdu (req)); +We keep coming back to this. Why isn't setup done at setup time?
Sorry, this is a left-over from previous tests, we will move it as we agreed last time [1].
PATCH v20 7/20 nvme-tcp: RX DDGST offload
In reply to Aurelien AptelFrom: Yoray Zack <[email protected]>
Enable rx side of DDGST offload when supported.
At the end of the capsule, check if all the skb bits are on, and if not recalculate the DDGST in SW and check it.
--- drivers/nvme/host/tcp.c | 84 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 79 insertions(+), 5 deletions(-)
drivers/nvme/host/tcp.c +79 -5
@@ -141,6 +141,7 @@ enum nvme_tcp_queue_flags {NVME_TCP_Q_LIVE =1 ,NVME_TCP_Q_POLLING =2 ,NVME_TCP_Q_OFF_DDP =3 , + NVME_TCP_Q_OFF_DDGST_RX = 4, }; enum nvme_tcp_recv_state {
@@ -178,6 +179,7 @@ struct nvme_tcp_queue {* is pending (ULP_DDP_RESYNC_PENDING). */ atomic64_t resync_tcp_seq; +bool ddp_ddgst_valid;#endif /* send state */
@@ -360,6 +362,33 @@ nvme_tcp_get_ddp_netdev_with_limits(struct nvme_tcp_ctrl *ctrl)return netdev; } +static inline bool nvme_tcp_ddp_ddgst_ok (struct nvme_tcp_queue *queue) +{ +return queue->ddp_ddgst_valid; +} + +static inline void nvme_tcp_ddp_ddgst_update (struct nvme_tcp_queue *queue, +struct sk_buff *skb) +{ +if (queue->ddp_ddgst_valid) + queue->ddp_ddgst_valid =skb_is_ulp_crc (skb); +} + +static void nvme_tcp_ddp_ddgst_recalc (struct ahash_request *hash, +struct request *rq, +__le32 *ddgst) +{ +struct nvme_tcp_request *req; + +if (!rq) +return ; + + req =blk_mq_rq_to_pdu (rq); +ahash_request_set_crypt (hash, req->ddp.sg_table.sgl, (u8 *)ddgst, + req->data_len); +crypto_ahash_digest (hash); +} +static bool nvme_tcp_resync_request (struct sock *sk,u32 seq,u32 flags);static void nvme_tcp_ddp_teardown_done (void *ddp_ctx);static const struct ulp_ddp_ulp_ops nvme_tcp_ddp_ulp_ops = {
@@ -430,6 +459,8 @@ static void nvme_tcp_setup_ddp(struct nvme_tcp_queue *queue,static int nvme_tcp_offload_socket (struct nvme_tcp_queue *queue) {struct ulp_ddp_config config = {.type =ULP_DDP_NVME }; +bool offload_ddgst_rx =ulp_ddp_is_cap_active (queue->ctrl->ddp_netdev, +ULP_DDP_CAP_NVME_TCP_DDGST_RX );int ret; config.nvmeotcp.pfv =NVME_TCP_PFV_1_0 ;
@@ -449,6 +480,8 @@ static int nvme_tcp_offload_socket(struct nvme_tcp_queue *queue)return ret;set_bit (NVME_TCP_Q_OFF_DDP , &queue->flags); +if (queue->data_digest && offload_ddgst_rx) +set_bit (NVME_TCP_Q_OFF_DDGST_RX , &queue->flags);return 0 ; }
@@ -456,6 +489,7 @@ static int nvme_tcp_offload_socket(struct nvme_tcp_queue *queue)static void nvme_tcp_unoffload_socket (struct nvme_tcp_queue *queue) {clear_bit (NVME_TCP_Q_OFF_DDP , &queue->flags); +clear_bit (NVME_TCP_Q_OFF_DDGST_RX , &queue->flags);ulp_ddp_sk_del (queue->ctrl->ddp_netdev, queue->sock->sk); }
@@ -555,6 +589,20 @@ static void nvme_tcp_resync_response(struct nvme_tcp_queue *queue, struct sk_buff *skb, unsigned int offset) {} +static inline bool nvme_tcp_ddp_ddgst_ok (struct nvme_tcp_queue *queue) +{ +return false; +} + +static inline void nvme_tcp_ddp_ddgst_update (struct nvme_tcp_queue *queue, +struct sk_buff *skb) +{} + +static void nvme_tcp_ddp_ddgst_recalc (struct ahash_request *hash, +struct request *rq, +__le32 *ddgst) +{} +#endif static void nvme_tcp_init_iter(struct nvme_tcp_request *req,
@@ -815,6 +863,9 @@ static void nvme_tcp_init_recv_ctx(struct nvme_tcp_queue *queue) queue->pdu_offset =0 ; queue->data_remaining =-1 ; queue->ddgst_remaining =0 ; +#ifdef CONFIG_ULP_DDP + queue->ddp_ddgst_valid = true; +#endif }static void nvme_tcp_error_recovery (struct nvme_ctrl *ctrl)
@@ -1082,6 +1133,10 @@ static int nvme_tcp_recv_data(struct nvme_tcp_queue *queue, struct sk_buff *skb,nvme_cid_to_rq (nvme_tcp_tagset (queue), pdu->command_id);struct nvme_tcp_request *req =blk_mq_rq_to_pdu (rq); +if (queue->data_digest && +test_bit (NVME_TCP_Q_OFF_DDGST_RX , &queue->flags)) +nvme_tcp_ddp_ddgst_update (queue, skb); +while (true) {int recv_len, ret;
@@ -1110,7 +1165,8 @@ static int nvme_tcp_recv_data(struct nvme_tcp_queue *queue, struct sk_buff *skb, recv_len =min_t (size_t, recv_len,iov_iter_count (&req->iter)); -if (queue->data_digest) +if (queue->data_digest && + !test_bit (NVME_TCP_Q_OFF_DDGST_RX , &queue->flags)) ret =skb_copy_and_hash_datagram_iter (skb, *offset, &req->iter, recv_len, queue->rcv_hash);else
@@ -1152,8 +1208,11 @@ static int nvme_tcp_recv_ddgst(struct nvme_tcp_queue *queue,char *ddgst = (char *)&queue->recv_ddgst;size_t recv_len =min_t (size_t, *len, queue->ddgst_remaining);off_t off =NVME_TCP_DIGEST_LENGTH - queue->ddgst_remaining; +struct request *rq;int ret; +if (test_bit (NVME_TCP_Q_OFF_DDGST_RX , &queue->flags)) +nvme_tcp_ddp_ddgst_update (queue, skb); ret =skb_copy_bits (skb, *offset, &ddgst[off], recv_len);if (unlikely (ret))return ret;
@@ -1164,9 +1223,25 @@ static int nvme_tcp_recv_ddgst(struct nvme_tcp_queue *queue,if (queue->ddgst_remaining)return 0 ; + rq =nvme_cid_to_rq (nvme_tcp_tagset (queue), + pdu->command_id); + +if (test_bit (NVME_TCP_Q_OFF_DDGST_RX , &queue->flags)) { +/* +* If HW successfully offloaded the digest +* verification, we can skip it +*/ +if (nvme_tcp_ddp_ddgst_ok (queue)) + goto out; +/* +* Otherwise we have to recalculate and verify the +* digest with the software-fallback +*/ +nvme_tcp_ddp_ddgst_recalc (queue->rcv_hash, rq, + &queue->exp_ddgst); + } +if (queue->recv_ddgst != queue->exp_ddgst) { -struct request *rq =nvme_cid_to_rq (nvme_tcp_tagset (queue), - pdu->command_id);struct nvme_tcp_request *req =blk_mq_rq_to_pdu (rq); req->status =cpu_to_le16 (NVME_SC_DATA_XFER_ERROR );
@@ -1177,9 +1252,8 @@ static int nvme_tcp_recv_ddgst(struct nvme_tcp_queue *queue, le32_to_cpu(queue->exp_ddgst)); } +out:if (pdu->hdr.flags &NVME_TCP_F_DATA_SUCCESS ) { -struct request *rq =nvme_cid_to_rq (nvme_tcp_tagset (queue), - pdu->command_id);struct nvme_tcp_request *req =blk_mq_rq_to_pdu (rq);nvme_tcp_end_request (rq,le16_to_cpu (req->status));
Signature · 1 line
2.34.1
Sagi Grimberg
maintainerRe: [PATCH v20 07/20] nvme-tcp: RX DDGST offload
Quoted 52 lines · Aurelien Aptel
From: Yoray Zack <[email protected]>
Enable rx side of DDGST offload when supported.
At the end of the capsule, check if all the skb bits are on, and if not recalculate the DDGST in SW and check it.
Signed-off-by Yoray Zack <[email protected]>Signed-off-by Boris Pismenny <[email protected]>Signed-off-by Ben Ben-Ishay <[email protected]>Signed-off-by Or Gerlitz <[email protected]>Signed-off-by Shai Malin <[email protected]>Signed-off-by Aurelien Aptel <[email protected]>Reviewed-by Chaitanya Kulkarni <[email protected]>--- drivers/nvme/host/tcp.c | 84 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 79 insertions(+), 5 deletions(-)drivers/nvme/host/tcp.c +12
-0@@ -141,6 +141,7 @@ enum nvme_tcp_queue_flags {NVME_TCP_Q_LIVE =1 ,NVME_TCP_Q_POLLING =2 ,NVME_TCP_Q_OFF_DDP =3 , + NVME_TCP_Q_OFF_DDGST_RX = 4, }; enum nvme_tcp_recv_state {@@ -178,6 +179,7 @@ struct nvme_tcp_queue {* is pending (ULP_DDP_RESYNC_PENDING). */ atomic64_t resync_tcp_seq; +bool ddp_ddgst_valid;#endif /* send state */ @@ -360,6 +362,33 @@ nvme_tcp_get_ddp_netdev_with_limits(struct nvme_tcp_ctrl *ctrl)return netdev; } +static inline bool nvme_tcp_ddp_ddgst_ok (struct nvme_tcp_queue *queue) +{ +return queue->ddp_ddgst_valid; +} + +static inline void nvme_tcp_ddp_ddgst_update (struct nvme_tcp_queue *queue, +struct sk_buff *skb) +{ +if (queue->ddp_ddgst_valid) + queue->ddp_ddgst_valid =skb_is_ulp_crc (skb);
drivers/nvme/host/tcp.c nvme_tcp_get_ddp_netdev_with_limits(struct nvme_tcp_ctrl *ctrl) · line 384
Quoted 10 lines
drivers/nvme/host/tcp.c +10
-0+} + +static void nvme_tcp_ddp_ddgst_recalc (struct ahash_request *hash, +struct request *rq, +__le32 *ddgst) +{ +struct nvme_tcp_request *req; + +if (!rq) +return ;
How is this even possible? And what happens down the road if this is indeed a null rq?
Quoted 11 lines
drivers/nvme/host/tcp.c +7
-0+ + req =blk_mq_rq_to_pdu (rq); +ahash_request_set_crypt (hash, req->ddp.sg_table.sgl, (u8 *)ddgst, + req->data_len); +crypto_ahash_digest (hash); +} +static bool nvme_tcp_resync_request (struct sock *sk,u32 seq,u32 flags);static void nvme_tcp_ddp_teardown_done (void *ddp_ctx);static const struct ulp_ddp_ulp_ops nvme_tcp_ddp_ulp_ops = {
drivers/nvme/host/tcp.c static void nvme_tcp_setup_ddp(struct nvme_tcp_queue *queue, · line 463
Quoted 5 lines
drivers/nvme/host/tcp.c +2
-0@@ -430,6 +459,8 @@ static void nvme_tcp_setup_ddp(struct nvme_tcp_queue *queue,static int nvme_tcp_offload_socket (struct nvme_tcp_queue *queue) {struct ulp_ddp_config config = {.type =ULP_DDP_NVME }; +bool offload_ddgst_rx =ulp_ddp_is_cap_active (queue->ctrl->ddp_netdev, +ULP_DDP_CAP_NVME_TCP_DDGST_RX );
Not sure a local variable is needed here.
Re: [PATCH v20 07/20] nvme-tcp: RX DDGST offload
Quoted 11 lines · Sagi Grimberg
drivers/nvme/host/tcp.c nvme_tcp_get_ddp_netdev_with_limits(struct nvme_tcp_ctrl *ctrl) · line 384
Quoted 8 lines
drivers/nvme/host/tcp.c +8
-0+static void nvme_tcp_ddp_ddgst_recalc (struct ahash_request *hash, +struct request *rq, +__le32 *ddgst) +{ +struct nvme_tcp_request *req; + +if (!rq) +return ;How is this even possible? And what happens down the road if this is indeed a null rq?
You are correct, this isn't possible. We can see the req is fetched earlier in nvme_tcp_recv_pdu() so it must exist.
We will remove it.
Quoted 10 lines
Quoted 10 lines
drivers/nvme/host/tcp.c +7
-0+ + req =blk_mq_rq_to_pdu (rq); +ahash_request_set_crypt (hash, req->ddp.sg_table.sgl, (u8 *)ddgst, + req->data_len); +crypto_ahash_digest (hash); +} +static bool nvme_tcp_resync_request (struct sock *sk,u32 seq,u32 flags);static void nvme_tcp_ddp_teardown_done (void *ddp_ctx);static const struct ulp_ddp_ulp_ops nvme_tcp_ddp_ulp_ops = {
Quoted 8 lines
drivers/nvme/host/tcp.c static void nvme_tcp_setup_ddp(struct nvme_tcp_queue *queue, · line 463
Quoted 6 lines
drivers/nvme/host/tcp.c +2
-0@@ -430,6 +459,8 @@ static void nvme_tcp_setup_ddp(struct nvme_tcp_queue *queue,static int nvme_tcp_offload_socket (struct nvme_tcp_queue *queue) {struct ulp_ddp_config config = {.type =ULP_DDP_NVME }; +bool offload_ddgst_rx =ulp_ddp_is_cap_active (queue->ctrl->ddp_netdev, +ULP_DDP_CAP_NVME_TCP_DDGST_RX );Not sure a local variable is needed here.
Ok we will remove it.
Thanks
PATCH v20 8/20 nvme-tcp: Deal with netdevice DOWN events
In reply to Aurelien AptelFrom: Or Gerlitz <[email protected]>
For ddp setup/teardown and resync, the offloading logic uses HW resources at the NIC driver such as SQ and CQ.
These resources are destroyed when the netdevice does down and hence we must stop using them before the NIC driver destroys them.
Use netdevice notifier for that matter -- offloaded connections are stopped before the stack continues to call the NIC driver close ndo.
We use the existing recovery flow which has the advantage of resuming the offload once the connection is re-set.
This also buys us proper handling for the UNREGISTER event b/c our offloading starts in the UP state, and down is always there between up to unregister.
--- drivers/nvme/host/tcp.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)
drivers/nvme/host/tcp.c +41 -0
@@ -234,6 +234,7 @@ struct nvme_tcp_ctrl {static LIST_HEAD (nvme_tcp_ctrl_list);static DEFINE_MUTEX (nvme_tcp_ctrl_mutex); +static struct notifier_block nvme_tcp_netdevice_nb;static struct workqueue_struct *nvme_tcp_wq;static const struct blk_mq_ops nvme_tcp_mq_ops;static const struct blk_mq_ops nvme_tcp_admin_mq_ops;
@@ -3179,6 +3180,32 @@ static struct nvme_ctrl *nvme_tcp_create_ctrl(struct device *dev,return ERR_PTR (ret); } +static int nvme_tcp_netdev_event (struct notifier_block *this, +unsigned long event,void *ptr) +{ +#ifdef CONFIG_ULP_DDP +struct net_device *ndev =netdev_notifier_info_to_dev (ptr); +struct nvme_tcp_ctrl *ctrl; + +switch (event) { +case NETDEV_GOING_DOWN : +mutex_lock (&nvme_tcp_ctrl_mutex); +list_for_each_entry (ctrl, &nvme_tcp_ctrl_list, list) { +if (ndev == ctrl->ddp_netdev) +nvme_tcp_error_recovery (&ctrl->ctrl); + } +mutex_unlock (&nvme_tcp_ctrl_mutex); +flush_workqueue (nvme_reset_wq); +/* +* The associated controllers teardown has completed, +* ddp contexts were also torn down so we should be +* safe to continue... +*/ + } +#endif +return NOTIFY_DONE ; +} +static struct nvmf_transport_ops nvme_tcp_transport = { .name ="tcp" , .module =THIS_MODULE ,
@@ -3194,6 +3221,8 @@ static struct nvmf_transport_ops nvme_tcp_transport = {static int __init nvme_tcp_init_module (void ) { +int ret; +BUILD_BUG_ON (sizeof (struct nvme_tcp_hdr ) !=8 );BUILD_BUG_ON (sizeof (struct nvme_tcp_cmd_pdu ) !=72 );BUILD_BUG_ON (sizeof (struct nvme_tcp_data_pdu ) !=24 );
@@ -3208,8 +3237,19 @@ static int __init nvme_tcp_init_module(void)if (!nvme_tcp_wq)return -ENOMEM ; + nvme_tcp_netdevice_nb.notifier_call = nvme_tcp_netdev_event; + ret =register_netdevice_notifier (&nvme_tcp_netdevice_nb); +if (ret) { +pr_err ("failed to register netdev notifier\n" ); + goto out_free_workqueue; + } +nvmf_register_transport (&nvme_tcp_transport);return 0 ; + +out_free_workqueue: +destroy_workqueue (nvme_tcp_wq); +return ret; } static void __exit nvme_tcp_cleanup_module(void)
@@ -3217,6 +3257,7 @@ static void __exit nvme_tcp_cleanup_module(void)struct nvme_tcp_ctrl *ctrl;nvmf_unregister_transport (&nvme_tcp_transport); +unregister_netdevice_notifier (&nvme_tcp_netdevice_nb);mutex_lock (&nvme_tcp_ctrl_mutex);list_for_each_entry (ctrl, &nvme_tcp_ctrl_list, list)
Signature · 1 line
2.34.1
Re: [PATCH v20 08/20] nvme-tcp: Deal with netdevice DOWN events
PATCH v20 9/20 Documentation: add ULP DDP offload documentation
In reply to Aurelien AptelFrom: Yoray Zack <[email protected]>
Document the new ULP DDP API and add it under "networking". Use NVMe-TCP implementation as an example.
--- Documentation/networking/index.rst | 1 + Documentation/networking/ulp-ddp-offload.rst | 374 +++++++++++++++++++ 2 files changed, 375 insertions(+) create mode 100644 Documentation/networking/ulp-ddp-offload.rst
Documentation/networking/index.rst +1 -0
@@ -108,6 +108,7 @@ Contents: tc-queue-filters tcp_ao tcp-thin + ulp-ddp-offload team timestamping tipc
Documentation/networking/ulp-ddp-offload.rst new file +374 -0
374 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v20 10/20 net/mlx5e: Rename from tls to transport static params
In reply to Aurelien AptelFrom: Or Gerlitz <[email protected]>
The static params structure is used in TLS but also in other transports we're offloading like nvmeotcp:
- Rename the relevant structures/fields
- Create common file for appropriate transports
- Apply changes in the TLS code
No functional change here.
--- .../mlx5/core/en_accel/common_utils.h | 32 +++++++++++++++++ .../mellanox/mlx5/core/en_accel/ktls.c | 2 +- .../mellanox/mlx5/core/en_accel/ktls_rx.c | 6 ++-- .../mellanox/mlx5/core/en_accel/ktls_tx.c | 8 ++--- .../mellanox/mlx5/core/en_accel/ktls_txrx.c | 36 ++++++++----------- .../mellanox/mlx5/core/en_accel/ktls_utils.h | 17 ++------- include/linux/mlx5/device.h | 8 ++--- include/linux/mlx5/mlx5_ifc.h | 8 +++-- 8 files changed, 67 insertions(+), 50 deletions(-) create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/common_utils.h
drivers/net/ethernet/mellanox/mlx5/core/en_accel/common_utils.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */ +/* Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. */ +#ifndef __MLX5E_COMMON_UTILS_H__ +#define __MLX5E_COMMON_UTILS_H__ + +#include "en.h" + +struct mlx5e_set_transport_static_params_wqe { +struct mlx5_wqe_ctrl_seg ctrl; +struct mlx5_wqe_umr_ctrl_seg uctrl; +struct mlx5_mkey_seg mkc; +struct mlx5_wqe_transport_static_params_seg params; +}; + +/* macros for transport_static_params handling */ +#define MLX5E_TRANSPORT_SET_STATIC_PARAMS_WQEBBS \ + (DIV_ROUND_UP(sizeof(struct mlx5e_set_transport_static_params_wqe), MLX5_SEND_WQE_BB)) + +#define MLX5E_TRANSPORT_FETCH_SET_STATIC_PARAMS_WQE (sq, pi) \ + ((struct mlx5e_set_transport_static_params_wqe *)\ + mlx5e_fetch_wqe(&(sq)->wq, pi, sizeof(struct mlx5e_set_transport_static_params_wqe))) + +#define MLX5E_TRANSPORT_STATIC_PARAMS_WQE_SZ \ + (sizeof(struct mlx5e_set_transport_static_params_wqe)) + +#define MLX5E_TRANSPORT_STATIC_PARAMS_DS_CNT \ + (DIV_ROUND_UP(MLX5E_TRANSPORT_STATIC_PARAMS_WQE_SZ, MLX5_SEND_WQE_DS)) + +#define MLX5E_TRANSPORT_STATIC_PARAMS_OCTWORD_SIZE \ + (MLX5_ST_SZ_BYTES(transport_static_params) / MLX5_SEND_WQE_DS) + +#endif /* __MLX5E_COMMON_UTILS_H__ */
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c +1 -1
@@ -100,7 +100,7 @@ bool mlx5e_is_ktls_rx(struct mlx5_core_dev *mdev)return false;/* Check the possibility to post the required ICOSQ WQEs. */ -if (WARN_ON_ONCE (max_sq_wqebbs <MLX5E_TLS_SET_STATIC_PARAMS_WQEBBS )) +if (WARN_ON_ONCE (max_sq_wqebbs <MLX5E_TRANSPORT_SET_STATIC_PARAMS_WQEBBS ))return false;if (WARN_ON_ONCE (max_sq_wqebbs <MLX5E_TLS_SET_PROGRESS_PARAMS_WQEBBS ))return false;
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c +3 -3
@@ -136,16 +136,16 @@ static struct mlx5_wqe_ctrl_seg * post_static_params(struct mlx5e_icosq *sq, struct mlx5e_ktls_offload_context_rx *priv_rx) { - struct mlx5e_set_tls_static_params_wqe *wqe; + struct mlx5e_set_transport_static_params_wqe *wqe;struct mlx5e_icosq_wqe_info wi;u16 pi, num_wqebbs; - num_wqebbs =MLX5E_TLS_SET_STATIC_PARAMS_WQEBBS ; + num_wqebbs =MLX5E_TRANSPORT_SET_STATIC_PARAMS_WQEBBS ;if (unlikely (!mlx5e_icosq_can_post_wqe (sq, num_wqebbs)))return ERR_PTR (-ENOSPC ); pi =mlx5e_icosq_get_next_pi (sq, num_wqebbs); - wqe =MLX5E_TLS_FETCH_SET_STATIC_PARAMS_WQE (sq, pi); + wqe =MLX5E_TRANSPORT_FETCH_SET_STATIC_PARAMS_WQE (sq, pi); mlx5e_ktls_build_static_params(wqe, sq->pc, sq->sqn, &priv_rx->crypto_info, mlx5e_tir_get_tirn(&priv_rx->tir), mlx5_crypto_dek_get_id(priv_rx->dek),
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c +4 -4
@@ -33,7 +33,7 @@ u16 mlx5e_ktls_get_stop_room(struct mlx5_core_dev *mdev, struct mlx5e_params *pa num_dumps =mlx5e_ktls_dumps_num_wqes (params,MAX_SKB_FRAGS ,TLS_MAX_PAYLOAD_SIZE ); - stop_room +=mlx5e_stop_room_for_wqe (mdev,MLX5E_TLS_SET_STATIC_PARAMS_WQEBBS ); + stop_room +=mlx5e_stop_room_for_wqe (mdev,MLX5E_TRANSPORT_SET_STATIC_PARAMS_WQEBBS ); stop_room +=mlx5e_stop_room_for_wqe (mdev,MLX5E_TLS_SET_PROGRESS_PARAMS_WQEBBS ); stop_room += num_dumps *mlx5e_stop_room_for_wqe (mdev,MLX5E_KTLS_DUMP_WQEBBS ); stop_room +=1 ;/* fence nop */
@@ -550,12 +550,12 @@ post_static_params(struct mlx5e_txqsq *sq, struct mlx5e_ktls_offload_context_tx *priv_tx, bool fence) { -struct mlx5e_set_tls_static_params_wqe *wqe; +struct mlx5e_set_transport_static_params_wqe *wqe;u16 pi, num_wqebbs; - num_wqebbs =MLX5E_TLS_SET_STATIC_PARAMS_WQEBBS ; + num_wqebbs =MLX5E_TRANSPORT_SET_STATIC_PARAMS_WQEBBS ; pi =mlx5e_txqsq_get_next_pi (sq, num_wqebbs); - wqe =MLX5E_TLS_FETCH_SET_STATIC_PARAMS_WQE (sq, pi); + wqe =MLX5E_TRANSPORT_FETCH_SET_STATIC_PARAMS_WQE (sq, pi); mlx5e_ktls_build_static_params(wqe, sq->pc, sq->sqn, &priv_tx->crypto_info, priv_tx->tisn, mlx5_crypto_dek_get_id(priv_tx->dek),
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_txrx.c +15 -21
@@ -8,10 +8,6 @@ enum { MLX5E_STATIC_PARAMS_CONTEXT_TLS_1_2 = 0x2, }; -enum { -MLX5E_ENCRYPTION_STANDARD_TLS =0x1 , -}; -#define EXTRACT_INFO_FIELDS do { \ salt = info->salt; \ rec_seq = info->rec_seq; \
@@ -20,7 +16,7 @@ enum { }while (0 ) static void -fill_static_params (struct mlx5_wqe_tls_static_params_seg *params, +fill_static_params (struct mlx5_wqe_transport_static_params_seg *params,union mlx5e_crypto_info *crypto_info,u32 key_id,u32 resync_tcp_sn) {
@@ -53,25 +49,25 @@ fill_static_params(struct mlx5_wqe_tls_static_params_seg *params,return ; } - gcm_iv =MLX5_ADDR_OF (tls_static_params, ctx, gcm_iv); - initial_rn =MLX5_ADDR_OF (tls_static_params, ctx, initial_record_number); + gcm_iv =MLX5_ADDR_OF (transport_static_params, ctx, gcm_iv); + initial_rn =MLX5_ADDR_OF (transport_static_params, ctx, initial_record_number);memcpy (gcm_iv, salt, salt_sz);memcpy (initial_rn, rec_seq, rec_seq_sz); tls_version =MLX5E_STATIC_PARAMS_CONTEXT_TLS_1_2 ; -MLX5_SET (tls_static_params, ctx, tls_version, tls_version); -MLX5_SET (tls_static_params, ctx, const_1,1 ); -MLX5_SET (tls_static_params, ctx, const_2,2 ); -MLX5_SET (tls_static_params, ctx, encryption_standard, -MLX5E_ENCRYPTION_STANDARD_TLS ); -MLX5_SET (tls_static_params, ctx, resync_tcp_sn, resync_tcp_sn); -MLX5_SET (tls_static_params, ctx, dek_index, key_id); +MLX5_SET (transport_static_params, ctx, tls_version, tls_version); +MLX5_SET (transport_static_params, ctx, const_1,1 ); +MLX5_SET (transport_static_params, ctx, const_2,2 ); +MLX5_SET (transport_static_params, ctx, acc_type, +MLX5_TRANSPORT_STATIC_PARAMS_ACC_TYPE_TLS ); +MLX5_SET (transport_static_params, ctx, resync_tcp_sn, resync_tcp_sn); +MLX5_SET (transport_static_params, ctx, dek_index, key_id); } void -mlx5e_ktls_build_static_params(struct mlx5e_set_tls_static_params_wqe *wqe, +mlx5e_ktls_build_static_params(struct mlx5e_set_transport_static_params_wqe *wqe, u16 pc, u32 sqn, union mlx5e_crypto_info *crypto_info, u32 tis_tir_num, u32 key_id, u32 resync_tcp_sn,
@@ -80,19 +76,17 @@ mlx5e_ktls_build_static_params(struct mlx5e_set_tls_static_params_wqe *wqe,struct mlx5_wqe_umr_ctrl_seg *ucseg = &wqe->uctrl;struct mlx5_wqe_ctrl_seg *cseg = &wqe->ctrl;u8 opmod = direction ==TLS_OFFLOAD_CTX_DIR_TX ? -MLX5_OPC_MOD_TLS_TIS_STATIC_PARAMS : -MLX5_OPC_MOD_TLS_TIR_STATIC_PARAMS ; - -#define STATIC_PARAMS_DS_CNT DIV_ROUND_UP(sizeof(*wqe), MLX5_SEND_WQE_DS) +MLX5_OPC_MOD_TRANSPORT_TIS_STATIC_PARAMS : +MLX5_OPC_MOD_TRANSPORT_TIR_STATIC_PARAMS ; cseg->opmod_idx_opcode =cpu_to_be32 ((pc <<8 ) |MLX5_OPCODE_UMR | (opmod <<24 )); cseg->qpn_ds =cpu_to_be32 ((sqn <<MLX5_WQE_CTRL_QPN_SHIFT ) | -STATIC_PARAMS_DS_CNT ); +MLX5E_TRANSPORT_STATIC_PARAMS_DS_CNT ); cseg->fm_ce_se = fence ?MLX5_FENCE_MODE_INITIATOR_SMALL :0 ; cseg->tis_tir_num =cpu_to_be32 (tis_tir_num <<8 ); ucseg->flags =MLX5_UMR_INLINE ; - ucseg->bsf_octowords =cpu_to_be16 (MLX5_ST_SZ_BYTES (tls_static_params) /16 ); + ucseg->bsf_octowords =cpu_to_be16 (MLX5E_TRANSPORT_STATIC_PARAMS_OCTWORD_SIZE );fill_static_params (&wqe->params, crypto_info, key_id, resync_tcp_sn); }
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_utils.h +2 -15
@@ -6,6 +6,7 @@#include <net/tls.h> #include "en.h" +#include "en_accel/common_utils.h" enum {MLX5E_TLS_PROGRESS_PARAMS_AUTH_STATE_NO_OFFLOAD =0 ,
@@ -33,13 +34,6 @@ union mlx5e_crypto_info {struct tls12_crypto_info_aes_gcm_256 crypto_info_256; }; -struct mlx5e_set_tls_static_params_wqe { -struct mlx5_wqe_ctrl_seg ctrl; -struct mlx5_wqe_umr_ctrl_seg uctrl; -struct mlx5_mkey_seg mkc; -struct mlx5_wqe_tls_static_params_seg params; -}; -struct mlx5e_set_tls_progress_params_wqe {struct mlx5_wqe_ctrl_seg ctrl;struct mlx5_wqe_tls_progress_params_seg params;
@@ -50,19 +44,12 @@ struct mlx5e_get_tls_progress_params_wqe {struct mlx5_seg_get_psv psv; }; -#define MLX5E_TLS_SET_STATIC_PARAMS_WQEBBS \ - (DIV_ROUND_UP(sizeof(struct mlx5e_set_tls_static_params_wqe), MLX5_SEND_WQE_BB)) -#define MLX5E_TLS_SET_PROGRESS_PARAMS_WQEBBS \ (DIV_ROUND_UP(sizeof(struct mlx5e_set_tls_progress_params_wqe), MLX5_SEND_WQE_BB))#define MLX5E_KTLS_GET_PROGRESS_WQEBBS \ (DIV_ROUND_UP(sizeof(struct mlx5e_get_tls_progress_params_wqe), MLX5_SEND_WQE_BB)) -#define MLX5E_TLS_FETCH_SET_STATIC_PARAMS_WQE (sq, pi) \ - ((struct mlx5e_set_tls_static_params_wqe *)\ - mlx5e_fetch_wqe(&(sq)->wq, pi, sizeof(struct mlx5e_set_tls_static_params_wqe))) -#define MLX5E_TLS_FETCH_SET_PROGRESS_PARAMS_WQE (sq, pi) \ ((struct mlx5e_set_tls_progress_params_wqe *)\ mlx5e_fetch_wqe(&(sq)->wq, pi, sizeof(struct mlx5e_set_tls_progress_params_wqe)))
@@ -76,7 +63,7 @@ struct mlx5e_get_tls_progress_params_wqe { mlx5e_fetch_wqe(&(sq)->wq, pi, sizeof(struct mlx5e_dump_wqe))) void -mlx5e_ktls_build_static_params(struct mlx5e_set_tls_static_params_wqe *wqe, +mlx5e_ktls_build_static_params(struct mlx5e_set_transport_static_params_wqe *wqe, u16 pc, u32 sqn, union mlx5e_crypto_info *crypto_info, u32 tis_tir_num, u32 key_id, u32 resync_tcp_sn,
include/linux/mlx5/device.h +4 -4
@@ -454,8 +454,8 @@ enum { };enum { -MLX5_OPC_MOD_TLS_TIS_STATIC_PARAMS =0x1 , -MLX5_OPC_MOD_TLS_TIR_STATIC_PARAMS =0x2 , +MLX5_OPC_MOD_TRANSPORT_TIS_STATIC_PARAMS =0x1 , +MLX5_OPC_MOD_TRANSPORT_TIR_STATIC_PARAMS =0x2 , };enum {
@@ -463,8 +463,8 @@ enum { MLX5_OPC_MOD_TLS_TIR_PROGRESS_PARAMS = 0x2, }; -struct mlx5_wqe_tls_static_params_seg { -u8 ctx[MLX5_ST_SZ_BYTES (tls_static_params)]; +struct mlx5_wqe_transport_static_params_seg { +u8 ctx[MLX5_ST_SZ_BYTES (transport_static_params)]; };struct mlx5_wqe_tls_progress_params_seg {
include/linux/mlx5/mlx5_ifc.h +6 -2
@@ -12358,12 +12358,16 @@ enum { MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_PURPOSE_MACSEC = 0x4, }; -struct mlx5_ifc_tls_static_params_bits { +enum { +MLX5_TRANSPORT_STATIC_PARAMS_ACC_TYPE_TLS =0x1 , +}; + +struct mlx5_ifc_transport_static_params_bits {u8 const_2[0x2 ];u8 tls_version[0x4 ];u8 const_1[0x2 ];u8 reserved_at_8[0x14 ]; -u8 encryption_standard[0x4 ]; +u8 acc_type[0x4 ];u8 reserved_at_20[0x20 ];
Signature · 1 line
2.34.1
PATCH v20 11/20 net/mlx5e: Refactor ico sq polling to get budget
In reply to Aurelien AptelFrom: Or Gerlitz <[email protected]>
The mlx5e driver uses ICO SQs for internal control operations which are not visible to the network stack, such as UMR mapping for striding RQ (MPWQ) and etc more cases.
The upcoming nvmeotcp offload uses ico sq for umr mapping as part of the offload. As a pre-step for nvmeotcp ico sqs which have their own napi and need to comply with budget, add the budget as parameter to the polling of cqs related to ico sqs.
The polling already stops after a limit is reached, so just have the caller to provide this limit as the budget.
Additionnaly, we move the mdev pointer directly on the icosq structure. This provides better separation between channels to ICO SQs for use-cases where they are not tightly coupled (such as the upcoming nvmeotcp code).
No functional change here.
--- drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 + drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c | 4 ++-- drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 ++--- drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 4 ++-- drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en.h +1 -0
@@ -555,6 +555,7 @@ struct mlx5e_icosq {/* control path */ struct mlx5_wq_ctrl wq_ctrl;struct mlx5e_channel *channel; +struct mlx5_core_dev *mdev;struct work_struct recover_work; }____cacheline_aligned_in_smp ;
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c +2 -2
@@ -46,7 +46,7 @@ static int mlx5e_query_rq_state(struct mlx5_core_dev *dev, u32 rqn, u8 *state)static int mlx5e_wait_for_icosq_flush (struct mlx5e_icosq *icosq) { -struct mlx5_core_dev *dev = icosq->channel->mdev; +struct mlx5_core_dev *dev = icosq->mdev;unsigned long exp_time; exp_time = jiffies +msecs_to_jiffies (mlx5_tout_ms (dev,FLUSH_ON_ERROR ));
@@ -91,7 +91,7 @@ static int mlx5e_rx_reporter_err_icosq_cqe_recover(void *ctx) rq = &icosq->channel->rq;if (test_bit (MLX5E_RQ_STATE_ENABLED , &icosq->channel->xskrq.state)) xskrq = &icosq->channel->xskrq; - mdev = icosq->channel->mdev; + mdev = icosq->mdev; dev = icosq->channel->netdev; err =mlx5_core_query_sq_state (mdev, icosq->sqn, &state);if (err) {
drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h +1 -1
@@ -62,7 +62,7 @@ void mlx5e_trigger_irq(struct mlx5e_icosq *sq);void mlx5e_completion_event (struct mlx5_core_cq *mcq,struct mlx5_eqe *eqe);void mlx5e_cq_error_event (struct mlx5_core_cq *mcq,enum mlx5_event event);int mlx5e_napi_poll (struct napi_struct *napi,int budget); -int mlx5e_poll_ico_cq (struct mlx5e_cq *cq); +int mlx5e_poll_ico_cq (struct mlx5e_cq *cq,int budget);/* RX */ INDIRECT_CALLABLE_DECLARE(bool mlx5e_post_rx_wqes(struct mlx5e_rq *rq));
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c +1 -1
@@ -267,7 +267,7 @@ resync_post_get_progress_params(struct mlx5e_icosq *sq, goto err_out; } - pdev =mlx5_core_dma_dev (sq->channel->priv->mdev); + pdev =mlx5_core_dma_dev (sq->mdev); buf->dma_addr =dma_map_single (pdev, &buf->progress,PROGRESS_PARAMS_PADDED_SIZE ,DMA_FROM_DEVICE );if (unlikely (dma_mapping_error (pdev, buf->dma_addr))) {
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +2 -3
@@ -1500,6 +1500,7 @@ static int mlx5e_alloc_icosq(struct mlx5e_channel *c,int err; sq->channel = c; + sq->mdev = mdev; sq->uar_map = mdev->mlx5e_res.hw_objs.bfreg.map; sq->reserved_room = param->stop_room;
@@ -1898,11 +1899,9 @@ void mlx5e_deactivate_icosq(struct mlx5e_icosq *icosq)static void mlx5e_close_icosq (struct mlx5e_icosq *sq) { -struct mlx5e_channel *c = sq->channel; -if (sq->ktls_resync)mlx5e_ktls_rx_resync_destroy_resp_list (sq->ktls_resync); -mlx5e_destroy_sq (c->mdev, sq->sqn); +mlx5e_destroy_sq (sq->mdev, sq->sqn);mlx5e_free_icosq_descs (sq);mlx5e_free_icosq (sq); }
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +2 -2
@@ -993,7 +993,7 @@ static void mlx5e_handle_shampo_hd_umr(struct mlx5e_shampo_umr umr, shampo->ci = (shampo->ci + umr.len) & (shampo->hd_per_wq -1 ); } -int mlx5e_poll_ico_cq (struct mlx5e_cq *cq) +int mlx5e_poll_ico_cq (struct mlx5e_cq *cq,int budget) { struct mlx5e_icosq *sq = container_of(cq, struct mlx5e_icosq, cq);struct mlx5_cqe64 *cqe;
@@ -1068,7 +1068,7 @@ int mlx5e_poll_ico_cq(struct mlx5e_cq *cq) wi->wqe_type); } }while (!last_wqe); - }while ((++i <MLX5E_TX_CQ_POLL_BUDGET ) && (cqe =mlx5_cqwq_get_cqe (&cq->wq))); + }while ((++i < budget) && (cqe =mlx5_cqwq_get_cqe (&cq->wq))); sq->cc = sqcc;
drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c +2 -2
@@ -178,8 +178,8 @@ int mlx5e_napi_poll(struct napi_struct *napi, int budget) busy |= work_done == budget; -mlx5e_poll_ico_cq (&c->icosq.cq); -if (mlx5e_poll_ico_cq (&c->async_icosq.cq)) +mlx5e_poll_ico_cq (&c->icosq.cq,MLX5E_TX_CQ_POLL_BUDGET ); +if (mlx5e_poll_ico_cq (&c->async_icosq.cq,MLX5E_TX_CQ_POLL_BUDGET ))/* Don't clear the flag if nothing was polled to prevent * queueing more WQEs and overflowing the async ICOSQ. */
Signature · 1 line
2.34.1
PATCH v20 12/20 net/mlx5: Add NVMEoTCP caps, HW bits, 128B CQE and enumerations
In reply to Aurelien AptelFrom: Ben Ben-Ishay <[email protected]>
Add the necessary infrastructure for NVMEoTCP offload:
- Create mlx5_cqe128 structure for NVMEoTCP offload. The new structure consist from the regular mlx5_cqe64 + NVMEoTCP data information for offloaded packets.
- Add nvmetcp field to mlx5_cqe64, this field define the type of the data that the additional NVMEoTCP part represents.
- Add nvmeotcp_zero_copy_en + nvmeotcp_crc_en bit to the TIR, for identify NVMEoTCP offload flow and tag_buffer_id that will be used by the connected nvmeotcp_queues.
- Add new capability to HCA_CAP that represents the NVMEoTCP offload ability.
--- drivers/net/ethernet/mellanox/mlx5/core/fw.c | 6 ++ include/linux/mlx5/device.h | 51 ++++++++++++- include/linux/mlx5/mlx5_ifc.h | 75 ++++++++++++++++++-- include/linux/mlx5/qp.h | 1 + 4 files changed, 128 insertions(+), 5 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/fw.c +6 -0
@@ -280,6 +280,12 @@ int mlx5_query_hca_caps(struct mlx5_core_dev *dev)return err; } +if (MLX5_CAP_GEN (dev, nvmeotcp)) { + err =mlx5_core_get_caps (dev,MLX5_CAP_DEV_NVMEOTCP ); +if (err) +return err; + } +return 0 ; }
include/linux/mlx5/device.h +50 -1
87 lines not on this page · raw message
include/linux/mlx5/mlx5_ifc.h +71 -4
139 lines not on this page · raw message
include/linux/mlx5/qp.h +1 -0
@@ -227,6 +227,7 @@ struct mlx5_wqe_ctrl_seg {#define MLX5_WQE_CTRL_OPCODE_MASK 0xff#define MLX5_WQE_CTRL_WQE_INDEX_MASK 0x00ffff00#define MLX5_WQE_CTRL_WQE_INDEX_SHIFT 8 +#define MLX5_WQE_CTRL_TIR_TIS_INDEX_SHIFT 8enum {MLX5_ETH_WQE_L3_INNER_CSUM =1 <<4 ,
Signature · 1 line
2.34.1
PATCH v20 13/20 net/mlx5e: NVMEoTCP, offload initialization
In reply to Aurelien AptelFrom: Ben Ben-Ishay <[email protected]>
This commit introduces the driver structures and initialization blocks for NVMEoTCP offload. The mlx5 nvmeotcp structures are:
- queue (mlx5e_nvmeotcp_queue) - pairs 1:1 with nvmeotcp driver queues and deals with the offloading parts. The mlx5e queue is accessed in the ddp
ops: initialized on sk_add, used in ddp setup,teardown,resync and in the fast path when dealing with packets, destroyed in the sk_del op.
- queue entry (nvmeotcp_queue_entry) - pairs 1:1 with offloaded IO from that queue. Keeps pointers to the SG elements describing the buffers used for the IO and the ddp context of it.
- queue handler (mlx5e_nvmeotcp_queue_handler) - we use icosq per NVME-TCP queue for UMR mapping as part of the ddp offload. Those dedicated SQs are unique in the sense that they are driven directly by the NVME-TCP layer to submit and invalidate ddp requests.
Since the life-cycle of these icosqs is not tied to the channels, we create dedicated napi contexts for polling them such that channels can be re-created during offloading. The queue handler has pointer to the cq associated with the queue's sq and napi context.
- main offload context (mlx5e_nvmeotcp) - has ida and hash table instances. Each offloaded queue gets an ID from the ida instance and the <id, queue> pairs are kept in the hash table. The id is programmed as flow tag to be set by HW on the completion (cqe) of all packets related to this queue (by 5-tuple steering). The fast path which deals with packets uses the flow tag to access the hash table and retrieve the queue for the processing.
We query nvmeotcp capabilities to see if the offload can be supported and use 128B CQEs when this happens. By default, the offload is off but can be enabled with ethtool --ulp-ddp <device> nvme-tcp-ddp on.
--- .../net/ethernet/mellanox/mlx5/core/Kconfig | 11 + .../net/ethernet/mellanox/mlx5/core/Makefile | 2 + drivers/net/ethernet/mellanox/mlx5/core/en.h | 4 + .../net/ethernet/mellanox/mlx5/core/en/fs.h | 4 +- .../ethernet/mellanox/mlx5/core/en/params.c | 12 +- .../ethernet/mellanox/mlx5/core/en/params.h | 3 + .../mellanox/mlx5/core/en_accel/en_accel.h | 3 + .../mellanox/mlx5/core/en_accel/fs_tcp.h | 2 +- .../mellanox/mlx5/core/en_accel/nvmeotcp.c | 217 ++++++++++++++++++ .../mellanox/mlx5/core/en_accel/nvmeotcp.h | 120 ++++++++++ .../ethernet/mellanox/mlx5/core/en_ethtool.c | 6 + .../net/ethernet/mellanox/mlx5/core/en_fs.c | 4 +- .../net/ethernet/mellanox/mlx5/core/en_main.c | 16 ++ .../net/ethernet/mellanox/mlx5/core/main.c | 1 + 14 files changed, 396 insertions(+), 9 deletions(-) create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp.c create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp.h
drivers/net/ethernet/mellanox/mlx5/core/Kconfig +11 -0
@@ -164,6 +164,17 @@ config MLX5_EN_TLS help Build support for TLS cryptography-offload acceleration in the NIC. +config MLX5_EN_NVMEOTCP + bool "NVMEoTCP acceleration" + depends on ULP_DDP + depends on MLX5_CORE_EN + default y + help + Build support for NVMEoTCP acceleration in the NIC. + This includes Direct Data Placement and CRC offload. + Note: Support for hardware with this capability needs to be selected + for this option to become available. + config MLX5_SW_STEERING bool "Mellanox Technologies software-managed steering" depends on MLX5_CORE_EN && MLX5_ESWITCH
drivers/net/ethernet/mellanox/mlx5/core/Makefile +2 -0
@@ -109,6 +109,8 @@ mlx5_core-$(CONFIG_MLX5_EN_TLS) += en_accel/ktls_stats.o \ en_accel/fs_tcp.o en_accel/ktls.o en_accel/ktls_txrx.o \ en_accel/ktls_tx.o en_accel/ktls_rx.o +mlx5_core-$(CONFIG_MLX5_EN_NVMEOTCP) += en_accel/fs_tcp.o en_accel/nvmeotcp.o + mlx5_core-$(CONFIG_MLX5_SW_STEERING) += steering/dr_domain.o steering/dr_table.o \ steering/dr_matcher.o steering/dr_rule.o \ steering/dr_icm_pool.o steering/dr_buddy.o \
drivers/net/ethernet/mellanox/mlx5/core/en.h +4 -0
@@ -327,6 +327,7 @@ struct mlx5e_params {int hard_mtu;bool ptp_rx;__be32 terminate_lkey_be; +bool nvmeotcp; };static inline u8 mlx5e_get_dcb_num_tc (struct mlx5e_params *params)
@@ -934,6 +935,9 @@ struct mlx5e_priv {#endif #ifdef CONFIG_MLX5_EN_TLS struct mlx5e_tls *tls; +#endif +#ifdef CONFIG_MLX5_EN_NVMEOTCP +struct mlx5e_nvmeotcp *nvmeotcp;#endif struct devlink_health_reporter *tx_reporter;struct devlink_health_reporter *rx_reporter;
drivers/net/ethernet/mellanox/mlx5/core/en/fs.h +2 -2
@@ -77,7 +77,7 @@ enum { MLX5E_INNER_TTC_FT_LEVEL,MLX5E_FS_TT_UDP_FT_LEVEL =MLX5E_INNER_TTC_FT_LEVEL +1 ,MLX5E_FS_TT_ANY_FT_LEVEL =MLX5E_INNER_TTC_FT_LEVEL +1 , -#ifdef CONFIG_MLX5_EN_TLS +#if defined(CONFIG_MLX5_EN_TLS) || defined(CONFIG_MLX5_EN_NVMEOTCP)MLX5E_ACCEL_FS_TCP_FT_LEVEL =MLX5E_INNER_TTC_FT_LEVEL +1 , #endif #ifdef CONFIG_MLX5_EN_ARFS
@@ -169,7 +169,7 @@ struct mlx5e_fs_any *mlx5e_fs_get_any(struct mlx5e_flow_steering *fs);void mlx5e_fs_set_any (struct mlx5e_flow_steering *fs,struct mlx5e_fs_any *any);struct mlx5e_fs_udp *mlx5e_fs_get_udp (struct mlx5e_flow_steering *fs);void mlx5e_fs_set_udp (struct mlx5e_flow_steering *fs,struct mlx5e_fs_udp *udp); -#ifdef CONFIG_MLX5_EN_TLS +#if defined(CONFIG_MLX5_EN_TLS ) || defined(CONFIG_MLX5_EN_NVMEOTCP )struct mlx5e_accel_fs_tcp *mlx5e_fs_get_accel_tcp (struct mlx5e_flow_steering *fs);void mlx5e_fs_set_accel_tcp (struct mlx5e_flow_steering *fs,struct mlx5e_accel_fs_tcp *accel_tcp);#endif
drivers/net/ethernet/mellanox/mlx5/core/en/params.c +8 -4
@@ -873,7 +873,8 @@ static void mlx5e_build_common_cq_param(struct mlx5_core_dev *mdev,void *cqc = param->cqc;MLX5_SET (cqc, cqc, uar_page, mdev->priv.uar->index); -if (MLX5_CAP_GEN (mdev, cqe_128_always) &&cache_line_size () >=128 ) +if (MLX5_CAP_GEN (mdev, cqe_128_always) && + (cache_line_size () >=128 || param->force_cqe128))MLX5_SET (cqc, cqc, cqe_sz,CQE_STRIDE_128_PAD ); }
@@ -903,6 +904,9 @@ static void mlx5e_build_rx_cq_param(struct mlx5_core_dev *mdev,void *cqc = param->cqc;u8 log_cq_size; +/* nvme-tcp offload mandates 128 byte cqes */ + param->force_cqe128 |=IS_ENABLED (CONFIG_MLX5_EN_NVMEOTCP ) && params->nvmeotcp; +switch (params->rq_wq_type) {case MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ : hw_stridx =MLX5_CAP_GEN (mdev, mini_cqe_resp_stride_index);
@@ -1242,9 +1246,9 @@ static u8 mlx5e_build_async_icosq_log_wq_sz(struct mlx5_core_dev *mdev)return MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE ; } -static void mlx5e_build_icosq_param (struct mlx5_core_dev *mdev, -u8 log_wq_size, -struct mlx5e_sq_param *param) +void mlx5e_build_icosq_param (struct mlx5_core_dev *mdev, +u8 log_wq_size, +struct mlx5e_sq_param *param) {void *sqc = param->sqc;void *wq =MLX5_ADDR_OF (sqc, sqc, wq);
drivers/net/ethernet/mellanox/mlx5/core/en/params.h +3 -0
@@ -17,6 +17,7 @@ struct mlx5e_cq_param {struct mlx5_wq_param wq;u16 eq_ix;u8 cq_period_mode; +bool force_cqe128; };struct mlx5e_rq_param {
@@ -147,6 +148,8 @@ void mlx5e_build_xdpsq_param(struct mlx5_core_dev *mdev,struct mlx5e_params *params, struct mlx5e_xsk_param *xsk, struct mlx5e_sq_param *param); +void mlx5e_build_icosq_param (struct mlx5_core_dev *mdev, +u8 log_wq_size,struct mlx5e_sq_param *param); int mlx5e_build_channel_param(struct mlx5_core_dev *mdev, struct mlx5e_params *params, u16 q_counter,
drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h +3 -0
@@ -40,6 +40,7 @@#include "en_accel/ktls.h" #include "en_accel/ktls_txrx.h" #include <en_accel/macsec.h> +#include "en_accel/nvmeotcp.h" #include "en.h" #include "en/txrx.h"
@@ -202,11 +203,13 @@ static inline void mlx5e_accel_tx_finish(struct mlx5e_txqsq *sq,static inline int mlx5e_accel_init_rx (struct mlx5e_priv *priv) { +mlx5e_nvmeotcp_init_rx (priv);return mlx5e_ktls_init_rx (priv); }static inline void mlx5e_accel_cleanup_rx (struct mlx5e_priv *priv) { +mlx5e_nvmeotcp_cleanup_rx (priv);mlx5e_ktls_cleanup_rx (priv); }
drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.h +1 -1
@@ -6,7 +6,7 @@#include "en/fs.h" -#ifdef CONFIG_MLX5_EN_TLS +#if defined(CONFIG_MLX5_EN_TLS ) || defined(CONFIG_MLX5_EN_NVMEOTCP )int mlx5e_accel_fs_tcp_create (struct mlx5e_flow_steering *fs);void mlx5e_accel_fs_tcp_destroy (struct mlx5e_flow_steering *fs); struct mlx5_flow_handle *mlx5e_accel_fs_add_sk(struct mlx5e_flow_steering *fs,
drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp.c new file +217 -0
217 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp.h new file +120 -0
120 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +6 -0
@@ -38,6 +38,7 @@#include "en/ptp.h" #include "lib/clock.h" #include "en/fs_ethtool.h" +#include "en_accel/nvmeotcp.h" void mlx5e_ethtool_get_drvinfo (struct mlx5e_priv *priv,struct ethtool_drvinfo *drvinfo)
@@ -1934,6 +1935,11 @@ int mlx5e_modify_rx_cqe_compression_locked(struct mlx5e_priv *priv, bool new_valreturn -EINVAL ; } +if (priv->channels.params.nvmeotcp) { +netdev_warn (priv->netdev,"Can't set CQE compression after ULP DDP NVMe-TCP offload\n" ); +return -EINVAL ; + } + new_params = priv->channels.params;MLX5E_SET_PFLAG (&new_params,MLX5E_PFLAG_RX_CQE_COMPRESS , new_val);if (rx_filter)
drivers/net/ethernet/mellanox/mlx5/core/en_fs.c +2 -2
@@ -62,7 +62,7 @@ struct mlx5e_flow_steering {#ifdef CONFIG_MLX5_EN_ARFS struct mlx5e_arfs_tables *arfs;#endif -#ifdef CONFIG_MLX5_EN_TLS +#if defined(CONFIG_MLX5_EN_TLS ) || defined(CONFIG_MLX5_EN_NVMEOTCP )struct mlx5e_accel_fs_tcp *accel_tcp;#endif struct mlx5e_fs_udp *udp;
@@ -1557,7 +1557,7 @@ void mlx5e_fs_set_any(struct mlx5e_flow_steering *fs, struct mlx5e_fs_any *any) fs->any = any; } -#ifdef CONFIG_MLX5_EN_TLS +#if defined(CONFIG_MLX5_EN_TLS ) || defined(CONFIG_MLX5_EN_NVMEOTCP )struct mlx5e_accel_fs_tcp *mlx5e_fs_get_accel_tcp (struct mlx5e_flow_steering *fs) {return fs->accel_tcp;
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +16 -0
@@ -50,6 +50,7 @@#include "en_accel/macsec.h" #include "en_accel/en_accel.h" #include "en_accel/ktls.h" +#include "en_accel/nvmeotcp.h" #include "lib/vxlan.h" #include "lib/clock.h" #include "en/port.h"
@@ -4267,6 +4268,13 @@ static netdev_features_t mlx5e_fix_features(struct net_device *netdev, features &= ~NETIF_F_NETNS_LOCAL ; } +if (features & (NETIF_F_LRO |NETIF_F_GRO_HW )) { +if (params->nvmeotcp) { +netdev_warn (netdev,"Disabling HW-GRO/LRO, not supported after ULP DDP NVMe-TCP offload\n" ); + features &= ~(NETIF_F_LRO |NETIF_F_GRO_HW ); + } + } +mutex_unlock (&priv->state_lock);return features;
@@ -5020,6 +5028,9 @@ const struct net_device_ops mlx5e_netdev_ops = { .ndo_has_offload_stats = mlx5e_has_offload_stats, .ndo_get_offload_stats = mlx5e_get_offload_stats,#endif +#ifdef CONFIG_MLX5_EN_NVMEOTCP + .ulp_ddp_ops = &mlx5e_nvmeotcp_ops, +#endif };static u32 mlx5e_choose_lro_timeout (struct mlx5_core_dev *mdev,u32 wanted_timeout)
@@ -5359,6 +5370,10 @@ static int mlx5e_nic_init(struct mlx5_core_dev *mdev,if (err)mlx5_core_err (mdev,"TLS initialization failed, %d\n" , err); + err =mlx5e_nvmeotcp_init (priv); +if (err) +mlx5_core_err (mdev,"NVMEoTCP initialization failed, %d\n" , err); +mlx5e_health_create_reporters (priv);/* If netdev is already registered (e.g. move from uplink to nic profile),
@@ -5379,6 +5394,7 @@ static int mlx5e_nic_init(struct mlx5_core_dev *mdev,static void mlx5e_nic_cleanup (struct mlx5e_priv *priv) {mlx5e_health_destroy_reporters (priv); +mlx5e_nvmeotcp_cleanup (priv);mlx5e_ktls_cleanup (priv);mlx5e_fs_cleanup (priv->fs);debugfs_remove_recursive (priv->dfs_root);
drivers/net/ethernet/mellanox/mlx5/core/main.c +1 -0
@@ -1744,6 +1744,7 @@ static const int types[] = {MLX5_CAP_MACSEC ,MLX5_CAP_ADV_VIRTUALIZATION ,MLX5_CAP_CRYPTO , + MLX5_CAP_DEV_NVMEOTCP, };static void mlx5_hca_caps_free (struct mlx5_core_dev *dev)
Signature · 1 line
2.34.1
PATCH v20 14/20 net/mlx5e: TCP flow steering for nvme-tcp acceleration
In reply to Aurelien AptelFrom: Boris Pismenny <[email protected]>
Both nvme-tcp and tls acceleration require tcp flow steering. Add reference counter to share TCP flow steering structure.
--- .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c +11 -1
@@ -14,6 +14,7 @@ enum accel_fs_tcp_type {struct mlx5e_accel_fs_tcp {struct mlx5e_flow_table tables[ACCEL_FS_TCP_NUM_TYPES ];struct mlx5_flow_handle *default_rules[ACCEL_FS_TCP_NUM_TYPES ]; +refcount_t user_count; };static enum mlx5_traffic_types fs_accel2tt (enum accel_fs_tcp_type i)
@@ -361,6 +362,9 @@ void mlx5e_accel_fs_tcp_destroy(struct mlx5e_flow_steering *fs)if (!accel_tcp)return ; +if (!refcount_dec_and_test (&accel_tcp->user_count)) +return ; +accel_fs_tcp_disable (fs);for (i =0 ; i <ACCEL_FS_TCP_NUM_TYPES ; i++)
@@ -372,12 +376,17 @@ void mlx5e_accel_fs_tcp_destroy(struct mlx5e_flow_steering *fs)int mlx5e_accel_fs_tcp_create (struct mlx5e_flow_steering *fs) { -struct mlx5e_accel_fs_tcp *accel_tcp; +struct mlx5e_accel_fs_tcp *accel_tcp =mlx5e_fs_get_accel_tcp (fs);int i, err;if (!MLX5_CAP_FLOWTABLE_NIC_RX (mlx5e_fs_get_mdev (fs), ft_field_support.outer_ip_version))return -EOPNOTSUPP ; +if (accel_tcp) { +refcount_inc (&accel_tcp->user_count); +return 0 ; + } + accel_tcp =kzalloc (sizeof (*accel_tcp),GFP_KERNEL );if (!accel_tcp)return -ENOMEM ;
@@ -393,6 +402,7 @@ int mlx5e_accel_fs_tcp_create(struct mlx5e_flow_steering *fs)if (err) goto err_destroy_tables; +refcount_set (&accel_tcp->user_count,1 );return 0 ; err_destroy_tables:
Signature · 1 line
2.34.1
PATCH v20 15/20 net/mlx5e: NVMEoTCP, use KLM UMRs for buffer registration
In reply to Aurelien AptelFrom: Ben Ben-Ishay <[email protected]>
NVMEoTCP offload uses buffer registration for ddp operation. Every request comprises from SG list that might consist from elements with multiple combination sizes, thus the appropriate way to perform buffer registration is with KLM UMRs.
UMR stands for user-mode memory registration, it is a mechanism to alter address translation properties of MKEY by posting WorkQueueElement aka WQE on send queue.
MKEY stands for memory key, MKEY are used to describe a region in memory that can be later used by HW.
KLM stands for {Key, Length, MemVa}, KLM_MKEY is indirect MKEY that enables to map multiple memory spaces with different sizes in unified MKEY. KLM UMR is a UMR that use to update a KLM_MKEY.
Nothing needs to be done on memory registration completion and this notification is expensive so we add a wrapper to be able to ring the doorbell without generating any.
--- .../net/ethernet/mellanox/mlx5/core/en/txrx.h | 16 ++- .../mellanox/mlx5/core/en_accel/nvmeotcp.c | 123 ++++++++++++++++++ .../mlx5/core/en_accel/nvmeotcp_utils.h | 25 ++++ .../net/ethernet/mellanox/mlx5/core/en_rx.c | 4 + 4 files changed, 165 insertions(+), 3 deletions(-) create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp_utils.h
drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h +13 -3
@@ -50,6 +50,9 @@ enum mlx5e_icosq_wqe_type { MLX5E_ICOSQ_WQE_SET_PSV_TLS, MLX5E_ICOSQ_WQE_GET_PSV_TLS,#endif +#ifdef CONFIG_MLX5_EN_NVMEOTCP + MLX5E_ICOSQ_WQE_UMR_NVMEOTCP, +#endif };/* General */
@@ -256,10 +259,10 @@ static inline u16 mlx5e_icosq_get_next_pi(struct mlx5e_icosq *sq, u16 size) }static inline void -mlx5e_notify_hw (struct mlx5_wq_cyc *wq,u16 pc,void __iomem *uar_map, -struct mlx5_wqe_ctrl_seg *ctrl) +__mlx5e_notify_hw (struct mlx5_wq_cyc *wq,u16 pc,void __iomem *uar_map, +struct mlx5_wqe_ctrl_seg *ctrl,u8 cq_update) { - ctrl->fm_ce_se |=MLX5_WQE_CTRL_CQ_UPDATE ; + ctrl->fm_ce_se |= cq_update;/* ensure wqe is visible to device before updating doorbell record */ dma_wmb ();
@@ -273,6 +276,13 @@ mlx5e_notify_hw(struct mlx5_wq_cyc *wq, u16 pc, void __iomem *uar_map,mlx5_write64 ((__be32 *)ctrl, uar_map); } +static inline void +mlx5e_notify_hw (struct mlx5_wq_cyc *wq,u16 pc,void __iomem *uar_map, +struct mlx5_wqe_ctrl_seg *ctrl) +{ +__mlx5e_notify_hw (wq, pc, uar_map, ctrl,MLX5_WQE_CTRL_CQ_UPDATE ); +} +static inline void mlx5e_cq_arm (struct mlx5e_cq *cq) {struct mlx5_core_cq *mcq;
drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp.c +123 -0
141 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp_utils.h new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */ +/* Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. */ +#ifndef __MLX5E_NVMEOTCP_UTILS_H__ +#define __MLX5E_NVMEOTCP_UTILS_H__ + +#include "en.h" + +#define MLX5E_NVMEOTCP_FETCH_KLM_WQE (sq, pi) \ + ((struct mlx5e_umr_wqe *)\ + mlx5e_fetch_wqe(&(sq)->wq, pi, sizeof(struct mlx5e_umr_wqe))) + +#define MLX5_CTRL_SEGMENT_OPC_MOD_UMR_NVMEOTCP_TIR_PROGRESS_PARAMS 0x4 + +#define MLX5_CTRL_SEGMENT_OPC_MOD_UMR_TIR_PARAMS 0x2 +#define MLX5_CTRL_SEGMENT_OPC_MOD_UMR_UMR 0x0 + +enum wqe_type { +KLM_UMR , +BSF_KLM_UMR , +SET_PSV_UMR , +BSF_UMR , +KLM_INV_UMR , +}; + +#endif /* __MLX5E_NVMEOTCP_UTILS_H__ */
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +4 -0
@@ -1061,6 +1061,10 @@ int mlx5e_poll_ico_cq(struct mlx5e_cq *cq, int budget)case MLX5E_ICOSQ_WQE_GET_PSV_TLS :mlx5e_ktls_handle_get_psv_completion (wi, sq);break ; +#endif +#ifdef CONFIG_MLX5_EN_NVMEOTCP +case MLX5E_ICOSQ_WQE_UMR_NVMEOTCP : +break ;#endif default : netdev_WARN_ONCE(cq->netdev,
Signature · 1 line
2.34.1
PATCH v20 16/20 net/mlx5e: NVMEoTCP, queue init/teardown
In reply to Aurelien AptelFrom: Ben Ben-Ishay <[email protected]>
Adds the ddp ops of sk_add, sk_del and offload limits.
When nvme-tcp establishes new queue/connection, the sk_add op is called. We allocate a hardware context to offload operations for this queue:
- use a steering rule based on the connection 5-tuple to mark packets of this queue/connection with a flow-tag in their completion (cqe)
- use a dedicated TIR to identify the queue and maintain the HW context
- use a dedicated ICOSQ to maintain the HW context by UMR postings
- use a dedicated tag buffer for buffer registration
- maintain static and progress HW contexts by posting the proper WQEs.
When nvme-tcp teardowns a queue/connection, the sk_del op is called. We teardown the queue and free the corresponding contexts.
The offload limits we advertise deal with the max SG supported.
[Re-enabled calling open/close icosq out of en_main.c]
--- drivers/net/ethernet/mellanox/mlx5/core/en.h | 4 + .../ethernet/mellanox/mlx5/core/en/rx_res.c | 28 + .../ethernet/mellanox/mlx5/core/en/rx_res.h | 4 + .../net/ethernet/mellanox/mlx5/core/en/tir.c | 15 + .../net/ethernet/mellanox/mlx5/core/en/tir.h | 2 + .../net/ethernet/mellanox/mlx5/core/en/txrx.h | 6 + .../mellanox/mlx5/core/en_accel/nvmeotcp.c | 566 +++++++++++++++++- .../mellanox/mlx5/core/en_accel/nvmeotcp.h | 4 + .../mlx5/core/en_accel/nvmeotcp_utils.h | 41 ++ .../net/ethernet/mellanox/mlx5/core/en_main.c | 8 +- .../net/ethernet/mellanox/mlx5/core/en_rx.c | 15 +- 11 files changed, 682 insertions(+), 11 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en.h +4 -0
@@ -1035,6 +1035,10 @@ int mlx5e_create_rq(struct mlx5e_rq *rq, struct mlx5e_rq_param *param);void mlx5e_destroy_rq (struct mlx5e_rq *rq);struct mlx5e_sq_param ; +int mlx5e_open_icosq (struct mlx5e_channel *c,struct mlx5e_params *params, +struct mlx5e_sq_param *param,struct mlx5e_icosq *sq, +work_func_t recover_work_func); +void mlx5e_close_icosq (struct mlx5e_icosq *sq);int mlx5e_open_xdpsq (struct mlx5e_channel *c,struct mlx5e_params *params,struct mlx5e_sq_param *param,struct xsk_buff_pool *xsk_pool,struct mlx5e_xdpsq *sq,bool is_redirect);
drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c +28 -0
@@ -643,6 +643,34 @@ struct mlx5e_rss_params_hash mlx5e_rx_res_get_current_hash(struct mlx5e_rx_res *return mlx5e_rss_get_hash (res->rss[0 ]); } +int mlx5e_rx_res_nvmeotcp_tir_create (struct mlx5e_rx_res *res,unsigned int rxq,bool crc_rx, +u32 tag_buf_id,struct mlx5e_tir *tir) +{ +bool inner_ft_support = res->features &MLX5E_RX_RES_FEATURE_INNER_FT ; +struct mlx5e_tir_builder *builder; +u32 rqtn; +int err; + + builder =mlx5e_tir_builder_alloc (false); +if (!builder) +return -ENOMEM ; + + rqtn =mlx5e_rx_res_get_rqtn_direct (res, rxq); + +mlx5e_tir_builder_build_rqt (builder, res->mdev->mlx5e_res.hw_objs.td.tdn, rqtn, + inner_ft_support); +mlx5e_tir_builder_build_direct (builder); +mlx5e_tir_builder_build_nvmeotcp (builder, crc_rx, tag_buf_id); +down_read (&res->pkt_merge_param_sem); +mlx5e_tir_builder_build_packet_merge (builder, &res->pkt_merge_param); + err =mlx5e_tir_init (tir, builder, res->mdev, false); +up_read (&res->pkt_merge_param_sem); + +mlx5e_tir_builder_free (builder); + +return err; +} +int mlx5e_rx_res_tls_tir_create (struct mlx5e_rx_res *res,unsigned int rxq,struct mlx5e_tir *tir) {
drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h +4 -0
@@ -67,4 +67,8 @@ struct mlx5e_rss_params_hash mlx5e_rx_res_get_current_hash(struct mlx5e_rx_res */* Accel TIRs */ int mlx5e_rx_res_tls_tir_create (struct mlx5e_rx_res *res,unsigned int rxq,struct mlx5e_tir *tir); + +int mlx5e_rx_res_nvmeotcp_tir_create (struct mlx5e_rx_res *res,unsigned int rxq,bool crc_rx, +u32 tag_buf_id,struct mlx5e_tir *tir); +#endif /* __MLX5_EN_RX_RES_H__ */
drivers/net/ethernet/mellanox/mlx5/core/en/tir.c +15 -0
@@ -143,6 +143,21 @@ void mlx5e_tir_builder_build_direct(struct mlx5e_tir_builder *builder)MLX5_SET (tirc, tirc, rx_hash_fn,MLX5_RX_HASH_FN_INVERTED_XOR8 ); } +void mlx5e_tir_builder_build_nvmeotcp (struct mlx5e_tir_builder *builder,bool crc_rx, +u32 tag_buf_id) +{ +void *tirc =mlx5e_tir_builder_get_tirc (builder); + +WARN_ON (builder->modify); + +MLX5_SET (tirc, tirc, nvmeotcp_zero_copy_en,1 ); +MLX5_SET (tirc, tirc, nvmeotcp_tag_buffer_table_id, tag_buf_id); +MLX5_SET (tirc, tirc, nvmeotcp_crc_en, !!crc_rx); +MLX5_SET (tirc, tirc, self_lb_block, +MLX5_TIRC_SELF_LB_BLOCK_BLOCK_UNICAST | +MLX5_TIRC_SELF_LB_BLOCK_BLOCK_MULTICAST ); +} +void mlx5e_tir_builder_build_tls (struct mlx5e_tir_builder *builder) {void *tirc =mlx5e_tir_builder_get_tirc (builder);
drivers/net/ethernet/mellanox/mlx5/core/en/tir.h +2 -0
@@ -35,6 +35,8 @@ void mlx5e_tir_builder_build_rss(struct mlx5e_tir_builder *builder, bool inner);void mlx5e_tir_builder_build_direct (struct mlx5e_tir_builder *builder);void mlx5e_tir_builder_build_tls (struct mlx5e_tir_builder *builder); +void mlx5e_tir_builder_build_nvmeotcp (struct mlx5e_tir_builder *builder,bool crc_rx, +u32 tag_buf_id);struct mlx5_core_dev ;
drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h +6 -0
@@ -52,6 +52,7 @@ enum mlx5e_icosq_wqe_type {#endif #ifdef CONFIG_MLX5_EN_NVMEOTCP MLX5E_ICOSQ_WQE_UMR_NVMEOTCP, + MLX5E_ICOSQ_WQE_SET_PSV_NVMEOTCP,#endif };
@@ -224,6 +225,11 @@ struct mlx5e_icosq_wqe_info {struct {struct mlx5e_ktls_rx_resync_buf *buf; } tls_get_params; +#endif +#ifdef CONFIG_MLX5_EN_NVMEOTCP +struct { +struct mlx5e_nvmeotcp_queue *queue; + } nvmeotcp_q;#endif }; };
drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp.c +561 -5
641 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp.h +4 -0
@@ -106,6 +106,10 @@ struct mlx5e_nvmeotcp {int mlx5e_nvmeotcp_init (struct mlx5e_priv *priv);int set_ulp_ddp_nvme_tcp (struct net_device *netdev,bool enable);void mlx5e_nvmeotcp_cleanup (struct mlx5e_priv *priv); +struct mlx5e_nvmeotcp_queue * +mlx5e_nvmeotcp_get_queue (struct mlx5e_nvmeotcp *nvmeotcp,int id); +void mlx5e_nvmeotcp_put_queue (struct mlx5e_nvmeotcp_queue *queue); +void mlx5e_nvmeotcp_ctx_complete (struct mlx5e_icosq_wqe_info *wi);static inline void mlx5e_nvmeotcp_init_rx (struct mlx5e_priv *priv) {}void mlx5e_nvmeotcp_cleanup_rx (struct mlx5e_priv *priv);extern const struct ulp_ddp_dev_ops mlx5e_nvmeotcp_ops;
drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp_utils.h +41 -0
57 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +4 -4
@@ -1852,9 +1852,9 @@ void mlx5e_tx_err_cqe_work(struct work_struct *recover_work)mlx5e_reporter_tx_err_cqe (sq); } -static int mlx5e_open_icosq (struct mlx5e_channel *c,struct mlx5e_params *params, -struct mlx5e_sq_param *param,struct mlx5e_icosq *sq, -work_func_t recover_work_func) +int mlx5e_open_icosq (struct mlx5e_channel *c,struct mlx5e_params *params, +struct mlx5e_sq_param *param,struct mlx5e_icosq *sq, +work_func_t recover_work_func) {struct mlx5e_create_sq_param csp = {};int err;
@@ -1898,7 +1898,7 @@ void mlx5e_deactivate_icosq(struct mlx5e_icosq *icosq)synchronize_net ();/* Sync with NAPI. */ } -static void mlx5e_close_icosq (struct mlx5e_icosq *sq) +void mlx5e_close_icosq (struct mlx5e_icosq *sq) {if (sq->ktls_resync)mlx5e_ktls_rx_resync_destroy_resp_list (sq->ktls_resync);
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +13 -2
@@ -53,6 +53,7 @@#include "en_accel/macsec.h" #include "en_accel/ipsec_rxtx.h" #include "en_accel/ktls_txrx.h" +#include "en_accel/nvmeotcp.h" #include "en/xdp.h" #include "en/xsk/rx.h" #include "en/health.h"
@@ -957,16 +958,23 @@ void mlx5e_free_icosq_descs(struct mlx5e_icosq *sq) ci =mlx5_wq_cyc_ctr2ix (&sq->wq, sqcc); wi = &sq->db.wqe_info[ci]; sqcc += wi->num_wqebbs; -#ifdef CONFIG_MLX5_EN_TLS switch (wi->wqe_type) { +#ifdef CONFIG_MLX5_EN_TLS case MLX5E_ICOSQ_WQE_SET_PSV_TLS :mlx5e_ktls_handle_ctx_completion (wi);break ;case MLX5E_ICOSQ_WQE_GET_PSV_TLS :mlx5e_ktls_handle_get_psv_completion (wi, sq);break ; - }#endif +#ifdef CONFIG_MLX5_EN_NVMEOTCP +case MLX5E_ICOSQ_WQE_SET_PSV_NVMEOTCP : +mlx5e_nvmeotcp_ctx_complete (wi); +break ; +#endif +default : +break ; + } } sq->cc = sqcc; }
@@ -1065,6 +1073,9 @@ int mlx5e_poll_ico_cq(struct mlx5e_cq *cq, int budget)#ifdef CONFIG_MLX5_EN_NVMEOTCP case MLX5E_ICOSQ_WQE_UMR_NVMEOTCP :break ; +case MLX5E_ICOSQ_WQE_SET_PSV_NVMEOTCP : +mlx5e_nvmeotcp_ctx_complete (wi); +break ;#endif default : netdev_WARN_ONCE(cq->netdev,
Signature · 1 line
2.34.1
PATCH v20 17/20 net/mlx5e: NVMEoTCP, ddp setup and resync
In reply to Aurelien AptelFrom: Ben Ben-Ishay <[email protected]>
NVMEoTCP offload uses buffer registration for every NVME request to perform direct data placement. This is achieved by creating a NIC HW mapping between the CCID (command capsule ID) to the set of buffers that compose the request. The registration is implemented via MKEY for which we do fast/async mapping using KLM UMR WQE.
The buffer registration takes place when the ULP calls the ddp_setup op which is done before they send their corresponding request to the other side (e.g nvmf target). We don't wait for the completion of the registration before returning back to the ulp. The reason being that the HW mapping should be in place fast enough vs the RTT it would take for the request to be responded. If this doesn't happen, some IO may not be ddp-offloaded, but that doesn't stop the overall offloading session.
When the offloading HW gets out of sync with the protocol session, a hardware/software handshake takes place to resync. The ddp_resync op is the part of the handshake where the SW confirms to the HW that a indeed they identified correctly a PDU header at a certain TCP sequence number. This allows the HW to resume the offload.
The 1st part of the handshake is when the HW identifies such sequence number in an arriving packet. A special mark is made on the completion (cqe) and then the mlx5 driver invokes the ddp resync_request callback advertised by the ULP in the ddp context - this is in downstream patch.
--- .../mellanox/mlx5/core/en_accel/nvmeotcp.c | 146 +++++++++++++++++- 1 file changed, 144 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp.c +144 -2
@@ -684,19 +684,156 @@ mlx5e_nvmeotcp_queue_teardown(struct net_device *netdev,mlx5e_nvmeotcp_put_queue (queue); } +static bool +mlx5e_nvmeotcp_validate_small_sgl_suffix (struct scatterlist *sg,int sg_len,int mtu) +{ +int i, hole_size, hole_len, chunk_size =0 ; + +for (i =1 ; i < sg_len; i++) + chunk_size +=sg_dma_len (&sg[i]); + +if (chunk_size >= mtu) +return true; + + hole_size = mtu - chunk_size -1 ; + hole_len =DIV_ROUND_UP (hole_size,PAGE_SIZE ); + +if (sg_len + hole_len >MAX_SKB_FRAGS ) +return false; + +return true; +} + +static bool +mlx5e_nvmeotcp_validate_big_sgl_suffix (struct scatterlist *sg,int sg_len,int mtu) +{ +int i, j, last_elem, window_idx, window_size =MAX_SKB_FRAGS -1 ; +int chunk_size =0 ; + + last_elem = sg_len - window_size; + window_idx = window_size; + +for (j =1 ; j < window_size; j++) + chunk_size +=sg_dma_len (&sg[j]); + +for (i =1 ; i <= last_elem; i++, window_idx++) { + chunk_size +=sg_dma_len (&sg[window_idx]); +if (chunk_size < mtu -1 ) +return false; + + chunk_size -=sg_dma_len (&sg[i]); + } + +return true; +} + +/* This function makes sure that the middle/suffix of a PDU SGL meets the +* restriction of MAX_SKB_FRAGS. There are two cases here: +* 1. sg_len < MAX_SKB_FRAGS - the extreme case here is a packet that consists +* of one byte from the first SG element + the rest of the SGL and the remaining +* space of the packet will be scattered to the WQE and will be pointed by +* SKB frags. +* 2. sg_len => MAX_SKB_FRAGS - the extreme case here is a packet that consists +* of one byte from middle SG element + 15 continuous SG elements + one byte +* from a sequential SG element or the rest of the packet. +*/ +static bool +mlx5e_nvmeotcp_validate_sgl_suffix (struct scatterlist *sg,int sg_len,int mtu) +{ +int ret; + +if (sg_len <MAX_SKB_FRAGS ) + ret =mlx5e_nvmeotcp_validate_small_sgl_suffix (sg, sg_len, mtu); +else + ret =mlx5e_nvmeotcp_validate_big_sgl_suffix (sg, sg_len, mtu); + +return ret; +} + +static bool +mlx5e_nvmeotcp_validate_sgl_prefix (struct scatterlist *sg,int sg_len,int mtu) +{ +int i, hole_size, hole_len, tmp_len, chunk_size =0 ; + + tmp_len =min_t (int, sg_len,MAX_SKB_FRAGS ); + +for (i =0 ; i < tmp_len; i++) + chunk_size +=sg_dma_len (&sg[i]); + +if (chunk_size >= mtu) +return true; + + hole_size = mtu - chunk_size; + hole_len =DIV_ROUND_UP (hole_size,PAGE_SIZE ); + +if (tmp_len + hole_len >MAX_SKB_FRAGS ) +return false; + +return true; +} + +/* This function is responsible to ensure that a PDU could be offloaded. +* PDU is offloaded by building a non-linear SKB such that each SGL element is +* placed in frag, thus this function should ensure that all packets that +* represent part of the PDU won't exaggerate from MAX_SKB_FRAGS SGL. +* In addition NVMEoTCP offload has one PDU offload for packet restriction. +* Packet could start with a new PDU and then we should check that the prefix +* of the PDU meets the requirement or a packet can start in the middle of SG +* element and then we should check that the suffix of PDU meets the requirement. +*/ +static bool +mlx5e_nvmeotcp_validate_sgl (struct scatterlist *sg,int sg_len,int mtu) +{ +int max_hole_frags; + + max_hole_frags =DIV_ROUND_UP (mtu,PAGE_SIZE ); +if (sg_len + max_hole_frags <=MAX_SKB_FRAGS ) +return true; + +if (!mlx5e_nvmeotcp_validate_sgl_prefix (sg, sg_len, mtu) || + !mlx5e_nvmeotcp_validate_sgl_suffix (sg, sg_len, mtu)) +return false; + +return true; +} +static int mlx5e_nvmeotcp_ddp_setup (struct net_device *netdev,struct sock *sk,struct ulp_ddp_io *ddp) { +struct scatterlist *sg = ddp->sg_table.sgl; +struct mlx5e_nvmeotcp_queue_entry *nvqt;struct mlx5e_nvmeotcp_queue *queue; +struct mlx5_core_dev *mdev; +int i, size =0 , count =0 ; queue =container_of (ulp_ddp_get_ctx (sk), struct mlx5e_nvmeotcp_queue, ulp_ddp_ctx); + mdev = queue->priv->mdev; + count =dma_map_sg (mdev->device, ddp->sg_table.sgl, ddp->nents, +DMA_FROM_DEVICE ); + +if (count <=0 ) +return -EINVAL ; -/* Placeholder - map_sg and initializing the count */ +if (WARN_ON (count >mlx5e_get_max_sgl (mdev))) +return -ENOSPC ; + +if (!mlx5e_nvmeotcp_validate_sgl (sg, count,READ_ONCE (netdev->mtu))) +return -EOPNOTSUPP ; + +for (i =0 ; i < count; i++) + size +=sg_dma_len (&sg[i]); + + nvqt = &queue->ccid_table[ddp->command_id]; + nvqt->size = size; + nvqt->ddp = ddp; + nvqt->sgl = sg; + nvqt->ccid_gen++; + nvqt->sgl_length = count; +mlx5e_nvmeotcp_post_klm_wqe (queue,KLM_UMR , ddp->command_id, count); -mlx5e_nvmeotcp_post_klm_wqe (queue,KLM_UMR , ddp->command_id,0 );return 0 ; }
@@ -719,6 +856,11 @@ static void mlx5e_nvmeotcp_ddp_resync(struct net_device *netdev, struct sock *sk, u32 seq) { + struct mlx5e_nvmeotcp_queue *queue = + container_of(ulp_ddp_get_ctx(sk), struct mlx5e_nvmeotcp_queue, ulp_ddp_ctx); + + queue->after_resync_cqe =1 ; +mlx5e_nvmeotcp_rx_post_static_params_wqe (queue, seq); } struct mlx5e_nvmeotcp_queue *
Signature · 1 line
2.34.1
PATCH v20 18/20 net/mlx5e: NVMEoTCP, async ddp invalidation
In reply to Aurelien AptelFrom: Ben Ben-Ishay <[email protected]>
After the ULP consumed the buffers of the offloaded request, it calls the ddp_teardown op to release the NIC mapping for them and allow the NIC to reuse the HW contexts associated with offloading this IO. We do a fast/async un-mapping via UMR WQE. In this case, the ULP does holds off with completing the request towards the upper/application layers until the HW unmapping is done.
When the corresponding CQE is received, a notification is done via the the teardown_done ddp callback advertised by the ULP in the ddp context.
--- .../net/ethernet/mellanox/mlx5/core/en/txrx.h | 4 ++ .../mellanox/mlx5/core/en_accel/nvmeotcp.c | 66 ++++++++++++++++--- .../mellanox/mlx5/core/en_accel/nvmeotcp.h | 1 + .../net/ethernet/mellanox/mlx5/core/en_rx.c | 6 ++ 4 files changed, 67 insertions(+), 10 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h +4 -0
@@ -52,6 +52,7 @@ enum mlx5e_icosq_wqe_type {#endif #ifdef CONFIG_MLX5_EN_NVMEOTCP MLX5E_ICOSQ_WQE_UMR_NVMEOTCP , +MLX5E_ICOSQ_WQE_UMR_NVMEOTCP_INVALIDATE , MLX5E_ICOSQ_WQE_SET_PSV_NVMEOTCP, #endif };
@@ -230,6 +231,9 @@ struct mlx5e_icosq_wqe_info {struct {struct mlx5e_nvmeotcp_queue *queue; } nvmeotcp_q; +struct { +struct mlx5e_nvmeotcp_queue_entry *entry; + } nvmeotcp_qe;#endif }; };
drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp.c +56 -10
126 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp.h +1 -0
@@ -109,6 +109,7 @@ void mlx5e_nvmeotcp_cleanup(struct mlx5e_priv *priv);struct mlx5e_nvmeotcp_queue *mlx5e_nvmeotcp_get_queue (struct mlx5e_nvmeotcp *nvmeotcp,int id);void mlx5e_nvmeotcp_put_queue (struct mlx5e_nvmeotcp_queue *queue); +void mlx5e_nvmeotcp_ddp_inv_done (struct mlx5e_icosq_wqe_info *wi);void mlx5e_nvmeotcp_ctx_complete (struct mlx5e_icosq_wqe_info *wi);static inline void mlx5e_nvmeotcp_init_rx (struct mlx5e_priv *priv) {}void mlx5e_nvmeotcp_cleanup_rx (struct mlx5e_priv *priv);
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +6 -0
@@ -968,6 +968,9 @@ void mlx5e_free_icosq_descs(struct mlx5e_icosq *sq)break ;#endif #ifdef CONFIG_MLX5_EN_NVMEOTCP +case MLX5E_ICOSQ_WQE_UMR_NVMEOTCP_INVALIDATE : +mlx5e_nvmeotcp_ddp_inv_done (wi); +break ;case MLX5E_ICOSQ_WQE_SET_PSV_NVMEOTCP :mlx5e_nvmeotcp_ctx_complete (wi);break ;
@@ -1073,6 +1076,9 @@ int mlx5e_poll_ico_cq(struct mlx5e_cq *cq, int budget)#ifdef CONFIG_MLX5_EN_NVMEOTCP case MLX5E_ICOSQ_WQE_UMR_NVMEOTCP :break ; +case MLX5E_ICOSQ_WQE_UMR_NVMEOTCP_INVALIDATE : +mlx5e_nvmeotcp_ddp_inv_done (wi); +break ;case MLX5E_ICOSQ_WQE_SET_PSV_NVMEOTCP :mlx5e_nvmeotcp_ctx_complete (wi);break ;
Signature · 1 line
2.34.1
PATCH v20 19/20 net/mlx5e: NVMEoTCP, data-path for DDP+DDGST offload
In reply to Aurelien AptelFrom: Ben Ben-Ishay <[email protected]>
This patch implements the data-path for direct data placement (DDP) and DDGST offloads. NVMEoTCP DDP constructs an SKB from each CQE, while pointing at NVME destination buffers. In turn, this enables the offload, as the NVMe-TCP layer will skip the copy when src == dst.
Additionally, this patch adds support for DDGST (CRC32) offload. HW will report DDGST offload only if it has not encountered an error in the received packet. We pass this indication in skb->ulp_crc up the stack to NVMe-TCP to skip computing the DDGST if all corresponding SKBs were verified by HW.
This patch also handles context resynchronization requests made by NIC HW. The resync request is passed to the NVMe-TCP layer to be handled at a later point in time.
Finally, we also use the skb->no_condense bit to avoid skb_condense. This is critical as every SKB that uses DDP has a hole that fits perfectly with skb_condense's policy, but filling this hole is counter-productive as the data there already resides in its destination buffer.
--- .../net/ethernet/mellanox/mlx5/core/Makefile | 2 +- .../net/ethernet/mellanox/mlx5/core/en/txrx.h | 6 + .../mlx5/core/en_accel/nvmeotcp_rxtx.c | 345 ++++++++++++++++++ .../mlx5/core/en_accel/nvmeotcp_rxtx.h | 37 ++ .../net/ethernet/mellanox/mlx5/core/en_rx.c | 44 ++- 5 files changed, 419 insertions(+), 15 deletions(-) create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp_rxtx.c create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp_rxtx.h
drivers/net/ethernet/mellanox/mlx5/core/Makefile +1 -1
@@ -109,7 +109,7 @@ mlx5_core-$(CONFIG_MLX5_EN_TLS) += en_accel/ktls_stats.o \ en_accel/fs_tcp.o en_accel/ktls.o en_accel/ktls_txrx.o \ en_accel/ktls_tx.o en_accel/ktls_rx.o -mlx5_core-$(CONFIG_MLX5_EN_NVMEOTCP) += en_accel/fs_tcp.o en_accel/nvmeotcp.o +mlx5_core-$(CONFIG_MLX5_EN_NVMEOTCP) += en_accel/fs_tcp.o en_accel/nvmeotcp.o en_accel/nvmeotcp_rxtx.o mlx5_core-$(CONFIG_MLX5_SW_STEERING) += steering/dr_domain.o steering/dr_table.o \ steering/dr_matcher.o steering/dr_rule.o \
drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h +6 -0
@@ -526,4 +526,10 @@ static inline struct mlx5e_mpw_info *mlx5e_get_mpw_info(struct mlx5e_rq *rq, int return (struct mlx5e_mpw_info *)((char *)rq->mpwqe.info + array_size(i, isz)); } + +static inline struct mlx5e_wqe_frag_info *get_frag (struct mlx5e_rq *rq,u16 ix) +{ +return &rq->wqe.frags[ix << rq->wqe.info.log_num_frags]; +} +#endif
drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp_rxtx.c new file +345 -0
345 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp_rxtx.h new file +37 -0
@@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */ +/* Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. */ +#ifndef __MLX5E_NVMEOTCP_RXTX_H__ +#define __MLX5E_NVMEOTCP_RXTX_H__ + +#ifdef CONFIG_MLX5_EN_NVMEOTCP + +#include <linux/skbuff.h> +#include "en_accel/nvmeotcp.h" + +bool +mlx5e_nvmeotcp_rebuild_rx_skb (struct mlx5e_rq *rq,struct sk_buff *skb, +struct mlx5_cqe64 *cqe,u32 cqe_bcnt); + +static inline int mlx5_nvmeotcp_get_headlen (struct mlx5_cqe64 *cqe,u32 cqe_bcnt) +{ +struct mlx5e_cqe128 *cqe128; + +if (!cqe_is_nvmeotcp_zc (cqe)) +return cqe_bcnt; + + cqe128 = container_of(cqe, struct mlx5e_cqe128, cqe64); +return be16_to_cpu (cqe128->hlen); +} + +#else + +static inline bool +mlx5e_nvmeotcp_rebuild_rx_skb (struct mlx5e_rq *rq,struct sk_buff *skb, +struct mlx5_cqe64 *cqe,u32 cqe_bcnt) +{return true; } + +static inline int mlx5_nvmeotcp_get_headlen (struct mlx5_cqe64 *cqe,u32 cqe_bcnt) +{return cqe_bcnt; } + +#endif /* CONFIG_MLX5_EN_NVMEOTCP */ +#endif /* __MLX5E_NVMEOTCP_RXTX_H__ */
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +30 -14
128 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v20 20/20 net/mlx5e: NVMEoTCP, statistics
In reply to Aurelien AptelNVMEoTCP offload statistics include both control and data path
statistic: counters for the netdev ddp ops, offloaded packets/bytes, resync and dropped packets.
Expose the statistics using ulp_ddp_ops->get_stats() instead of the regular statistics flow.
--- .../net/ethernet/mellanox/mlx5/core/Makefile | 3 +- .../mellanox/mlx5/core/en_accel/nvmeotcp.c | 52 ++++++++++++--- .../mellanox/mlx5/core/en_accel/nvmeotcp.h | 16 +++++ .../mlx5/core/en_accel/nvmeotcp_rxtx.c | 11 +++- .../mlx5/core/en_accel/nvmeotcp_stats.c | 66 +++++++++++++++++++ .../ethernet/mellanox/mlx5/core/en_stats.h | 8 +++ 6 files changed, 145 insertions(+), 11 deletions(-) create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp_stats.c
drivers/net/ethernet/mellanox/mlx5/core/Makefile +2 -1
@@ -109,7 +109,8 @@ mlx5_core-$(CONFIG_MLX5_EN_TLS) += en_accel/ktls_stats.o \ en_accel/fs_tcp.o en_accel/ktls.o en_accel/ktls_txrx.o \ en_accel/ktls_tx.o en_accel/ktls_rx.o -mlx5_core-$(CONFIG_MLX5_EN_NVMEOTCP) += en_accel/fs_tcp.o en_accel/nvmeotcp.o en_accel/nvmeotcp_rxtx.o +mlx5_core-$(CONFIG_MLX5_EN_NVMEOTCP) += en_accel/fs_tcp.o en_accel/nvmeotcp.o \ + en_accel/nvmeotcp_rxtx.o en_accel/nvmeotcp_stats.o mlx5_core-$(CONFIG_MLX5_SW_STEERING) += steering/dr_domain.o steering/dr_table.o \ steering/dr_matcher.o steering/dr_rule.o \
drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp.c +43 -9
132 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp.h +16 -0
@@ -9,6 +9,15 @@#include "en.h" #include "en/params.h" +struct mlx5e_nvmeotcp_sw_stats { +atomic64_t rx_nvmeotcp_sk_add; +atomic64_t rx_nvmeotcp_sk_add_fail; +atomic64_t rx_nvmeotcp_sk_del; +atomic64_t rx_nvmeotcp_ddp_setup; +atomic64_t rx_nvmeotcp_ddp_setup_fail; +atomic64_t rx_nvmeotcp_ddp_teardown; +}; +struct mlx5e_nvmeotcp_queue_entry {struct mlx5e_nvmeotcp_queue *queue;u32 sgl_length;
@@ -52,6 +61,7 @@ struct mlx5e_nvmeotcp_queue_handler {* @sk: The socket used by the NVMe-TCP queue * @crc_rx: CRC Rx offload indication for this queue * @priv: mlx5e netdev priv +* @sw_stats: Global software statistics for nvmeotcp offload * @static_params_done: Async completion structure for the initial umr mapping * synchronization * @sq_lock: Spin lock for the icosq
@@ -88,6 +98,7 @@ struct mlx5e_nvmeotcp_queue { u8 crc_rx:1;/* for ddp invalidate flow */ struct mlx5e_priv *priv; +struct mlx5e_nvmeotcp_sw_stats *sw_stats;/* end of data-path section */ struct completion static_params_done;
@@ -97,6 +108,7 @@ struct mlx5e_nvmeotcp_queue { };struct mlx5e_nvmeotcp { +struct mlx5e_nvmeotcp_sw_stats sw_stats;struct ida queue_ids;struct rhashtable queue_hash;struct ulp_ddp_dev_caps ddp_caps;
@@ -113,6 +125,7 @@ void mlx5e_nvmeotcp_ddp_inv_done(struct mlx5e_icosq_wqe_info *wi);void mlx5e_nvmeotcp_ctx_complete (struct mlx5e_icosq_wqe_info *wi);static inline void mlx5e_nvmeotcp_init_rx (struct mlx5e_priv *priv) {}void mlx5e_nvmeotcp_cleanup_rx (struct mlx5e_priv *priv); +int mlx5e_nvmeotcp_get_stats (struct mlx5e_priv *priv,struct ulp_ddp_stats *stats);extern const struct ulp_ddp_dev_ops mlx5e_nvmeotcp_ops;#else
@@ -121,5 +134,8 @@ static inline void mlx5e_nvmeotcp_cleanup(struct mlx5e_priv *priv) {}static inline int set_ulp_ddp_nvme_tcp (struct net_device *dev,bool en) {return -EOPNOTSUPP ; }static inline void mlx5e_nvmeotcp_init_rx (struct mlx5e_priv *priv) {}static inline void mlx5e_nvmeotcp_cleanup_rx (struct mlx5e_priv *priv) {} +static inline int mlx5e_nvmeotcp_get_stats (struct mlx5e_priv *priv, +struct ulp_ddp_stats *stats) +{return 0 ; }#endif #endif /* __MLX5E_NVMEOTCP_H__ */
drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp_rxtx.c +10 -1
@@ -140,6 +140,7 @@ mlx5e_nvmeotcp_rebuild_rx_skb_nonlinear(struct mlx5e_rq *rq, struct sk_buff *skbint ccoff, cclen, hlen, ccid, remaining, fragsz, to_copy =0 ;struct net_device *netdev = rq->netdev;struct mlx5e_priv *priv =netdev_priv (netdev); +struct mlx5e_rq_stats *stats = rq->stats;struct mlx5e_nvmeotcp_queue_entry *nqe;skb_frag_t org_frags[MAX_SKB_FRAGS ];struct mlx5e_nvmeotcp_queue *queue;
@@ -151,12 +152,14 @@ mlx5e_nvmeotcp_rebuild_rx_skb_nonlinear(struct mlx5e_rq *rq, struct sk_buff *skb queue =mlx5e_nvmeotcp_get_queue (priv->nvmeotcp, queue_id);if (unlikely (!queue)) {dev_kfree_skb_any (skb); + stats->nvmeotcp_drop++;return false; } cqe128 = container_of(cqe, struct mlx5e_cqe128, cqe64);if (cqe_is_nvmeotcp_resync (cqe)) {nvmeotcp_update_resync (queue, cqe128); + stats->nvmeotcp_resync++;mlx5e_nvmeotcp_put_queue (queue);return true; }
@@ -230,7 +233,8 @@ mlx5e_nvmeotcp_rebuild_rx_skb_nonlinear(struct mlx5e_rq *rq, struct sk_buff *skb org_nr_frags, frag_index); } - + stats->nvmeotcp_packets++; + stats->nvmeotcp_bytes += cclen;mlx5e_nvmeotcp_put_queue (queue);return true; }
@@ -242,6 +246,7 @@ mlx5e_nvmeotcp_rebuild_rx_skb_linear(struct mlx5e_rq *rq, struct sk_buff *skb,int ccoff, cclen, hlen, ccid, remaining, fragsz, to_copy =0 ;struct net_device *netdev = rq->netdev;struct mlx5e_priv *priv =netdev_priv (netdev); +struct mlx5e_rq_stats *stats = rq->stats;struct mlx5e_nvmeotcp_queue_entry *nqe;struct mlx5e_nvmeotcp_queue *queue;struct mlx5e_cqe128 *cqe128;
@@ -251,12 +256,14 @@ mlx5e_nvmeotcp_rebuild_rx_skb_linear(struct mlx5e_rq *rq, struct sk_buff *skb, queue =mlx5e_nvmeotcp_get_queue (priv->nvmeotcp, queue_id);if (unlikely (!queue)) {dev_kfree_skb_any (skb); + stats->nvmeotcp_drop++;return false; } cqe128 = container_of(cqe, struct mlx5e_cqe128, cqe64);if (cqe_is_nvmeotcp_resync (cqe)) {nvmeotcp_update_resync (queue, cqe128); + stats->nvmeotcp_resync++;mlx5e_nvmeotcp_put_queue (queue);return true; }
@@ -330,6 +337,8 @@ mlx5e_nvmeotcp_rebuild_rx_skb_linear(struct mlx5e_rq *rq, struct sk_buff *skb, hlen + cclen, remaining); } + stats->nvmeotcp_packets++; + stats->nvmeotcp_bytes += cclen;mlx5e_nvmeotcp_put_queue (queue);return true; }
drivers/net/ethernet/mellanox/mlx5/core/en_accel/nvmeotcp_stats.c new file +66 -0
66 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_stats.h +8 -0
@@ -128,6 +128,8 @@ void mlx5e_stats_rmon_get(struct mlx5e_priv *priv, const struct ethtool_rmon_hist_range **ranges);void mlx5e_get_link_ext_stats (struct net_device *dev,struct ethtool_link_ext_stats *stats); +struct ulp_ddp_stats ; +void mlx5e_stats_ulp_ddp_get (struct mlx5e_priv *priv,struct ulp_ddp_stats *stats);/* Concrete NIC Stats */
@@ -396,6 +398,12 @@ struct mlx5e_rq_stats {u64 tls_resync_res_skip;u64 tls_err;#endif +#ifdef CONFIG_MLX5_EN_NVMEOTCP +u64 nvmeotcp_drop; +u64 nvmeotcp_resync; +u64 nvmeotcp_packets; +u64 nvmeotcp_bytes; +#endif };struct mlx5e_sq_stats {
Signature · 1 line
2.34.1