From owner-dev-commits-src-all@freebsd.org Tue Jan 19 05:08:26 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1E3E64E5509; Tue, 19 Jan 2021 05:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DKcB06r0Lz4XNF; Tue, 19 Jan 2021 05:08:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F294C20CE6; Tue, 19 Jan 2021 05:08:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10J58J4c085910; Tue, 19 Jan 2021 05:08:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10J58J25085909; Tue, 19 Jan 2021 05:08:19 GMT (envelope-from git) Date: Tue, 19 Jan 2021 05:08:19 GMT Message-Id: <202101190508.10J58J25085909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bryan Venteicher Subject: git: 32e0493c9245 - main - if_vtnet: Cleanup the interface setup methods MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bryanv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32e0493c92458dc885167e5e3d76b2918ff72c24 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jan 2021 05:08:26 -0000 The branch main has been updated by bryanv: URL: https://cgit.FreeBSD.org/src/commit/?id=32e0493c92458dc885167e5e3d76b2918ff72c24 commit 32e0493c92458dc885167e5e3d76b2918ff72c24 Author: Bryan Venteicher AuthorDate: 2021-01-19 04:55:25 +0000 Commit: Bryan Venteicher CommitDate: 2021-01-19 04:55:25 +0000 if_vtnet: Cleanup the interface setup methods Defer the ether_ifattach until the interface capabilities are configured Reviewed by: grehan (mentor) Differential Revision: https://reviews.freebsd.org/D27913 --- sys/dev/virtio/network/if_vtnet.c | 59 ++++++++++++++------------------------- 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index ec1fc8de1a90..33d421b32b1f 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -827,6 +827,7 @@ vtnet_alloc_rxtx_queues(struct vtnet_softc *sc) return (error); } + vtnet_set_rx_process_limit(sc); vtnet_setup_queue_sysctl(sc); return (0); @@ -996,6 +997,7 @@ vtnet_setup_interface(struct vtnet_softc *sc) ifp->if_softc = sc; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST | IFF_KNOWSEPOCH; + ifp->if_baudrate = IF_Gbps(10); ifp->if_init = vtnet_init; ifp->if_ioctl = vtnet_ioctl; ifp->if_get_counter = vtnet_get_counter; @@ -1010,29 +1012,15 @@ vtnet_setup_interface(struct vtnet_softc *sc) IFQ_SET_READY(&ifp->if_snd); #endif - if (virtio_with_feature(dev, VIRTIO_NET_F_SPEED_DUPLEX)) { - uint32_t speed = virtio_read_dev_config_4(dev, - offsetof(struct virtio_net_config, speed)); - if (speed != -1) - ifp->if_baudrate = IF_Mbps(speed); - else - ifp->if_baudrate = IF_Gbps(10); /* Approx. */ - } else - ifp->if_baudrate = IF_Gbps(10); /* Approx. */ - - ifmedia_init(&sc->vtnet_media, 0, vtnet_ifmedia_upd, vtnet_ifmedia_sts); - ifmedia_add(&sc->vtnet_media, IFM_ETHER | IFM_AUTO, 0, NULL); - ifmedia_set(&sc->vtnet_media, IFM_ETHER | IFM_AUTO); - vtnet_get_macaddr(sc); - ether_ifattach(ifp, sc->vtnet_hwaddr); - - /* Tell the upper layer(s) we support long frames. */ - ifp->if_hdrlen = sizeof(struct ether_vlan_header); if (virtio_with_feature(dev, VIRTIO_NET_F_STATUS)) ifp->if_capabilities |= IFCAP_LINKSTATE; + ifmedia_init(&sc->vtnet_media, 0, vtnet_ifmedia_upd, vtnet_ifmedia_sts); + ifmedia_add(&sc->vtnet_media, IFM_ETHER | IFM_AUTO, 0, NULL); + ifmedia_set(&sc->vtnet_media, IFM_ETHER | IFM_AUTO); + if (virtio_with_feature(dev, VIRTIO_NET_F_CSUM)) { int gso; @@ -1063,7 +1051,7 @@ vtnet_setup_interface(struct vtnet_softc *sc) ifp->if_capabilities |= IFCAP_LRO; } - if (ifp->if_capabilities & IFCAP_HWCSUM) { + if (ifp->if_capabilities & (IFCAP_HWCSUM | IFCAP_HWCSUM_IPV6)) { /* * VirtIO does not support VLAN tagging, but we can fake * it by inserting and removing the 802.1Q header during @@ -1078,11 +1066,11 @@ vtnet_setup_interface(struct vtnet_softc *sc) ifp->if_capabilities |= IFCAP_JUMBO_MTU; ifp->if_capabilities |= IFCAP_VLAN_MTU; - ifp->if_capenable = ifp->if_capabilities; - /* * Capabilities after here are not enabled by default. */ + ifp->if_capenable = ifp->if_capabilities; + if (sc->vtnet_flags & VTNET_FLAG_VLAN_FILTER) { ifp->if_capabilities |= IFCAP_VLAN_HWFILTER; @@ -1092,7 +1080,10 @@ vtnet_setup_interface(struct vtnet_softc *sc) vtnet_unregister_vlan, sc, EVENTHANDLER_PRI_FIRST); } - vtnet_set_rx_process_limit(sc); + ether_ifattach(ifp, sc->vtnet_hwaddr); + + /* Tell the upper layer(s) we support long frames. */ + ifp->if_hdrlen = sizeof(struct ether_vlan_header); DEBUGNET_SET(ifp, vtnet); @@ -3623,20 +3614,17 @@ vtnet_unregister_vlan(void *arg, struct ifnet *ifp, uint16_t tag) static void vtnet_update_speed_duplex(struct vtnet_softc *sc) { - device_t dev; struct ifnet *ifp; uint32_t speed; - dev = sc->vtnet_dev; ifp = sc->vtnet_ifp; - /* BMV: Ignore duplex. */ if ((sc->vtnet_features & VIRTIO_NET_F_SPEED_DUPLEX) == 0) - speed = -1; - else - speed = virtio_read_dev_config_4(dev, - offsetof(struct virtio_net_config, speed)); + return; + /* BMV: Ignore duplex. */ + speed = virtio_read_dev_config_4(sc->vtnet_dev, + offsetof(struct virtio_net_config, speed)); if (speed != -1) ifp->if_baudrate = IF_Mbps(speed); } @@ -3644,18 +3632,13 @@ vtnet_update_speed_duplex(struct vtnet_softc *sc) static int vtnet_is_link_up(struct vtnet_softc *sc) { - device_t dev; - struct ifnet *ifp; uint16_t status; - dev = sc->vtnet_dev; - ifp = sc->vtnet_ifp; + if ((sc->vtnet_features & VIRTIO_NET_F_STATUS) == 0) + return (1); - if ((ifp->if_capabilities & IFCAP_LINKSTATE) == 0) - status = VIRTIO_NET_S_LINK_UP; - else - status = virtio_read_dev_config_2(dev, - offsetof(struct virtio_net_config, status)); + status = virtio_read_dev_config_2(sc->vtnet_dev, + offsetof(struct virtio_net_config, status)); return ((status & VIRTIO_NET_S_LINK_UP) != 0); }