From owner-svn-src-head@freebsd.org Tue Apr 11 18:49:59 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27A3CD3A9FA; Tue, 11 Apr 2017 18:49:59 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 12B931039; Tue, 11 Apr 2017 18:49:58 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id v3BInv62075893; Tue, 11 Apr 2017 11:49:57 -0700 (PDT) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id v3BInuuB075892; Tue, 11 Apr 2017 11:49:56 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201704111849.v3BInuuB075892@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r316699 - head/sys/net In-Reply-To: To: "Andrey V. Elsukov" Date: Tue, 11 Apr 2017 11:49:56 -0700 (PDT) CC: rgrimes@freebsd.org, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Apr 2017 18:49:59 -0000 [ Charset UTF-8 unsupported, converting... ] > On 11.04.2017 19:51, Rodney W. Grimes wrote: > >> Modified: head/sys/net/if_gre.c > >> ============================================================================== > >> --- head/sys/net/if_gre.c Tue Apr 11 08:29:12 2017 (r316698) > >> +++ head/sys/net/if_gre.c Tue Apr 11 08:56:18 2017 (r316699) > >> @@ -88,7 +88,7 @@ __FBSDID("$FreeBSD$"); > >> #include > >> #include > >> > >> -#define GREMTU 1500 > >> +#define GREMTU 1476 > > > > I would of thought that this was > > #define GREMTU ETHERMTU > > and now should probably be: > > #define GREMTU ETHERMTU - gre_hlen; > > Or what ever the approprite sizeof(foo) is; > > I just returned back constants that were here :) Can we try to improve on this, or maybe just ignore it? > The man page says: > "The MTU of gre interfaces is set to 1476 by default, to match the > value used by Cisco routers." That might need some clean up too? > > Isn't this arguably wrong in the face of JumboFrames? > > > > I don't see why it may be wrong for jumbo frames. The default MTU value > used by any interfaces is ETHERMTU, if you know that your NIC supports > jumbo frames, you will configure specific MTU value. > If you want 9k MTU on gre(4), you should configure it. I may some day want to #define ETHERMTU 9000 and just have all the right magic happen, wouldnt that be nice? > >> static const char grename[] = "gre"; > >> static MALLOC_DEFINE(M_GRE, grename, "Generic Routing Encapsulation"); > >> static VNET_DEFINE(struct mtx, gre_mtx); > >> @@ -173,7 +173,7 @@ gre_clone_create(struct if_clone *ifc, i > >> GRE2IFP(sc)->if_softc = sc; > >> if_initname(GRE2IFP(sc), grename, unit); > >> > >> - GRE2IFP(sc)->if_mtu = sc->gre_mtu = GREMTU; > >> + GRE2IFP(sc)->if_mtu = GREMTU; > >> GRE2IFP(sc)->if_flags = IFF_POINTOPOINT|IFF_MULTICAST; > >> GRE2IFP(sc)->if_output = gre_output; > >> GRE2IFP(sc)->if_ioctl = gre_ioctl; > >> @@ -231,7 +231,8 @@ gre_ioctl(struct ifnet *ifp, u_long cmd, > >> /* XXX: */ > >> if (ifr->ifr_mtu < 576) > > > > This is another magic constant that should be in a #define. > > It was here too. I think it is something from the past and can be removed. > > From RFC791: "It is recommended that hosts only send datagrams larger > than 576 octets". No, I doubt we want to remove that, it is also part of ipv6 documentation, and iirc part of some BCP's. You really dont want to be running on the internet with MTU < 576. It use to be 296 in the days when we had SLIP. > > >> return (EINVAL); > >> - break; > >> + ifp->if_mtu = ifr->ifr_mtu; > >> + return (0); > >> case SIOCSIFADDR: > >> ifp->if_flags |= IFF_UP; > >> case SIOCSIFFLAGS: > >> @@ -255,12 +256,6 @@ gre_ioctl(struct ifnet *ifp, u_long cmd, > >> } > >> error = 0; > >> switch (cmd) { > >> - case SIOCSIFMTU: > >> - GRE_WLOCK(sc); > >> - sc->gre_mtu = ifr->ifr_mtu; > >> - gre_updatehdr(sc); > >> - GRE_WUNLOCK(sc); > >> - goto end; > >> case SIOCSIFPHYADDR: > >> #ifdef INET6 > >> case SIOCSIFPHYADDR_IN6: > >> @@ -549,7 +544,6 @@ gre_updatehdr(struct gre_softc *sc) > >> } else > >> sc->gre_oseq = 0; > >> gh->gre_flags = htons(flags); > >> - GRE2IFP(sc)->if_mtu = sc->gre_mtu - sc->gre_hlen; > >> } > >> > >> static void > >> > >> Modified: head/sys/net/if_gre.h > >> ============================================================================== > >> --- head/sys/net/if_gre.h Tue Apr 11 08:29:12 2017 (r316698) > >> +++ head/sys/net/if_gre.h Tue Apr 11 08:56:18 2017 (r316699) > >> @@ -69,7 +69,6 @@ struct gre_softc { > >> uint32_t gre_oseq; > >> uint32_t gre_key; > >> uint32_t gre_options; > >> - uint32_t gre_mtu; > >> u_int gre_fibnum; > >> u_int gre_hlen; /* header size */ > >> union { > >> > >> Modified: head/sys/net/if_me.c > >> ============================================================================== > >> --- head/sys/net/if_me.c Tue Apr 11 08:29:12 2017 (r316698) > >> +++ head/sys/net/if_me.c Tue Apr 11 08:56:18 2017 (r316699) > >> @@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$"); > >> #include > >> #include > >> > >> -#define MEMTU 1500 > >> +#define MEMTU (1500 - sizeof(struct mobhdr)) > > > > 1500 -> ETHERMTU? > > Feel free to fix this. Many pseudo interfaces has similar MTU limitations. > > -- > WBR, Andrey V. Elsukov > -- Rod Grimes rgrimes@freebsd.org