FreeBSD src
Go to file
John Baldwin 4e865d9eb0 Fix unit number of EFI net interfaces and ignore psuedo network interfaces.
In r277943, the efinet_match() routine was changed to use an off by one
when matching network interfaces.  The effect was that using "net1"
actually used the device attached to "net0".

Digging into the hardware that needed this workaround more, I found that
UEFI was creating two simple network protocol devices for each physical
NIC.  The first device was a "raw" Ethernet device and the second device
was a "IP" device that used the IP protocol on top of the underlying
"raw" device.  The PXE code in the firmware used the "IP" device to pull
across the loader.efi, so currdev was set to "net1" when booting from the
physical interface "net0".  (The loaded image's device handle referenced
the "IP" device that "net1" claimed.)

However, the IP device isn't suitable for doing raw packet I/O (and the
current code to open devices exclusively actually turns the "IP" devices
off on these systems).

To fix, change the efinet driver to only attach to "raw" devices.  This
is determined by fetching the DEVICE_PATH for each handle which supports
the simple network protocol and examining the last node in the path.  If
the last node in the path is a MAC address, the device is assumed to be
a "raw" device and is added as a 'netX' device.  If the last node is not
a MAC address, the device is ignored.

However, this causes a new problem as the device handle associated with
the loaded image no longer matches any of the handles enumerated by
efinet for systems that load the image via the "IP" device.  To handle
this case, expand the logic that resolves currdev from the loaded image
in main().  First, the existing logic of looking for a handle that
matches the loaded image's handle is tried.  If that fails, the device
path of the handle that loaded the loaded image is fetched via
efi_lookup_image_devpath().  This device path is then walked from the
end up to the beginning using efi_handle_lookup() to fetch the handle
associated with a path.  If the handle is found and is a known handle,
then that is used as currdev.  The effect for machines that load the
image via the "IP" device is that the first lookup fails (the handle
for the "IP" device isn't claimed by efinet), but walking up the
image's device path finds the handle of the raw MAC device which is used
as currdev.

With these fixes in place, the hack to subtract 1 from the unit can now
be removed, so that setting currdev to 'net0' actually uses 'net0'.

PR:		202097
Tested by:	ambrisko
Sponsored by:	Cisco Systems
2016-05-26 23:32:28 +00:00
bin Close the input FILE * in read_file() and the output FILE * in write_file() 2016-05-25 18:38:30 +00:00
cddl Add initial DTrace support for RISC-V. 2016-05-24 16:41:37 +00:00
contrib Update libc++ to 3.8.0. Excerpted list of fixes (with upstream revision 2016-05-26 18:52:49 +00:00
crypto libkrb5: Fix potential double-free 2016-05-11 23:25:59 +00:00
etc Use the expiry date to determine whether to replace the DB copy of 2016-05-25 01:35:02 +00:00
gnu gnugrep: Update the configuration. 2016-05-22 20:17:55 +00:00
include WITH_META_MODE: Disable cookie handling for include installation. 2016-05-21 01:31:57 +00:00
kerberos5 Remove the old depend (mkdep) code and make FAST_DEPEND the one true way. 2016-03-30 23:50:23 +00:00
lib Let l64a() properly null terminate its result. 2016-05-26 20:55:15 +00:00
libexec Fix issues found by Coverity in the rtld-elf.c:gethints(). 2016-05-25 18:10:44 +00:00
release Remove vestigial cloudware-install bits missed in r300767. 2016-05-26 21:08:44 +00:00
rescue DIRDEPS_BUILD: Fix and hookup rescue/rescue to the build. 2016-05-26 23:20:40 +00:00
sbin Import Dummynet AQM version 0.2.1 (CoDel, FQ-CoDel, PIE and FQ-PIE). 2016-05-26 21:40:13 +00:00
secure Regen x86 assembly files for r299480. 2016-05-11 20:11:21 +00:00
share DIRDEPS_BUILD: Fix and hookup rescue/rescue to the build. 2016-05-26 23:20:40 +00:00
sys Fix unit number of EFI net interfaces and ignore psuedo network interfaces. 2016-05-26 23:32:28 +00:00
targets DIRDEPS_BUILD: Fix and hookup rescue/rescue to the build. 2016-05-26 23:20:40 +00:00
tests Return the correct status when a partially completed request is cancelled. 2016-05-24 21:09:05 +00:00
tools DIRDEPS_BUILD: Add a Makefile.depend 2016-05-26 23:20:44 +00:00
usr.bin Do libxo cleanup even in case of errors. 2016-05-26 14:21:02 +00:00
usr.sbin WITH_AUTO_OBJ: Fix crunchgen builds. 2016-05-26 23:20:36 +00:00
.arcconfig Remove project.name which is a product of a bygone era. 2016-04-21 04:33:07 +00:00
.arclint phabricator related changes: 2015-04-20 20:33:22 +00:00
COPYRIGHT Bump copyright year. 2015-12-31 11:21:45 +00:00
LOCKS Explicitly require Security Officer's approval for kernel PRNG bits. 2013-09-17 14:19:05 +00:00
MAINTAINERS Add myself to MAINTAINERS. 2016-03-14 16:27:43 +00:00
Makefile Import bmake-20160512 2016-05-20 16:19:56 +00:00
Makefile.inc1 WITH_AUTO_OBJ: Fix crunchgen builds. 2016-05-26 23:20:36 +00:00
Makefile.libcompat Set CPP from XCPP for the libcompat build. 2016-04-15 18:32:05 +00:00
ObsoleteFiles.inc Drop trailing asterisks. 2016-05-20 17:41:12 +00:00
README README: remove nonexistent 'games' directory. 2016-05-18 10:43:13 +00:00
UPDATING Add bit_count to the bitstring(3) api 2016-05-23 20:29:18 +00:00

This is the top level of the FreeBSD source directory.  This file
was last revised on:
$FreeBSD$

For copyright information, please see the file COPYRIGHT in this
directory (additional copyright information also exists for some
sources in this tree - please see the specific source directories for
more information).

The Makefile in this directory supports a number of targets for
building components (or all) of the FreeBSD source tree.  See build(7)
and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
for more information, including setting make(1) variables.

The `buildkernel` and `installkernel` targets build and install
the kernel and the modules (see below).  Please see the top of
the Makefile in this directory for more information on the
standard build targets and compile-time flags.

Building a kernel is a somewhat more involved process.  See build(7), config(8),
and http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html
for more information.

Note: If you want to build and install the kernel with the
`buildkernel` and `installkernel` targets, you might need to build
world before.  More information is available in the handbook.

The kernel configuration files reside in the sys/<arch>/conf
sub-directory.  GENERIC is the default configuration used in release builds.
NOTES contains entries and documentation for all possible
devices, not just those commonly used.


Source Roadmap:
---------------

bin		System/user commands.

cddl		Various commands and libraries under the Common Development
		and Distribution License.

contrib		Packages contributed by 3rd parties.

crypto		Cryptography stuff (see crypto/README).

etc		Template files for /etc.

gnu		Various commands and libraries under the GNU Public License.
		Please see gnu/COPYING* for more information.

include		System include files.

kerberos5	Kerberos5 (Heimdal) package.

lib		System libraries.

libexec		System daemons.

release		Release building Makefile & associated tools.

rescue		Build system for statically linked /rescue utilities.

sbin		System commands.

secure		Cryptographic libraries and commands.

share		Shared resources.

sys		Kernel sources.

tests		Regression tests which can be run by Kyua.  See tests/README
		for additional information.

tools		Utilities for regression testing and miscellaneous tasks.

usr.bin		User commands.

usr.sbin	System administration commands.


For information on synchronizing your source tree with one or more of
the FreeBSD Project's development branches, please see:

  http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/synching.html