From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 8DA8E36D510 for ; Tue, 2 Dec 2025 03:48:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764647301; cv=none; b=g+tsAY8ipjm8mpp3z9Mi5wmJOEbUzSGRAjYRqVE14Sqjhlmcyd9K/bPxKPufBWZlO5Kan5hys4s/6A0RwF4Rt59Z9eO1FpsazBzF7M/m9X6LTC65jktlgCgVTwkjFWmZ9A69c+AyzRC0jUXft4xfZktXL7fJstOWJHfcWBL988U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764647301; c=relaxed/simple; bh=ZMfx66bdpaJivIFLmf32uKiPzwqpTL0M5QjJ0HjLuts=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=eFRlG4dBYAwGR3s9o2bpaospWQjmTmkaLYySdkx6F4BqXoHO0Rk1fv2jBEq3NWaKyDPtVbgIIpr2r3qMTS5jBBSf4B3yQntnadCY9I4UJepJ1HsLmPqTuOR9QtYwNj1zE4aqNEgqn2XKKFDG+LyjPgratIx/Yk1DYq9ipbp3PBc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=B1QXDvL2; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=lyfcAQ4w; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="B1QXDvL2"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="lyfcAQ4w" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764647297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=H18A+0RmYy7qzAd6no2pQnFAn6q5fxVYh0auTgIufyI=; b=B1QXDvL2cpAg+C6l6SZWonY2NM9rVBkT8iG9xKsnv5/MSY8jsLrA2sQObY/NXOwEAeBtk+ y8szKhrfqKtn5B7m+ekjEByIb6EpYTD09eQLepF4qu5YEF9vlzqvdIq6tDT9YXrZBuaRAX Zyz9Eqv6BkXalcR7TlKhnv6yi9vds2c= Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-413-0QB6okXOPaO26xcUI1pKEw-1; Mon, 01 Dec 2025 22:48:16 -0500 X-MC-Unique: 0QB6okXOPaO26xcUI1pKEw-1 X-Mimecast-MFC-AGG-ID: 0QB6okXOPaO26xcUI1pKEw_1764647295 Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-29846a9efa5so92158945ad.0 for ; Mon, 01 Dec 2025 19:48:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1764647295; x=1765252095; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=H18A+0RmYy7qzAd6no2pQnFAn6q5fxVYh0auTgIufyI=; b=lyfcAQ4wOAHkIrObkX7rppETAs9q5CM7vGPlvtjApeGDNozp1lWBJXT2hKalW64nOp 3Z0AG4mcpdYUNutaZOt6k9MXoDoqBNiSI4EYBicPHJQpSVdk5I962mQrnUa4yErsq1Bi Bw09xIz9nW+gsSWfQUfs0ulTg9An1Oi3PQtqE1xUCyWPRUVLH4fx2t4RczI1KSQDhzPR sEpaLgN07u9e37poc4UQjjZviJ0rC5oxlOfVOlaCIAMffSdehEo8clqkvtbdQTfhrvwP DE3Qoo7EadJB5yH5NIQPH1DyTRE1f+4fDNVXlg5yF9tgXR83FED0VzRZ66TVKsV7havb 7Ehg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764647295; x=1765252095; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H18A+0RmYy7qzAd6no2pQnFAn6q5fxVYh0auTgIufyI=; b=bGyR4lLxU6BmT4dYTT24h47cGqAC8teXssGyVmAdAWTnGbNsKz1BblP48C+GoW5oM+ A9hMNPZnjuqMerqp4yxEQcMesRQXnBTA/0mPcRFMQ0rUYWapyTfP3NztlfI6CeZrtNlZ NLxaJCevztfOU3t/kjaXwkfr+kBf47Kp1UAmIkSD+5YIzov3kuF3qLItV0cmXQC25q+r PjUJGKMGOleHkodhO61JMbt5NGXuG6MeluwmMvXdDN/a9p5P8Zogp3+KiTSdZKi/9+IR Jzvkpj6T5x/yeUjNaffh0WY2I0rAZfo3JnH2q18khSyuTIq201VF5woliKuH/SxOunhN Maug== X-Forwarded-Encrypted: i=1; AJvYcCXoN4nQNyz6Qaml/NEJML+TSNxfs0L1Ke8u1ZfG5ZaySrW3UEB+zTzO+HT/0x6wJ4/jXoDwMriKsYgE8QY=@vger.kernel.org X-Gm-Message-State: AOJu0Ywigm3yB+JQ/mg5CxAqot01zCgD89JZBkU7mC59pg6zGkhNMZ1K jlSOoed/+vfeM3a4iA4tu81cFYAVNfuX5Xofiiu7vagLekmTkZyFMtMDz7mecwlSEf2wT4G3qsD Vz8C8teNyICJ5V9dCzdO0ugjD8PAs52mWmfCuia2KiFvEQJP2xh/wjul4uCbjjMC3bQ== X-Gm-Gg: ASbGncvOrWdX5w2NR893Mppv3euGqmuX4zE/KY1kyFFWEsMIIQYA6wlHMvZJuu/aL+s VB63MTesSFTE92a1QwUMx68dlFIJ/9b0gcanFvmx2qYREVi8bdvFcdw6Sge9ovXp24MlVGsJjI9 wB6vjexzrMDCKa1rUCIssNH6q8VdPFyYBQsZN/ypYeoSoa7AZHVWj0hd/wIPQvCHSeCoKSmsh98 h3PeHErlwTeu7hssWPmBovn24nFAEgjwVVhzaAkoytgW66Ke17srAZVeYlbsfCxg5iBzyT2TJ9i nYxKfvqDqF/gJEety00I3bbEw5LIvgCzSTj1WEldFa9wP3H3I7yWYmlbv1inmQo6Q9LV4eDDsDb J8B7m X-Received: by 2002:a17:903:4b04:b0:297:f527:a38f with SMTP id d9443c01a7336-29b6bec3fcfmr425510395ad.18.1764647295285; Mon, 01 Dec 2025 19:48:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IGO/Mnp57Xj9CDlhkU9TdtnPMdRJNu7iIsNI+FeGU9EsPa5P4IulqY35znPbwdyF9adk2BbZQ== X-Received: by 2002:a17:903:4b04:b0:297:f527:a38f with SMTP id d9443c01a7336-29b6bec3fcfmr425510275ad.18.1764647294921; Mon, 01 Dec 2025 19:48:14 -0800 (PST) Received: from zeus ([2405:6580:83a0:7600:6e93:a15a:9134:ae1f]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29bceb559d6sm138403325ad.94.2025.12.01.19.48.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 19:48:14 -0800 (PST) Date: Tue, 2 Dec 2025 12:48:10 +0900 From: Ryosuke Yasuoka To: pbonzini@redhat.com, vkuznets@redhat.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com Cc: x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] x86/kvm: Avoid freeing stack-allocated node in kvm_async_pf_queue_task Message-ID: References: <20251122090828.1416464-1-ryasuoka@redhat.com> 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-Disposition: inline In-Reply-To: <20251122090828.1416464-1-ryasuoka@redhat.com> On Sat, Nov 22, 2025 at 06:08:24PM +0900, Ryosuke Yasuoka wrote: > kvm_async_pf_queue_task() can incorrectly remove a node allocated on the > stack of kvm_async_pf_task_wait_schedule(). This occurs when a task > request a PF while another task's PF request with the same token is > still pending. Currently, kvm_async_pf_queue_task() assumes that any > entry in the list is a dummy entry and tries to kfree(). To fix this, > add a dummy flag to the node structure and the function should check > this flag and kfree() only if it is a dummy entry. > > Signed-off-by: Ryosuke Yasuoka > --- > arch/x86/kernel/kvm.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c > index b67d7c59dca0..2c92ec528379 100644 > --- a/arch/x86/kernel/kvm.c > +++ b/arch/x86/kernel/kvm.c > @@ -88,6 +88,7 @@ struct kvm_task_sleep_node { > struct swait_queue_head wq; > u32 token; > int cpu; > + bool dummy; > }; > > static struct kvm_task_sleep_head { > @@ -119,10 +120,17 @@ static bool kvm_async_pf_queue_task(u32 token, struct kvm_task_sleep_node *n) > raw_spin_lock(&b->lock); > e = _find_apf_task(b, token); > if (e) { > + struct kvm_task_sleep_node *dummy = NULL; > + > /* dummy entry exist -> wake up was delivered ahead of PF */ > - hlist_del(&e->link); > + /* Otherwise it should not be freed here. */ > + if (e->dummy) { > + hlist_del(&e->link); > + dummy = e; > + } > + > raw_spin_unlock(&b->lock); > - kfree(e); > + kfree(dummy); > return false; > } > > @@ -230,6 +238,7 @@ static void kvm_async_pf_task_wake(u32 token) > } > dummy->token = token; > dummy->cpu = smp_processor_id(); > + dummy->dummy = true; > init_swait_queue_head(&dummy->wq); > hlist_add_head(&dummy->link, &b->list); > dummy = NULL; > > base-commit: 2eba5e05d9bcf4cdea995ed51b0f07ba0275794a > -- > 2.51.0 Hi all, It's just a gentle ping on this patch. Please let me know if thare any changes required. Any feedbacks are welcome. Here is a original patch's link: https://lore.kernel.org/all/20251122090828.1416464-1-ryasuoka@redhat.com/ Thank you Ryosuke