From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1aUbVz-00063V-0F for mharc-grub-devel@gnu.org; Sat, 13 Feb 2016 09:49:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36048) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUbVw-00062t-Hl for grub-devel@gnu.org; Sat, 13 Feb 2016 09:49:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aUbVr-0005nD-I0 for grub-devel@gnu.org; Sat, 13 Feb 2016 09:49:36 -0500 Received: from mail-lb0-x233.google.com ([2a00:1450:4010:c04::233]:34048) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUbVr-0005n7-8w for grub-devel@gnu.org; Sat, 13 Feb 2016 09:49:31 -0500 Received: by mail-lb0-x233.google.com with SMTP id ap4so1271552lbd.1 for ; Sat, 13 Feb 2016 06:49:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=5fYv9sQ0yZW3OJXKry/4XUaKZkg3pZeg1jJM0I58pwg=; b=DE3fz558vWBWk76JeeK6+EmxU6K3hdsVsX/aoxQg5AvIfOKpo1+NCFRi5rjMsEbslf Rg4RC/WB+e/mIgtF/tNrXP/kQ4tQi6S2wWilYV8FARn4HxC0Wbljt8hW1n5m+yogSQ19 nNdA71u92yVEyHQI0zQuilRExu6Oqqdo5DPTfHkdWg9ikMZfJrdbcLMSZzG0Q/HX+JQT VbOF+E17jBvDc58UrFHi2CF0UWYWlSKPh/7WUx6D+S6wFRkgf0RvdY+bZW5EqHvl/rv8 m0TA12a/M9lUVbDAWitVzNvyDH1gb9b2hm3iZGUDdu24dyH4n3ENeo98K+1CK0yXT8H+ Vlzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=5fYv9sQ0yZW3OJXKry/4XUaKZkg3pZeg1jJM0I58pwg=; b=MdBXw+lmnW9F64BGMMCMpHcfiueGVbrokgsARwPUNyBnJk8FHKKL8qAUVzDMHuk7sO f9zp0C6Yg9jj8lhTaM5pVO2JpiQbUUV+uDmKnI7sRsPb3hrTIHzMogc1YbTb4WMRDh/F MKjYFg/vKqgDWAOtGDZj2EXNutb+pc/JKmv49pgpfmatDBr6qAQLRI4VOsxNLZR8WcnF pxaVmbaUER2gTMKMAYYG/h4G4dPOlj+WvPXIWQfkq3a9SHXtGEF0CGbzsNJkzg0VYK4e FxDLd5+knP2RVmn92SgDudAHJ4y2zUqB2lRqNLz2avei/m0HTCt6kf9QpyYM9sdzP/tg F/og== X-Gm-Message-State: AG10YOTqURKBhAtyZfHCvjEcryWaDdNP9TfGcqwlvLKudSuue5LMcGZ6QkwMTWNRul9p3g== X-Received: by 10.112.12.233 with SMTP id b9mr2688608lbc.63.1455374970146; Sat, 13 Feb 2016 06:49:30 -0800 (PST) Received: from [192.168.1.41] (ppp109-252-76-159.pppoe.spdop.ru. [109.252.76.159]) by smtp.gmail.com with ESMTPSA id s75sm2478927lfs.21.2016.02.13.06.49.28 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 13 Feb 2016 06:49:29 -0800 (PST) Subject: Re: [PATCH] sparc64: OBP available region contains grub. Start at grub_phys_end To: The development of GNU GRUB References: <1455312923-166743-1-git-send-email-eric.snowberg@oracle.com> <56BEBF61.8040205@gmail.com> From: Andrei Borzenkov X-Enigmail-Draft-Status: N1110 Message-ID: <56BF4278.1010503@gmail.com> Date: Sat, 13 Feb 2016 17:49:28 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c04::233 Cc: Eric Snowberg , daniel.kiper@oracle.com X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2016 14:49:37 -0000 13.02.2016 16:56, Vladimir 'phcoder' Serbinenko пишет: > Le sam. 13 févr. 2016 06:30, Andrei Borzenkov a > écrit : > >> 13.02.2016 00:35, Eric Snowberg пишет: >>> OBP available region contains grub. Start at grub_phys_end. >>> >>> This prevents a problem where grub was being overwritten since >>> grub_phys_start does not start at a zero offset within the memory >>> map. >>> >>> Signed-off-by: Eric Snowberg >>> --- >>> grub-core/loader/sparc64/ieee1275/linux.c | 16 ++++++++-------- >>> 1 files changed, 8 insertions(+), 8 deletions(-) >>> >>> diff --git a/grub-core/loader/sparc64/ieee1275/linux.c >> b/grub-core/loader/sparc64/ieee1275/linux.c >>> index d44d7a1..67ef048 100644 >>> --- a/grub-core/loader/sparc64/ieee1275/linux.c >>> +++ b/grub-core/loader/sparc64/ieee1275/linux.c >>> @@ -203,20 +203,20 @@ alloc_phys_choose (grub_uint64_t addr, >> grub_uint64_t len, >>> if (addr + ctx->size >= end) >>> return 0; >>> >>> - if (addr >= grub_phys_start && addr < grub_phys_end) >>> - { >>> - addr = ALIGN_UP (grub_phys_end, FOUR_MB); >>> - if (addr + ctx->size >= end) >>> - return 0; >>> - } >>> - if ((addr + ctx->size) >= grub_phys_start >>> - && (addr + ctx->size) < grub_phys_end) >>> + /* OBP available region contains grub. Start at grub_phys_end. */ >>> + /* grub_phys_start does not start at the beginning of the memory >> region */ >>> + if ((grub_phys_start >= addr && grub_phys_end < end) || >>> + (addr > grub_phys_start && addr < grub_phys_end)) >> >> What about >> >> a) overlapping regions? >> >> addr < grub_phys_start < end < grub_phys_end >> >> Good catch. Condition should have been > grub_phys_start >= addr && grub_phys_start < end) || (addr > > grub_phys_start && addr < grub_phys_end)) > My pattern matching algorithm failed and I thought it was standard check > for segment intersection but it wasn't. I'll fix this > > >> >> b) is is possible for requested region to fit before grub? >> > There is only 16KiB of memory before GRUB but thinking about it again, it's > 16 KiB of virtual memory, not physical. What about attached patch? > As far as I understand what it does looks OK.