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 0C3C5156C3 for ; Wed, 15 Nov 2023 15:31:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none 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="RZktU7jr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700062303; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D/U++RP8J87fTpffNLluzx5XIExdTU9ynmak8Mre+P4=; b=RZktU7jr49koGscOk+YZGcJZn45sRaj4nqUQEDdRqRhmo/X9YFfVy/E0vjCxK0+zXp8/wX V5kQhgoa2VVligDeznTggXjrL9525P5RhbYNwu10beVLdiKVC+wZqPtcMyQAW/0hmCvOph n+OCKWcVE7Tr/aFrqvZjbFgEUA63I7A= Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-19-jmelvw4rNq-9iXFADBC2mA-1; Wed, 15 Nov 2023 10:31:41 -0500 X-MC-Unique: jmelvw4rNq-9iXFADBC2mA-1 Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-6bdc140103bso1690487b3a.1 for ; Wed, 15 Nov 2023 07:31:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700062300; x=1700667100; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=D/U++RP8J87fTpffNLluzx5XIExdTU9ynmak8Mre+P4=; b=ww2ggZhEJeAWN6MH34n2CfA7PCrEDINkYArhAf1yrlG68CMCH862/qyNIbD3UG1mHk bp9oJONIzfRCoeAE/mv8m/718qmU8u9AlNXBcnd+LsmHMCiqrDzMR++QWuRvEKI7i4LM aJ0BVX7YdTmxNnSO8Z/AoOEuH+bt4fDCGZ1QuTiuRHR08dhYL9R7cDetDP3FjTWwOLNj S/rs3tdyMKo1cLkfFdRS0udQ3OY72YOvY3RMpiVH+j8YrEE/uvV58F19goyVMzTRijJn ZE4t/iIiSWDC0tMAy6/z/CSuL2J68JH1wJWCTAB9Z3CrzYqSGBQCcZwxKGNIhPZCINSz TfVA== X-Gm-Message-State: AOJu0YwE5qv6RyZqVIw3gMf04uZPVxpBrZkTUYuPgzC6upfX/8yJo5z/ vBF62mDfrlWteDKPuaeE+S2Jt2xoaDGnpv96VMh3/xv9KGLA5GSfng7T0phe+ncZTi51WSSfEQn oENAkZQAc5VWDUWSH X-Received: by 2002:a05:6a00:6894:b0:6c0:81a3:fe4c with SMTP id hr20-20020a056a00689400b006c081a3fe4cmr2631604pfb.3.1700062299858; Wed, 15 Nov 2023 07:31:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IG6wTglBWhG4nljh27JjPWJF2LXSzDl20T4s5YweTj0uHIb6TdJ4bD03xIAZOHx+3l4vNETfQ== X-Received: by 2002:a05:6a00:6894:b0:6c0:81a3:fe4c with SMTP id hr20-20020a056a00689400b006c081a3fe4cmr2631564pfb.3.1700062299414; Wed, 15 Nov 2023 07:31:39 -0800 (PST) Received: from [10.72.112.25] ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id e12-20020a6558cc000000b0058ee60f8e4dsm1174195pgu.34.2023.11.15.07.31.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 15 Nov 2023 07:31:39 -0800 (PST) Message-ID: Date: Wed, 15 Nov 2023 23:31:35 +0800 Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: [PATCH] KVM: arm64: selftests: Clean up the GIC[D,R]_BASE_GPA To: kvm@vger.kernel.org, kvmarm@lists.linux.dev Cc: Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , Paolo Bonzini , Shuah Khan , linux-arm-kernel@lists.infradead.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org References: <20231115104757.15710-1-shahuang@redhat.com> From: Shaoqin Huang In-Reply-To: <20231115104757.15710-1-shahuang@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11/15/23 18:47, Shaoqin Huang wrote: > The GIC[D,R]_BASE_GPA has been defined in multiple files with the same > value, define it in one place to make the code clean. > > Signed-off-by: Shaoqin Huang > --- > tools/testing/selftests/kvm/aarch64/arch_timer.c | 3 --- > tools/testing/selftests/kvm/aarch64/vgic_irq.c | 3 --- > tools/testing/selftests/kvm/dirty_log_perf_test.c | 3 --- > tools/testing/selftests/kvm/include/aarch64/vgic.h | 3 +++ Oops. Forget the kvm/aarch64/vpmu_counter_access.c. I will update a new one. > 4 files changed, 3 insertions(+), 9 deletions(-) > > diff --git a/tools/testing/selftests/kvm/aarch64/arch_timer.c b/tools/testing/selftests/kvm/aarch64/arch_timer.c > index 274b8465b42a..818854007bfd 100644 > --- a/tools/testing/selftests/kvm/aarch64/arch_timer.c > +++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c > @@ -59,9 +59,6 @@ static struct test_args test_args = { > > #define msecs_to_usecs(msec) ((msec) * 1000LL) > > -#define GICD_BASE_GPA 0x8000000ULL > -#define GICR_BASE_GPA 0x80A0000ULL > - > enum guest_stage { > GUEST_STAGE_VTIMER_CVAL = 1, > GUEST_STAGE_VTIMER_TVAL, > diff --git a/tools/testing/selftests/kvm/aarch64/vgic_irq.c b/tools/testing/selftests/kvm/aarch64/vgic_irq.c > index 2e64b4856e38..a48aff110fb6 100644 > --- a/tools/testing/selftests/kvm/aarch64/vgic_irq.c > +++ b/tools/testing/selftests/kvm/aarch64/vgic_irq.c > @@ -19,9 +19,6 @@ > #include "gic_v3.h" > #include "vgic.h" > > -#define GICD_BASE_GPA 0x08000000ULL > -#define GICR_BASE_GPA 0x080A0000ULL > - > /* > * Stores the user specified args; it's passed to the guest and to every test > * function. > diff --git a/tools/testing/selftests/kvm/dirty_log_perf_test.c b/tools/testing/selftests/kvm/dirty_log_perf_test.c > index d374dbcf9a53..4971e8f77a0a 100644 > --- a/tools/testing/selftests/kvm/dirty_log_perf_test.c > +++ b/tools/testing/selftests/kvm/dirty_log_perf_test.c > @@ -22,9 +22,6 @@ > #ifdef __aarch64__ > #include "aarch64/vgic.h" > > -#define GICD_BASE_GPA 0x8000000ULL > -#define GICR_BASE_GPA 0x80A0000ULL > - > static int gic_fd; > > static void arch_setup_vm(struct kvm_vm *vm, unsigned int nr_vcpus) > diff --git a/tools/testing/selftests/kvm/include/aarch64/vgic.h b/tools/testing/selftests/kvm/include/aarch64/vgic.h > index 0ac6f05c63f9..9dbb342fd808 100644 > --- a/tools/testing/selftests/kvm/include/aarch64/vgic.h > +++ b/tools/testing/selftests/kvm/include/aarch64/vgic.h > @@ -33,4 +33,7 @@ void kvm_irq_write_isactiver(int gic_fd, uint32_t intid, struct kvm_vcpu *vcpu); > > #define KVM_IRQCHIP_NUM_PINS (1020 - 32) > > +#define GICD_BASE_GPA 0x08000000ULL > +#define GICR_BASE_GPA 0x080A0000ULL > + > #endif // SELFTEST_KVM_VGIC_H -- Shaoqin From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AD5E1C2BB3F for ; Wed, 15 Nov 2023 15:32:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1VBdUepVhZ/ct8w7Y5BCR+hjZ3R+nARvvJicEE6f/tE=; b=BssbW4y1jkt7Q4 6T2Xv+AP0KiuCcjClVsY5Ia8qZcVqgQ7yxNJnSgT18j20UECfMpmsVForLzneGLthsIXu6SKQQxBG wreBtYhqueZBxbr0JNP4nAdXVT3LtM22JdqBqP/RBf6CcG9GJpNsN2wF5gZ7bArBoOK74jQjRZ+JQ W0ocqsdhy9JX312JpZmi1M3wsMkQ5j3ehYF1DJNaq2MjHEoGToww2IQFUd72fvE9NqFXBUQ7G6AOg R6f+6nk4nzvjWKN6MwzZV8u3YSYEnKR/gjHq1mvlJrbUpDlb4ngWkQ5XMhY0KGtHG4uSuI5Yn6krk 44KgdJrfFQ5eQnNRLh/A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r3Hrn-001BeL-0I; Wed, 15 Nov 2023 15:31:47 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r3Hrk-001BdS-0s for linux-arm-kernel@lists.infradead.org; Wed, 15 Nov 2023 15:31:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700062302; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D/U++RP8J87fTpffNLluzx5XIExdTU9ynmak8Mre+P4=; b=Qt27BkML2PP1cPd/8aCgLA5uH6LBroIvaAaul0bsKeiH0E27NYXWy6Sfyuz/QqYxVr7l5w tcoVV1skG7SEh4AFL8bxGjcKcIOPGZiu+bkZmekvxbYZcTBItlatYzGxWCxFq9PsAHlOHi FGxT5r+bWKw9Jw5Ef71daNlxJX+juko= Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-624-zLWoe6a6N7y7h8fOkU8Xtg-1; Wed, 15 Nov 2023 10:31:41 -0500 X-MC-Unique: zLWoe6a6N7y7h8fOkU8Xtg-1 Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-6bdc140103bso1690484b3a.1 for ; Wed, 15 Nov 2023 07:31:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700062300; x=1700667100; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=D/U++RP8J87fTpffNLluzx5XIExdTU9ynmak8Mre+P4=; b=YMbqAbUtmjbWCrd8zvtvIGZ00SsIdB8nSQCJrjqYRHUO0M3WzTfo4nqE1vP3qvl6/E /lNkweA7bMlhhtARCGvTQH2rP0AC0R9QNGEUOcn5hhUewIQ4XegYg35eivOQkj/JSYmd qgkkFvzDmNzzeRX0Qmcs3lOtbyzq0df/LYB47tWDT9eCGORlUYQT43sCxZAIsHyUnJ28 YBotqUu9hJeZQmd0zZPXYT11T7kY7EfWNt2Z175rEKhsrEx9A7yhKrreqZ+ynfWiF1Sv 0VimfeBBf2D/cBZScJEOXzzsO9/dOV/RqkEHvx3MxDQCKUK8KEtlz3VmzcRukTFOuBwu dVAg== X-Gm-Message-State: AOJu0YxvdSs6MQz/zT0SX4ZG4ulflp5aWEPdl3TVrD97040Fw6i2EcsO ncAU1I9C3iB6wisuWWr6T7q33jthPTWJC036GHSFLyHMIcSGJ9s6W47Zr/Drioguc9NhANhcTtm JQXOwvtDmVyEuekIW+p4ts5sOD2eO9kWLu7k= X-Received: by 2002:a05:6a00:6894:b0:6c0:81a3:fe4c with SMTP id hr20-20020a056a00689400b006c081a3fe4cmr2631594pfb.3.1700062299849; Wed, 15 Nov 2023 07:31:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IG6wTglBWhG4nljh27JjPWJF2LXSzDl20T4s5YweTj0uHIb6TdJ4bD03xIAZOHx+3l4vNETfQ== X-Received: by 2002:a05:6a00:6894:b0:6c0:81a3:fe4c with SMTP id hr20-20020a056a00689400b006c081a3fe4cmr2631564pfb.3.1700062299414; Wed, 15 Nov 2023 07:31:39 -0800 (PST) Received: from [10.72.112.25] ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id e12-20020a6558cc000000b0058ee60f8e4dsm1174195pgu.34.2023.11.15.07.31.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 15 Nov 2023 07:31:39 -0800 (PST) Message-ID: Date: Wed, 15 Nov 2023 23:31:35 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: [PATCH] KVM: arm64: selftests: Clean up the GIC[D,R]_BASE_GPA To: kvm@vger.kernel.org, kvmarm@lists.linux.dev Cc: Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , Paolo Bonzini , Shuah Khan , linux-arm-kernel@lists.infradead.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org References: <20231115104757.15710-1-shahuang@redhat.com> From: Shaoqin Huang In-Reply-To: <20231115104757.15710-1-shahuang@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231115_073144_648563_97B32F39 X-CRM114-Status: GOOD ( 18.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 11/15/23 18:47, Shaoqin Huang wrote: > The GIC[D,R]_BASE_GPA has been defined in multiple files with the same > value, define it in one place to make the code clean. > > Signed-off-by: Shaoqin Huang > --- > tools/testing/selftests/kvm/aarch64/arch_timer.c | 3 --- > tools/testing/selftests/kvm/aarch64/vgic_irq.c | 3 --- > tools/testing/selftests/kvm/dirty_log_perf_test.c | 3 --- > tools/testing/selftests/kvm/include/aarch64/vgic.h | 3 +++ Oops. Forget the kvm/aarch64/vpmu_counter_access.c. I will update a new one. > 4 files changed, 3 insertions(+), 9 deletions(-) > > diff --git a/tools/testing/selftests/kvm/aarch64/arch_timer.c b/tools/testing/selftests/kvm/aarch64/arch_timer.c > index 274b8465b42a..818854007bfd 100644 > --- a/tools/testing/selftests/kvm/aarch64/arch_timer.c > +++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c > @@ -59,9 +59,6 @@ static struct test_args test_args = { > > #define msecs_to_usecs(msec) ((msec) * 1000LL) > > -#define GICD_BASE_GPA 0x8000000ULL > -#define GICR_BASE_GPA 0x80A0000ULL > - > enum guest_stage { > GUEST_STAGE_VTIMER_CVAL = 1, > GUEST_STAGE_VTIMER_TVAL, > diff --git a/tools/testing/selftests/kvm/aarch64/vgic_irq.c b/tools/testing/selftests/kvm/aarch64/vgic_irq.c > index 2e64b4856e38..a48aff110fb6 100644 > --- a/tools/testing/selftests/kvm/aarch64/vgic_irq.c > +++ b/tools/testing/selftests/kvm/aarch64/vgic_irq.c > @@ -19,9 +19,6 @@ > #include "gic_v3.h" > #include "vgic.h" > > -#define GICD_BASE_GPA 0x08000000ULL > -#define GICR_BASE_GPA 0x080A0000ULL > - > /* > * Stores the user specified args; it's passed to the guest and to every test > * function. > diff --git a/tools/testing/selftests/kvm/dirty_log_perf_test.c b/tools/testing/selftests/kvm/dirty_log_perf_test.c > index d374dbcf9a53..4971e8f77a0a 100644 > --- a/tools/testing/selftests/kvm/dirty_log_perf_test.c > +++ b/tools/testing/selftests/kvm/dirty_log_perf_test.c > @@ -22,9 +22,6 @@ > #ifdef __aarch64__ > #include "aarch64/vgic.h" > > -#define GICD_BASE_GPA 0x8000000ULL > -#define GICR_BASE_GPA 0x80A0000ULL > - > static int gic_fd; > > static void arch_setup_vm(struct kvm_vm *vm, unsigned int nr_vcpus) > diff --git a/tools/testing/selftests/kvm/include/aarch64/vgic.h b/tools/testing/selftests/kvm/include/aarch64/vgic.h > index 0ac6f05c63f9..9dbb342fd808 100644 > --- a/tools/testing/selftests/kvm/include/aarch64/vgic.h > +++ b/tools/testing/selftests/kvm/include/aarch64/vgic.h > @@ -33,4 +33,7 @@ void kvm_irq_write_isactiver(int gic_fd, uint32_t intid, struct kvm_vcpu *vcpu); > > #define KVM_IRQCHIP_NUM_PINS (1020 - 32) > > +#define GICD_BASE_GPA 0x08000000ULL > +#define GICR_BASE_GPA 0x080A0000ULL > + > #endif // SELFTEST_KVM_VGIC_H -- Shaoqin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel