* [PATCH -next] RDMA/core: Properly return the error code of rdma_set_src_addr_rcu
@ 2018-09-19 12:28 ` YueHaibing
0 siblings, 0 replies; 7+ messages in thread
From: YueHaibing @ 2018-09-19 12:28 UTC (permalink / raw)
To: dledford, jgg, leon, parav, danielj; +Cc: linux-kernel, linux-rdma, YueHaibing
rdma_set_src_addr_rcu should check copy_src_l2_addr fails,
rather than always return 0. Also copy_src_l2_addr should return
'ret' as its return value while rdma_translate_ip fails.
Fixes: c31d4b2ddf07 ("RDMA/core: Protect against changing dst->dev during destination resolve")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
drivers/infiniband/core/addr.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 7a0356c..8a31b11 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -468,7 +468,7 @@ static int addr_resolve_neigh(const struct dst_entry *dst,
return ret;
}
-static void copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
+static int copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
const struct sockaddr *dst_in,
const struct dst_entry *dst,
const struct net_device *ndev)
@@ -492,6 +492,8 @@ static void copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
RDMA_NETWORK_IPV6;
else
dev_addr->network = RDMA_NETWORK_IB;
+
+ return ret;
}
static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr,
@@ -499,6 +501,7 @@ static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr,
const struct sockaddr *dst_in,
const struct dst_entry *dst)
{
+ int ret;
struct net_device *ndev = READ_ONCE(dst->dev);
*ndev_flags = ndev->flags;
@@ -515,8 +518,8 @@ static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr,
return -ENODEV;
}
- copy_src_l2_addr(dev_addr, dst_in, dst, ndev);
- return 0;
+ ret = copy_src_l2_addr(dev_addr, dst_in, dst, ndev);
+ return ret;
}
static int set_addr_netns_by_gid_rcu(struct rdma_dev_addr *addr)
--
2.7.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* RE: [PATCH -next] RDMA/core: Properly return the error code of rdma_set_src_addr_rcu
2018-09-19 12:28 ` YueHaibing
(?)
@ 2018-09-19 13:47 ` Parav Pandit
2018-09-19 14:19 ` Parav Pandit
-1 siblings, 1 reply; 7+ messages in thread
From: Parav Pandit @ 2018-09-19 13:47 UTC (permalink / raw)
To: YueHaibing, dledford, jgg, leon, Daniel Jurgens; +Cc: linux-kernel, linux-rdma
> -----Original Message-----
> From: YueHaibing <yuehaibing@huawei.com>
> Sent: Wednesday, September 19, 2018 7:29 AM
> To: dledford@redhat.com; jgg@ziepe.ca; leon@kernel.org; Parav Pandit
> <parav@mellanox.com>; Daniel Jurgens <danielj@mellanox.com>
> Cc: linux-kernel@vger.kernel.org; linux-rdma@vger.kernel.org; YueHaibing
> <yuehaibing@huawei.com>
> Subject: [PATCH -next] RDMA/core: Properly return the error code of
> rdma_set_src_addr_rcu
>
> rdma_set_src_addr_rcu should check copy_src_l2_addr fails, rather than
> always return 0. Also copy_src_l2_addr should return 'ret' as its return value
> while rdma_translate_ip fails.
>
> Fixes: c31d4b2ddf07 ("RDMA/core: Protect against changing dst->dev during
> destination resolve")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
> drivers/infiniband/core/addr.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
> index 7a0356c..8a31b11 100644
> --- a/drivers/infiniband/core/addr.c
> +++ b/drivers/infiniband/core/addr.c
> @@ -468,7 +468,7 @@ static int addr_resolve_neigh(const struct dst_entry
> *dst,
> return ret;
> }
>
> -static void copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
> +static int copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
> const struct sockaddr *dst_in,
> const struct dst_entry *dst,
> const struct net_device *ndev)
> @@ -492,6 +492,8 @@ static void copy_src_l2_addr(struct rdma_dev_addr
> *dev_addr,
> RDMA_NETWORK_IPV6;
> else
> dev_addr->network = RDMA_NETWORK_IB;
> +
> + return ret;
> }
>
> static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr, @@ -
> 499,6 +501,7 @@ static int rdma_set_src_addr_rcu(struct rdma_dev_addr
> *dev_addr,
> const struct sockaddr *dst_in,
> const struct dst_entry *dst)
> {
> + int ret;
> struct net_device *ndev = READ_ONCE(dst->dev);
>
> *ndev_flags = ndev->flags;
> @@ -515,8 +518,8 @@ static int rdma_set_src_addr_rcu(struct
> rdma_dev_addr *dev_addr,
> return -ENODEV;
> }
>
> - copy_src_l2_addr(dev_addr, dst_in, dst, ndev);
> - return 0;
> + ret = copy_src_l2_addr(dev_addr, dst_in, dst, ndev);
> + return ret;
> }
>
> static int set_addr_netns_by_gid_rcu(struct rdma_dev_addr *addr)
> --
> 2.7.0
>
Reviewed-by: Parav Pandit <parav@mellanox.com>
^ permalink raw reply [flat|nested] 7+ messages in thread* RE: [PATCH -next] RDMA/core: Properly return the error code of rdma_set_src_addr_rcu
2018-09-19 13:47 ` Parav Pandit
@ 2018-09-19 14:19 ` Parav Pandit
0 siblings, 0 replies; 7+ messages in thread
From: Parav Pandit @ 2018-09-19 14:19 UTC (permalink / raw)
To: Parav Pandit, YueHaibing, dledford, jgg, leon, Daniel Jurgens
Cc: linux-kernel, linux-rdma
Hi YueHaibing,
> -----Original Message-----
> From: linux-rdma-owner@vger.kernel.org <linux-rdma-
> owner@vger.kernel.org> On Behalf Of Parav Pandit
> Sent: Wednesday, September 19, 2018 8:47 AM
> To: YueHaibing <yuehaibing@huawei.com>; dledford@redhat.com;
> jgg@ziepe.ca; leon@kernel.org; Daniel Jurgens <danielj@mellanox.com>
> Cc: linux-kernel@vger.kernel.org; linux-rdma@vger.kernel.org
> Subject: RE: [PATCH -next] RDMA/core: Properly return the error code of
> rdma_set_src_addr_rcu
>
>
>
> > -----Original Message-----
> > From: YueHaibing <yuehaibing@huawei.com>
> > Sent: Wednesday, September 19, 2018 7:29 AM
> > To: dledford@redhat.com; jgg@ziepe.ca; leon@kernel.org; Parav Pandit
> > <parav@mellanox.com>; Daniel Jurgens <danielj@mellanox.com>
> > Cc: linux-kernel@vger.kernel.org; linux-rdma@vger.kernel.org;
> > YueHaibing <yuehaibing@huawei.com>
> > Subject: [PATCH -next] RDMA/core: Properly return the error code of
> > rdma_set_src_addr_rcu
> >
> > rdma_set_src_addr_rcu should check copy_src_l2_addr fails, rather than
> > always return 0. Also copy_src_l2_addr should return 'ret' as its
> > return value while rdma_translate_ip fails.
> >
> > Fixes: c31d4b2ddf07 ("RDMA/core: Protect against changing dst->dev
> > during destination resolve")
> > Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> > ---
> > drivers/infiniband/core/addr.c | 9 ++++++---
> > 1 file changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/infiniband/core/addr.c
> > b/drivers/infiniband/core/addr.c index 7a0356c..8a31b11 100644
> > --- a/drivers/infiniband/core/addr.c
> > +++ b/drivers/infiniband/core/addr.c
> > @@ -468,7 +468,7 @@ static int addr_resolve_neigh(const struct
> > dst_entry *dst,
> > return ret;
> > }
> >
> > -static void copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
> > +static int copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
> > const struct sockaddr *dst_in,
> > const struct dst_entry *dst,
> > const struct net_device *ndev) @@ -492,6 +492,8
> @@ static
> > void copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
> > RDMA_NETWORK_IPV6;
> > else
> > dev_addr->network = RDMA_NETWORK_IB;
> > +
> > + return ret;
> > }
> >
> > static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr, @@ -
> > 499,6 +501,7 @@ static int rdma_set_src_addr_rcu(struct rdma_dev_addr
> > *dev_addr,
> > const struct sockaddr *dst_in,
> > const struct dst_entry *dst)
> > {
> > + int ret;
> > struct net_device *ndev = READ_ONCE(dst->dev);
> >
> > *ndev_flags = ndev->flags;
> > @@ -515,8 +518,8 @@ static int rdma_set_src_addr_rcu(struct
> > rdma_dev_addr *dev_addr,
> > return -ENODEV;
> > }
> >
> > - copy_src_l2_addr(dev_addr, dst_in, dst, ndev);
> > - return 0;
> > + ret = copy_src_l2_addr(dev_addr, dst_in, dst, ndev);
> > + return ret;
> > }
> >
> > static int set_addr_netns_by_gid_rcu(struct rdma_dev_addr *addr)
> > --
> > 2.7.0
> >
> Reviewed-by: Parav Pandit <parav@mellanox.com>
Can you please correct the alignment for copy_src_l2_addr() with this change from void to int for rest of the function arguments.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH -next] RDMA/core: Properly return the error code of rdma_set_src_addr_rcu
2018-09-19 12:28 ` YueHaibing
(?)
(?)
@ 2018-09-19 16:14 ` Jason Gunthorpe
2018-09-20 1:13 ` YueHaibing
-1 siblings, 1 reply; 7+ messages in thread
From: Jason Gunthorpe @ 2018-09-19 16:14 UTC (permalink / raw)
To: YueHaibing; +Cc: dledford, leon, parav, danielj, linux-kernel, linux-rdma
On Wed, Sep 19, 2018 at 08:28:38PM +0800, YueHaibing wrote:
> rdma_set_src_addr_rcu should check copy_src_l2_addr fails,
> rather than always return 0. Also copy_src_l2_addr should return
> 'ret' as its return value while rdma_translate_ip fails.
>
> Fixes: c31d4b2ddf07 ("RDMA/core: Protect against changing dst->dev during destination resolve")
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> Reviewed-by: Parav Pandit <parav@mellanox.com>
> ---
> drivers/infiniband/core/addr.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
Applied to for-next, thanks
> diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
> index 7a0356c..8a31b11 100644
> --- a/drivers/infiniband/core/addr.c
> +++ b/drivers/infiniband/core/addr.c
> @@ -468,7 +468,7 @@ static int addr_resolve_neigh(const struct dst_entry *dst,
> return ret;
> }
>
> -static void copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
> +static int copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
> const struct sockaddr *dst_in,
> const struct dst_entry *dst,
> const struct net_device *ndev)
I fixed the indenting as Parav pointed out
> @@ -492,6 +492,8 @@ static void copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
> RDMA_NETWORK_IPV6;
> else
> dev_addr->network = RDMA_NETWORK_IB;
> +
> + return ret;
> }
>
> static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr,
> @@ -499,6 +501,7 @@ static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr,
> const struct sockaddr *dst_in,
> const struct dst_entry *dst)
> {
> + int ret;
> struct net_device *ndev = READ_ONCE(dst->dev);
>
> *ndev_flags = ndev->flags;
> @@ -515,8 +518,8 @@ static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr,
> return -ENODEV;
> }
>
> - copy_src_l2_addr(dev_addr, dst_in, dst, ndev);
> - return 0;
> + ret = copy_src_l2_addr(dev_addr, dst_in, dst, ndev);
> + return ret;
> }
And made this just 'return copy_src_l2_addr' without the ret.
Jason
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH -next] RDMA/core: Properly return the error code of rdma_set_src_addr_rcu
2018-09-19 16:14 ` Jason Gunthorpe
@ 2018-09-20 1:13 ` YueHaibing
0 siblings, 0 replies; 7+ messages in thread
From: YueHaibing @ 2018-09-20 1:13 UTC (permalink / raw)
To: Jason Gunthorpe; +Cc: dledford, leon, parav, danielj, linux-kernel, linux-rdma
On 2018/9/20 0:14, Jason Gunthorpe wrote:
> On Wed, Sep 19, 2018 at 08:28:38PM +0800, YueHaibing wrote:
>> rdma_set_src_addr_rcu should check copy_src_l2_addr fails,
>> rather than always return 0. Also copy_src_l2_addr should return
>> 'ret' as its return value while rdma_translate_ip fails.
>>
>> Fixes: c31d4b2ddf07 ("RDMA/core: Protect against changing dst->dev during destination resolve")
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
>> Reviewed-by: Parav Pandit <parav@mellanox.com>
>> ---
>> drivers/infiniband/core/addr.c | 9 ++++++---
>> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> Applied to for-next, thanks
>
>> diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
>> index 7a0356c..8a31b11 100644
>> --- a/drivers/infiniband/core/addr.c
>> +++ b/drivers/infiniband/core/addr.c
>> @@ -468,7 +468,7 @@ static int addr_resolve_neigh(const struct dst_entry *dst,
>> return ret;
>> }
>>
>> -static void copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
>> +static int copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
>> const struct sockaddr *dst_in,
>> const struct dst_entry *dst,
>> const struct net_device *ndev)
>
> I fixed the indenting as Parav pointed out
>
>> @@ -492,6 +492,8 @@ static void copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
>> RDMA_NETWORK_IPV6;
>> else
>> dev_addr->network = RDMA_NETWORK_IB;
>> +
>> + return ret;
>> }
>>
>> static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr,
>> @@ -499,6 +501,7 @@ static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr,
>> const struct sockaddr *dst_in,
>> const struct dst_entry *dst)
>> {
>> + int ret;
>> struct net_device *ndev = READ_ONCE(dst->dev);
>>
>> *ndev_flags = ndev->flags;
>> @@ -515,8 +518,8 @@ static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr,
>> return -ENODEV;
>> }
>>
>> - copy_src_l2_addr(dev_addr, dst_in, dst, ndev);
>> - return 0;
>> + ret = copy_src_l2_addr(dev_addr, dst_in, dst, ndev);
>> + return ret;
>> }
>
> And made this just 'return copy_src_l2_addr' without the ret.
Thank you.
>
> Jason
>
> .
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH -next] RDMA/core: Properly return the error code of rdma_set_src_addr_rcu
@ 2018-09-20 1:13 ` YueHaibing
0 siblings, 0 replies; 7+ messages in thread
From: YueHaibing @ 2018-09-20 1:13 UTC (permalink / raw)
To: Jason Gunthorpe; +Cc: dledford, leon, parav, danielj, linux-kernel, linux-rdma
On 2018/9/20 0:14, Jason Gunthorpe wrote:
> On Wed, Sep 19, 2018 at 08:28:38PM +0800, YueHaibing wrote:
>> rdma_set_src_addr_rcu should check copy_src_l2_addr fails,
>> rather than always return 0. Also copy_src_l2_addr should return
>> 'ret' as its return value while rdma_translate_ip fails.
>>
>> Fixes: c31d4b2ddf07 ("RDMA/core: Protect against changing dst->dev during destination resolve")
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
>> Reviewed-by: Parav Pandit <parav@mellanox.com>
>> ---
>> drivers/infiniband/core/addr.c | 9 ++++++---
>> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> Applied to for-next, thanks
>
>> diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
>> index 7a0356c..8a31b11 100644
>> --- a/drivers/infiniband/core/addr.c
>> +++ b/drivers/infiniband/core/addr.c
>> @@ -468,7 +468,7 @@ static int addr_resolve_neigh(const struct dst_entry *dst,
>> return ret;
>> }
>>
>> -static void copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
>> +static int copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
>> const struct sockaddr *dst_in,
>> const struct dst_entry *dst,
>> const struct net_device *ndev)
>
> I fixed the indenting as Parav pointed out
>
>> @@ -492,6 +492,8 @@ static void copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
>> RDMA_NETWORK_IPV6;
>> else
>> dev_addr->network = RDMA_NETWORK_IB;
>> +
>> + return ret;
>> }
>>
>> static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr,
>> @@ -499,6 +501,7 @@ static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr,
>> const struct sockaddr *dst_in,
>> const struct dst_entry *dst)
>> {
>> + int ret;
>> struct net_device *ndev = READ_ONCE(dst->dev);
>>
>> *ndev_flags = ndev->flags;
>> @@ -515,8 +518,8 @@ static int rdma_set_src_addr_rcu(struct rdma_dev_addr *dev_addr,
>> return -ENODEV;
>> }
>>
>> - copy_src_l2_addr(dev_addr, dst_in, dst, ndev);
>> - return 0;
>> + ret = copy_src_l2_addr(dev_addr, dst_in, dst, ndev);
>> + return ret;
>> }
>
> And made this just 'return copy_src_l2_addr' without the ret.
Thank you.
>
> Jason
>
> .
>
^ permalink raw reply [flat|nested] 7+ messages in thread