From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.5]) (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 7A9283BED78; Mon, 21 Sep 2026 16:19:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.5 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790007573; cv=none; b=LNgJCdxNwmR13KVTlOvz9DctUwvdtX2rHgeF431l6+HRxJZJcqTfqBFPeczLQqSPm6MsXMBwhMS+Pz1R1cWpEfrLs6evbxmwgHFGCJQpYZGI+cqcVtZdj396oggFqpGsvJ858wvPDUjEvxbqJj3TW6W7WB5B3uID1UTwzcs3fxI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790007573; c=relaxed/simple; bh=887MquzIHSe/iEOnfLb6yCNYFWPX/CoUsvP1EJyQ5h8=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=neqxJ9zhhkTLfSFWdaGstK9495PpdVym/AXr7AeSGiZMQKlFPGZa3/SmdXOUFDM6KaHyxi2AJDyudmAC47zZwV0yQO4l2696stJo4Odw/6Uj6i3wRAPPl9Fod0Isz4IHShgwDWXGbQle6rmRoGR5yrIy/lJMcnoe88wn3TMUT/I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=j+hESakO; arc=none smtp.client-ip=192.198.163.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="j+hESakO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1790007570; x=1821543570; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=887MquzIHSe/iEOnfLb6yCNYFWPX/CoUsvP1EJyQ5h8=; b=j+hESakOZzYQHTocnIBgIDxKgGflOb/FsvJc2Sg1QZDjwPEtQytwo26x V/pEosWWtqqghrYkA3P0LQj8nM+zmX+SZXbVzbZ4JMhorek07fmchC+8A LHAS1AMSKZvuft36rlkIzruGG/txHNyevvpyhvMSoox4QsLGWTnjdELvL izCRHJ4pS/jWUo3vmfm/7LQ6S4SoNz/5G+IEY+kPrzFoSlwMRWLQ3SaB4 1VYfxhKUzG7bkNw+MxIYVucR7F/SkWatneY5r7hJ2UtBM5yT5tnDmZEIL eCToM6Rxdx/I+f9nV1T4W4OBzkyAFlQTS/S2DmV1ZlM2xdOTX9QSzuO9H A==; X-CSE-ConnectionGUID: YxfcYW0OS4SS6XGlHMgABA== X-CSE-MsgGUID: 3Bt+NmviRZKnjdkZesZxtA== X-IronPort-AV: E=McAfee;i="6800,10657,11912"; a="1043761" X-IronPort-AV: E=Sophos;i="6.27,115,1787036400"; d="scan'208";a="1043761" Received: from fmviesa012.fm.intel.com ([10.60.135.152]) by fmvoesa115.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2026 09:19:29 -0700 X-CSE-ConnectionGUID: tLmR9Ml+Sx+36mkelsPfCg== X-CSE-MsgGUID: Ymk9WNNWS32bFWMSP/oKtg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,115,1787036400"; d="scan'208";a="3705836" Received: from ssimmeri-mobl2.amr.corp.intel.com (HELO [10.125.109.204]) ([10.125.109.204]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2026 09:19:30 -0700 Message-ID: Date: Mon, 21 Sep 2026 09:19:29 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] x86/mm: don't apply va_align to hugetlb mappings on AMD F15h To: Laurent Wandrebeck , Borislav Petkov Cc: Thomas Gleixner , Ingo Molnar , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Oscar Salvador , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org References: <20260828135747.724789-1-l.wandrebeck@quelquesmots.fr> <3faecf65-7edb-4cec-be7a-e5266dd3a649@intel.com> <20260829174704.GAapMbGAZMwImcvIN7@fat_crate.local> <0B48BE2C-2E72-4961-91D9-35E215F537A9@quelquesmots.fr> <20260829185120.GBapMqKFM35KtL0Mod@fat_crate.local> <78225f07785ed89e0c3e5def8a8bb1a48e444322.camel@quelquesmots.fr> <20260916200247.GFaqr15333nu5IAfjU@fat_crate.local> <45dc4a4f62e49107de788b4be9a4039e0d772fa1.camel@quelquesmots.fr> Content-Language: en-US From: Dave Hansen Autocrypt: addr=dave.hansen@intel.com; keydata= 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 In-Reply-To: <45dc4a4f62e49107de788b4be9a4039e0d772fa1.camel@quelquesmots.fr> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 9/19/26 01:47, Laurent Wandrebeck wrote: > static unsigned long get_align_mask(struct file *filp) > { > - if (filp && is_file_hugepages(filp)) > + if (is_file_hugepages(filp)) > return huge_page_mask_align(filp); > /* handle 32- and 64-bit case with a single conditional */ > if (va_align.flags < 0 || !(va_align.flags & (2 - mmap_is_ia32()))) I'd just leave that hunk out for now. It's harmless to leave. > @@ -50,9 +50,13 @@ static unsigned long get_align_mask(struct file *filp) > * value before calling vm_unmapped_area() or ORed directly to the > * address. > */ > -static unsigned long get_align_bits(void) > +static unsigned long get_align_bits(struct file *filp) > { > - return va_align.bits & get_align_mask(NULL); > + /* hugetlb mappings must stay on the huge page boundary. */ > + if (is_file_hugepages(filp)) > + return 0; I don't find that comment helpful. The function is kinda misnamed a bit too. Maybe a comment like this? /* * va_align.bits is smaller than the huge page size and will * lead to misaligned huge pages. Ignore it for huge mappings. */ > + return va_align.bits & get_align_mask(filp); > } > > static int __init control_va_addr_alignment(char *str) > @@ -157,7 +161,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len, > } > if (filp) { > info.align_mask = get_align_mask(filp); > - info.align_offset += get_align_bits(); > + info.align_offset += get_align_bits(filp); > } > > return vm_unmapped_area(&info); > @@ -222,7 +226,7 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr0, > > if (filp) { > info.align_mask = get_align_mask(filp); > - info.align_offset += get_align_bits(); > + info.align_offset += get_align_bits(filp); > } That looks fine too. I would rather this whole mechanism die, personally. But this is a fine, backportable fix.