From owner-svn-src-head@freebsd.org Tue Nov 28 15:27:21 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 44FF5DB9890; Tue, 28 Nov 2017 15:27:21 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: from mail-it0-x22b.google.com (mail-it0-x22b.google.com [IPv6:2607:f8b0:4001:c0b::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7F94368C77; Tue, 28 Nov 2017 15:27:16 +0000 (UTC) (envelope-from chmeeedalf@gmail.com) Received: by mail-it0-x22b.google.com with SMTP id r6so119974itr.3; Tue, 28 Nov 2017 07:27:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=4MFD7YqzqUwG9H07YP9PbyO+a/jgfw0rKGs0LOr5FF8=; b=EYRDQzh6nnxfTPRVFj3xVWwI9xORBgaMg+zrgXHGnF5/FKAZqt2CfAmyA1qm1WBF/+ FqRn4+hGU0gIpXzYJX790BSiUmU6iNb6BlsgKF+kjq/bIV1mKEGogqTxgxXur+J8m2ae JuQ5Kck0UiIX/oZQxsqAEjip/X0XsurbFdh69dX84Tx0OdKpkYyzx/iMtD+oApDfPmX5 FS2QcGcDk264c4xKZSLRzxkmgd5TZ/gdRrRL9OEMC1KRExstfI4S2Ki3F6+xh5T5iXfa KjErD2R0qlECVxbp1Egq846Vy/P7F23UJLjlliCLiuoEf6h1cv3Tx/FF9yK3CJdD/zB9 FmZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=4MFD7YqzqUwG9H07YP9PbyO+a/jgfw0rKGs0LOr5FF8=; b=t4Zk8cz+LoD0GeLxrZqX5t3bq+Xui2gMYjU2WL5jA9pV3sbEnPYu6DJ07raMgaEbJ0 QnyXA+cYFdy2Bh55BOJ8FpnEQo9OtOlYRQZc2lmhpWbsO9aCBHiSzf0l+0EaNU6chUlC CT5Vsg29SWzDT1dZsATHCLJLIaca/Y7cy5mdrIiz9POVz5zT//a8fqwQo03YETfiILSG fgrgz9AsctwpU+7Li8jQtNMOGovtNYL9YfrPQLAv3w5EPRMUw/tzP6LrDJJIa46P4X91 a9MS7KhmGWb7NJm4f7wH3vdCN4H72M4CkuX0vrnUnxuavu/dzTdjTGop/Zmuv1kw4FK7 ZsGg== X-Gm-Message-State: AJaThX4ZwE962HPd2aEjBtFVlbOgRxhswhPfqe1lZny6Ef+plAs9DWkU xrR+ehf5HfECIK0bG5i2BIZNcDoE70s5hDcOp2A= X-Google-Smtp-Source: AGs4zMYNzCugFmlDrfawG9i0sdcOtVELYCinIMv9omyNnPAlwrQ0QxlhcP3CFvsJxCz/DzZ80UI8QD4UNP3BVmjwDSk= X-Received: by 10.36.67.141 with SMTP id s135mr3028694itb.142.1511882835577; Tue, 28 Nov 2017 07:27:15 -0800 (PST) MIME-Version: 1.0 Sender: chmeeedalf@gmail.com Received: by 10.79.78.207 with HTTP; Tue, 28 Nov 2017 07:27:14 -0800 (PST) In-Reply-To: <201711252145.vAPLjpV6051703@repo.freebsd.org> References: <201711252145.vAPLjpV6051703@repo.freebsd.org> From: Justin Hibbits Date: Tue, 28 Nov 2017 09:27:14 -0600 X-Google-Sender-Auth: iYUzt87C5BtZQ8iUT-p4MVLGWE0 Message-ID: Subject: Re: svn commit: r326203 - head/sys/conf To: Nathan Whitehorn Cc: src-committers , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 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, 28 Nov 2017 15:27:22 -0000 On Sat, Nov 25, 2017 at 3:45 PM, Nathan Whitehorn wrote: > Author: nwhitehorn > Date: Sat Nov 25 21:45:51 2017 > New Revision: 326203 > URL: https://svnweb.freebsd.org/changeset/base/326203 > > Log: > Avoid emitting a PT_INTERP section for powerpc64 kernels and arrange for > the first instruction to be at the start of the text segment. This allows > the kernel to be booted correctly by stock kexec-lite. > > MFC after: 2 weeks > > Modified: > head/sys/conf/ldscript.powerpc64 > > Modified: head/sys/conf/ldscript.powerpc64 > ============================================================================== > --- head/sys/conf/ldscript.powerpc64 Sat Nov 25 21:44:23 2017 (r326202) > +++ head/sys/conf/ldscript.powerpc64 Sat Nov 25 21:45:51 2017 (r326203) > @@ -10,7 +10,7 @@ SECTIONS > { > /* Read-only sections, merged into text segment: */ > > - . = kernbase + SIZEOF_HEADERS; > + . = kernbase; > PROVIDE (begin = . - SIZEOF_HEADERS); > > .text : > @@ -24,7 +24,10 @@ SECTIONS > _etext = .; > PROVIDE (etext = .); > > - .interp : { *(.interp) } > + /* Do not emit PT_INTERP section, which confuses some loaders (kexec-lite) */ > + .interpX : { *(.interp) } : NONE > + /DISCARD/ : { *(.interp) } > + > .hash : { *(.hash) } > .dynsym : { *(.dynsym) } > .dynstr : { *(.dynstr) } > This broke powerpc64 Book-E kernels. It now puts a 1MB blank space ahead of the kernel data (ELF header + 1MB - sizeof(header) of 0's), meaning that now the kernel needs to be loaded by uboot 1MB earlier in memory, rather than straight on the 64MB boundary as it has been. - Justin