From patchwork Fri May 15 14:27:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 48571 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AEA5D2121F for ; Fri, 15 May 2015 14:29:57 +0000 (UTC) Received: by laat2 with SMTP id t2sf31458393laa.2 for ; Fri, 15 May 2015 07:29:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type :content-transfer-encoding:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=wgxNS7rltEm3x81pC2iVIIgOPXAkm2iMcvYOK+9+1AA=; b=G8U5ech+xv+t0IaUjD+LO0D6VqoYs3ympF7g7c3/U0I6rOoo0PWcyq2DEmHqxBUynx n60wnxVn9GfOQNIJ4ZXH1spXXi3mwrPSIMm9715FW1Hg80dJAaFhtyvMWQy/5mJyBOSo xuTsg4JKwIvXpZXRmQ0h722VG5j801IuAakrmszubS/zjAlmRbhSbE+dRpcwWNoU0Or1 dlSEMygS8qrQIPFIUDcOuhErb1FQUiMK82SZqAHXXK3CKsb0aMRqky4/XTqSu7WAFER3 NKK9g93zEq71U8ZnjlZsI61jIggYijfVj3JPXRbxEL79gdhvCDQ+mPev1CYbsW0K6oP1 S8Ww== X-Gm-Message-State: ALoCoQlrFWTWsBJdQK3zul4YLhzgeQLfO/nt6wdeLn/oC3Gzvl8Kv7kEjjAvkqfUnu3vW+5dljPo X-Received: by 10.112.162.228 with SMTP id yd4mr7250009lbb.8.1431700196351; Fri, 15 May 2015 07:29:56 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.245.43 with SMTP id xl11ls546510lac.21.gmail; Fri, 15 May 2015 07:29:56 -0700 (PDT) X-Received: by 10.153.4.135 with SMTP id ce7mr7403254lad.44.1431700196179; Fri, 15 May 2015 07:29:56 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id t5si1175568lbb.35.2015.05.15.07.29.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 May 2015 07:29:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by laat2 with SMTP id t2so121961166laa.1 for ; Fri, 15 May 2015 07:29:56 -0700 (PDT) X-Received: by 10.153.8.167 with SMTP id dl7mr7440464lad.86.1431700196076; Fri, 15 May 2015 07:29:56 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp2077702lbb; Fri, 15 May 2015 07:29:55 -0700 (PDT) X-Received: by 10.66.148.34 with SMTP id tp2mr18823561pab.65.1431700194277; Fri, 15 May 2015 07:29:54 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y10si2869429pdn.1.2015.05.15.07.29.29; Fri, 15 May 2015 07:29:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946017AbbEOO1l (ORCPT + 28 others); Fri, 15 May 2015 10:27:41 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:36198 "EHLO socrates.bennee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934381AbbEOO1g (ORCPT ); Fri, 15 May 2015 10:27:36 -0400 Received: from localhost ([127.0.0.1] helo=zen.linaroharston) by socrates.bennee.com with esmtp (Exim 4.80) (envelope-from ) id 1YtHqI-0000D4-B8; Fri, 15 May 2015 17:48:06 +0200 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com, peter.maydell@linaro.org, agraf@suse.de, drjones@redhat.com, pbonzini@redhat.com, zhichao.huang@linaro.org Cc: jan.kiszka@siemens.com, dahi@linux.vnet.ibm.com, r65777@freescale.com, bp@suse.de, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Martin Schwidefsky , Heiko Carstens , linux390@de.ibm.com (supporter:S390), Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org (maintainer:X86 ARCHITECTURE...), Gleb Natapov , Bharat Bhushan , Alexey Kardashevskiy , Mihai Caraman , Christian Borntraeger , Cornelia Huck , Michael Mueller , Eric Farman , Dominik Dingel , Tony Krowiak , "Jason J. Herne" , Nadav Amit , linuxppc-dev@lists.ozlabs.org (open list:LINUX FOR POWERPC...), linux-kernel@vger.kernel.org (open list), linux-s390@vger.kernel.org (open list:S390), linux-api@vger.kernel.org (open list:ABI/API) Subject: [PATCH v4 02/12] KVM: define common KVM_GUESTDBG_USE_SW/HW_BP bits Date: Fri, 15 May 2015 15:27:05 +0100 Message-Id: <1431700035-23479-3-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1431700035-23479-1-git-send-email-alex.bennee@linaro.org> References: <1431700035-23479-1-git-send-email-alex.bennee@linaro.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: alex.bennee@linaro.org X-SA-Exim-Scanned: No (on socrates.bennee.com); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: alex.bennee@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Currently x86, powerpc and soon arm64 use the same two architecture specific bits for guest debug support for software and hardware breakpoints. This makes the shared values explicit. Signed-off-by: Alex Bennée Reviewed-by: Andrew Jones - v4 - claim more bits for the common functionality v5 - don't use __ mechanism to move values common diff --git a/arch/powerpc/include/uapi/asm/kvm.h b/arch/powerpc/include/uapi/asm/kvm.h index ab4d473..6ea24a5 100644 --- a/arch/powerpc/include/uapi/asm/kvm.h +++ b/arch/powerpc/include/uapi/asm/kvm.h @@ -307,11 +307,9 @@ struct kvm_guest_debug_arch { /* Debug related defines */ /* * kvm_guest_debug->control is a 32 bit field. The lower 16 bits are generic - * and upper 16 bits are architecture specific. Architecture specific defines + * and upper 14 bits are architecture specific. Architecture specific defines * that ioctl is for setting hardware breakpoint or software breakpoint. */ -#define KVM_GUESTDBG_USE_SW_BP 0x00010000 -#define KVM_GUESTDBG_USE_HW_BP 0x00020000 /* definition of registers in kvm_run */ struct kvm_sync_regs { diff --git a/arch/s390/include/uapi/asm/kvm.h b/arch/s390/include/uapi/asm/kvm.h index ef1a5fc..aca4f86 100644 --- a/arch/s390/include/uapi/asm/kvm.h +++ b/arch/s390/include/uapi/asm/kvm.h @@ -114,8 +114,6 @@ struct kvm_fpu { __u64 fprs[16]; }; -#define KVM_GUESTDBG_USE_HW_BP 0x00010000 - #define KVM_HW_BP 1 #define KVM_HW_WP_WRITE 2 #define KVM_SINGLESTEP 4 diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/kvm.h index d7dcef5..ca51d4c 100644 --- a/arch/x86/include/uapi/asm/kvm.h +++ b/arch/x86/include/uapi/asm/kvm.h @@ -250,8 +250,6 @@ struct kvm_debug_exit_arch { __u64 dr7; }; -#define KVM_GUESTDBG_USE_SW_BP 0x00010000 -#define KVM_GUESTDBG_USE_HW_BP 0x00020000 #define KVM_GUESTDBG_INJECT_DB 0x00040000 #define KVM_GUESTDBG_INJECT_BP 0x00080000 diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 70ac641..7c5dd11 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -570,8 +570,10 @@ struct kvm_s390_irq_state { /* for KVM_SET_GUEST_DEBUG */ -#define KVM_GUESTDBG_ENABLE 0x00000001 -#define KVM_GUESTDBG_SINGLESTEP 0x00000002 +#define KVM_GUESTDBG_ENABLE (1 << 0) +#define KVM_GUESTDBG_SINGLESTEP (1 << 1) +#define KVM_GUESTDBG_USE_SW_BP (1 << 16) +#define KVM_GUESTDBG_USE_HW_BP (1 << 17) struct kvm_guest_debug { __u32 control;