Received-SPF: pass (google.com: domain of linux-kernel+bounces-109747-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Thu, 21 Mar 2024 08:51:40 +0100
From: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>
To: Tony Luck <tony.luck@intel.com>
CC: Fenghua Yu <fenghua.yu@intel.com>, Reinette Chatre
	<reinette.chatre@intel.com>, Peter Newman <peternewman@google.com>, "Jonathan
 Corbet" <corbet@lwn.net>, Shuah Khan <skhan@linuxfoundation.org>,
	<x86@kernel.org>, Shaopeng Tan <tan.shaopeng@fujitsu.com>, James Morse
	<james.morse@arm.com>, Jamie Iles <quic_jiles@quicinc.com>, Babu Moger
	<babu.moger@amd.com>, Randy Dunlap <rdunlap@infradead.org>, Drew Fustini
	<dfustini@baylibre.com>, <linux-kernel@vger.kernel.org>,
	<linux-doc@vger.kernel.org>, <patches@lists.linux.dev>
Subject: Re: [PATCH v16 0/9] Add support for Sub-NUMA cluster (SNC) systems
Message-ID: <bn4wtfyec4mfoztcr35rctgcbibypjh5gmxdr3fro72glh2y3n@vmqsuxgjlonw>
References: <20240312214247.91772-1-tony.luck@intel.com>
Content-Type: text/plain; charset="iso-8859-1"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20240312214247.91772-1-tony.luck@intel.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-1?Q?mAjrY95KCDOyVKT3BrfFN/L3F+7QLuw+IWSgbCMtLK3/xpEVuSq220fBTo?=
 =?iso-8859-1?Q?yUAfgWzBpQONTQ/yPEw5VctEtdf29Hak5wh4GMN7BV/kk0iIrGqoMKlJxG?=
 =?iso-8859-1?Q?4Hs5nRxsYc9LpGrLMDuR9mGdCaJAM4IAe8R7JmgU+gu8S92jAewGbzSHpV?=
 =?iso-8859-1?Q?yNgQ+/jCjy9fZQlzm+EOy5ZmO0h/+H2kthPpzK9UCek00P1pHzrrliRwH0?=
 =?iso-8859-1?Q?vKUsTzZ8aaY99aqAHgBL8uzzJfDDjpApw14f8ex9vD0JM8vAY8fDCKTU94?=
 =?iso-8859-1?Q?nIfTp2fXfuU7tjDR9XR/EQZizIGdgBrTvbkAQNnasagUw7eVdCPm80jato?=
 =?iso-8859-1?Q?mYYHsNdNWREcUcjGfWG2uaOPP7AEdh2oLPMYWZivaaaGdLpow8Dx+MpeLl?=
 =?iso-8859-1?Q?paH1QZ6eces1uTrlGEV+CZkfBUta7Oi2bFbUyoQCuQzbTTVOul5iE6RRsk?=
 =?iso-8859-1?Q?pujLmrE96Scrayt/i8niiH2gO3TxUswwI1dGpFuAmE+Xy+vZALSZ0+viNo?=
 =?iso-8859-1?Q?8NnZjNtiQAOXS8t5bn8vnxi/0ikMce30mIjhTzxCh/zKf/A+ImvQvbYZoT?=
 =?iso-8859-1?Q?rT9wkXShAVO6fzzNK9z6+fIfQV2N3b6YmlM0CEifa++pD3+2aAltRUmrWb?=
 =?iso-8859-1?Q?+vLHb1NyWfZX6lWFb65EQxgdzUGOsb88qH1yekwFr794ufsjiDfJkhSW0p?=
 =?iso-8859-1?Q?dkhuzOromay+Yz7ExS5f2+1VYluj64i3n/XnpvtotVkzt+F4ssZV+omxVt?=
 =?iso-8859-1?Q?TJFaOGhB+r8D+XdXGVyXOqQ1s55mHE7eitOV+VByp+ewjoWfy5alPKNZWj?=
 =?iso-8859-1?Q?fnCsZH2Q8pbtzw5c5sEWRQux5lyNjNZjfzVBhi9mLL9DcZqsKjHmTz6+S4?=
 =?iso-8859-1?Q?U9mbJhHh5PTLdiwkkEYdPvZ2D2LkWxuaoRNt/+APBzN6Rasy2jmfmS7vjR?=
 =?iso-8859-1?Q?FfIRbDmXeMVWi3epkYbFouIUl3UwUzlWcTUIXmfbCehSYlDe6VSJSjRnL1?=
 =?iso-8859-1?Q?jZPpHbWDWvj/ejwQmtABOtjJPsUd3rsij8KvLx/Nx/JQrbudu3hUHd8N2D?=
 =?iso-8859-1?Q?YkMmTWZ4o47JvZ4/I4UsBTMCVk+cEmXANb6STHXK+3Hf+4o+5ZDFJbvcHo?=
 =?iso-8859-1?Q?Gs4/EqszkaZn9rYNy59+jxJ/LZYEcMRgUA4Oaj4EGPkKNHQqczNQdt0zuj?=
 =?iso-8859-1?Q?LZeqKCZ3bF89GHc1W+3dIv2+AN98v/TCfGLKHfrHSH9PRs/RNwuxkOyKTM?=
 =?iso-8859-1?Q?kXnV/0G52Fx4N6YMb0kzwxc3E5icKjTSxyv7rJzqTKEse+7FNal1RNHwlP?=
 =?iso-8859-1?Q?G5NjVOzFZ5dpdjh4D+t2K4BpNzUZBVWpXGvM8v5P82ae+6nd36cVXQPC6C?=
 =?iso-8859-1?Q?wzI+h7hlYOaiII0Bkr9b/D45fWrVhUSHdxnjD7FvgfcBWphHW6ehgnsmWf?=
 =?iso-8859-1?Q?gMURwD8bgHhrnUJPk+jN7pk3GamNbsQDYevurTkBjsWeExdN0KSDpH8NYZ?=
 =?iso-8859-1?Q?JxzmZEofahz84jUvElyGMr2qiWkuIhq9LKNruUB6ME1CdgNs9B+WbvG5SA?=
 =?iso-8859-1?Q?T60rcHyNpIhlv7yKwr65jotKUbXrEc2CSMPscrUr8QN19ZxGRxHbY5joPv?=
 =?iso-8859-1?Q?nLRpdhNamU16hgOwFEMO//5+jO/yxnsjBdZkLoOiqjJzMI+5VnV+D4IoBE?=
 =?iso-8859-1?Q?Rgv+6A4A1TCnQS/WUbc=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: cb2d2f13-92ec-4e9d-ca27-08dc497bc9a5
X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6231.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2024 07:51:59.6653
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: oT4F2B4B75RumBo6WCqRr4ZzEt4Qmpc473bNYnztUnwDYcoxcsdhLQaXv9xnZMHSEPdXjO6LvPlkM/E58lxbAS16vlAAYb1Ol7o3+H20S+c=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR11MB5823
X-OriginatorOrg: intel.com

Hi Tony,

On 2024-03-12 at 14:42:38 -0700, Tony Luck wrote:
>The Sub-NUMA cluster feature on some Intel processors partitions the CPUs
>that share an L3 cache into two or more sets. This plays havoc with the
>Resource Director Technology (RDT) monitoring features.  Prior to this
>patch Intel has advised that SNC and RDT are incompatible.
>
>Some of these CPU support an MSR that can partition the RMID counters in
>the same way. This allows monitoring features to be used. With the caveat
>that users must be aware that Linux may migrate tasks more frequently
>between SNC nodes than between "regular" NUMA nodes, so reading counters
>from all SNC nodes may be needed to get a complete picture of activity
>for tasks.
>
>Cache and memory bandwidth allocation features continue to operate at
>the scope of the L3 cache.
>
>Signed-off-by: Tony Luck <tony.luck@intel.com>
>
>---
>Changes since v15: Link: https://lore.kernel.org/all/20240228112935.8087-tony.luck@intel.com/
>
>0) Note that v14 Reviewed/Testing tags have been removed because of the
>   extent of refactoring to catch up with upstream. But nothing
>   fundamental changed, so everything should look familiar.
>
>1) Refactor to apply on top of Link: https://lore.kernel.org/all/20240308213846.77075-1-tony.luck@intel.com/
>   [So base commit is either tip x86/cache, or upstream current merge PLUS
>    the two patches in that series]

I'm having problems with cleanly applying this series. Here are the steps I
took:

- I pulled this series with b4.
- I pulled two patches from the "Pass domain to target CPU" series with b4.
- Then I hard reseted my branch to tip x86/cache
- Tried applying first the two patches and then this series.

And here I'm getting conflicts on patch 0002 "Prepare to split rdt_domain
structure". I also tried with tip master and applying James Morse's series
before your patches but I got the same problem. Am I doing something wrong?

I wanted to find what causes the conflict so I can give more details but three
way merging doesn't seem to work and git am doesn't leave any conflict markers,
just fails.

-- 
Kind regards
Maciej Wiecz?r-Retman