IB/uverbs: Refactor kern_spec_to_ib_spec_filter
The current implementation of kern_spec_to_ib_spec_filter, which takes a uAPI based flow steering specification and creates the respective kernel API flow steering structure, gets a ib_uverbs_flow_spec structure. The new flow_action uAPI gets a match mask and filter from user-space which aren't encoded in the flow steering's ib_uverbs_flow_spec structure. Exporting the logic out of kern_spec_to_ib_spec_filter to get user-space blobs rather than ib_uverbs_flow_spec structure. Reviewed-by: Yishai Hadas <yishaih@mellanox.com> Signed-off-by: Matan Barak <matanb@mellanox.com> Signed-off-by: Leon Romanovsky <leonro@mellanox.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
parent
8510020d29
commit
766d8551ad
2 changed files with 37 additions and 16 deletions
|
@ -254,6 +254,12 @@ struct ib_uverbs_flow_spec {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
int ib_uverbs_kern_spec_to_ib_spec_filter(enum ib_flow_spec_type type,
|
||||||
|
const void *kern_spec_mask,
|
||||||
|
const void *kern_spec_val,
|
||||||
|
size_t kern_filter_sz,
|
||||||
|
union ib_flow_spec *ib_spec);
|
||||||
|
|
||||||
extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_DEVICE);
|
extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_DEVICE);
|
||||||
extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_PD);
|
extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_PD);
|
||||||
extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_MR);
|
extern const struct uverbs_object_def UVERBS_OBJECT(UVERBS_OBJECT_MR);
|
||||||
|
|
|
@ -2765,13 +2765,13 @@ static int kern_spec_to_ib_spec_action(struct ib_uverbs_flow_spec *kern_spec,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static size_t kern_spec_filter_sz(struct ib_uverbs_flow_spec_hdr *spec)
|
static size_t kern_spec_filter_sz(const struct ib_uverbs_flow_spec_hdr *spec)
|
||||||
{
|
{
|
||||||
/* Returns user space filter size, includes padding */
|
/* Returns user space filter size, includes padding */
|
||||||
return (spec->size - sizeof(struct ib_uverbs_flow_spec_hdr)) / 2;
|
return (spec->size - sizeof(struct ib_uverbs_flow_spec_hdr)) / 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ssize_t spec_filter_size(void *kern_spec_filter, u16 kern_filter_size,
|
static ssize_t spec_filter_size(const void *kern_spec_filter, u16 kern_filter_size,
|
||||||
u16 ib_real_filter_sz)
|
u16 ib_real_filter_sz)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
@ -2789,28 +2789,21 @@ static ssize_t spec_filter_size(void *kern_spec_filter, u16 kern_filter_size,
|
||||||
return kern_filter_size;
|
return kern_filter_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int kern_spec_to_ib_spec_filter(struct ib_uverbs_flow_spec *kern_spec,
|
int ib_uverbs_kern_spec_to_ib_spec_filter(enum ib_flow_spec_type type,
|
||||||
union ib_flow_spec *ib_spec)
|
const void *kern_spec_mask,
|
||||||
|
const void *kern_spec_val,
|
||||||
|
size_t kern_filter_sz,
|
||||||
|
union ib_flow_spec *ib_spec)
|
||||||
{
|
{
|
||||||
ssize_t actual_filter_sz;
|
ssize_t actual_filter_sz;
|
||||||
ssize_t kern_filter_sz;
|
|
||||||
ssize_t ib_filter_sz;
|
ssize_t ib_filter_sz;
|
||||||
void *kern_spec_mask;
|
|
||||||
void *kern_spec_val;
|
|
||||||
|
|
||||||
if (kern_spec->reserved)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
ib_spec->type = kern_spec->type;
|
|
||||||
|
|
||||||
kern_filter_sz = kern_spec_filter_sz(&kern_spec->hdr);
|
|
||||||
/* User flow spec size must be aligned to 4 bytes */
|
/* User flow spec size must be aligned to 4 bytes */
|
||||||
if (kern_filter_sz != ALIGN(kern_filter_sz, 4))
|
if (kern_filter_sz != ALIGN(kern_filter_sz, 4))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
kern_spec_val = (void *)kern_spec +
|
ib_spec->type = type;
|
||||||
sizeof(struct ib_uverbs_flow_spec_hdr);
|
|
||||||
kern_spec_mask = kern_spec_val + kern_filter_sz;
|
|
||||||
if (ib_spec->type == (IB_FLOW_SPEC_INNER | IB_FLOW_SPEC_VXLAN_TUNNEL))
|
if (ib_spec->type == (IB_FLOW_SPEC_INNER | IB_FLOW_SPEC_VXLAN_TUNNEL))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
@ -2885,6 +2878,28 @@ static int kern_spec_to_ib_spec_filter(struct ib_uverbs_flow_spec *kern_spec,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int kern_spec_to_ib_spec_filter(struct ib_uverbs_flow_spec *kern_spec,
|
||||||
|
union ib_flow_spec *ib_spec)
|
||||||
|
{
|
||||||
|
ssize_t kern_filter_sz;
|
||||||
|
void *kern_spec_mask;
|
||||||
|
void *kern_spec_val;
|
||||||
|
|
||||||
|
if (kern_spec->reserved)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
kern_filter_sz = kern_spec_filter_sz(&kern_spec->hdr);
|
||||||
|
|
||||||
|
kern_spec_val = (void *)kern_spec +
|
||||||
|
sizeof(struct ib_uverbs_flow_spec_hdr);
|
||||||
|
kern_spec_mask = kern_spec_val + kern_filter_sz;
|
||||||
|
|
||||||
|
return ib_uverbs_kern_spec_to_ib_spec_filter(kern_spec->type,
|
||||||
|
kern_spec_mask,
|
||||||
|
kern_spec_val,
|
||||||
|
kern_filter_sz, ib_spec);
|
||||||
|
}
|
||||||
|
|
||||||
static int kern_spec_to_ib_spec(struct ib_uverbs_flow_spec *kern_spec,
|
static int kern_spec_to_ib_spec(struct ib_uverbs_flow_spec *kern_spec,
|
||||||
union ib_flow_spec *ib_spec)
|
union ib_flow_spec *ib_spec)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue