On 10/03/2020 11:14, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@xxxxxxxxxxxx>
>
> Remove custom and duplicated variant of offsetofend().
>
> Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxxxx>
> ---
> drivers/infiniband/hw/efa/efa_verbs.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/infiniband/hw/efa/efa_verbs.c b/drivers/infiniband/hw/efa/efa_verbs.c
> index bf3120f140f7..5c57098a4aee 100644
> --- a/drivers/infiniband/hw/efa/efa_verbs.c
> +++ b/drivers/infiniband/hw/efa/efa_verbs.c
> @@ -144,9 +144,6 @@ static inline bool is_rdma_read_cap(struct efa_dev *dev)
> return dev->dev_attr.device_caps & EFA_ADMIN_FEATURE_DEVICE_ATTR_DESC_RDMA_READ_MASK;
> }
>
> -#define field_avail(x, fld, sz) (offsetof(typeof(x), fld) + \
> - sizeof_field(typeof(x), fld) <= (sz))
I would use offsetofend here and keep the field_avail naming for readability
sake of the using functions, but I guess that's fine as well.
Thanks Leon,
Acked-by: Gal Pressman <galpress@xxxxxxxxxx>
> -
> #define is_reserved_cleared(reserved) \
> !memchr_inv(reserved, 0, sizeof(reserved))
>
> @@ -609,7 +606,7 @@ struct ib_qp *efa_create_qp(struct ib_pd *ibpd,
> if (err)
> goto err_out;
>
> - if (!field_avail(cmd, driver_qp_type, udata->inlen)) {
> + if (offsetofend(typeof(cmd), driver_qp_type) > udata->inlen) {
> ibdev_dbg(&dev->ibdev,
> "Incompatible ABI params, no input udata\n");
> err = -EINVAL;
> @@ -896,7 +893,7 @@ int efa_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
> goto err_out;
> }
>
> - if (!field_avail(cmd, num_sub_cqs, udata->inlen)) {
> + if (offsetofend(typeof(cmd), num_sub_cqs) > udata->inlen) {
> ibdev_dbg(ibdev,
> "Incompatible ABI params, no input udata\n");
> err = -EINVAL;
> --
> 2.24.1
>
