Message ID | 1565644386-22284-1-git-send-email-tlfalcon@linux.ibm.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | [net,v2] ibmveth: Convert multicast list size for little-endian system | expand |
On Mon, 12 Aug 2019 16:13:06 -0500, Thomas Falcon wrote: > The ibm,mac-address-filters property defines the maximum number of > addresses the hypervisor's multicast filter list can support. It is > encoded as a big-endian integer in the OF device tree, but the virtual > ethernet driver does not convert it for use by little-endian systems. > As a result, the driver is not behaving as it should on affected systems > when a large number of multicast addresses are assigned to the device. > > Reported-by: Hangbin Liu <liuhangbin@gmail.com> > Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com> Okay, applied, but: > diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c > index 77af9c2c0571..5641c00d34f2 100644 > --- a/drivers/net/ethernet/ibm/ibmveth.c > +++ b/drivers/net/ethernet/ibm/ibmveth.c > @@ -1643,7 +1643,7 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) > struct net_device *netdev; > struct ibmveth_adapter *adapter; > unsigned char *mac_addr_p; > - unsigned int *mcastFilterSize_p; > + __be32 *mcastFilterSize_p; > long ret; > unsigned long ret_attr; > > @@ -1665,8 +1665,9 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) > return -EINVAL; > } > > - mcastFilterSize_p = (unsigned int *)vio_get_attribute(dev, > - VETH_MCAST_FILTER_SIZE, NULL); > + mcastFilterSize_p = (__be32 *)vio_get_attribute(dev, > + VETH_MCAST_FILTER_SIZE, > + NULL); > if (!mcastFilterSize_p) { > dev_err(&dev->dev, "Can't find VETH_MCAST_FILTER_SIZE " > "attribute\n"); > @@ -1683,7 +1684,7 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) > > adapter->vdev = dev; > adapter->netdev = netdev; > - adapter->mcastFilterSize = *mcastFilterSize_p; > + adapter->mcastFilterSize = be32_to_cpu(*mcastFilterSize_p); > adapter->pool_config = 0; > ibmveth_init_link_settings(adapter); ibmveth_init_link_settings() is part of your net-next patch which you're respining, so I had to apply manually. Please double check your patches apply cleanly to the designated tree.
On Mon, Aug 12, 2019 at 04:13:06PM -0500, Thomas Falcon wrote: > The ibm,mac-address-filters property defines the maximum number of > addresses the hypervisor's multicast filter list can support. It is > encoded as a big-endian integer in the OF device tree, but the virtual > ethernet driver does not convert it for use by little-endian systems. > As a result, the driver is not behaving as it should on affected systems > when a large number of multicast addresses are assigned to the device. > > Reported-by: Hangbin Liu <liuhangbin@gmail.com> > Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com> Thanks, I tested and it works good.
On 8/13/19 9:43 PM, Jakub Kicinski wrote: > On Mon, 12 Aug 2019 16:13:06 -0500, Thomas Falcon wrote: >> The ibm,mac-address-filters property defines the maximum number of >> addresses the hypervisor's multicast filter list can support. It is >> encoded as a big-endian integer in the OF device tree, but the virtual >> ethernet driver does not convert it for use by little-endian systems. >> As a result, the driver is not behaving as it should on affected systems >> when a large number of multicast addresses are assigned to the device. >> >> Reported-by: Hangbin Liu <liuhangbin@gmail.com> >> Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com> > Okay, applied, but: Thanks! ... > ibmveth_init_link_settings() is part of your net-next patch which > you're respining, so I had to apply manually. Please double check your > patches apply cleanly to the designated tree. Sorry about that, I thought I fixed that but maybe I got patches mixed up somehow. Thanks again. Tom
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c index 77af9c2c0571..5641c00d34f2 100644 --- a/drivers/net/ethernet/ibm/ibmveth.c +++ b/drivers/net/ethernet/ibm/ibmveth.c @@ -1643,7 +1643,7 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) struct net_device *netdev; struct ibmveth_adapter *adapter; unsigned char *mac_addr_p; - unsigned int *mcastFilterSize_p; + __be32 *mcastFilterSize_p; long ret; unsigned long ret_attr; @@ -1665,8 +1665,9 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) return -EINVAL; } - mcastFilterSize_p = (unsigned int *)vio_get_attribute(dev, - VETH_MCAST_FILTER_SIZE, NULL); + mcastFilterSize_p = (__be32 *)vio_get_attribute(dev, + VETH_MCAST_FILTER_SIZE, + NULL); if (!mcastFilterSize_p) { dev_err(&dev->dev, "Can't find VETH_MCAST_FILTER_SIZE " "attribute\n"); @@ -1683,7 +1684,7 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) adapter->vdev = dev; adapter->netdev = netdev; - adapter->mcastFilterSize = *mcastFilterSize_p; + adapter->mcastFilterSize = be32_to_cpu(*mcastFilterSize_p); adapter->pool_config = 0; ibmveth_init_link_settings(adapter);
The ibm,mac-address-filters property defines the maximum number of addresses the hypervisor's multicast filter list can support. It is encoded as a big-endian integer in the OF device tree, but the virtual ethernet driver does not convert it for use by little-endian systems. As a result, the driver is not behaving as it should on affected systems when a large number of multicast addresses are assigned to the device. Reported-by: Hangbin Liu <liuhangbin@gmail.com> Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com> --- v2: define filter size pointer as __be32 instead of unsigned int, suggested by Joe Perches --- drivers/net/ethernet/ibm/ibmveth.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)