diff mbox

IB/iopib: Report SG feature regardless of HW UD CSUM capability

Message ID 1468753728-13369-1-git-send-email-yuval.shaia@oracle.com (mailing list archive)
State Superseded
Headers show

Commit Message

Yuval Shaia July 17, 2016, 11:08 a.m. UTC
Decouple SG support from HW ability to do UD checksum.
This coupling is for historical reasons and removed with commit
ec5f06156423 ("net: Kill link between CSUM and SG features.")

Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
---
 drivers/infiniband/ulp/ipoib/ipoib_main.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Comments

Leon Romanovsky July 17, 2016, 1:54 p.m. UTC | #1
On Sun, Jul 17, 2016 at 04:08:48AM -0700, Yuval Shaia wrote:
> Decouple SG support from HW ability to do UD checksum.
> This coupling is for historical reasons and removed with commit
> ec5f06156423 ("net: Kill link between CSUM and SG features.")
> 
> Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
> ---
>  drivers/infiniband/ulp/ipoib/ipoib_main.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
> index 5f58c41..119790c 100644
> --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
> +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
> @@ -1967,8 +1967,7 @@ int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)
>  	priv->hca_caps = hca->attrs.device_cap_flags;
>  
>  	if (priv->hca_caps & IB_DEVICE_UD_IP_CSUM) {
> -		priv->dev->hw_features = NETIF_F_SG |
> -			NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
> +		priv->dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
>  
>  		if (priv->hca_caps & IB_DEVICE_UD_TSO)
>  			priv->dev->hw_features |= NETIF_F_TSO;
> @@ -1976,6 +1975,8 @@ int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)
>  		priv->dev->features |= priv->dev->hw_features;
>  	}
>  
> +	priv->dev->features |= NETIF_F_SG;
> +

I don't know about it for sure, but maybe the more appropriate place
to place it will be in ipoib_setup() function?

1764         dev->features            = (NETIF_F_VLAN_CHALLENGED     |
1765                                     NETIF_F_HIGHDMA);

What do you think?

>  	return 0;
>  }
>  
> -- 
> 1.7.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Yuval Shaia July 18, 2016, 7:39 a.m. UTC | #2
On Sun, Jul 17, 2016 at 04:54:45PM +0300, Leon Romanovsky wrote:
> On Sun, Jul 17, 2016 at 04:08:48AM -0700, Yuval Shaia wrote:
> > Decouple SG support from HW ability to do UD checksum.
> > This coupling is for historical reasons and removed with commit
> > ec5f06156423 ("net: Kill link between CSUM and SG features.")
> > 
> > Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com>
> > ---
> >  drivers/infiniband/ulp/ipoib/ipoib_main.c |    5 +++--
> >  1 files changed, 3 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
> > index 5f58c41..119790c 100644
> > --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
> > +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
> > @@ -1967,8 +1967,7 @@ int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)
> >  	priv->hca_caps = hca->attrs.device_cap_flags;
> >  
> >  	if (priv->hca_caps & IB_DEVICE_UD_IP_CSUM) {
> > -		priv->dev->hw_features = NETIF_F_SG |
> > -			NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
> > +		priv->dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
> >  
> >  		if (priv->hca_caps & IB_DEVICE_UD_TSO)
> >  			priv->dev->hw_features |= NETIF_F_TSO;
> > @@ -1976,6 +1975,8 @@ int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)
> >  		priv->dev->features |= priv->dev->hw_features;
> >  	}
> >  
> > +	priv->dev->features |= NETIF_F_SG;
> > +
> 
> I don't know about it for sure, but maybe the more appropriate place

Not sure about the place or the idea itself?

> to place it will be in ipoib_setup() function?
> 
> 1764         dev->features            = (NETIF_F_VLAN_CHALLENGED     |
> 1765                                     NETIF_F_HIGHDMA);
> 
> What do you think?

Much better.
Please check my v1.

> 
> >  	return 0;
> >  }
> >  
> > -- 
> > 1.7.1
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html


--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 5f58c41..119790c 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -1967,8 +1967,7 @@  int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)
 	priv->hca_caps = hca->attrs.device_cap_flags;
 
 	if (priv->hca_caps & IB_DEVICE_UD_IP_CSUM) {
-		priv->dev->hw_features = NETIF_F_SG |
-			NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
+		priv->dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
 
 		if (priv->hca_caps & IB_DEVICE_UD_TSO)
 			priv->dev->hw_features |= NETIF_F_TSO;
@@ -1976,6 +1975,8 @@  int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca)
 		priv->dev->features |= priv->dev->hw_features;
 	}
 
+	priv->dev->features |= NETIF_F_SG;
+
 	return 0;
 }