IB/pack: IBoE UD packet packing support
Add support for packing IBoE packet headers. Signed-off-by: Eli Cohen <eli@mellanox.co.il> [ Clean up and fix ib_ud_header_init() a bit. - Roland ] Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
parent
3c86aa70bf
commit
ff7f5aab35
|
@ -80,6 +80,29 @@ static const struct ib_field lrh_table[] = {
|
||||||
.size_bits = 16 }
|
.size_bits = 16 }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const struct ib_field eth_table[] = {
|
||||||
|
{ STRUCT_FIELD(eth, dmac_h),
|
||||||
|
.offset_words = 0,
|
||||||
|
.offset_bits = 0,
|
||||||
|
.size_bits = 32 },
|
||||||
|
{ STRUCT_FIELD(eth, dmac_l),
|
||||||
|
.offset_words = 1,
|
||||||
|
.offset_bits = 0,
|
||||||
|
.size_bits = 16 },
|
||||||
|
{ STRUCT_FIELD(eth, smac_h),
|
||||||
|
.offset_words = 1,
|
||||||
|
.offset_bits = 16,
|
||||||
|
.size_bits = 16 },
|
||||||
|
{ STRUCT_FIELD(eth, smac_l),
|
||||||
|
.offset_words = 2,
|
||||||
|
.offset_bits = 0,
|
||||||
|
.size_bits = 32 },
|
||||||
|
{ STRUCT_FIELD(eth, type),
|
||||||
|
.offset_words = 3,
|
||||||
|
.offset_bits = 0,
|
||||||
|
.size_bits = 16 }
|
||||||
|
};
|
||||||
|
|
||||||
static const struct ib_field grh_table[] = {
|
static const struct ib_field grh_table[] = {
|
||||||
{ STRUCT_FIELD(grh, ip_version),
|
{ STRUCT_FIELD(grh, ip_version),
|
||||||
.offset_words = 0,
|
.offset_words = 0,
|
||||||
|
@ -180,38 +203,38 @@ static const struct ib_field deth_table[] = {
|
||||||
/**
|
/**
|
||||||
* ib_ud_header_init - Initialize UD header structure
|
* ib_ud_header_init - Initialize UD header structure
|
||||||
* @payload_bytes:Length of packet payload
|
* @payload_bytes:Length of packet payload
|
||||||
|
* @lrh_present: specify if LRH is present
|
||||||
|
* @eth_present: specify if Eth header is present
|
||||||
* @grh_present:GRH flag (if non-zero, GRH will be included)
|
* @grh_present:GRH flag (if non-zero, GRH will be included)
|
||||||
* @immediate_present: specify if immediate data should be used
|
* @immediate_present: specify if immediate data is present
|
||||||
* @header:Structure to initialize
|
* @header:Structure to initialize
|
||||||
*
|
|
||||||
* ib_ud_header_init() initializes the lrh.link_version, lrh.link_next_header,
|
|
||||||
* lrh.packet_length, grh.ip_version, grh.payload_length,
|
|
||||||
* grh.next_header, bth.opcode, bth.pad_count and
|
|
||||||
* bth.transport_header_version fields of a &struct ib_ud_header given
|
|
||||||
* the payload length and whether a GRH will be included.
|
|
||||||
*/
|
*/
|
||||||
void ib_ud_header_init(int payload_bytes,
|
void ib_ud_header_init(int payload_bytes,
|
||||||
|
int lrh_present,
|
||||||
|
int eth_present,
|
||||||
int grh_present,
|
int grh_present,
|
||||||
int immediate_present,
|
int immediate_present,
|
||||||
struct ib_ud_header *header)
|
struct ib_ud_header *header)
|
||||||
{
|
{
|
||||||
u16 packet_length;
|
|
||||||
|
|
||||||
memset(header, 0, sizeof *header);
|
memset(header, 0, sizeof *header);
|
||||||
|
|
||||||
header->lrh.link_version = 0;
|
if (lrh_present) {
|
||||||
header->lrh.link_next_header =
|
u16 packet_length;
|
||||||
grh_present ? IB_LNH_IBA_GLOBAL : IB_LNH_IBA_LOCAL;
|
|
||||||
packet_length = (IB_LRH_BYTES +
|
header->lrh.link_version = 0;
|
||||||
IB_BTH_BYTES +
|
header->lrh.link_next_header =
|
||||||
IB_DETH_BYTES +
|
grh_present ? IB_LNH_IBA_GLOBAL : IB_LNH_IBA_LOCAL;
|
||||||
payload_bytes +
|
packet_length = (IB_LRH_BYTES +
|
||||||
4 + /* ICRC */
|
IB_BTH_BYTES +
|
||||||
3) / 4; /* round up */
|
IB_DETH_BYTES +
|
||||||
|
(grh_present ? IB_GRH_BYTES : 0) +
|
||||||
|
payload_bytes +
|
||||||
|
4 + /* ICRC */
|
||||||
|
3) / 4; /* round up */
|
||||||
|
header->lrh.packet_length = cpu_to_be16(packet_length);
|
||||||
|
}
|
||||||
|
|
||||||
header->grh_present = grh_present;
|
|
||||||
if (grh_present) {
|
if (grh_present) {
|
||||||
packet_length += IB_GRH_BYTES / 4;
|
|
||||||
header->grh.ip_version = 6;
|
header->grh.ip_version = 6;
|
||||||
header->grh.payload_length =
|
header->grh.payload_length =
|
||||||
cpu_to_be16((IB_BTH_BYTES +
|
cpu_to_be16((IB_BTH_BYTES +
|
||||||
|
@ -222,18 +245,50 @@ void ib_ud_header_init(int payload_bytes,
|
||||||
header->grh.next_header = 0x1b;
|
header->grh.next_header = 0x1b;
|
||||||
}
|
}
|
||||||
|
|
||||||
header->lrh.packet_length = cpu_to_be16(packet_length);
|
|
||||||
|
|
||||||
header->immediate_present = immediate_present;
|
|
||||||
if (immediate_present)
|
if (immediate_present)
|
||||||
header->bth.opcode = IB_OPCODE_UD_SEND_ONLY_WITH_IMMEDIATE;
|
header->bth.opcode = IB_OPCODE_UD_SEND_ONLY_WITH_IMMEDIATE;
|
||||||
else
|
else
|
||||||
header->bth.opcode = IB_OPCODE_UD_SEND_ONLY;
|
header->bth.opcode = IB_OPCODE_UD_SEND_ONLY;
|
||||||
header->bth.pad_count = (4 - payload_bytes) & 3;
|
header->bth.pad_count = (4 - payload_bytes) & 3;
|
||||||
header->bth.transport_header_version = 0;
|
header->bth.transport_header_version = 0;
|
||||||
|
|
||||||
|
header->lrh_present = lrh_present;
|
||||||
|
header->eth_present = eth_present;
|
||||||
|
header->grh_present = grh_present;
|
||||||
|
header->immediate_present = immediate_present;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(ib_ud_header_init);
|
EXPORT_SYMBOL(ib_ud_header_init);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ib_lrh_header_pack - Pack LRH header struct into wire format
|
||||||
|
* @lrh:unpacked LRH header struct
|
||||||
|
* @buf:Buffer to pack into
|
||||||
|
*
|
||||||
|
* ib_lrh_header_pack() packs the LRH header structure @lrh into
|
||||||
|
* wire format in the buffer @buf.
|
||||||
|
*/
|
||||||
|
int ib_lrh_header_pack(struct ib_unpacked_lrh *lrh, void *buf)
|
||||||
|
{
|
||||||
|
ib_pack(lrh_table, ARRAY_SIZE(lrh_table), lrh, buf);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(ib_lrh_header_pack);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ib_lrh_header_unpack - Unpack LRH structure from wire format
|
||||||
|
* @lrh:unpacked LRH header struct
|
||||||
|
* @buf:Buffer to pack into
|
||||||
|
*
|
||||||
|
* ib_lrh_header_unpack() unpacks the LRH header structure from
|
||||||
|
* wire format (in buf) into @lrh.
|
||||||
|
*/
|
||||||
|
int ib_lrh_header_unpack(void *buf, struct ib_unpacked_lrh *lrh)
|
||||||
|
{
|
||||||
|
ib_unpack(lrh_table, ARRAY_SIZE(lrh_table), buf, lrh);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(ib_lrh_header_unpack);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ib_ud_header_pack - Pack UD header struct into wire format
|
* ib_ud_header_pack - Pack UD header struct into wire format
|
||||||
* @header:UD header struct
|
* @header:UD header struct
|
||||||
|
@ -247,10 +302,16 @@ int ib_ud_header_pack(struct ib_ud_header *header,
|
||||||
{
|
{
|
||||||
int len = 0;
|
int len = 0;
|
||||||
|
|
||||||
ib_pack(lrh_table, ARRAY_SIZE(lrh_table),
|
if (header->lrh_present) {
|
||||||
&header->lrh, buf);
|
ib_pack(lrh_table, ARRAY_SIZE(lrh_table),
|
||||||
len += IB_LRH_BYTES;
|
&header->lrh, buf + len);
|
||||||
|
len += IB_LRH_BYTES;
|
||||||
|
}
|
||||||
|
if (header->eth_present) {
|
||||||
|
ib_pack(eth_table, ARRAY_SIZE(eth_table),
|
||||||
|
&header->eth, buf + len);
|
||||||
|
len += IB_ETH_BYTES;
|
||||||
|
}
|
||||||
if (header->grh_present) {
|
if (header->grh_present) {
|
||||||
ib_pack(grh_table, ARRAY_SIZE(grh_table),
|
ib_pack(grh_table, ARRAY_SIZE(grh_table),
|
||||||
&header->grh, buf + len);
|
&header->grh, buf + len);
|
||||||
|
|
|
@ -1231,7 +1231,7 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_send_wr *wr,
|
||||||
for (i = 0; i < wr->num_sge; ++i)
|
for (i = 0; i < wr->num_sge; ++i)
|
||||||
send_size += wr->sg_list[i].length;
|
send_size += wr->sg_list[i].length;
|
||||||
|
|
||||||
ib_ud_header_init(send_size, mlx4_ib_ah_grh_present(ah), 0, &sqp->ud_header);
|
ib_ud_header_init(send_size, 1, 0, mlx4_ib_ah_grh_present(ah), 0, &sqp->ud_header);
|
||||||
|
|
||||||
sqp->ud_header.lrh.service_level =
|
sqp->ud_header.lrh.service_level =
|
||||||
be32_to_cpu(ah->av.sl_tclass_flowlabel) >> 28;
|
be32_to_cpu(ah->av.sl_tclass_flowlabel) >> 28;
|
||||||
|
|
|
@ -1493,7 +1493,7 @@ static int build_mlx_header(struct mthca_dev *dev, struct mthca_sqp *sqp,
|
||||||
int err;
|
int err;
|
||||||
u16 pkey;
|
u16 pkey;
|
||||||
|
|
||||||
ib_ud_header_init(256, /* assume a MAD */
|
ib_ud_header_init(256, /* assume a MAD */ 1, 0,
|
||||||
mthca_ah_grh_present(to_mah(wr->wr.ud.ah)), 0,
|
mthca_ah_grh_present(to_mah(wr->wr.ud.ah)), 0,
|
||||||
&sqp->ud_header);
|
&sqp->ud_header);
|
||||||
|
|
||||||
|
|
|
@ -37,6 +37,7 @@
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
IB_LRH_BYTES = 8,
|
IB_LRH_BYTES = 8,
|
||||||
|
IB_ETH_BYTES = 14,
|
||||||
IB_GRH_BYTES = 40,
|
IB_GRH_BYTES = 40,
|
||||||
IB_BTH_BYTES = 12,
|
IB_BTH_BYTES = 12,
|
||||||
IB_DETH_BYTES = 8
|
IB_DETH_BYTES = 8
|
||||||
|
@ -210,14 +211,25 @@ struct ib_unpacked_deth {
|
||||||
__be32 source_qpn;
|
__be32 source_qpn;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct ib_unpacked_eth {
|
||||||
|
u8 dmac_h[4];
|
||||||
|
u8 dmac_l[2];
|
||||||
|
u8 smac_h[2];
|
||||||
|
u8 smac_l[4];
|
||||||
|
__be16 type;
|
||||||
|
};
|
||||||
|
|
||||||
struct ib_ud_header {
|
struct ib_ud_header {
|
||||||
|
int lrh_present;
|
||||||
struct ib_unpacked_lrh lrh;
|
struct ib_unpacked_lrh lrh;
|
||||||
int grh_present;
|
int eth_present;
|
||||||
struct ib_unpacked_grh grh;
|
struct ib_unpacked_eth eth;
|
||||||
struct ib_unpacked_bth bth;
|
int grh_present;
|
||||||
|
struct ib_unpacked_grh grh;
|
||||||
|
struct ib_unpacked_bth bth;
|
||||||
struct ib_unpacked_deth deth;
|
struct ib_unpacked_deth deth;
|
||||||
int immediate_present;
|
int immediate_present;
|
||||||
__be32 immediate_data;
|
__be32 immediate_data;
|
||||||
};
|
};
|
||||||
|
|
||||||
void ib_pack(const struct ib_field *desc,
|
void ib_pack(const struct ib_field *desc,
|
||||||
|
@ -230,9 +242,11 @@ void ib_unpack(const struct ib_field *desc,
|
||||||
void *buf,
|
void *buf,
|
||||||
void *structure);
|
void *structure);
|
||||||
|
|
||||||
void ib_ud_header_init(int payload_bytes,
|
void ib_ud_header_init(int payload_bytes,
|
||||||
int grh_present,
|
int lrh_present,
|
||||||
int immediate_present,
|
int eth_present,
|
||||||
|
int grh_present,
|
||||||
|
int immediate_present,
|
||||||
struct ib_ud_header *header);
|
struct ib_ud_header *header);
|
||||||
|
|
||||||
int ib_ud_header_pack(struct ib_ud_header *header,
|
int ib_ud_header_pack(struct ib_ud_header *header,
|
||||||
|
|
Loading…
Reference in a new issue