mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
Pull networking updates from David Miller: 1) BPF debugger and asm tool by Daniel Borkmann. 2) Speed up create/bind in AF_PACKET, also from Daniel Borkmann. 3) Correct reciprocal_divide and update users, from Hannes Frederic Sowa and Daniel Borkmann. 4) Currently we only have a "set" operation for the hw timestamp socket ioctl, add a "get" operation to match. From Ben Hutchings. 5) Add better trace events for debugging driver datapath problems, also from Ben Hutchings. 6) Implement auto corking in TCP, from Eric Dumazet. Basically, if we have a small send and a previous packet is already in the qdisc or device queue, defer until TX completion or we get more data. 7) Allow userspace to manage ipv6 temporary addresses, from Jiri Pirko. 8) Add a qdisc bypass option for AF_PACKET sockets, from Daniel Borkmann. 9) Share IP header compression code between Bluetooth and IEEE802154 layers, from Jukka Rissanen. 10) Fix ipv6 router reachability probing, from Jiri Benc. 11) Allow packets to be captured on macvtap devices, from Vlad Yasevich. 12) Support tunneling in GRO layer, from Jerry Chu. 13) Allow bonding to be configured fully using netlink, from Scott Feldman. 14) Allow AF_PACKET users to obtain the VLAN TPID, just like they can already get the TCI. From Atzm Watanabe. 15) New "Heavy Hitter" qdisc, from Terry Lam. 16) Significantly improve the IPSEC support in pktgen, from Fan Du. 17) Allow ipv4 tunnels to cache routes, just like sockets. From Tom Herbert. 18) Add Proportional Integral Enhanced packet scheduler, from Vijay Subramanian. 19) Allow openvswitch to mmap'd netlink, from Thomas Graf. 20) Key TCP metrics blobs also by source address, not just destination address. From Christoph Paasch. 21) Support 10G in generic phylib. From Andy Fleming. 22) Try to short-circuit GRO flow compares using device provided RX hash, if provided. From Tom Herbert. The wireless and netfilter folks have been busy little bees too. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (2064 commits) net/cxgb4: Fix referencing freed adapter ipv6: reallocate addrconf router for ipv6 address when lo device up fib_frontend: fix possible NULL pointer dereference rtnetlink: remove IFLA_BOND_SLAVE definition rtnetlink: remove check for fill_slave_info in rtnl_have_link_slave_info qlcnic: update version to 5.3.55 qlcnic: Enhance logic to calculate msix vectors. qlcnic: Refactor interrupt coalescing code for all adapters. qlcnic: Update poll controller code path qlcnic: Interrupt code cleanup qlcnic: Enhance Tx timeout debugging. qlcnic: Use bool for rx_mac_learn. bonding: fix u64 division rtnetlink: add missing IFLA_BOND_AD_INFO_UNSPEC sfc: Use the correct maximum TX DMA ring size for SFC9100 Add Shradha Shah as the sfc driver maintainer. net/vxlan: Share RX skb de-marking and checksum checks with ovs tulip: cleanup by using ARRAY_SIZE() ip_tunnel: clear IPCB in ip_tunnel_xmit() in case dst_link_failure() is called net/cxgb4: Don't retrieve stats during recovery ...
178 lines
4.6 KiB
C
178 lines
4.6 KiB
C
/*
|
|
* Copyright (c) 2007 Cisco Systems, Inc. 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 MLX4_CQ_H
|
|
#define MLX4_CQ_H
|
|
|
|
#include <linux/types.h>
|
|
#include <uapi/linux/if_ether.h>
|
|
|
|
#include <linux/mlx4/device.h>
|
|
#include <linux/mlx4/doorbell.h>
|
|
|
|
struct mlx4_cqe {
|
|
__be32 vlan_my_qpn;
|
|
__be32 immed_rss_invalid;
|
|
__be32 g_mlpath_rqpn;
|
|
__be16 sl_vid;
|
|
union {
|
|
struct {
|
|
__be16 rlid;
|
|
__be16 status;
|
|
u8 ipv6_ext_mask;
|
|
u8 badfcs_enc;
|
|
};
|
|
u8 smac[ETH_ALEN];
|
|
};
|
|
__be32 byte_cnt;
|
|
__be16 wqe_index;
|
|
__be16 checksum;
|
|
u8 reserved[3];
|
|
u8 owner_sr_opcode;
|
|
};
|
|
|
|
struct mlx4_err_cqe {
|
|
__be32 my_qpn;
|
|
u32 reserved1[5];
|
|
__be16 wqe_index;
|
|
u8 vendor_err_syndrome;
|
|
u8 syndrome;
|
|
u8 reserved2[3];
|
|
u8 owner_sr_opcode;
|
|
};
|
|
|
|
struct mlx4_ts_cqe {
|
|
__be32 vlan_my_qpn;
|
|
__be32 immed_rss_invalid;
|
|
__be32 g_mlpath_rqpn;
|
|
__be32 timestamp_hi;
|
|
__be16 status;
|
|
u8 ipv6_ext_mask;
|
|
u8 badfcs_enc;
|
|
__be32 byte_cnt;
|
|
__be16 wqe_index;
|
|
__be16 checksum;
|
|
u8 reserved;
|
|
__be16 timestamp_lo;
|
|
u8 owner_sr_opcode;
|
|
} __packed;
|
|
|
|
enum {
|
|
MLX4_CQE_L2_TUNNEL_IPOK = 1 << 31,
|
|
MLX4_CQE_VLAN_PRESENT_MASK = 1 << 29,
|
|
MLX4_CQE_L2_TUNNEL = 1 << 27,
|
|
MLX4_CQE_L2_TUNNEL_CSUM = 1 << 26,
|
|
MLX4_CQE_L2_TUNNEL_IPV4 = 1 << 25,
|
|
|
|
MLX4_CQE_QPN_MASK = 0xffffff,
|
|
MLX4_CQE_VID_MASK = 0xfff,
|
|
};
|
|
|
|
enum {
|
|
MLX4_CQE_OWNER_MASK = 0x80,
|
|
MLX4_CQE_IS_SEND_MASK = 0x40,
|
|
MLX4_CQE_OPCODE_MASK = 0x1f
|
|
};
|
|
|
|
enum {
|
|
MLX4_CQE_SYNDROME_LOCAL_LENGTH_ERR = 0x01,
|
|
MLX4_CQE_SYNDROME_LOCAL_QP_OP_ERR = 0x02,
|
|
MLX4_CQE_SYNDROME_LOCAL_PROT_ERR = 0x04,
|
|
MLX4_CQE_SYNDROME_WR_FLUSH_ERR = 0x05,
|
|
MLX4_CQE_SYNDROME_MW_BIND_ERR = 0x06,
|
|
MLX4_CQE_SYNDROME_BAD_RESP_ERR = 0x10,
|
|
MLX4_CQE_SYNDROME_LOCAL_ACCESS_ERR = 0x11,
|
|
MLX4_CQE_SYNDROME_REMOTE_INVAL_REQ_ERR = 0x12,
|
|
MLX4_CQE_SYNDROME_REMOTE_ACCESS_ERR = 0x13,
|
|
MLX4_CQE_SYNDROME_REMOTE_OP_ERR = 0x14,
|
|
MLX4_CQE_SYNDROME_TRANSPORT_RETRY_EXC_ERR = 0x15,
|
|
MLX4_CQE_SYNDROME_RNR_RETRY_EXC_ERR = 0x16,
|
|
MLX4_CQE_SYNDROME_REMOTE_ABORTED_ERR = 0x22,
|
|
};
|
|
|
|
enum {
|
|
MLX4_CQE_STATUS_IPV4 = 1 << 6,
|
|
MLX4_CQE_STATUS_IPV4F = 1 << 7,
|
|
MLX4_CQE_STATUS_IPV6 = 1 << 8,
|
|
MLX4_CQE_STATUS_IPV4OPT = 1 << 9,
|
|
MLX4_CQE_STATUS_TCP = 1 << 10,
|
|
MLX4_CQE_STATUS_UDP = 1 << 11,
|
|
MLX4_CQE_STATUS_IPOK = 1 << 12,
|
|
};
|
|
|
|
enum {
|
|
MLX4_CQE_LLC = 1,
|
|
MLX4_CQE_SNAP = 1 << 1,
|
|
MLX4_CQE_BAD_FCS = 1 << 4,
|
|
};
|
|
|
|
static inline void mlx4_cq_arm(struct mlx4_cq *cq, u32 cmd,
|
|
void __iomem *uar_page,
|
|
spinlock_t *doorbell_lock)
|
|
{
|
|
__be32 doorbell[2];
|
|
u32 sn;
|
|
u32 ci;
|
|
|
|
sn = cq->arm_sn & 3;
|
|
ci = cq->cons_index & 0xffffff;
|
|
|
|
*cq->arm_db = cpu_to_be32(sn << 28 | cmd | ci);
|
|
|
|
/*
|
|
* Make sure that the doorbell record in host memory is
|
|
* written before ringing the doorbell via PCI MMIO.
|
|
*/
|
|
wmb();
|
|
|
|
doorbell[0] = cpu_to_be32(sn << 28 | cmd | cq->cqn);
|
|
doorbell[1] = cpu_to_be32(ci);
|
|
|
|
mlx4_write64(doorbell, uar_page + MLX4_CQ_DOORBELL, doorbell_lock);
|
|
}
|
|
|
|
static inline void mlx4_cq_set_ci(struct mlx4_cq *cq)
|
|
{
|
|
*cq->set_ci_db = cpu_to_be32(cq->cons_index & 0xffffff);
|
|
}
|
|
|
|
enum {
|
|
MLX4_CQ_DB_REQ_NOT_SOL = 1 << 24,
|
|
MLX4_CQ_DB_REQ_NOT = 2 << 24
|
|
};
|
|
|
|
int mlx4_cq_modify(struct mlx4_dev *dev, struct mlx4_cq *cq,
|
|
u16 count, u16 period);
|
|
int mlx4_cq_resize(struct mlx4_dev *dev, struct mlx4_cq *cq,
|
|
int entries, struct mlx4_mtt *mtt);
|
|
|
|
#endif /* MLX4_CQ_H */
|