From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) (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 E79994C10C3 for ; Mon, 28 Sep 2026 13:30:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790602224; cv=none; b=cF4hiBMByJnvjHGygImgewKdKb871EInuI0Dr0JZ05EOwlTScigMVXwc2JpENxvx5ODrIBAa8UgjQPW+t0oYLVzYGadUWJCfEvdSqOk50D2OK2pueuejU3olOTNGjsxg2nWFtMeFk0Yorgim73KbMap/yFFcficIOJaXT3Kciz8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790602224; c=relaxed/simple; bh=u4F+lc3vx+jYByWGzH3MQLi5+iszxVz9Dw6kvDqbkF0=; h=From:To:Cc:Subject:In-Reply-To:Date:Message-ID:References: MIME-version:Content-type; b=EWrGKEqNh7K5O1rm8Eb+TpNYLr+ZXwek0Pd8YCXwNw/FvGPpozowJzf6UwUKjoHoNbOG9grbt87tV/jQ3U0gtW8u4SsQ+CT9H/d+1B4r0uL2vJgU3wg4px50iigrbAVt9cFKM3KfMCzSV+rSQ1iW5uyVXvMEyigwrjsCm5hCCUY= 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=Lpegnlyt; arc=none smtp.client-ip=209.85.222.182 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="Lpegnlyt" Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-93c7014af8eso104090485a.0 for ; Mon, 28 Sep 2026 06:30:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790602222; x=1791207022; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:references :message-id:date:in-reply-to:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=Xh2NHRfJCMfylFQd8bfgqsz1kSEX8TvOZMy0ZzkkjyY=; b=LpegnlytEl7EEm0zeMq0gt0pLZT6IiGfhc9Ta6sUpfujUsWtqfv9u3G3nQ0ZXQIvWC TCS+gHs0xUZ4GV+T3EJVqnFLCXUQtA46szeKIG7aV5ZQVBDUcvOoPpFtAW6vY6MQS3aS pJgRhJRkCbOOdlcsKdgBCZxx/HljAPB44xxZQ97Q5a8K0WM321wlsyDG4qYQ7+tn/C/F K2sN44+u4EHcdEEUqi5ns0UbiZO1N3sKklxsGgDWzGTxkglIRHcCwVozFka2vGSveEpz nn/1Y4gKI27y6QPmTfAtWC36CrbvcHzoIiqOpdgXT5eUTAKy7l8zjbV7OQhI03sry+zs hC5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790602222; x=1791207022; h=content-transfer-encoding:content-type:mime-version:references :message-id:date:in-reply-to:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Xh2NHRfJCMfylFQd8bfgqsz1kSEX8TvOZMy0ZzkkjyY=; b=gOQGHK0LVDGyIlC+O7yICn60t93y4ZBNfMAB/bHpH7jIX7XavY3m2en/BMdU3N7UQ/ 1LWof/26+H/R2CLG6XN806bJ4U4fq/mdxrjkY7hf6xwBdlw9ENgWIjVkcIOGhXWY9F5Q KAtfyFGkaWp/VU5MOxHUfxW5K0ZyA9g+TNqE3sHv7U/pYI2ErphlIdBxr5o3n2qkn3Ve rLSsExXn3n9cURYlUnoEjLaPWqPfXY/YJFDRIJP+nle9h/5goMEq7Cz+IpvaJJVn311a FBkg8BuA7/ObtvU9eMJrO5IgLCkpPidW3SJzqPM3YRMwEwyk5YPmrmFpLkZoXRBX9XmE 2uBg== X-Forwarded-Encrypted: i=1; AKwUvBwbrhYJZn0xhd5kPHfk2cAVWkvk+lVuEtYdgiQm+j692FdRRk2e1Y2gwXjlYbUO6/oeuYOh+4kv@vger.kernel.org X-Gm-Message-State: AFuF++nBVbwpbf+39x04FOvXlE1Pr47jt2UpkhR15497cD1TtKXhhtLC E9KZuOAxPofXSAJitPqMkvnd/p/Ioyw9KJE9WsewsEDZbu07IB2uGEKe X-Gm-Gg: AYBFou27rKGmoiTg6hH8VLRUlv85vG8Pen1pG9XcCjilEZPFAfiBdyEVij+awEizrcC 8HltjNjTjh2LG3G06kEkHCfNlAx2e3iKAp/bgPk8sCcv7TLUiXDz5ouLsOeBtvUhHDid+/B2R5m WMP5xxWSG8WJT9lQpGPyR/EMufkCAMEfOBSiySYLKVXqXq8BjM5DUaXAtTVVlhPkqu0fi2bpP+x UqyiPEiFqR/AhRXD4Bn5WdsnVJqFkcGdA2DosUOSjjV8xqJbzpG3qMExoQG+G+BL+wVMz37n8kl t2ksw9dP4miqDYhOWCByunm2i+NcOtgsq1phbzxD2IofdVY1X4eDX7kDi6BSYAmUjpZ579H3WpK LwnraN5mfZKYDZr93Fc1LbXmjr+mIVf6/9/Ww3kn+vNv5wnL6NT356aHoN1GLoe1JL7QnQ/x5ne j3gkJJxAraY/bXr50pcZgipNfnkx1Sq+5G7veBiPE5PJfb1KzU6sEk28cQNmqnmxrXalXPd88rj R1pDJ3E0ep5ebQ2pkklJQjaj+O7ysjHCTyzI/tGsSxMJfJBTyqKYg== X-Received: by 2002:a05:620a:2888:b0:93a:ea:b00e with SMTP id af79cd13be357-93c43d9e0eemr2013943785a.30.1790602206503; Mon, 28 Sep 2026 06:30:06 -0700 (PDT) Received: from pve-server ([49.205.216.49]) by smtp.gmail.com with ESMTPSA id af79cd13be357-93c813a443fsm151650285a.12.2026.09.28.06.29.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2026 06:30:05 -0700 (PDT) From: Ritesh Harjani (IBM) To: Amit Machhiwal , Madhavan Srinivasan , linuxppc-dev@lists.ozlabs.org Cc: Amit Machhiwal , Nicholas Piggin , Michael Ellerman , "Christophe Leroy (CS GROUP)" , Shrikanth Hegde , kvm-ppc@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Gautam Menghani , Harsh Prateek Bora , R Nageswara Sastry , Alexander Graf , linux-hardening@vger.kernel.org, stable@vger.kernel.org, Avi Kivity Subject: Re: [RESEND PATCH 1/3] KVM: PPC: Book3S HV: Add SRCU protection for virtual-mode HPT hcalls In-Reply-To: <20260928122837.8782-2-amachhiw@linux.ibm.com> Date: Mon, 28 Sep 2026 18:57:16 +0530 Message-ID: References: <20260928122837.8782-1-amachhiw@linux.ibm.com> <20260928122837.8782-2-amachhiw@linux.ibm.com> Precedence: bulk X-Mailing-List: kvm-ppc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Amit Machhiwal writes: > The virtual-mode HPT hcall handlers (H_ENTER, H_REMOVE, H_BULK_REMOVE, > H_CLEAR_REF, H_CLEAR_MOD) call into book3s_hv_rm_mmu.c, which accesses > memslots via kvm_memslots_raw(). kvm_memslots_raw() uses > rcu_dereference_raw_check() to bypass SRCU lockdep annotation checking. > This is safe in real mode because the entire guest entry/exit is wrapped > in srcu_read_lock/unlock inside kvmppc_run_core() and > kvmhv_run_single_vcpu(). > > However, since commit 6165d5dd99db ("KVM: PPC: Book3S HV: add virtual > mode handlers for HPT hcalls and page faults"), these same handlers are > also executed in virtual mode via kvmppc_pseries_do_hcall(), which runs > after SRCU has already been released on guest exit. > > A concurrent KVM_SET_USER_MEMORY_REGION deletion or move can therefore > call synchronize_srcu_expedited() — which does not wait for this thread — > and then kfree(slot) and vfree(slot->arch.rmap) while the hcall handler > still holds a raw pointer to the memslot. lock_rmap() then writes to > freed vmalloc memory, leading to use-after-free and memory corruption. > Because kvm_memslots_raw() suppresses lockdep checks, this race is > entirely silent. > > Fix this by factoring out the 7 HPT hcall handlers (H_REMOVE, H_ENTER, > H_READ, H_CLEAR_MOD, H_CLEAR_REF, H_PROTECT, H_BULK_REMOVE) into a > helper function, kvmppc_pseries_do_hpt_hcall(), and wrapping its call > site in srcu_read_lock(&kvm->srcu) / srcu_read_unlock(&kvm->srcu, idx). > Targeting only the HPT hcalls avoids wrapping non-HPT hcalls that sleep > (such as H_CONFER, H_REGISTER_VPA, H_PAGE_INIT) or handlers that already > acquire SRCU internally (such as H_RTAS). > > Fixes: 6165d5dd99db ("KVM: PPC: Book3S HV: add virtual mode handlers for HPT hcalls and page faults") > Cc: stable@vger.kernel.org # v5.14+ > Suggested-by: Ritesh Harjani (IBM) > Signed-off-by: Amit Machhiwal > --- > arch/powerpc/kvm/book3s_hv.c | 70 ++++++++++++++++++------------------ > 1 file changed, 35 insertions(+), 35 deletions(-) I had looked at this path in depth earlier itself. LGTM. Please feel free to add: Reviewed-by: Ritesh Harjani (IBM)