| Message ID | 20211027152012.3393077-1-kuba@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f2edaa4ad5d51371709196f2c258fbe875962dee |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] net: virtio: use eth_hw_addr_set() | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Single patches do not need cover letters |
| netdev/fixes_present | success | Fixes tag not required for -next series |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 6 of 6 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | No Fixes tag |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 19 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | No static functions without inline keyword in header files |
On Wed, Oct 27, 2021 at 08:20:12AM -0700, Jakub Kicinski wrote: > Commit 406f42fa0d3c ("net-next: When a bond have a massive amount > of VLANs...") introduced a rbtree for faster Ethernet address look > up. To maintain netdev->dev_addr in this tree we need to make all > the writes to it go through appropriate helpers. > > Even though the current code uses dev->addr_len the we can switch > to eth_hw_addr_set() instead of dev_addr_set(). The netdev is > always allocated by alloc_etherdev_mq() and there are at least two > places which assume Ethernet address: > - the line below calling eth_hw_addr_random() > - virtnet_set_mac_address() -> eth_commit_mac_addr_change() > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > v2: - actually switch to eth_hw_addr_set() not dev_addr_set() > - resize the buffer to ETH_ALEN > - pass ETH_ALEN instead of dev->dev_addr to virtio_cread_bytes() > > CC: mst@redhat.com > CC: jasowang@redhat.com > CC: virtualization@lists.linux-foundation.org > --- > drivers/net/virtio_net.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index c501b5974aee..cc79343cd220 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -3177,12 +3177,16 @@ static int virtnet_probe(struct virtio_device *vdev) > dev->max_mtu = MAX_MTU; > > /* Configuration may specify what MAC to use. Otherwise random. */ > - if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) > + if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) { > + u8 addr[ETH_ALEN]; > + > virtio_cread_bytes(vdev, > offsetof(struct virtio_net_config, mac), > - dev->dev_addr, dev->addr_len); > - else > + addr, ETH_ALEN); > + eth_hw_addr_set(dev, addr); > + } else { > eth_hw_addr_random(dev); > + } > > /* Set up our device-specific information */ > vi = netdev_priv(dev); > -- > 2.31.1
On Wed, Oct 27, 2021 at 11:31 PM Michael S. Tsirkin <mst@redhat.com> wrote: > > On Wed, Oct 27, 2021 at 08:20:12AM -0700, Jakub Kicinski wrote: > > Commit 406f42fa0d3c ("net-next: When a bond have a massive amount > > of VLANs...") introduced a rbtree for faster Ethernet address look > > up. To maintain netdev->dev_addr in this tree we need to make all > > the writes to it go through appropriate helpers. > > > > Even though the current code uses dev->addr_len the we can switch > > to eth_hw_addr_set() instead of dev_addr_set(). The netdev is > > always allocated by alloc_etherdev_mq() and there are at least two > > places which assume Ethernet address: > > - the line below calling eth_hw_addr_random() > > - virtnet_set_mac_address() -> eth_commit_mac_addr_change() > > > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > > Acked-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com> > > > --- > > v2: - actually switch to eth_hw_addr_set() not dev_addr_set() > > - resize the buffer to ETH_ALEN > > - pass ETH_ALEN instead of dev->dev_addr to virtio_cread_bytes() > > > > CC: mst@redhat.com > > CC: jasowang@redhat.com > > CC: virtualization@lists.linux-foundation.org > > --- > > drivers/net/virtio_net.c | 10 +++++++--- > > 1 file changed, 7 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > > index c501b5974aee..cc79343cd220 100644 > > --- a/drivers/net/virtio_net.c > > +++ b/drivers/net/virtio_net.c > > @@ -3177,12 +3177,16 @@ static int virtnet_probe(struct virtio_device *vdev) > > dev->max_mtu = MAX_MTU; > > > > /* Configuration may specify what MAC to use. Otherwise random. */ > > - if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) > > + if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) { > > + u8 addr[ETH_ALEN]; > > + > > virtio_cread_bytes(vdev, > > offsetof(struct virtio_net_config, mac), > > - dev->dev_addr, dev->addr_len); > > - else > > + addr, ETH_ALEN); > > + eth_hw_addr_set(dev, addr); > > + } else { > > eth_hw_addr_random(dev); > > + } > > > > /* Set up our device-specific information */ > > vi = netdev_priv(dev); > > -- > > 2.31.1 >
Hello: This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Wed, 27 Oct 2021 08:20:12 -0700 you wrote: > Commit 406f42fa0d3c ("net-next: When a bond have a massive amount > of VLANs...") introduced a rbtree for faster Ethernet address look > up. To maintain netdev->dev_addr in this tree we need to make all > the writes to it go through appropriate helpers. > > Even though the current code uses dev->addr_len the we can switch > to eth_hw_addr_set() instead of dev_addr_set(). The netdev is > always allocated by alloc_etherdev_mq() and there are at least two > places which assume Ethernet address: > - the line below calling eth_hw_addr_random() > - virtnet_set_mac_address() -> eth_commit_mac_addr_change() > > [...] Here is the summary with links: - [net-next,v2] net: virtio: use eth_hw_addr_set() https://git.kernel.org/netdev/net-next/c/f2edaa4ad5d5 You are awesome, thank you!
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index c501b5974aee..cc79343cd220 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3177,12 +3177,16 @@ static int virtnet_probe(struct virtio_device *vdev) dev->max_mtu = MAX_MTU; /* Configuration may specify what MAC to use. Otherwise random. */ - if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) + if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) { + u8 addr[ETH_ALEN]; + virtio_cread_bytes(vdev, offsetof(struct virtio_net_config, mac), - dev->dev_addr, dev->addr_len); - else + addr, ETH_ALEN); + eth_hw_addr_set(dev, addr); + } else { eth_hw_addr_random(dev); + } /* Set up our device-specific information */ vi = netdev_priv(dev);
Commit 406f42fa0d3c ("net-next: When a bond have a massive amount of VLANs...") introduced a rbtree for faster Ethernet address look up. To maintain netdev->dev_addr in this tree we need to make all the writes to it go through appropriate helpers. Even though the current code uses dev->addr_len the we can switch to eth_hw_addr_set() instead of dev_addr_set(). The netdev is always allocated by alloc_etherdev_mq() and there are at least two places which assume Ethernet address: - the line below calling eth_hw_addr_random() - virtnet_set_mac_address() -> eth_commit_mac_addr_change() Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- v2: - actually switch to eth_hw_addr_set() not dev_addr_set() - resize the buffer to ETH_ALEN - pass ETH_ALEN instead of dev->dev_addr to virtio_cread_bytes() CC: mst@redhat.com CC: jasowang@redhat.com CC: virtualization@lists.linux-foundation.org --- drivers/net/virtio_net.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)