From patchwork Tue May 21 01:45:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stewart Smith X-Patchwork-Id: 1102492 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 457JXp1BqSz9s9T for ; Tue, 21 May 2019 11:47:06 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 457JXp0Gm6zDqKT for ; Tue, 21 May 2019 11:47:06 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=stewart@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 457JXj4tbWzDqC9 for ; Tue, 21 May 2019 11:47:01 +1000 (AEST) Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x4L1gMfs004571 for ; Mon, 20 May 2019 21:46:58 -0400 Received: from ppma01dal.us.ibm.com (83.d6.3fa9.ip4.static.sl-reverse.com [169.63.214.131]) by mx0b-001b2d01.pphosted.com with ESMTP id 2sm6pwt5rk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 20 May 2019 21:46:58 -0400 Received: from pps.filterd (ppma01dal.us.ibm.com [127.0.0.1]) by ppma01dal.us.ibm.com (8.16.0.27/8.16.0.27) with SMTP id x4L0VOvC002255 for ; Tue, 21 May 2019 00:34:03 GMT Received: from b01cxnp23032.gho.pok.ibm.com (b01cxnp23032.gho.pok.ibm.com [9.57.198.27]) by ppma01dal.us.ibm.com with ESMTP id 2sj9p3ksqv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 21 May 2019 00:34:03 +0000 Received: from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com [9.57.199.111]) by b01cxnp23032.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x4L1jfhJ35586068 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 21 May 2019 01:45:41 GMT Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CAE4AAC05B for ; Tue, 21 May 2019 01:45:41 +0000 (GMT) Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 89FAAAC059 for ; Tue, 21 May 2019 01:45:41 +0000 (GMT) Received: from birb.localdomain (unknown [9.185.142.26]) by b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP for ; Tue, 21 May 2019 01:45:41 +0000 (GMT) Received: by birb.localdomain (Postfix, from userid 1000) id D4B4B4E6D95; Tue, 21 May 2019 11:45:39 +1000 (AEST) From: Stewart Smith To: skiboot@lists.ozlabs.org Date: Tue, 21 May 2019 11:45:37 +1000 Message-Id: <20190521014538.6633-1-stewart@linux.ibm.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-05-20_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=715 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905210008 Subject: [Skiboot] [PATCH 1/2] Intentionally discard fini_array sections X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Produced in a SKIBOOT_GCOV=1 build, and never called by skiboot. Signed-off-by: Stewart Smith --- skiboot.lds.S | 1 + 1 file changed, 1 insertion(+) diff --git a/skiboot.lds.S b/skiboot.lds.S index 54b1fef07b4f..18e89f3e73c6 100644 --- a/skiboot.lds.S +++ b/skiboot.lds.S @@ -229,5 +229,6 @@ SECTIONS *(.comment) *(.eh_frame) *(.interp) + *(.fini_array.*) } } From patchwork Tue May 21 01:45:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stewart Smith X-Patchwork-Id: 1102491 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 457JWR6tVBz9s9T for ; Tue, 21 May 2019 11:45:55 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 457JWR5yKszDqKT for ; Tue, 21 May 2019 11:45:55 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=linux.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=stewart@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 457JWK6lwKzDqGb for ; Tue, 21 May 2019 11:45:49 +1000 (AEST) Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x4L1gROf142596 for ; Mon, 20 May 2019 21:45:46 -0400 Received: from e17.ny.us.ibm.com (e17.ny.us.ibm.com [129.33.205.207]) by mx0a-001b2d01.pphosted.com with ESMTP id 2sm4986rgu-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 20 May 2019 21:45:45 -0400 Received: from localhost by e17.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 21 May 2019 02:45:44 +0100 Received: from b01cxnp22036.gho.pok.ibm.com (9.57.198.26) by e17.ny.us.ibm.com (146.89.104.204) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 21 May 2019 02:45:42 +0100 Received: from b01ledav005.gho.pok.ibm.com (b01ledav005.gho.pok.ibm.com [9.57.199.110]) by b01cxnp22036.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x4L1jfaZ45744208 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 21 May 2019 01:45:41 GMT Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D2B06AE05C for ; Tue, 21 May 2019 01:45:41 +0000 (GMT) Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 925CAAE063 for ; Tue, 21 May 2019 01:45:41 +0000 (GMT) Received: from birb.localdomain (unknown [9.185.142.26]) by b01ledav005.gho.pok.ibm.com (Postfix) with ESMTP for ; Tue, 21 May 2019 01:45:41 +0000 (GMT) Received: by birb.localdomain (Postfix, from userid 1000) id DA0CD4FE486; Tue, 21 May 2019 11:45:39 +1000 (AEST) From: Stewart Smith To: skiboot@lists.ozlabs.org Date: Tue, 21 May 2019 11:45:38 +1000 X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190521014538.6633-1-stewart@linux.ibm.com> References: <20190521014538.6633-1-stewart@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 19052101-0040-0000-0000-000004F239F7 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00011134; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000286; SDB=6.01206288; UDB=6.00633413; IPR=6.00987248; MB=3.00026977; MTD=3.00000008; XFM=3.00000015; UTC=2019-05-21 01:45:43 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19052101-0041-0000-0000-000008FE4D18 Message-Id: <20190521014538.6633-2-stewart@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-05-20_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905210008 Subject: [Skiboot] [PATCH 2/2] With new GCC comes larger GCOV binaries X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" So we need to change our heap size to make more room for data/bss without having to change where the console is or have more fun moving things about. Signed-off-by: Stewart Smith --- include/mem-map.h | 16 +++++++++------- skiboot.lds.S | 6 +++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/include/mem-map.h b/include/mem-map.h index 3e30d9b76111..fa5cacb1c610 100644 --- a/include/mem-map.h +++ b/include/mem-map.h @@ -59,8 +59,8 @@ */ #define CPU_CTL_OFF (SPIRA_OFF + 0x1800) -/* We keep a gap of 2M for skiboot text & bss for now. We will - * then we have our heap which goes up to base + 14M (so 12M for +/* We keep a gap of 5M for skiboot text & bss for now. We will + * then we have our heap which goes up to base + 14M (so 11M for * now, though we can certainly reduce that a lot). * * Ideally, we should fix the heap end and use _end to basically @@ -71,14 +71,16 @@ * regions statically in mem_region.c, but still on the list of * things to improve. * - * As of this writing (2014/4/6), we use approc 512K for skiboot + * As of A Long Time Ago (2014/4/6), we used approc 512K for skiboot * core and 2M of heap on a 1 socket machine. * - * As of 2015/5/7 we use approx 800k for skiboot, 500k HEAP for - * mambo boot. + * As of still a Long Time Ago (2015/5/7) we used approx 800k for skiboot, + * 500k HEAP for mambo boot. + * + * As of mid-2019, a 2 socket Romulus uses ~4MB heap. */ -#define HEAP_BASE (SKIBOOT_BASE + 0x00400000) -#define HEAP_SIZE 0x00c00000 +#define HEAP_BASE (SKIBOOT_BASE + 0x00500000) +#define HEAP_SIZE 0x00b00000 /* This is the location of our console buffer at base + 16M */ #define INMEM_CON_START (SKIBOOT_BASE + 0x01000000) diff --git a/skiboot.lds.S b/skiboot.lds.S index 18e89f3e73c6..4a7727dc99e1 100644 --- a/skiboot.lds.S +++ b/skiboot.lds.S @@ -117,7 +117,7 @@ SECTIONS KEEP(*(.init_array)) __ctors_end = .; } - + . = ALIGN(0x10); .opd : { *(.opd) @@ -201,8 +201,8 @@ SECTIONS *(.branch_lt) } - /* We locate the BSS at 3M to leave room for the symbol map */ - . = 0x300000; + /* We locate the BSS at 4M to leave room for the symbol map */ + . = 0x400000; _sbss = .; .bss : {