From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99CD1C3DA6E for ; Wed, 3 Jan 2024 16:01:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2AB096B0330; Wed, 3 Jan 2024 11:01:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 25AC66B0336; Wed, 3 Jan 2024 11:01:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0D4F26B0337; Wed, 3 Jan 2024 11:01:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E7E2B6B0330 for ; Wed, 3 Jan 2024 11:01:23 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 7445F40943 for ; Wed, 3 Jan 2024 16:01:23 +0000 (UTC) X-FDA: 81638464446.30.7C70AC6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf29.hostedemail.com (Postfix) with ESMTP id 3255012002D for ; Wed, 3 Jan 2024 16:01:18 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YB0a5Bgb; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf29.hostedemail.com: domain of leobras@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=leobras@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704297679; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pGw3FQc0MsxvF9cxW/ZiV7CdITqr1kZ41Lg1YYp8Ods=; b=5pNss1+BhjKqcwu+t7jM+P7GGl4OW/MChH4lmrphNF2GCSN9ZcZPrQseBL7dv6vx64nNOF XAdIX+7B6kEPyBrgxxklP4EfxJ6jASgrAyZ9NVdq7zyX4SnByvGZSmdeA3ijYpBK4KhHGS 442H6G39qcrLfhc1BuzFPwnpf2H5abE= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=YB0a5Bgb; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf29.hostedemail.com: domain of leobras@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=leobras@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704297679; a=rsa-sha256; cv=none; b=uh8qExRdmk2nDx1/yCO63ZbgAoyppKybKLnFbzW7Sblyi+1Vq2FgPhmBGLMcR+L4XdffW8 aJpECvEjtvVnFrRetIYmC//S9WcXLlrCnNxb7BR5ljUJpfun2eG9CJ2L/tF640m/Fanaef qX+2oTYkalOAWgUDqq3cJsPAEcJVRE4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704297678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pGw3FQc0MsxvF9cxW/ZiV7CdITqr1kZ41Lg1YYp8Ods=; b=YB0a5BgbYGzWkaJctlUt/qkqpTsLztxXCb79hR5TFAknYDEBgr2cLvsFeEPhQ/B8pyIu0K 6bw5wWRYM05KB8Ob6GVYbdFWg6qr23ElYGhH70V2fD3HHOsdipkFBoaeH+lNvoEh5ZV+Ww 6I2eCiJqIoD6Iz/jReoMX+BPCeY/g4o= Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-606-7Iuy6uoTMcGnzqXaIjyAaw-1; Wed, 03 Jan 2024 11:01:16 -0500 X-MC-Unique: 7Iuy6uoTMcGnzqXaIjyAaw-1 Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-28bbe965866so6292805a91.3 for ; Wed, 03 Jan 2024 08:01:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704297673; x=1704902473; 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=pGw3FQc0MsxvF9cxW/ZiV7CdITqr1kZ41Lg1YYp8Ods=; b=pHRaBU3zauVZMyG4BdkIRTzZi02ieWRRFihwdt6HwgkozwUBVwgEVqm5tlrszbomkW hfryahNimM27LzAUpe6hjJL2yAh8CEUdzIA8GAqj4ys/c7zB4rSHsWkLmxoxkD7rYH9b ikcAyVdgkB6cSwWGgLncyOocii+IaFiHEShJYxp5GGoMcanqhjbhF6FU9OwtNLbGJSae vAAWjKsxu4194pkZAGix6G//hEejpz15cWXGvRh3L6Odd7OU7VdM6ApmE8wzn8vxg+OA QOoidNWYleG+wjn+2lCWdWinr0Kdddv9grMpNPLDN04deO4NhDsgFwBkR1zI3hyGZkEF H/jQ== X-Gm-Message-State: AOJu0YzwXrq24rsaxOfOHqnuQIpwFkto+mxdC1EDP1NSRXaKwsak6I2S uWaV7KzXTi65UJIAOmCnRDk9PrM0zhoDt8SOmay7xQk25wktanIgc+S9frdwqp6/Yu0JmxR0gyV e+vfjZjUSOwBlk+4ehsk= X-Received: by 2002:a17:90b:4f82:b0:28b:cf7f:3f17 with SMTP id qe2-20020a17090b4f8200b0028bcf7f3f17mr6279170pjb.77.1704297673437; Wed, 03 Jan 2024 08:01:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IE2RComsIUtAWCzXZpT7ImLMVrEUH4zz96VXv/Gywk03MIGNb3i0+fYpKYCJQlz+rbFDL1dHg== X-Received: by 2002:a17:90b:4f82:b0:28b:cf7f:3f17 with SMTP id qe2-20020a17090b4f8200b0028bcf7f3f17mr6279141pjb.77.1704297672832; Wed, 03 Jan 2024 08:01:12 -0800 (PST) Received: from localhost.localdomain ([2804:431:c7ec:911:6911:ca60:846:eb46]) by smtp.gmail.com with ESMTPSA id qc8-20020a17090b288800b0028b1fce7c01sm1922253pjb.37.2024.01.03.08.01.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jan 2024 08:01:12 -0800 (PST) From: Leonardo Bras To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Eric Biederman , Kees Cook , Oleg Nesterov , Leonardo Bras , Guo Ren , Andy Chiu , Conor Dooley , Xiao Wang , Vincent Chen , Charlie Jenkins , Greg Ungerer , Andrew Morton , Kemeng Shi , Alexandre Ghiti , David Hildenbrand , "Matthew Wilcox (Oracle)" , Qinglin Pan , Greentime Hu , Baoquan He , =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v1 3/5] riscv: add compile-time test into is_compat_task() Date: Wed, 3 Jan 2024 13:00:21 -0300 Message-ID: <20240103160024.70305-5-leobras@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240103160024.70305-2-leobras@redhat.com> References: <20240103160024.70305-2-leobras@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Queue-Id: 3255012002D X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: a3n3yfosz7z9ntyb4xe3oyugygofw3ac X-HE-Tag: 1704297678-461722 X-HE-Meta: U2FsdGVkX1+0Frhzi9luQIBI2/stEs4NTtQlZJ0KeWc7MHF8EIxm6tfQyba0eZhgpNOYstUKq33fDgaCX0bSvFesQPDo70jRFfU2OTxiRd03uB6lFEiL2WCBBa909qMHqg8DXNGZMp9Dm6RTk7Xub/m4U8lQbttYTbI6RVUOBCYCqNR9vklyU4B6hizOtqRNv40qdBbULMkyEKX1+7WoHRdex9GhAV6wZEsUKFNd6gqu1ALf2a4eSYoiYPb4wzvqrWFigBPTCjhWXXIaidDrAJOXKFzoinIBwvURAtODbbqknlCaIkxLiZztJUDC0QxgB+K6yfRWGirnijgpmAvNboLPEIHA5PvEK2Ujgn13bJ32f7HNrXjvgorPwFev9D1M0iA1wZ6xG+UkNEbSS73PBlvru1sFcciyIRnUy2Gv/wwfm+TEDc4UVzWf7EluJ0gPfXivJG9XX45ZBiRzNWVPkaN4cFJItGBibgkOMF7GKNYPrMiInZzaSDMhxHzrlxkNjUB5Q+NaeBTSDu5/t8s1Hm2mcuJeXQO0TdoT9EYEDxf/80COrUTIIH+xjql1Vonfo0R/OOJP5YckRO6RGWfUTuYM9ZXVjer1uCSyxCLlwtQUa617lrBMalP2JUXMCjqAlPCxMknv4gr2tdi/ouDMH0lHYDB2VzeGw1hnbMAe/KRS0PiV9A8JYV0eAonbYIb9JfsHsSV8JePfLwFKvsYYFMzFUUOXak6gWJVBi8FAgHTBGTCD7HcQ1U156j0HQx96hQm4BzoGcJ0+15uKPa6kWfwzLxYJBPIHXj2BJubxWsMm0qWyXJ28Ozcl7le3eMnNG1EuMJXmQKvzsQni2dZzmljKvXcciRPB4PZbMRoyub67h0qEF0MYEDWG6rM+fkqXZlJdV0MFUXnrjEEP+PsJoZ3AvZb7L05pgZbTBxQC+0YSm1K4gNK+Bvnp1Gc6XgdkJhz5mvUmnaOHTI6oemU 11gUZGyC vw37ihsTdcqu6juOF01b/APAuVUJN7BxSiV0zNqyyzeUGL1hSCmOwZ9srIrnZ18jT/6WZOUUjq+Wol4DG8cLQ809+rvzocNHu5o9fVwGDzv1RX4AkcbQck+/trorCXr06dKvafqNDMu5Ty2g= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Currently several places will test for CONFIG_COMPAT before testing is_compat_task(), probably in order to avoid a run-time test into the task structure. Since is_compat_task() is an inlined function, it would be helpful to add a compile-time test of CONFIG_COMPAT, making sure it always returns zero when the option is not enabled during the kernel build. With this, the compiler is able to understand in build-time that is_compat_task() will always return 0, and optimize-out some of the extra code introduced by the option. This will also allow removing a lot #ifdefs that were introduced, and make the code more clean. Signed-off-by: Leonardo Bras Reviewed-by: Guo Ren Reviewed-by: Andy Chiu --- arch/riscv/include/asm/compat.h | 3 +++ arch/riscv/include/asm/elf.h | 4 ---- arch/riscv/include/asm/pgtable.h | 6 ------ arch/riscv/include/asm/processor.h | 4 ++-- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/arch/riscv/include/asm/compat.h b/arch/riscv/include/asm/compat.h index 2ac955b51148f..91517b51b8e27 100644 --- a/arch/riscv/include/asm/compat.h +++ b/arch/riscv/include/asm/compat.h @@ -14,6 +14,9 @@ static inline int is_compat_task(void) { + if (!IS_ENABLED(CONFIG_COMPAT)) + return 0; + return test_thread_flag(TIF_32BIT); } diff --git a/arch/riscv/include/asm/elf.h b/arch/riscv/include/asm/elf.h index 59a08367fddd7..2e88257cafaea 100644 --- a/arch/riscv/include/asm/elf.h +++ b/arch/riscv/include/asm/elf.h @@ -53,13 +53,9 @@ extern bool compat_elf_check_arch(Elf32_Ehdr *hdr); #define ELF_ET_DYN_BASE ((DEFAULT_MAP_WINDOW / 3) * 2) #ifdef CONFIG_64BIT -#ifdef CONFIG_COMPAT #define STACK_RND_MASK (is_compat_task() ? \ 0x7ff >> (PAGE_SHIFT - 12) : \ 0x3ffff >> (PAGE_SHIFT - 12)) -#else -#define STACK_RND_MASK (0x3ffff >> (PAGE_SHIFT - 12)) -#endif #endif /* diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 1d472b31e0cfe..ea5b269be223a 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -127,16 +127,10 @@ #define VA_USER_SV48 (UL(1) << (VA_BITS_SV48 - 1)) #define VA_USER_SV57 (UL(1) << (VA_BITS_SV57 - 1)) -#ifdef CONFIG_COMPAT #define MMAP_VA_BITS_64 ((VA_BITS >= VA_BITS_SV48) ? VA_BITS_SV48 : VA_BITS) #define MMAP_MIN_VA_BITS_64 (VA_BITS_SV39) #define MMAP_VA_BITS (is_compat_task() ? VA_BITS_SV32 : MMAP_VA_BITS_64) #define MMAP_MIN_VA_BITS (is_compat_task() ? VA_BITS_SV32 : MMAP_MIN_VA_BITS_64) -#else -#define MMAP_VA_BITS ((VA_BITS >= VA_BITS_SV48) ? VA_BITS_SV48 : VA_BITS) -#define MMAP_MIN_VA_BITS (VA_BITS_SV39) -#endif /* CONFIG_COMPAT */ - #else #include #endif /* CONFIG_64BIT */ diff --git a/arch/riscv/include/asm/processor.h b/arch/riscv/include/asm/processor.h index 2278e2a8362af..d2d7ce30baf3e 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -28,7 +28,7 @@ ({ \ unsigned long mmap_end; \ typeof(addr) _addr = (addr); \ - if ((_addr) == 0 || (IS_ENABLED(CONFIG_COMPAT) && is_compat_task())) \ + if ((_addr) == 0 || is_compat_task()) \ mmap_end = STACK_TOP_MAX; \ else if (((_addr) >= VA_USER_SV57) && (VA_BITS >= VA_BITS_SV57)) \ mmap_end = VA_USER_SV57; \ @@ -45,7 +45,7 @@ typeof(addr) _addr = (addr); \ typeof(base) _base = (base); \ unsigned long rnd_gap = DEFAULT_MAP_WINDOW - (_base); \ - if ((_addr) == 0 || (IS_ENABLED(CONFIG_COMPAT) && is_compat_task())) \ + if ((_addr) == 0 || is_compat_task()) \ mmap_base = (_base); \ else if (((_addr) >= VA_USER_SV57) && (VA_BITS >= VA_BITS_SV57)) \ mmap_base = VA_USER_SV57 - rnd_gap; \ -- 2.43.0