From patchwork Sat Mar 23 17:32:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Bugaev X-Patchwork-Id: 87579 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 08D4E3858289 for ; Sat, 23 Mar 2024 17:36:39 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by sourceware.org (Postfix) with ESMTPS id C04A13858D39 for ; Sat, 23 Mar 2024 17:35:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C04A13858D39 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C04A13858D39 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711215313; cv=none; b=UAFMPWwI0XM2sCdZvVyyTxTFjy5srozcfoOG9z2d4OPMcjvh5i1UEEemFIkajAeh8/iUx/pb2U9G3B9AGAnXQuESRCvzbWIdjYVgiLskiDtLM6+ZaiRqI91tmTm5ufrIGmJhGoct+6NMOgbEDX6/BGfNetCSwLh+XfVzRQnAKHs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711215313; c=relaxed/simple; bh=ua2wrkWzr0DgDlTg/wgwK5vGhR9205yQahEdFrp+Ve0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Ie88M4b9fkSPkFTcY5k8v7BzMdZcsL1XtDb/bNSz3jijUW8BpBx2P5FF2KA7b7uR7NaCfCGNNujIMMysKb49/akSQysaVfW5Vg5THZa5s/KVVwzqKWjBFjaSG3Mip0V54sTwtpGheKgF830P5eilTiN7TjnvM/XnR+72iS28Rcg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-513e6777af4so5750269e87.2 for ; Sat, 23 Mar 2024 10:35:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711215310; x=1711820110; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Tg6zA1YDwVH8kmndOT/FzNmiZJsApfw7Akk/QmBE5S4=; b=QKaZZ+Otlw03dX+Pa2c8USGwvWW+abJr5ssT8nyEoNfOT4tFJy04i/MNJ9I8CeLUgx sLIeVsYZV9G5Y2iEzdO5eZR4erObkuZ9mvlX5BfWalvGphZ8ofCopCiublEmkB5Np8Mi KLjRvwzb8lgBOR8WdHQNyUPSvNQFE0Unm+I1IFPyg4ZZi9Y6UaywPJK1L9imO0l4opVh 0Tz9Q32zWTpcPHnYdIeiBmMrfoWpwiLa8TU22bHaQ34ozxNiie3Ll6vqnumAQGkEq2zm VbOhfoTLk+Y3eVtxJ5KlyI5TOdrraJozrPHveDKi3fKMOJq2ZsdSx1L1A9pBojn8pQ6t H7dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711215310; x=1711820110; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Tg6zA1YDwVH8kmndOT/FzNmiZJsApfw7Akk/QmBE5S4=; b=upsURIuYLgnv0IJ54S8cy/4ojXOHCKg+cyzKK9NOOpRycv9klt3PctWjAZxBEopeG5 ztE05/PJv7dp8TS9ZYmj8Jl/BLgMWsC3xMvUshmvDzL3Xm+wk9v9LzgT+d3s0jAM/NZL r0MovflA6B97KLBmUUdU+G6VVL8Vql1+4eHJrwV96qHLHyN2K24Gv/dxTr0Sm9esAPW4 BccJ3xUlQHqBsfkppHgUpKNxj2ttGtSz0l9oyXundNvvGODDPFnpGkDod4hIg//+19gR v7iHf/s8IuK/5rfTZLtuEDtrZyA+J424HSjtBxUY1ECruYYBvtITu7iU/O6wO2xDauEa joPw== X-Gm-Message-State: AOJu0YwwWgaoRjbzjIZBL/Emnu74V2cLK7Yrvz20dUOu05zmmuNbkLd+ u3NpCHLMYH3l4v7z2AhYUrEK61yrGf66cBHxajKbMiEW1KCqxfT6bfSAmtgq X-Google-Smtp-Source: AGHT+IHYLGpUg9r7OrgHCG2q+pnquh/BwBSRUsszgjBtkspdYqA0VesB8TQ6Q+flwFbguXdSmilvRQ== X-Received: by 2002:a05:6512:3106:b0:513:e7cc:97fc with SMTP id n6-20020a056512310600b00513e7cc97fcmr2049650lfb.49.1711215309848; Sat, 23 Mar 2024 10:35:09 -0700 (PDT) Received: from surface-pro-6.. (79-139-171-253.dynamic.spd-mgts.ru. [79.139.171.253]) by smtp.gmail.com with ESMTPSA id g20-20020ac25394000000b00513973dee6fsm361290lfh.150.2024.03.23.10.35.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Mar 2024 10:35:09 -0700 (PDT) From: Sergey Bugaev To: libc-alpha@sourceware.org, bug-hurd@gnu.org Cc: Maxim Kuvyrkov , Luca Subject: [PATCH v2 04/20] hurd: Disable Prefer_MAP_32BIT_EXEC on non-x86_64 for now Date: Sat, 23 Mar 2024 20:32:45 +0300 Message-ID: <20240323173301.151066-5-bugaevc@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240323173301.151066-1-bugaevc@gmail.com> References: <20240323173301.151066-1-bugaevc@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-9.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, 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: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org While we could support it on any architecture, the tunable is currently only defined on x86_64. Signed-off-by: Sergey Bugaev --- sysdeps/mach/hurd/dl-sysdep.c | 2 +- sysdeps/mach/hurd/mmap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index 43129a1e..6ba00e41 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -457,7 +457,7 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset) if (prot & PROT_EXEC) vmprot |= VM_PROT_EXECUTE; -#ifdef __LP64__ +#ifdef __x86_64__ if ((addr == NULL) && (prot & PROT_EXEC) && HAS_ARCH_FEATURE (Prefer_MAP_32BIT_EXEC)) flags |= MAP_32BIT; diff --git a/sysdeps/mach/hurd/mmap.c b/sysdeps/mach/hurd/mmap.c index 7b945610..30e369f0 100644 --- a/sysdeps/mach/hurd/mmap.c +++ b/sysdeps/mach/hurd/mmap.c @@ -60,7 +60,7 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset) copy = ! (flags & MAP_SHARED); anywhere = ! (flags & MAP_FIXED); -#ifdef __LP64__ +#ifdef __x86_64__ if ((addr == NULL) && (prot & PROT_EXEC) && HAS_ARCH_FEATURE (Prefer_MAP_32BIT_EXEC)) flags |= MAP_32BIT;