From owner-svn-src-head@freebsd.org Tue Aug 14 15:27:17 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 214D5107B72F; Tue, 14 Aug 2018 15:27:17 +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 9774F746EC; Tue, 14 Aug 2018 15:27:16 +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 w7EFRD9c042902; Tue, 14 Aug 2018 08:27:13 -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 w7EFRDOZ042901; Tue, 14 Aug 2018 08:27:13 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201808141527.w7EFRDOZ042901@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r337754 - head/sys/x86/x86 In-Reply-To: <201808141402.w7EE2seW007725@repo.freebsd.org> To: Mark Johnston Date: Tue, 14 Aug 2018 08:27:13 -0700 (PDT) CC: 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.27 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, 14 Aug 2018 15:27:17 -0000 [ Charset UTF-8 unsupported, converting... ] > Author: markj > Date: Tue Aug 14 14:02:53 2018 > New Revision: 337754 > URL: https://svnweb.freebsd.org/changeset/base/337754 > > Log: > Don't use memcpy() in the early microcode loading code. > > At some point memcpy() may be an ifunc, ifunc resolution cannot be done > until CPU identification has been performed, and CPU identification must > be done after loading any microcode updates. Could you please add a comment so that someone does not undo this? > > X-MFC with: r337715 > Sponsored by: The FreeBSD Foundation > > Modified: > head/sys/x86/x86/ucode.c > > Modified: head/sys/x86/x86/ucode.c > ============================================================================== > --- head/sys/x86/x86/ucode.c Tue Aug 14 14:01:12 2018 (r337753) > +++ head/sys/x86/x86/ucode.c Tue Aug 14 14:02:53 2018 (r337754) > @@ -312,8 +312,7 @@ ucode_load_bsp(uintptr_t free) > uint8_t *addr, *fileaddr, *match; > char *type; > caddr_t file; > - size_t len, ucode_len; > - int i; > + size_t i, len, ucode_len; > > KASSERT(free % PAGE_SIZE == 0, ("unaligned boundary %p", (void *)free)); > > @@ -345,7 +344,8 @@ ucode_load_bsp(uintptr_t free) > match = loader->match(fileaddr, &len); > if (match != NULL) { > addr = map_ucode(free, len); > - memcpy(addr, match, len); /* * NB: memcpy may be an uninitialized ifunc, * so can not be used here. */ > + for (i = 0; i < len; i++) > + addr[i] = match[i]; > match = addr; > > if (loader->load(match, false) == 0) { > > -- Rod Grimes rgrimes@freebsd.org