Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 75EAD10E8 for ; Tue, 15 Mar 2022 00:10:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=eCpP1iW/jtoz0bKchozNJkBQv1g6tIp2uQhpL5P71Hg=; b=j1ean3W6r1CCv8EjVPLBCYaxbu WjTTFCLkKPRvRh72mTxTyhyp8VnRkj+i4s6+EJRPhWb2hSDJ+4bWAcd2Bsk+vC6u1TTkMVZ0N4PAH 16C6fsEQw7eqw8UY+dIMAFDaFsKzC7EgmjsTkZeA3905T3kW2SuMmjA9o1ZHK8KNTK+hRvu143/v0 J8/MLkgaXKtm4cA0+wiaNvNLgMvMbei8QdTckvRDH1o6T4qFZbhKfHJBygPjg2C4ebIMUeZYWveR3 Lu9SbbPUmEFvLRKsKRpNZZ4hfXrnClyrZ/bt+9G0LMaqY37hmdWEg7aTq4kb24DS2lMZTTyt5jRHM QQind9tg==; Received: from [2601:1c0:6280:3f0::aa0b] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nTum0-007GMw-93; Tue, 15 Mar 2022 00:10:48 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: patches@lists.linux.dev, Randy Dunlap , Igor Zhbanov , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , x86@kernel.org Subject: [PATCH] x86, amd: modify the control_va_addr_alignment __setup handler Date: Mon, 14 Mar 2022 17:10:45 -0700 Message-Id: <20220315001045.7680-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Clean up control_va_addr_alignment(): a. Make '=' required instead of optional (as documented). b. Print a warning if an invalid option value is used. c. Return 1 from the __setup handler when an invalid option value is used. This prevents the kernel from polluting init's (limited) environment space with the entire string. Fixes: dfb09f9b7ab0 ("x86, amd: Avoid cache aliasing penalties on AMD family 15h") Signed-off-by: Randy Dunlap Reported-by: Igor Zhbanov Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: "H. Peter Anvin" Cc: x86@kernel.org --- arch/x86/kernel/sys_x86_64.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) --- lnx-517-rc8.orig/arch/x86/kernel/sys_x86_64.c +++ lnx-517-rc8/arch/x86/kernel/sys_x86_64.c @@ -68,9 +68,6 @@ static int __init control_va_addr_alignm if (*str == 0) return 1; - if (*str == '=') - str++; - if (!strcmp(str, "32")) va_align.flags = ALIGN_VA_32; else if (!strcmp(str, "64")) @@ -80,11 +77,11 @@ static int __init control_va_addr_alignm else if (!strcmp(str, "on")) va_align.flags = ALIGN_VA_32 | ALIGN_VA_64; else - return 0; + pr_warn("invalid option value: 'align_va_addr=%s'\n", str); return 1; } -__setup("align_va_addr", control_va_addr_alignment); +__setup("align_va_addr=", control_va_addr_alignment); SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len, unsigned long, prot, unsigned long, flags,