From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f202.google.com (mail-pg1-f202.google.com [209.85.215.202]) (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 5BB193F6C2C for ; Fri, 15 May 2026 22:26:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778884014; cv=none; b=L56L1fJPEX6PuHm2hDgG8Sv13qznvxWZJw2RWVPOQ9yUDyzCnlJyteRrZ7eGXXxKV2Q0r6e3IC/X97Gr8sDo1cpxIrPE0YKn2JW6yIeMWlg4PC3MDSUmeWXOYSjJWiQBsWMsGlHKK+Xhc5LCE/lf5E/5RnXXQFNrdfUcLZkcAGQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778884014; c=relaxed/simple; bh=UF2AcgAreN9t5cQBNksZDPJUbm/IWXoeU07tGghDGxA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Ku0U94SF2eFHGR5zdfgqTVHj8FEKDgJeE6Cuajup2fol8bB3LteZh6xqKNrLD/rm/j1ZRxih7eYwTKTQcOx4k0dqn/pTXTewgh9XStfOtz8OKagPOp2juTr+ZN4xJO/1YV9z9bCchfxrkJOVVuC0Yrf0ArO02hZQ+xbF36fwH/Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=JrBWGmpg; arc=none smtp.client-ip=209.85.215.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="JrBWGmpg" Received: by mail-pg1-f202.google.com with SMTP id 41be03b00d2f7-c828ab3b033so381627a12.3 for ; Fri, 15 May 2026 15:26:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778884006; x=1779488806; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=J27Ju2q/+RYx5fEK+7reGgGhOWnL4zngH5mix3OXeJc=; b=JrBWGmpggpyb06yxbsvdmFD7Mvgui4YhemkRFDVfzVuxtcylM4GHkhPgVtRiQNtyO0 aYjdoeurfDFM0FziP6VbqHBNHhyVvVxWE/14WIUCUHrxpm8LQaDXzx4Hm9+uXxaxD/UU KJAvDrPnxEL5Qq0BLQZEpMTRWKootzwg04hNsZw2WkxstZ/IM+XPRlnqJt5+jAocw9iw n76PBWGrlYhrw5FwDbiYpPLQjjtchWQoTamYgrFCyylqVgn/LbL2727eebrDpzrViz/Y 4xucJdajF2OFzKZC47vNrG+ke5FsRZoAyg0J9+KysFh21BxAMgXK6mhyL7V4b1bX1IhX /6Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778884006; x=1779488806; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=J27Ju2q/+RYx5fEK+7reGgGhOWnL4zngH5mix3OXeJc=; b=I7cx32G4532BSE1oYoCMhlrs0yjjQLbniQlNf7dd1KzmBmZrfuTO3KuyimuYX9IM+C pS9bWnY4Rj2O77o5MmHjH3yt3BwI33AMwuuatd3tFO6osCXT7b/g8BUY1rS22pVqnemC u7ycR4Csscl5q3jG4YFEv9Xp6rOFWMxnj8oaKexS94KsVvslNak/8S0xPmeZuWyf+Orr MEeT9QtF9oUDpaAnv+aHTP/iJwLTjCWaIunx5ByqnmFMS01l1bKxMPkCPXTVyBBxE91v y37J1TNLeT4QE8cnQCWyrGoxbi+QVRAuKVNp4lkNuSkGN3wWQ5Rqvq6Xh0DYiCU2DiWE absg== X-Forwarded-Encrypted: i=1; AFNElJ8E86sgAPJ2uUcuiAvYKx/BvEtAFFEXHagzNaN7LQq8n2VIXilY/vYmYQhLA7Af5CrtQobma+UyOEqc0b4=@vger.kernel.org X-Gm-Message-State: AOJu0YzamCey78ODMNF0vCrd3onfVOxia8Mjz+MIol3ZOO/2ad3frEOt ktyRS3iBHZUqrhJRpVi/SZWEt5YlLoly/fLhgqlHw5Jc1zd9FIljOgjeO0MWB7IPtVFINETWfce EhUGX7Q== X-Received: from pgnc6.prod.google.com ([2002:a63:7246:0:b0:c7d:a551:e17b]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:3c8f:b0:3b1:a9ce:5095 with SMTP id adf61e73a8af0-3b22ea4ce78mr6643197637.22.1778884006352; Fri, 15 May 2026 15:26:46 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 15 May 2026 15:26:34 -0700 In-Reply-To: <20260515222638.1949982-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260515222638.1949982-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260515222638.1949982-7-seanjc@google.com> Subject: [PATCH v3 06/10] KVM: x86: Move KVM_GUESTDBG_SINGLESTEP handling into kvm_inject_emulated_db() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Hou Wenlong , Lai Jiangshan Content-Type: text/plain; charset="UTF-8" From: Hou Wenlong Move KVM_GUESTDBG_SINGLESTEP handling from kvm_vcpu_do_singlestep() into kvm_inject_emulated_db() to dedup the USE_HW_BP vs. SINGLESTEP logic, and to allow for removing kvm_vcpu_do_singlestep() entirely. No functional change intended. Suggested-by: Lai Jiangshan Signed-off-by: Hou Wenlong [sean: massage changelog] Signed-off-by: Sean Christopherson --- arch/x86/kvm/x86.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 279e2734e088..ca30a8987f2f 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -8994,7 +8994,7 @@ static int kvm_inject_emulated_db(struct kvm_vcpu *vcpu, unsigned long dr6) { struct kvm_run *kvm_run = vcpu->run; - if (vcpu->guest_debug & KVM_GUESTDBG_USE_HW_BP) { + if (vcpu->guest_debug & (KVM_GUESTDBG_USE_HW_BP | KVM_GUESTDBG_SINGLESTEP)) { kvm_run->debug.arch.dr6 = dr6 | DR6_ACTIVE_LOW; kvm_run->debug.arch.pc = kvm_get_linear_rip(vcpu); kvm_run->debug.arch.exception = DB_VECTOR; @@ -9279,17 +9279,7 @@ static int kvm_vcpu_check_hw_bp(unsigned long addr, u32 type, u32 dr7, static int kvm_vcpu_do_singlestep(struct kvm_vcpu *vcpu) { - struct kvm_run *kvm_run = vcpu->run; - - if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP) { - kvm_run->debug.arch.dr6 = DR6_BS | DR6_ACTIVE_LOW; - kvm_run->debug.arch.pc = kvm_get_linear_rip(vcpu); - kvm_run->debug.arch.exception = DB_VECTOR; - kvm_run->exit_reason = KVM_EXIT_DEBUG; - return 0; - } - kvm_queue_exception_p(vcpu, DB_VECTOR, DR6_BS); - return 1; + return kvm_inject_emulated_db(vcpu, DR6_BS); } int kvm_skip_emulated_instruction(struct kvm_vcpu *vcpu) -- 2.54.0.563.g4f69b47b94-goog