public inbox for netdev@vger.kernel.org 
 help / color / mirror / Atom feed

From: Daniel Borkmann <daniel@iogearbox•net>
To: Saeed Mahameed <saeedm@mellanox•com>, davem@davemloft•net
Cc: alexei.starovoitov@gmail•com, bblanco@plumgrid•com,
	tariqt@mellanox•com, zhiyisun@gmail•com, ranas@mellanox•com,
	netdev@vger•kernel.org
Subject: Re: [PATCH net 1/3] bpf, mlx5: fix mlx5e_create_rq taking reference on prog
Date: Mon, 14 Nov 2016 19:26:29 +0100	[thread overview]
Message-ID: <582A01D5.6060608@iogearbox.net> (raw)
In-Reply-To: <918902f3-1852-ae68-b12d-eaa1c45bf641@mellanox.com>

Hi Saeed,

On 11/14/2016 07:15 PM, Saeed Mahameed wrote:
> On 11/14/2016 02:43 AM, Daniel Borkmann wrote:
>> In mlx5e_create_rq(), when creating a new queue, we call bpf_prog_add() but
>> without checking the return value. bpf_prog_add() can fail, so we really
>
> Didn't know this, thanks for noticing, I wonder why taking a reference for an object would fail ?
> especially when someone is requesting from the driver to take a reference to it ndo_xdp_set ?! sounds like a bad design.
>
> Anyway I will check that later.

See 92117d8443bc ("bpf: fix refcnt overflow").

>> must check it. Take the reference right when we assign it to the rq from
>> priv->xdp_prog, and just drop the reference on error path. Destruction in
>> mlx5e_destroy_rq() looks good, though.
>>
>> Fixes: 86994156c736 ("net/mlx5e: XDP fast RX drop bpf programs support")
>> Signed-off-by: Daniel Borkmann <daniel@iogearbox•net>
>> ---
>>   drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 14 +++++++++++---
>>   kernel/bpf/syscall.c                              |  1 +
>>   2 files changed, 12 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
>> index 84e8b25..2b83667 100644
>> --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
>> +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
>> @@ -489,7 +489,16 @@ static int mlx5e_create_rq(struct mlx5e_channel *c,
>>   	rq->channel = c;
>>   	rq->ix      = c->ix;
>>   	rq->priv    = c->priv;
>> +
>>   	rq->xdp_prog = priv->xdp_prog;
>
> Why keeping this assignment ? just test priv->xdp_prog.
>
>> +	if (rq->xdp_prog) {
>> +		rq->xdp_prog = bpf_prog_inc(rq->xdp_prog);
>> +		if (IS_ERR(rq->xdp_prog)) {
>> +			err = PTR_ERR(rq->xdp_prog);
>> +			rq->xdp_prog = NULL;
>> +			goto err_rq_wq_destroy;
>> +		}
>> +	}
>
> Try this, simpler and less indentations:
>
> rq->xdp_prog = priv->xdp_prog ? bpf_prog_inc(priv->xdp_prog) : NULL;
> if (IS_ERR(rq->xdp_prog)) {
> 	err = PTR_ERR(rq->xdp_prog);
> 	rq->xdp_prog = NULL;
> 	goto err_rq_wq_destroy;
> }

Sure, I don't mind. Will do.

Thanks,
Daniel

next prev parent reply	other threads:[~2016-11-14 18:26 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-14  0:43 [PATCH net 0/3] Couple of BPF refcount fixes for mlx5 Daniel Borkmann
2016-11-14  0:43 ` [PATCH net 1/3] bpf, mlx5: fix mlx5e_create_rq taking reference on prog Daniel Borkmann
2016-11-14 18:15   ` Saeed Mahameed
2016-11-14 18:26     ` Daniel Borkmann [this message]
2016-11-14  0:43 ` [PATCH net 2/3] bpf, mlx5: fix various refcount/prog issues in mlx5e_xdp_set Daniel Borkmann
2016-11-14  2:49   ` Alexei Starovoitov
2016-11-14  8:49     ` Daniel Borkmann
2016-11-14 17:35       ` Alexei Starovoitov
2016-11-14 18:23         ` Daniel Borkmann
2016-11-14 18:27   ` Saeed Mahameed
2016-11-14 19:05     ` Daniel Borkmann
2016-11-14  0:43 ` [PATCH net 3/3] bpf, mlx5: drop priv->xdp_prog reference on netdev cleanup Daniel Borkmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=582A01D5.6060608@iogearbox.net \
    --to=daniel@iogearbox$(echo .)net \
    --cc=alexei.starovoitov@gmail$(echo .)com \
    --cc=bblanco@plumgrid$(echo .)com \
    --cc=davem@davemloft$(echo .)net \
    --cc=netdev@vger$(echo .)kernel.org \
    --cc=ranas@mellanox$(echo .)com \
    --cc=saeedm@mellanox$(echo .)com \
    --cc=tariqt@mellanox$(echo .)com \
    --cc=zhiyisun@gmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox