From patchwork Sat Aug 19 07:45:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 74352 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0CA463870885 for ; Sat, 19 Aug 2023 07:46:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0CA463870885 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1692431183; bh=nqwRpuN9OjtoW+N1a/du/STnGvvajKaIuwHbsoDvEOk=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=aJIzXsw5+gV7e64HYtzVcnuqrmkjBF+8DassQl8YkfN65NUxSmtuwZQorXL9lDrNJ J/ogxDkthP+LKlsTmHy2Lt+AzJaxVkIvVXamjxiywVw7yVUcbbyx2OKOq8S9ERWU0z OqVAXPF0mUgThIDk2kXeOUZJNDk2VsBJ1/k+0j2w= X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id 5DA2E385841C for ; Sat, 19 Aug 2023 07:45:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5DA2E385841C Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-31969580797so1450543f8f.3 for ; Sat, 19 Aug 2023 00:45:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692431151; x=1693035951; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nqwRpuN9OjtoW+N1a/du/STnGvvajKaIuwHbsoDvEOk=; b=JBT4NTrvCPII5RaRtosBEyC682zd9pj2nij5ty/mfewQdhc+YTyRBiz3VblFeKmvK6 tIm9Kt0hkwDGcaPz4x1sCuFYxJ4Y9OmSxz4jRBQvCAmKKFmw13XtVuq0hxU98WTmiw4r pPh0+ktZnRsZF6EsDs6v0O/6/z2ZcVIo9Fp3uhXkQAMnXdowMxXEs3ehR1nOz4RIVvFD W8WFvmTBA8OI2P+xTmgN9VudShFJkb6ZzDGfM1wJl3OC1k9S8ZNV7RtNXOFZIo5xwQf4 PXSyufj2dEBEGSx8n872l7eEEOKnefsOr3LgFgAu/E1YpOUiizWorWrYmQ2JgijI/8XP 6waQ== X-Gm-Message-State: AOJu0YyxCPLUjYcTop+Y8oIA6GSyZ36Yb9EirbJXBxfMTjmAgL0HUrk0 LCWMp4TzXsoYc2788X4mabFzYMcOfLvA6Q== X-Google-Smtp-Source: AGHT+IGaUyF05wbDySY8Z7WTUZoff2+XjuMdQbzsq2fttAyxmZ58HnEiSu2n7gfXuUcS24wPaZvTRA== X-Received: by 2002:a5d:6103:0:b0:317:53e7:d7c2 with SMTP id v3-20020a5d6103000000b0031753e7d7c2mr985226wrt.11.1692431151248; Sat, 19 Aug 2023 00:45:51 -0700 (PDT) Received: from localhost (cpc1-brnt4-2-0-cust862.4-2.cable.virginm.net. [86.9.131.95]) by smtp.gmail.com with ESMTPSA id y15-20020adff6cf000000b0031759e6b43fsm5267536wrp.39.2023.08.19.00.45.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Aug 2023 00:45:50 -0700 (PDT) To: GNU Binutils Cc: Mike Frysinger , Linux OpenRISC , Stafford Horne Subject: [PATCH] sim: or1k: Eliminate dangerous RWX load segments Date: Sat, 19 Aug 2023 08:45:18 +0100 Message-Id: <20230819074518.2253226-1-shorne@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Stafford Horne via Binutils From: Stafford Horne Reply-To: Stafford Horne Errors-To: binutils-bounces+patchwork=sourceware.org@sourceware.org Sender: "Binutils" This fixes test failures caused by the new linker warning which report: ./ld/ld-new: warning: load.S.x has a LOAD segment with RWX permissions Fix this by splitting the linker MEMORY into ram and rom to avoid generating RWX sections. This required tests to be adjusted to fix issues with the move. Namely: - fpu tests: were incorrectly using l.ori with ha(anchor) which now that we pushed the anchor up in memory it exposes the bug. Update to used the correct l.movhi instruction instead. - adrp test: the test reports ram offset addresses, now that we have moved memory layout around a bit I adjusted the test output. Some padding is added before pi to show that the actual address of pi and the adrp page offset are not the same. Bug: https://sourceware.org/PR29957 --- sim/testsuite/or1k/adrp.S | 5 +++-- sim/testsuite/or1k/fpu-unordered.S | 2 +- sim/testsuite/or1k/fpu64a32-unordered.S | 2 +- sim/testsuite/or1k/fpu64a32.S | 2 +- sim/testsuite/or1k/or1k-test.ld | 7 ++++--- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/sim/testsuite/or1k/adrp.S b/sim/testsuite/or1k/adrp.S index eaddcb03885..192324c698e 100644 --- a/sim/testsuite/or1k/adrp.S +++ b/sim/testsuite/or1k/adrp.S @@ -17,9 +17,9 @@ # mach: or1k # output: report(0x00002064);\n -# output: report(0x00012138);\n +# output: report(0x0001a008);\n # output: report(0x00002000);\n -# output: report(0x00012000);\n +# output: report(0x0001a000);\n # output: report(0x00002000);\n # output: report(0x00014000);\n # output: report(0x00000000);\n @@ -32,6 +32,7 @@ .section .data .org 0x10000 .align 4 +pad: .quad 0 .type pi, @object .size pi, 4 pi: diff --git a/sim/testsuite/or1k/fpu-unordered.S b/sim/testsuite/or1k/fpu-unordered.S index 624aa0fe05d..a89172e37af 100644 --- a/sim/testsuite/or1k/fpu-unordered.S +++ b/sim/testsuite/or1k/fpu-unordered.S @@ -57,7 +57,7 @@ start_tests: * r13 e as float * r16 nan as float */ - l.ori r11, r0, ha(anchor) + l.movhi r11, ha(anchor) l.addi r11, r11, lo(anchor) l.lwz r12, 0(r11) diff --git a/sim/testsuite/or1k/fpu64a32-unordered.S b/sim/testsuite/or1k/fpu64a32-unordered.S index e0ae6e770d1..51d915e4e75 100644 --- a/sim/testsuite/or1k/fpu64a32-unordered.S +++ b/sim/testsuite/or1k/fpu64a32-unordered.S @@ -58,7 +58,7 @@ start_tests: * r14,r15 e as double * r16,r17 nan as double */ - l.ori r11, r0, ha(anchor) + l.movhi r11, ha(anchor) l.addi r11, r11, lo(anchor) l.lwz r12, 0(r11) l.lwz r13, 4(r11) diff --git a/sim/testsuite/or1k/fpu64a32.S b/sim/testsuite/or1k/fpu64a32.S index 71b72b7761c..6ea60b28cf2 100644 --- a/sim/testsuite/or1k/fpu64a32.S +++ b/sim/testsuite/or1k/fpu64a32.S @@ -98,7 +98,7 @@ start_tests: * r14,r15 e as double * r16,r17 a long long */ - l.ori r11, r0, ha(anchor) + l.movhi r11, ha(anchor) l.addi r11, r11, lo(anchor) l.lwz r12, 0(r11) l.lwz r13, 4(r11) diff --git a/sim/testsuite/or1k/or1k-test.ld b/sim/testsuite/or1k/or1k-test.ld index f1535daeabd..c26ecaf3f23 100644 --- a/sim/testsuite/or1k/or1k-test.ld +++ b/sim/testsuite/or1k/or1k-test.ld @@ -20,8 +20,9 @@ MEMORY /* The exception vectors actually start at 0x100, but if you specify that address here, the "--output-target binary" step will start from address 0 with the contents meant for address 0x100. */ - exception_vectors : ORIGIN = 0 , LENGTH = 8K - ram : ORIGIN = 8K, LENGTH = 2M - 8K + exception_vectors : ORIGIN = 0 , LENGTH = 8K + rom : ORIGIN = 8K, LENGTH = 40K + ram : ORIGIN = 40K, LENGTH = 2M - 40K } SECTIONS @@ -37,7 +38,7 @@ SECTIONS *(.text.*) *(.rodata) *(.rodata.*) - } > ram + } > rom .data : {