mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
25edbc383b
A typical collection of patches this cycle, mostly fixing with a few new features: - Fixes from static tools. clang warnings, dead code, unused variable, coccinelle sweeps, etc - Driver bug fixes and minor improvements in rxe, bnxt_re, hfi1, mlx5, irdma, qedr - rtrs ULP bug fixes an improvments - Additional counters for bnxt_re - Support verbs CQ notifications in EFA - Continued reworking and fixing of rxe - netlink control to enable/disable optional device counters - rxe now can use AH objects for its UD path, fixing various bugs in the process - Add DMABUF support to EFA -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEfB7FMLh+8QxL+6i3OG33FX4gmxoFAmGCiiEACgkQOG33FX4g mxrXlg//bsbMvwkgfS4DGtHyBgrkcqlilQuoNiNq8ezc1mWXWnvx5N/tq0biUlqu UOsZXgLk45pJa8k3pfCp2+7eWROobt5pfA0lSHoJWHY3bsoJmoM7mggg+PUTi6nm fAyN2qlzfGuPvcwfXeoj0qlhJMQuV0y2sDCDdh9nHMqsznPAu37cG4zcvXx2+8BL hQiW3GG1zg2fL1ZF4vaju6CT/6RwnIOYeYnCLYMkTrAjq7r9VyRYuKagUWrG82yN jeO9bBfhv9FV46C0yzWTbX0hC17YgnelmG0HOQuINr4vWE8cPkO0OakpIJNPGw7a OCK6+KmdtKLuDEcPx099xEaB1ZqFLh8L1FNuR/VdOIyrERmh4rAFcgsyDhlcZ1wQ vKOxZFqtUrz5vuGCteQUh9q841/sRorMFtefJIYuxbFDWLBft8heslL9Xn8APAuT 7kFHGBewdcuOSWQ016F5v8x25wY1dCYgdE9VSvxJnbjCp/Aeq8VzAnyNvfnmsg8e 0dsqWwP28mLrLMKtT9EBJ+sud/33x+JTZVBBF+XxtpKYma06OStiRqyUoFZiWmQU d6qexLelRldLRY9OUoPYpShTZ5X7e0LDJj/1sRV4J1pxDhX3v9rnubtrusWADxG5 VDKx7aJ5BT5xc+pOOkIKHyiw2WZ8ERF4J/YCRyGqT4Yl5fxxyto= =CxD0 -----END PGP SIGNATURE----- Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma Pull rdma updates from Jason Gunthorpe: "A typical collection of patches this cycle, mostly fixing with a few new features: - Fixes from static tools. clang warnings, dead code, unused variable, coccinelle sweeps, etc - Driver bug fixes and minor improvements in rxe, bnxt_re, hfi1, mlx5, irdma, qedr - rtrs ULP bug fixes an improvments - Additional counters for bnxt_re - Support verbs CQ notifications in EFA - Continued reworking and fixing of rxe - netlink control to enable/disable optional device counters - rxe now can use AH objects for its UD path, fixing various bugs in the process - Add DMABUF support to EFA" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (103 commits) RDMA/core: Require the driver to set the IOVA correctly during rereg_mr RDMA/bnxt_re: Remove unsupported bnxt_re_modify_ah callback RDMA/irdma: optimize rx path by removing unnecessary copy RDMA/qed: Use helper function to set GUIDs RDMA/hns: Use the core code to manage the fixed mmap entries IB/opa_vnic: Rebranding of OPA VNIC driver to Cornelis Networks IB/qib: Rebranding of qib driver to Cornelis Networks IB/hfi1: Rebranding of hfi1 driver to Cornelis Networks RDMA/bnxt_re: Use helper function to set GUIDs RDMA/bnxt_re: Fix kernel panic when trying to access bnxt_re_stat_descs RDMA/qedr: Fix NULL deref for query_qp on the GSI QP RDMA/hns: Modify the value of MAX_LP_MSG_LEN to meet hardware compatibility RDMA/hns: Fix initial arm_st of CQ RDMA/rxe: Make rxe_type_info static const RDMA/rxe: Use 'bitmap_zalloc()' when applicable RDMA/rxe: Save a few bytes from struct rxe_pool RDMA/irdma: Remove the unused variable local_qp RDMA/core: Fix missed initialization of rdma_hw_stats::lock RDMA/efa: Add support for dmabuf memory regions RDMA/umem: Allow pinned dmabuf umem usage ...
223 lines
4.9 KiB
C
223 lines
4.9 KiB
C
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB) */
|
|
/*
|
|
* Copyright (c) 2016 Mellanox Technologies Ltd. All rights reserved.
|
|
*
|
|
* This software is available to you under a choice of one of two
|
|
* licenses. You may choose to be licensed under the terms of the GNU
|
|
* General Public License (GPL) Version 2, available from the file
|
|
* COPYING in the main directory of this source tree, or the
|
|
* OpenIB.org BSD license below:
|
|
*
|
|
* Redistribution and use in source and binary forms, with or
|
|
* without modification, are permitted provided that the following
|
|
* conditions are met:
|
|
*
|
|
* - Redistributions of source code must retain the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer.
|
|
*
|
|
* - Redistributions in binary form must reproduce the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer in the documentation and/or other materials
|
|
* provided with the distribution.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#ifndef RDMA_USER_RXE_H
|
|
#define RDMA_USER_RXE_H
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/socket.h>
|
|
#include <linux/in.h>
|
|
#include <linux/in6.h>
|
|
|
|
enum {
|
|
RXE_NETWORK_TYPE_IPV4 = 1,
|
|
RXE_NETWORK_TYPE_IPV6 = 2,
|
|
};
|
|
|
|
union rxe_gid {
|
|
__u8 raw[16];
|
|
struct {
|
|
__be64 subnet_prefix;
|
|
__be64 interface_id;
|
|
} global;
|
|
};
|
|
|
|
struct rxe_global_route {
|
|
union rxe_gid dgid;
|
|
__u32 flow_label;
|
|
__u8 sgid_index;
|
|
__u8 hop_limit;
|
|
__u8 traffic_class;
|
|
};
|
|
|
|
struct rxe_av {
|
|
__u8 port_num;
|
|
/* From RXE_NETWORK_TYPE_* */
|
|
__u8 network_type;
|
|
__u8 dmac[6];
|
|
struct rxe_global_route grh;
|
|
union {
|
|
struct sockaddr_in _sockaddr_in;
|
|
struct sockaddr_in6 _sockaddr_in6;
|
|
} sgid_addr, dgid_addr;
|
|
};
|
|
|
|
struct rxe_send_wr {
|
|
__aligned_u64 wr_id;
|
|
__u32 num_sge;
|
|
__u32 opcode;
|
|
__u32 send_flags;
|
|
union {
|
|
__be32 imm_data;
|
|
__u32 invalidate_rkey;
|
|
} ex;
|
|
union {
|
|
struct {
|
|
__aligned_u64 remote_addr;
|
|
__u32 rkey;
|
|
__u32 reserved;
|
|
} rdma;
|
|
struct {
|
|
__aligned_u64 remote_addr;
|
|
__aligned_u64 compare_add;
|
|
__aligned_u64 swap;
|
|
__u32 rkey;
|
|
__u32 reserved;
|
|
} atomic;
|
|
struct {
|
|
__u32 remote_qpn;
|
|
__u32 remote_qkey;
|
|
__u16 pkey_index;
|
|
__u16 reserved;
|
|
__u32 ah_num;
|
|
__u32 pad[4];
|
|
struct rxe_av av;
|
|
} ud;
|
|
struct {
|
|
__aligned_u64 addr;
|
|
__aligned_u64 length;
|
|
__u32 mr_lkey;
|
|
__u32 mw_rkey;
|
|
__u32 rkey;
|
|
__u32 access;
|
|
} mw;
|
|
/* reg is only used by the kernel and is not part of the uapi */
|
|
#ifdef __KERNEL__
|
|
struct {
|
|
union {
|
|
struct ib_mr *mr;
|
|
__aligned_u64 reserved;
|
|
};
|
|
__u32 key;
|
|
__u32 access;
|
|
} reg;
|
|
#endif
|
|
} wr;
|
|
};
|
|
|
|
struct rxe_sge {
|
|
__aligned_u64 addr;
|
|
__u32 length;
|
|
__u32 lkey;
|
|
};
|
|
|
|
struct mminfo {
|
|
__aligned_u64 offset;
|
|
__u32 size;
|
|
__u32 pad;
|
|
};
|
|
|
|
struct rxe_dma_info {
|
|
__u32 length;
|
|
__u32 resid;
|
|
__u32 cur_sge;
|
|
__u32 num_sge;
|
|
__u32 sge_offset;
|
|
__u32 reserved;
|
|
union {
|
|
__DECLARE_FLEX_ARRAY(__u8, inline_data);
|
|
__DECLARE_FLEX_ARRAY(struct rxe_sge, sge);
|
|
};
|
|
};
|
|
|
|
struct rxe_send_wqe {
|
|
struct rxe_send_wr wr;
|
|
__u32 status;
|
|
__u32 state;
|
|
__aligned_u64 iova;
|
|
__u32 mask;
|
|
__u32 first_psn;
|
|
__u32 last_psn;
|
|
__u32 ack_length;
|
|
__u32 ssn;
|
|
__u32 has_rd_atomic;
|
|
struct rxe_dma_info dma;
|
|
};
|
|
|
|
struct rxe_recv_wqe {
|
|
__aligned_u64 wr_id;
|
|
__u32 num_sge;
|
|
__u32 padding;
|
|
struct rxe_dma_info dma;
|
|
};
|
|
|
|
struct rxe_create_ah_resp {
|
|
__u32 ah_num;
|
|
__u32 reserved;
|
|
};
|
|
|
|
struct rxe_create_cq_resp {
|
|
struct mminfo mi;
|
|
};
|
|
|
|
struct rxe_resize_cq_resp {
|
|
struct mminfo mi;
|
|
};
|
|
|
|
struct rxe_create_qp_resp {
|
|
struct mminfo rq_mi;
|
|
struct mminfo sq_mi;
|
|
};
|
|
|
|
struct rxe_create_srq_resp {
|
|
struct mminfo mi;
|
|
__u32 srq_num;
|
|
__u32 reserved;
|
|
};
|
|
|
|
struct rxe_modify_srq_cmd {
|
|
__aligned_u64 mmap_info_addr;
|
|
};
|
|
|
|
/* This data structure is stored at the base of work and
|
|
* completion queues shared between user space and kernel space.
|
|
* It contains the producer and consumer indices. Is also
|
|
* contains a copy of the queue size parameters for user space
|
|
* to use but the kernel must use the parameters in the
|
|
* rxe_queue struct. For performance reasons arrange to have
|
|
* producer and consumer indices in separate cache lines
|
|
* the kernel should always mask the indices to avoid accessing
|
|
* memory outside of the data area
|
|
*/
|
|
struct rxe_queue_buf {
|
|
__u32 log2_elem_size;
|
|
__u32 index_mask;
|
|
__u32 pad_1[30];
|
|
__u32 producer_index;
|
|
__u32 pad_2[31];
|
|
__u32 consumer_index;
|
|
__u32 pad_3[31];
|
|
__u8 data[];
|
|
};
|
|
|
|
#endif /* RDMA_USER_RXE_H */
|