From patchwork Fri Dec 22 07:46:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonardo Bras X-Patchwork-Id: 13503068 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 3244DC46CD8 for ; Fri, 22 Dec 2023 07:46:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8B6486B007B; Fri, 22 Dec 2023 02:46:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 867506B007D; Fri, 22 Dec 2023 02:46:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 706756B007E; Fri, 22 Dec 2023 02:46:50 -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 5CD636B007B for ; Fri, 22 Dec 2023 02:46:50 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 307A840399 for ; Fri, 22 Dec 2023 07:46:50 +0000 (UTC) X-FDA: 81593672580.06.6B9A6B2 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf02.hostedemail.com (Postfix) with ESMTP id 3114C8000A for ; Fri, 22 Dec 2023 07:46:47 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=AVXG507g; spf=pass (imf02.hostedemail.com: domain of leobras@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=leobras@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703231208; 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=fChu8SySxAk9bR4FCWD8rViiukJB4FWPqrqCbBPM0wY=; b=h4Yx1C+zROjkGsHHAxNeJNB6uPoUwkwnZrjX26cF2aZAAkSRCNlDza5lbQgJUDc7pWo+JJ rlNhN3KVxQvGK/QykEKp9LhqBHbIi+rbb6XKfOuno4VmQxjwNtoxnN7qJGRPwicNlHmoN2 tx/1ACkwNuyKrkT3rCsfNhY6R/krtJ0= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=AVXG507g; spf=pass (imf02.hostedemail.com: domain of leobras@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=leobras@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703231208; a=rsa-sha256; cv=none; b=ufKR4kZWoRx2TT5QTc3/8lR+17z+rXF54ZGi+NNAnFwJjMTBXOgjQ9Xed93hZtnPia42bK 1n2z1YZvkNZXxlFspoejnV49iC0osKDQIg64vzvFOThLFi1ovA/lQf6o9smmaengl+xJJL fV+URXAo++Ca0yLisen7z5sxXxXlAN0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703231207; 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=fChu8SySxAk9bR4FCWD8rViiukJB4FWPqrqCbBPM0wY=; b=AVXG507gC4H453v00p+C3J6H37yhv2Y2m9Pkkcavp6V3a6s7YhfQkMyHlh/k4qHLTT3A+b vQ/ENfedxI30Q+5wJEOpa86yuv0Xn93vVJDFtVTSCuBcK4mb44Af05CbeOiXuzNgwSrhFR ta7NVER+Gwx9Llwrf1EV78j0qTVkt3E= Received: from mail-oi1-f200.google.com (mail-oi1-f200.google.com [209.85.167.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-523-Xn9PYzEkMtKQaEY6LUlvcQ-1; Fri, 22 Dec 2023 02:46:43 -0500 X-MC-Unique: Xn9PYzEkMtKQaEY6LUlvcQ-1 Received: by mail-oi1-f200.google.com with SMTP id 5614622812f47-3bb8a3e268cso444468b6e.1 for ; Thu, 21 Dec 2023 23:46:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703231202; x=1703836002; 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=fChu8SySxAk9bR4FCWD8rViiukJB4FWPqrqCbBPM0wY=; b=rmTJHKLx1iuRrZRQUlevbzXIpzdA0hOweTilGnLEtUyqu6/ENXjTcXggP519OUXSjO 7P0JksYRxG2dQGVgiW2knOaVHjLUUwBFqS7t0AKQGbhlVvCjsrhRTZjh8+CpcTRKdTld faWIi7ha496XmEQ793ooRL1Z6N7UATWuN0Cn9WFm/1dlIACnG+WJuJ0Cg+6PwXBiKSMg wrIKv93x4vhHDsBIPFVtwncMrLy2cRI/Kf6vcL6AJQZ1I7dEDhpGEGCr4KOX/RKa0wU5 kXgVmKxhFuH6jQpyNfSTQuQTJ/t+qo1PLaUxhEv5edYLnxbE8+J0wpGjGu1Z7TahOp56 W+gw== X-Gm-Message-State: AOJu0YxsdrgJB/AQLKaRXMAytXpxOLUFSgH9lyYLbvNAO/H9W6gorBh8 R34NmqdfLhZ92zx2knelghDhy+4ffr35JPsdmoY1GbmSCjvfKpb0u72ywM92+Ga61/yguN0Iopi CNGxQvATBY0Kmy9LcZ2E= X-Received: by 2002:a05:6808:199e:b0:3af:9838:8494 with SMTP id bj30-20020a056808199e00b003af98388494mr1174163oib.20.1703231202614; Thu, 21 Dec 2023 23:46:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IFfty2NP0/+vK/Z37DtQxU8NTNsz0hOUOMzPkaafOkXIkbGg41CPwcD8fDjKPqNGVFT8AzCRw== X-Received: by 2002:a05:6808:199e:b0:3af:9838:8494 with SMTP id bj30-20020a056808199e00b003af98388494mr1174135oib.20.1703231202376; Thu, 21 Dec 2023 23:46:42 -0800 (PST) Received: from localhost.localdomain ([2804:1b3:a802:7496:88a7:1b1a:a837:bebf]) by smtp.gmail.com with ESMTPSA id m2-20020a62f202000000b006d97eaba6cesm1527015pfh.21.2023.12.21.23.46.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 23:46:41 -0800 (PST) From: Leonardo Bras To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Eric Biederman , Kees Cook , Oleg Nesterov , Leonardo Bras , Conor Dooley , Andy Chiu , Greg Ungerer , Vincent Chen , Xiao Wang , Charlie Jenkins , Andrew Morton , Alexandre Ghiti , Kemeng Shi , David Hildenbrand , "Matthew Wilcox (Oracle)" , Qinglin Pan , Greentime Hu , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , =?utf-8?b?Q2zDqW1l?= =?utf-8?b?bnQgTMOpZ2Vy?= , Guo Ren Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH 2/4] riscv: add compile-time test into is_compat_task() Date: Fri, 22 Dec 2023 04:46:02 -0300 Message-ID: <20231222074605.452452-3-leobras@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231222074605.452452-1-leobras@redhat.com> References: <20231222074605.452452-1-leobras@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Rspamd-Queue-Id: 3114C8000A X-Rspam-User: X-Stat-Signature: cjmwx93zuzof87k4fc6ppma59nj31s7s X-Rspamd-Server: rspam01 X-HE-Tag: 1703231207-419980 X-HE-Meta: U2FsdGVkX1+UhGdBZaJCRBFTyg7x3t2rAd4uEKIlbnivK4jtrQptDF3+pUzpbBc2EjY+c1Cwk5j79LeEmWqzWr2SSkGgvyqNCS5yHdL+b7Do5Uu+I8S+AYvmZZWB65y8vMEYZAMpcChW12woxf7Tk/+nitY8RrSkkOFE+QkdJmJLu4lzRm81Ky7Bhxa+Zr/RMwbmTT/Pu2PfUgXCjhgiWsBChcAczo9trfSggwTQKz/s49zGMGO4EsfMjKhkqP4qcKF+C8UnxQM4iEeUUx3Rk2FJyS+N8ZWq0+AYb8/nMd46hiMgpmGHQQtnsr6p8g4JLDl9WB8hDsTPcTo8aeEaZuHbKZj06KrjvHyGcQ64ttgJFzGBKHA5vCprsAqqeKVJtBXKsvg8va4vnrpnKHKGKDAB1/gRzqfey0tTv9UFn6uLoz7jrebmwAApe4uxMunL5Yj0RHDediL1yVw8sxTbd+MoRaBQ4oY5fyiFSbL/jjoQzbnZos24e8ohWEF4AkHqOB+x/O6SE5pmm8fNhBltPWLWlI4xpEfKZYTanzw6TDf9fcVUUkIxN7u1hMzAF3asG8EQw/VHUAJRU900heKO9YhcqM5MjGJOeU+3tKJ2XCBBUtDQ8nAtdcM83vYPGbN/JVmtyCz16nv/UELCTysGQkemPLeAH0aiFwiuZTpxqYySD1bKs5PJbM6TLGcbQAXTv0gYMS2zD2lKDVkO/qej0Gc7AYsSx0HDFv41UUuGny7HEkwI9uW54t5h+Xi8FQ81gJJOJhwMgeyCX44GskRUou29aXuHLvX97s0PTMOfF/9Jl5/yGgTyqFknKaiQYI1ksWfApPRysR4x9F7dVPZPb5hxsqk3T3c8zxm6Xl3Vm5lwGV+YTpLsu9hfjQxm/LyBWYW9SdUTLhTJ5hxMV63zNTomuSQvhRgGYnBJ3nnJKbg0B+Cv3xazxm1Do9EVrnDoYFPKzBV1zcrA63vYqDv sjDca91n mSMAfa6RT8qFvqCE76/MUF8v12S5kjhALZOHQSmOzp0mblKfSp093f/rZlBigM6EtquC3GzqpBwyBB5lpVUXmvOXcTZHlynPkr88HjUJ4fMWkJbwbi8LEJT22gWYogV627bolTlsXdPM817I= 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 f19f861cda549..ed32e53e55999 100644 --- a/arch/riscv/include/asm/processor.h +++ b/arch/riscv/include/asm/processor.h @@ -22,7 +22,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) \ mmap_end = STACK_TOP_MAX; \ @@ -39,7 +39,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; \