From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 A105D33A02B for ; Fri, 6 Mar 2026 23:01:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772838096; cv=none; b=dP8R7tJxEMxvWbm2JmSYi0YPjpaFf/2mSquo9pyv5IRGAlwcbUnf4p43lUtfXaIb9lcbazoTWZioFsd8j36FSPvLaurCekQCFvNyPw3GcyopJ/1HIZvJVHAoiZqPNlsIaoWA6hy+sbuOZN0OuVgwDOWj5i6+tz/JVY+6HCdOKKE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772838096; c=relaxed/simple; bh=EjaXSzZB4HkMLn7Se1JTSAcqw12uzM9oSKSDHPAFdro=; h=Date:From:To:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mdNea/Ae+Mt0BtZJyibdPYP7H0kcMc7PTBnMkyiObqhgfkD9llMRmi54PaJnBSXhSk+rSDPUhaOq9mx7pEanSZ/piNGosqZngiXcsxyBCqTh1dr2Mowm9po0EB5V3Aspdp1CY1+f9U/6CqfafLoRytB8iM7AtdW3prQDVAVZOl8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Cm16Uw2A; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Cm16Uw2A" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4806ce0f97bso86022005e9.0 for ; Fri, 06 Mar 2026 15:01:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772838093; x=1773442893; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:to:from:date:from:to:cc:subject:date:message-id :reply-to; bh=SokV2RO7rQ+NeLVrLYt3DfpSynH+nlITi453rfaD4mg=; b=Cm16Uw2Apl/tr8dyyry0o+MUxJM+8bgTaeJpV+hFHBFsBeFVaG3n92aYGK+E/pENcc kJ1jRR7e5GS1hJKsyPHFo/cBmGa9d233VNET1Qo3UGviRwMkDcAjZsSqx0gFX9xY1am1 37frrGU4hP0wdqNG/Mjk/J1m9rEvH/VYwh7E48BujEgCPhCKhOG8kTOMzoOneh96MqaE KPGIl/XwIyWyyo+RpDUcYEk2lVizRWFGeqX1Uc3ij+2eAnQrv4mE8nKe6lX53vo+DuEw rW99e04dRfkw94FdK3wVveu8Ul4dnUrbLtTmQnBpdskwHT75VQuJGY6x2iQ8mK3yf92Y FQ7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772838093; x=1773442893; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:to:from:date:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=SokV2RO7rQ+NeLVrLYt3DfpSynH+nlITi453rfaD4mg=; b=VES6NiJTNVRO0GkvuD6va5pvROHBFG3mrNyQUcta5rOl2NG0jWHa6TEHSLgC1GElNY fj83TCWdqH0BxniZKtfpH8Ql1rwVTskTXAvRrGUf7OzHhWv5KIaHTivYxzusjSiGrqeF B0PX7lEBPSOuck+d+b79IAMxqbYCIuFtJ1pro6NTSqG1rIOvvo636Ad04xgKXTt4GQK1 XdaS6dRl+ykF64VWVdngoGHM/kHBgOg2MqAtmKX5Tm465xkwbr7yZnp/4dSA1gmb7Dud pwdc91R4LjVcCSX235GLzQ5DYt2Y+8GU27o6FWR6sFcRbnIrnsaQ0r9AuSs5qj2JPBJb 4rLQ== X-Forwarded-Encrypted: i=1; AJvYcCXmMr2QojcD7pnE8WIe3il0HaoYggXu3xizG2RU8GpSu6TZTxK+hYFtxSCgn2FvfPLhB+zvjD079CFDPVg=@vger.kernel.org X-Gm-Message-State: AOJu0YwHmfg3pe/w/85XiU57dmh1lNhDwa1ExjH04mW+2lQZjcCfnWHe OfcJ72hKRo26OactFqgZI2wgujAeX2KAVrKRCDC0NTYNzRw/8OVDtt1VNx+2MG11 X-Gm-Gg: ATEYQzz2zOs/RNFTI5+87U/wq2fsDsNN5bkfl16cev71uESzAspYCIQjkrAzEtJrpgK /kiazK4UDFZ3eGOcR6GPidEJVcgXqCLFhw7fk9PcwZAtip1vAIn6fOdXtNUL40vNa2Q4F+g1o63 W6vCTxhNQjaLoYusf8PN/4wF3dngo1ligQrnjPdKuUgdCnUcGV+JgQHXG+SlJgXirHeFtekL6hA I9VUWn3CP0PhCGdmJR8sxX6phQXQ/0JBzEKoajMv3MdaQt36zrvqPQewthQIE7jSHY+VN7I8VVt evu2p4QYKRzx/pQFo63W1cr+q/TF3AWz8SU7+k6W9dh91t1l7e7fwIMUSIpB73c84ewi9EXHk+/ FzsIJB+muKUiwLFvOPqP1nHo5WcOcA/Mo3OEaE4mL2q5M6DG8mYYWyHeeF6QXpmE5ZVJMl7Rbrd krZ9mimU///nwQittBeDg/oB9nGHE0irw58eDQ9roq/C5hKEsf/g+5nL6ymZS7L1Od X-Received: by 2002:a05:600c:870e:b0:47b:e2a9:2bd7 with SMTP id 5b1f17b1804b1-48526951415mr66430025e9.19.1772838092648; Fri, 06 Mar 2026 15:01:32 -0800 (PST) Received: from pumpkin (82-69-66-36.dsl.in-addr.zen.co.uk. [82.69.66.36]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-439dae56300sm6680697f8f.37.2026.03.06.15.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2026 15:01:32 -0800 (PST) Date: Fri, 6 Mar 2026 23:01:31 +0000 From: David Laight To: Waiman Long , Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng , linux-kernel@vger.kernel.org, Linus Torvalds , Yafang Shao , Steven Rostedt Subject: Re: [PATCH v3 next 2/5] Optimise vcpu_is_preempted() check Message-ID: <20260306230131.0e9afd9d@pumpkin> In-Reply-To: <20260306225150.93178-3-david.laight.linux@gmail.com> References: <20260306225150.93178-1-david.laight.linux@gmail.com> <20260306225150.93178-3-david.laight.linux@gmail.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; arm-unknown-linux-gnueabihf) 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=US-ASCII Content-Transfer-Encoding: 7bit On Fri, 6 Mar 2026 22:51:47 +0000 david.laight.linux@gmail.com wrote: Apologies to Yafang for mistyping his address... > From: David Laight > > The vcpu_is_preempted() test stops osq_lock() spinning if a virtual > CPU is no longer running. > Although patched out for bare-metal, the code still needs the CPU number. > Reading this from 'prev->cpu' is a pretty much guaranteed have a cache miss > when osq_unlock() is waking up the next cpu. > > Instead save 'prev->cpu' in 'node->prev_cpu' and use that value instead. > Update in the osq_lock() 'unqueue' path when 'node->prev' is changed. > > Signed-off-by: David Laight > --- > kernel/locking/osq_lock.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/kernel/locking/osq_lock.c b/kernel/locking/osq_lock.c > index 96c6094157b5..0e1c7d11b6c0 100644 > --- a/kernel/locking/osq_lock.c > +++ b/kernel/locking/osq_lock.c > @@ -16,6 +16,7 @@ struct optimistic_spin_node { > struct optimistic_spin_node *next, *prev; > int locked; /* 1 if lock acquired */ > int cpu; /* encoded CPU # + 1 value */ > + int prev_cpu; /* encoded CPU # + 1 value */ > }; > > static DEFINE_PER_CPU_SHARED_ALIGNED(struct optimistic_spin_node, osq_node); > @@ -29,9 +30,9 @@ static inline int encode_cpu(int cpu_nr) > return cpu_nr + 1; > } > > -static inline int node_cpu(struct optimistic_spin_node *node) > +static inline int prev_cpu_nr(struct optimistic_spin_node *node) > { > - return node->cpu - 1; > + return READ_ONCE(node->prev_cpu) - 1; > } > > static inline struct optimistic_spin_node *decode_cpu(int encoded_cpu_val) > @@ -110,6 +111,7 @@ bool osq_lock(struct optimistic_spin_queue *lock) > if (old == OSQ_UNLOCKED_VAL) > return true; > > + WRITE_ONCE(node->prev_cpu, old); > prev = decode_cpu(old); > node->prev = prev; > node->locked = 0; > @@ -144,7 +146,7 @@ bool osq_lock(struct optimistic_spin_queue *lock) > * polling, be careful. > */ > if (smp_cond_load_relaxed(&node->locked, VAL || need_resched() || > - vcpu_is_preempted(node_cpu(node->prev)))) > + vcpu_is_preempted(prev_cpu_nr(node)))) > return true; > > /* unqueue */ > @@ -201,6 +203,7 @@ bool osq_lock(struct optimistic_spin_queue *lock) > * it will wait in Step-A. > */ > > + WRITE_ONCE(next->prev_cpu, prev->cpu); > WRITE_ONCE(next->prev, prev); > WRITE_ONCE(prev->next, next); >