Received: by 2002:ab2:715a:0:b0:1fd:c064:50c with SMTP id l26csp91690lqm; Mon, 10 Jun 2024 13:49:48 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWTJHr336YTJlE5L5Pp9AI7xEUgJqwRk9DO3wuWArScJvDSEnozIByIz/YXriLUiVSjCz6T7RzWWSu+hIVWhNCiHPIHpKjbkIVczK6FSQ== X-Google-Smtp-Source: AGHT+IHaD1bKtL0HJBc5lV2x5AwjkdVi5ubExXYptDbVhCqCPzcZEyFyiOhrrfcmme0neCwTyqEx X-Received: by 2002:a05:620a:25d2:b0:792:cd45:8e2b with SMTP id af79cd13be357-7953c72bdb9mr1242349285a.78.1718052588358; Mon, 10 Jun 2024 13:49:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718052588; cv=pass; d=google.com; s=arc-20160816; b=E3wqvHg5PvYchF715FMNc7baLLAHqDITwZ/psBqQQKXnDea9lDDwxciUKdgv/d+ZUp zdF58vKxKuDxTQWnxwGitxv9nj2/0hL1Kto1xJNcSdbJPyJdJ+EUMc4zcXcE8SnQSmDc 01VV7/2VEqcGCXWwD5mGmuDWag7vRr998T1aRazVWcqGdRysbUu9leELa+Pb4BkWLyyw p0QJVzYFKrAGQgmAgHx4eM1Thv/x1YRsl+WTd6DXTvfJRHa5lVRi3C2yw1Itl+xwZ7Mq P2H3MkJYP8joXpZuPH0eN1Q4wrUuKlHIrli7rc+wOw8C3gaertpWOnuVukQFs54OvSzU vf0A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=0iU5zmVbhgxT4dsRxaiKfwBHkM4BLg/GO4Fb9WoHbvk=; fh=gOiB6O4qTz0lnjzVhoJ4fPMl6n+fqzmQ+latPH+Ar/Q=; b=gyvWw8tl0iavCfU/hsKvABk+g2XbmQz93PnRTTIxaaLd3K84a9Tvjv6J1XhIDh6TxJ BST9XrimBJFGIWp5f7VOP2gxCUcRUchUv9a30IFS+bju0knuSQO1HXdHJi9OphHP/v+W u4Ghch6CV350Fray+BY0JlS4esiLuzPt/VjKPD1/cnzT0EMyDKagqqBE4hp/OWrX7+2i gY7848p4LRO/UA5KfWBvERbWGWDs+42ksHqYL0zCtOybly/E7l74p3xZP68qqEIF+ufO TyNecOo1FIhEkXSIdivw9QOJrmjtg8yRA0MjQK9WUPnk2/5aMGWF/A5yoo36VXUGsuVy ALcA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=korg header.b=JiH6A5U0; arc=pass (i=1 dkim=pass dkdomain=linux-foundation.org); spf=pass (google.com: domain of linux-kernel+bounces-208882-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-208882-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id d75a77b69052e-44057324bc8si63233221cf.95.2024.06.10.13.49.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jun 2024 13:49:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-208882-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@linux-foundation.org header.s=korg header.b=JiH6A5U0; arc=pass (i=1 dkim=pass dkdomain=linux-foundation.org); spf=pass (google.com: domain of linux-kernel+bounces-208882-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-208882-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id D9D0B1C22D4B for ; Mon, 10 Jun 2024 20:49:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5191814F135; Mon, 10 Jun 2024 20:48:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="JiH6A5U0" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 79A2014D6E4; Mon, 10 Jun 2024 20:48:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718052531; cv=none; b=h5RdNCTI32Nhqa34XakL4twgKnQOFtQZnDI4jgUXs3hntuhlBXJaZvgKQQAuGojJa0boH0odxO1xek9/KGrkfkWyYDK9/Ia3kJ9AA8bwbkjMG81xBkTco7p+Mnz04P+hdkuxFMh2FTioysKfRffVzkZ6olIvx1rXl14on/VIsJ8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718052531; c=relaxed/simple; bh=qEWhUwOtY4dP2oKEOdCg3gFZW6ZZXNIFIaLC2/7lZ38=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FaLzT9OIYcy0PZDWpA+ASm5FZd+CseCksekHT7fux31YZlvngmVKkFqdNdtmPrQXqS4a7eJ+pQUBRBlWmTYMtVuWGhsELXj+f91dUtW5AQaCPcpl4XgnPu1XXXba+zCEq89m/kInVrO4VzMAd05iB7pZ5MF23Nszenkt2G6eIpk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=JiH6A5U0; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0984C2BBFC; Mon, 10 Jun 2024 20:48:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1718052531; bh=qEWhUwOtY4dP2oKEOdCg3gFZW6ZZXNIFIaLC2/7lZ38=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JiH6A5U0arD1NhlbdfpjK8+SD3NECg/OLaKv9RnBd5T4AY15CPLPBn42T6GSAQYe0 huRV6nMOULL9ce93ox3iDF9DgMHNhwPGXHnXzZuoAnF9gMVEKsa6esEKLrVWVk74Q7 1anFZ5tXKEpPNvsXPKCh2bUP4fB3HkiBWds2d1Io= From: Linus Torvalds To: Peter Anvin , Ingo Molnar , Borislav Petkov , Thomas Gleixner , Rasmus Villemoes , Josh Poimboeuf , Catalin Marinas , Will Deacon Cc: Linux Kernel Mailing List , the arch/x86 maintainers , linux-arm-kernel@lists.infradead.org, linux-arch , Linus Torvalds Subject: [PATCH 3/7] x86: add 'runtime constant' support Date: Mon, 10 Jun 2024 13:48:17 -0700 Message-ID: <20240610204821.230388-4-torvalds@linux-foundation.org> X-Mailer: git-send-email 2.45.1.209.gc6f12300df In-Reply-To: <20240610204821.230388-1-torvalds@linux-foundation.org> References: <20240610204821.230388-1-torvalds@linux-foundation.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This implements the runtime constant infrastructure for x86, allowing the dcache d_hash() function to be generated using as a constant for hash table address followed by shift by a constant of the hash index. Signed-off-by: Linus Torvalds --- arch/x86/include/asm/runtime-const.h | 61 ++++++++++++++++++++++++++++ arch/x86/kernel/vmlinux.lds.S | 3 ++ 2 files changed, 64 insertions(+) create mode 100644 arch/x86/include/asm/runtime-const.h diff --git a/arch/x86/include/asm/runtime-const.h b/arch/x86/include/asm/runtime-const.h new file mode 100644 index 000000000000..24e3a53ca255 --- /dev/null +++ b/arch/x86/include/asm/runtime-const.h @@ -0,0 +1,61 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_RUNTIME_CONST_H +#define _ASM_RUNTIME_CONST_H + +#define runtime_const_ptr(sym) ({ \ + typeof(sym) __ret; \ + asm_inline("mov %1,%0\n1:\n" \ + ".pushsection runtime_ptr_" #sym ",\"a\"\n\t" \ + ".long 1b - %c2 - .\n\t" \ + ".popsection" \ + :"=r" (__ret) \ + :"i" ((unsigned long)0x0123456789abcdefull), \ + "i" (sizeof(long))); \ + __ret; }) + +// The 'typeof' will create at _least_ a 32-bit type, but +// will happily also take a bigger type and the 'shrl' will +// clear the upper bits +#define runtime_const_shift_right_32(val, sym) ({ \ + typeof(0u+(val)) __ret = (val); \ + asm_inline("shrl $12,%k0\n1:\n" \ + ".pushsection runtime_shift_" #sym ",\"a\"\n\t" \ + ".long 1b - 1 - .\n\t" \ + ".popsection" \ + :"+r" (__ret)); \ + __ret; }) + +#define runtime_const_init(type, sym) do { \ + extern s32 __start_runtime_##type##_##sym[]; \ + extern s32 __stop_runtime_##type##_##sym[]; \ + runtime_const_fixup(__runtime_fixup_##type, \ + (unsigned long)(sym), \ + __start_runtime_##type##_##sym, \ + __stop_runtime_##type##_##sym); \ +} while (0) + +/* + * The text patching is trivial - you can only do this at init time, + * when the text section hasn't been marked RO, and before the text + * has ever been executed. + */ +static inline void __runtime_fixup_ptr(void *where, unsigned long val) +{ + *(unsigned long *)where = val; +} + +static inline void __runtime_fixup_shift(void *where, unsigned long val) +{ + *(unsigned char *)where = val; +} + +static inline void runtime_const_fixup(void (*fn)(void *, unsigned long), + unsigned long val, s32 *start, s32 *end) +{ + while (start < end) { + fn(*start + (void *)start, val); + start++; + } +} + +#endif diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 3509afc6a672..6e73403e874f 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -357,6 +357,9 @@ SECTIONS PERCPU_SECTION(INTERNODE_CACHE_BYTES) #endif + RUNTIME_CONST(shift, d_hash_shift) + RUNTIME_CONST(ptr, dentry_hashtable) + . = ALIGN(PAGE_SIZE); /* freed after init ends here */ -- 2.45.1.209.gc6f12300df