From nobody Thu Feb 12 23:03:18 2026 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D7C01B21A6 for ; Fri, 3 Jan 2025 06:56:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735887399; cv=none; b=mSbenLYKhmNaTK45epunWfkrfdnUezd59BR6HiLr9VwPdx40LGpkDIcKL3OpkBuve1S9ZhRBbfjh0bz2c8q8ua5zRAOI+p1SZDZ/hDWAalKcUZ5BSqYFVY2cxuwdt215a4O6QF0kggGfVe9T5d/lMzc8inP2SUDPB6qJwOg1LaM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735887399; c=relaxed/simple; bh=7UoUEY8flwbDchCCDgFaQ6zPv6qQGAFDR9lKVSDprVM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=iE0Le8m2dhzucA/b1UrYGPKEMiYUdRZOAGig8FfZxdYwZFBP5so+L8MQYbX4HMiVN5pEuM41J7CMk/Al8lVxfoQH0NzhaA4ABCYHyUv7mKv7riletv7VANvefDiPEn9KRub+/woYHsogLnjStGknr9Fr6i+yCxoAQo+Zux2aMJs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=Bol9bpBL; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=Bol9bpBL; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="Bol9bpBL"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="Bol9bpBL" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 243F31F74A; Fri, 3 Jan 2025 06:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1735887395; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mI1bNKomd+67r7e+svLS74/8cOvAvNFlNHVmmPK2+vk=; b=Bol9bpBLgr9f3XcxLtaZ8BVIjIBNlF+jJJeFowaNlbSkhGPcHt/C76DUAY2OgNmlEi7uVv hrqOSIW2BDQCJo3kyPmP+4cnK8G9Wl4fEUTMSuV3NjtBC4rsQ0x9P6jnWdVgb19yVDcBCN 5WZtAQZIhxDSCpdXdj+Pup4PDdSrZPc= Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=Bol9bpBL DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1735887395; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mI1bNKomd+67r7e+svLS74/8cOvAvNFlNHVmmPK2+vk=; b=Bol9bpBLgr9f3XcxLtaZ8BVIjIBNlF+jJJeFowaNlbSkhGPcHt/C76DUAY2OgNmlEi7uVv hrqOSIW2BDQCJo3kyPmP+4cnK8G9Wl4fEUTMSuV3NjtBC4rsQ0x9P6jnWdVgb19yVDcBCN 5WZtAQZIhxDSCpdXdj+Pup4PDdSrZPc= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id BEC5E13418; Fri, 3 Jan 2025 06:56:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id +M/ZLCKKd2c2agAAD6G6ig (envelope-from ); Fri, 03 Jan 2025 06:56:34 +0000 From: Juergen Gross To: linux-kernel@vger.kernel.org, x86@kernel.org Cc: Juergen Gross , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH] x86/execmem: fix ROX cache usage in Xen PV guests Date: Fri, 3 Jan 2025 07:56:31 +0100 Message-ID: <20250103065631.26459-1-jgross@suse.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 243F31F74A X-Spam-Score: -3.51 X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.51 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FUZZY_BLOCKED(0.00)[rspamd.com]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_SEVEN(0.00)[11]; DKIM_TRACE(0.00)[suse.com:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:dkim,suse.com:mid,suse.com:email] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Flag: NO X-Spam-Level: The recently introduced ROX cache for modules is assuming large page support in 64-bit mode without testing the related feature bit. This results in breakage when running as a Xen PV guest, as in this mode large pages are not supported. Fix that by testing the X86_FEATURE_PSE capability when deciding whether to enable the ROX cache. Fixes: 2e45474ab14f ("execmem: add support for cache of large ROX pages") Reported-by: Marek Marczykowski-G=C3=B3recki Tested-by: Marek Marczykowski-G=C3=B3recki Signed-off-by: Juergen Gross --- arch/x86/mm/init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index c6d29f283001..62aa4d66a032 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -1080,7 +1080,8 @@ struct execmem_info __init *execmem_arch_setup(void) =20 start =3D MODULES_VADDR + offset; =20 - if (IS_ENABLED(CONFIG_ARCH_HAS_EXECMEM_ROX)) { + if (IS_ENABLED(CONFIG_ARCH_HAS_EXECMEM_ROX) && + cpu_feature_enabled(X86_FEATURE_PSE)) { pgprot =3D PAGE_KERNEL_ROX; flags =3D EXECMEM_KASAN_SHADOW | EXECMEM_ROX_CACHE; } else { --=20 2.43.0