Received: by 2002:a05:6500:1b8f:b0:1fa:5c73:8e2d with SMTP id df15csp1380780lqb; Thu, 30 May 2024 08:33:29 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUbWV8hfiQWm+bWqFIWMGtmrnD/+5baESfjSEKHcIRi3aAmLd2JlkRcPwCh/BEqJa3xbGT1JI7dDp3ffSoPFieM3HFiPWrFRmTXQADaaw== X-Google-Smtp-Source: AGHT+IHMuMe+TTRGL5wGHF7DJkqblca7z/goEBIn+QvFNKGRm6xGEJpiOKanNxlYlIg7Ui8Mmrfl X-Received: by 2002:a17:903:604:b0:1f4:a233:c964 with SMTP id d9443c01a7336-1f61983735fmr19173425ad.55.1717083209587; Thu, 30 May 2024 08:33:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717083209; cv=pass; d=google.com; s=arc-20160816; b=ccfn917iif/C4IZJUMgMcRoIzMVwG6sut1eCJWZxn+yiYIGn2Gj1L32FObPKcUj0QW cOoLptBEfUGghYRg/b/xXF64YJfcdY5nAaV8wEoxg0sjCHOBxONvp2XdpQM7Bl08+RTv 7uZ9cAN7AKSsPOXsvZodDmTRPcwL2UGDN1r9MZDdfMthTzq78NFBGRd19KyN6PJbUp5L NbmCbNl5Y6N47GdtNh3daVbgxLGC49cKntdV3DYBiLUAM/nGIB6OGdIjUb22XvTXF2Ri HrDwOQHnsVakeFPt2xedUaZT2DsMqA9zZ19e6qxcBSXZ5F9qva9UKeehjOVyTc8hpYbs ZRhA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :from:references:cc:to:subject:user-agent:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:date:message-id :dkim-signature; bh=SZW5ym3MPOjZVY4p5IUk+32aichJdSdcHQ2KXyboC3o=; fh=SX+29VvebLJtH88pBV1v1PkKWiW+75KOaTMjwCT/sDQ=; b=HYXRWUiRgfZmDX80xqlkXAuBbYzgJA24AKYqn8tBMvU21uzm9ir9EypGXPgAPgNo92 o4zxqE6u5FrfhWg6uixtlJIY5DGVq83Cf3Yfp2ZMqA35LrOseKTQ4wkA8zUuM52glqCX PriiMXkuqdDcx7Iql0PHANLS3gxbsayFGhwzOFDJrKD10YUU9+gWltio6SnCWzTbheOy LfgIsyTcWe9k67iqJF4vtQM1kVE6DbDxc0X5RtIHzKv0AGb3e+vF3OSkfjwZXep+1vj+ QlA8xCNP4CSDuwSY5uY/Ezb2Y5PNqyjvfd61gJVHUEx5Bm4bmKRihgpLlSvwoYVHkCal khvA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="OIM/F4At"; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-195604-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-195604-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id d9443c01a7336-1f44c97045asi119291175ad.229.2024.05.30.08.33.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 May 2024 08:33:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-195604-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="OIM/F4At"; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-195604-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-195604-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com 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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 2D902284001 for ; Thu, 30 May 2024 15:33:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1B6DC182D14; Thu, 30 May 2024 15:33:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="OIM/F4At" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) (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 B494818755D; Thu, 30 May 2024 15:33:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.9 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717083202; cv=none; b=scUbXPRgUA+rOXbK5/rOaHBmb+VcErnVLstUPk/gcvSUvC6cex6oWj4y+OGbflFZBccRA4wGeSiZH7QYYnJFYaSmYdR8dsfMJilluy7cJHU56LQLyFq4xzHvebFSfxCJQhN3uLwN3GeVZQrToR3ZCQMDXPgV2O+/DuBtkqN29TY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717083202; c=relaxed/simple; bh=t9rCtR888zCMmrHzZcCvAT1velIWgffOm4gsLVTlhw4=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=ANoZTi/5rq58wh2Lp9kxwFsnsXV9c+azyd/TC3/rZQKFVvAUfy+DaYtEE0tSJHzeQG8V71hwYUQnbeGGvpEQmOjNWXEQdkzSDDWibpJ36+3Vtkd6R/5FuqvdxAKos4x3vvnld0wgLz+0saaRGwzamQawOc/V8+2h34o/mJX7KFY= 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=OIM/F4At; arc=none smtp.client-ip=192.198.163.9 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1717083200; x=1748619200; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=t9rCtR888zCMmrHzZcCvAT1velIWgffOm4gsLVTlhw4=; b=OIM/F4AtG4gI4nRMh7lq5kM64e5SV0x1aVnItN6wO1ncrRIvxNlpfWvo 1HEmWm23daHv/aGngeXafFi8VQYFWjsM2ShXX7uTq3M42ICBeZ6VvklUH PtLrMZcTdhRYoAfQ2J23Q3AbGDn+Yb2Gelqtq/TZxNghdSfgSv0JFzb28 DzjYkFX7KnFAS0VHwUvNzskxpWZg2zAdT16Ih1jIyVTXB2asbnM7uPvUn huTQKR6+eDdn10/bjJ8o6v8ZpkaWF1MG/40JnyZG3fsHq0x7x3zUddITf yhROV074a5VKrfzKq1PsvLyub/hwqqxzWOKCOaagUlznKkEGpfc8tJIcp A==; X-CSE-ConnectionGUID: uwGej9ZcTxy8tblFdF2DmA== X-CSE-MsgGUID: Wa/TXlsqQ5upksJupzQtEw== X-IronPort-AV: E=McAfee;i="6600,9927,11088"; a="24239948" X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="24239948" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 08:33:19 -0700 X-CSE-ConnectionGUID: jqniPc5cRDugYYYRAiK0+g== X-CSE-MsgGUID: E3TRIy5tQCCBHZBQQvtwSA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,201,1712646000"; d="scan'208";a="40763385" Received: from kinlongk-desk.amr.corp.intel.com (HELO [10.125.111.178]) ([10.125.111.178]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 May 2024 08:33:19 -0700 Message-ID: <86c8a026-4df7-4ba8-b0e5-6289ae584289@intel.com> Date: Thu, 30 May 2024 08:33:18 -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: [tip: x86/urgent] x86/cpu: Provide default cache line size if not enumerated To: =?UTF-8?Q?J=C3=B6rn_Heusipp?= , linux-kernel@vger.kernel.org, Dave Hansen Cc: Andy Shevchenko , stable@vger.kernel.org, x86@kernel.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Andy Lutomirski , Peter Zijlstra , Adam Dunlap References: <171707898810.10875.17950546903678321366.tip-bot2@tip-bot2> From: Dave Hansen Content-Language: en-US Autocrypt: addr=dave.hansen@intel.com; keydata= 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 In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 5/30/24 08:05, Jörn Heusipp wrote: >> >> +        /* Provide a sane default if not enumerated: */ >> +        if (!c->x86_clflush_size) >> +            c->x86_clflush_size = 32; >>       } else { >>           cpuid(0x80000008, &eax, &ebx, &ecx, &edx); >> > > That honestly looks like a mis-merge to me. This is not what I did test. > x86_clflush_size needs to get set in the top-level else branch in which > it is not already set. commit 95bfb35269b2e85cff0dd2c957b2d42ebf95ae5f > had switched the if branches around. You're totally right. Thank you for catching that. I think a variable removal flipped that code around and it confused me when I did the rebase. It should be fixed up now. Again, thanks a bunch for the report, the testing, and catching my screwup quickly!