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 X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF59BC10DCE for ; Fri, 6 Mar 2020 08:47:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF64F2073D for ; Fri, 6 Mar 2020 08:47:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cXz8NvjQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726413AbgCFIrO (ORCPT ); Fri, 6 Mar 2020 03:47:14 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:34486 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725923AbgCFIrN (ORCPT ); Fri, 6 Mar 2020 03:47:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583484432; 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=sq19uiYcnGylfdNqIKtaPqUrfK1PWX84fJ9AJQFeyjo=; b=cXz8NvjQ/rGVn38bIbJtOLRENigCgk1/XbwdqXvaTT4wdvk4huvCgBUQ3eff6KowZc46aR OKpYGMy5vkBrPdBULUaFGYGHiC0tV09/i2h8+492Wmr5mNSw0V1mHIFi7TRmQZQZIrnLlA QyPkrG1CnCI1gy3//FQBinLlUW+BsB4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-61-Rra_508PPTmzmoVbi6CsZQ-1; Fri, 06 Mar 2020 03:47:08 -0500 X-MC-Unique: Rra_508PPTmzmoVbi6CsZQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 34389107ACCA; Fri, 6 Mar 2020 08:47:06 +0000 (UTC) Received: from [10.36.116.59] (ovpn-116-59.ams2.redhat.com [10.36.116.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 267F75DA76; Fri, 6 Mar 2020 08:47:01 +0000 (UTC) Subject: Re: [kvm-unit-tests PATCH v3 09/14] arm/arm64: ITS: Device and collection Initialization To: Andrew Jones Cc: eric.auger.pro@gmail.com, maz@kernel.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org, andre.przywara@arm.com, peter.maydell@linaro.org, yuzenghui@huawei.com, alexandru.elisei@arm.com, thuth@redhat.com References: <20200128103459.19413-1-eric.auger@redhat.com> <20200128103459.19413-10-eric.auger@redhat.com> <20200207125140.656ctxlmk3d4au7g@kamzik.brq.redhat.com> From: Auger Eric Message-ID: <4d7f5611-e8e1-c143-1f2b-074222fda4c4@redhat.com> Date: Fri, 6 Mar 2020 09:47:00 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20200207125140.656ctxlmk3d4au7g@kamzik.brq.redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Hi Drew, On 2/7/20 1:51 PM, Andrew Jones wrote: > On Tue, Jan 28, 2020 at 11:34:54AM +0100, Eric Auger wrote: >> Introduce an helper functions to register >> - a new device, characterized by its device id and the >> max number of event IDs that dimension its ITT (Interrupt >> Translation Table). The function allocates the ITT. >> >> - a new collection, characterized by its ID and the >> target processing engine (PE). >> >> Signed-off-by: Eric Auger >> >> --- >> >> v2 -> v3: >> - s/report_abort/assert >> >> v1 -> v2: >> - s/nb_/nr_ >> --- >> lib/arm/asm/gic-v3-its.h | 20 +++++++++++++++++- >> lib/arm/gic-v3-its.c | 44 ++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 63 insertions(+), 1 deletion(-) >> >> diff --git a/lib/arm/asm/gic-v3-its.h b/lib/arm/asm/gic-v3-its.h >> index fe73c04..acd97a9 100644 >> --- a/lib/arm/asm/gic-v3-its.h >> +++ b/lib/arm/asm/gic-v3-its.h >> @@ -31,6 +31,19 @@ struct its_baser { >> }; >> >> #define GITS_BASER_NR_REGS 8 >> +#define GITS_MAX_DEVICES 8 >> +#define GITS_MAX_COLLECTIONS 8 >> + >> +struct its_device { >> + u32 device_id; /* device ID */ >> + u32 nr_ites; /* Max Interrupt Translation Entries */ >> + void *itt; /* Interrupt Translation Table GPA */ >> +}; >> + >> +struct its_collection { >> + u64 target_address; >> + u16 col_id; >> +}; >> >> struct its_data { >> void *base; >> @@ -38,6 +51,10 @@ struct its_data { >> struct its_baser baser[GITS_BASER_NR_REGS]; >> struct its_cmd_block *cmd_base; >> struct its_cmd_block *cmd_write; >> + struct its_device devices[GITS_MAX_DEVICES]; >> + u32 nr_devices; /* Allocated Devices */ >> + struct its_collection collections[GITS_MAX_COLLECTIONS]; >> + u32 nr_collections; /* Allocated Collections */ >> }; >> >> extern struct its_data its_data; >> @@ -90,7 +107,6 @@ extern struct its_data its_data; >> #define GITS_BASER_TYPE_DEVICE 1 >> #define GITS_BASER_TYPE_COLLECTION 4 >> >> - >> struct its_cmd_block { >> u64 raw_cmd[4]; >> }; >> @@ -100,6 +116,8 @@ extern void its_init(void); >> extern int its_parse_baser(int i, struct its_baser *baser); >> extern struct its_baser *its_lookup_baser(int type); >> extern void its_enable_defaults(void); >> +extern struct its_device *its_create_device(u32 dev_id, int nr_ites); >> +extern struct its_collection *its_create_collection(u32 col_id, u32 target_pe); >> >> #else /* __arm__ */ >> >> diff --git a/lib/arm/gic-v3-its.c b/lib/arm/gic-v3-its.c >> index d1e7e52..c2dcd01 100644 >> --- a/lib/arm/gic-v3-its.c >> +++ b/lib/arm/gic-v3-its.c >> @@ -175,3 +175,47 @@ void its_enable_defaults(void) >> >> writel(GITS_CTLR_ENABLE, its_data.base + GITS_CTLR); >> } >> + >> +struct its_device *its_create_device(u32 device_id, int nr_ites) >> +{ >> + struct its_baser *baser; >> + struct its_device *new; >> + unsigned long n, order; >> + >> + assert(its_data.nr_devices < GITS_MAX_DEVICES); >> + >> + baser = its_lookup_baser(GITS_BASER_TYPE_DEVICE); >> + if (!baser) >> + return NULL; > > Should we assert here if we can't find a GITS_BASER_TYPE_DEVICE ? > It seems none of the callers of its_create_device are checking > for null. I removed that code which is useless. > >> + >> + new = &its_data.devices[its_data.nr_devices]; >> + >> + new->device_id = device_id; >> + new->nr_ites = nr_ites; >> + >> + n = (its_data.typer.ite_size * nr_ites) >> PAGE_SHIFT; >> + order = is_power_of_2(n) ? fls(n) : fls(n) + 1; > > I've seen this calculation several times now, so I think an > arch-neutral order calculator is in order: > > int get_order(size_t size); > >> + new->itt = (void *)virt_to_phys(alloc_pages(order)); I added this get_order helper in lib/alloc_page.h/c > > If this is a physical address then shouldn't itt be phys_addr_t ? > >> + >> + its_data.nr_devices++; >> + return new; >> +} ITT now is a GVA (void *). >> + >> +struct its_collection *its_create_collection(u32 col_id, u32 pe) >> +{ >> + struct its_collection *new; >> + >> + assert(its_data.nr_collections < GITS_MAX_COLLECTIONS); >> + >> + new = &its_data.collections[its_data.nr_collections]; >> + >> + new->col_id = col_id; >> + >> + if (its_data.typer.pta) >> + new->target_address = (u64)gicv3_data.redist_base[pe]; >> + else >> + new->target_address = pe << 16; >> + >> + its_data.nr_collections++; >> + return new; >> +} >> -- >> 2.20.1 >> > > Thanks, > drew > Thanks Eric 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 X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32EB1C10F25 for ; Fri, 6 Mar 2020 08:48:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0280C2073D for ; Fri, 6 Mar 2020 08:48:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cXz8NvjQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0280C2073D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:32930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jA8eM-00058z-5B for qemu-devel@archiver.kernel.org; Fri, 06 Mar 2020 03:48:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55873) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jA8db-0004Qi-Cw for qemu-devel@nongnu.org; Fri, 06 Mar 2020 03:47:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jA8dZ-0008Ki-RY for qemu-devel@nongnu.org; Fri, 06 Mar 2020 03:47:19 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:43446 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jA8dU-0008Dd-OY for qemu-devel@nongnu.org; Fri, 06 Mar 2020 03:47:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583484432; 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=sq19uiYcnGylfdNqIKtaPqUrfK1PWX84fJ9AJQFeyjo=; b=cXz8NvjQ/rGVn38bIbJtOLRENigCgk1/XbwdqXvaTT4wdvk4huvCgBUQ3eff6KowZc46aR OKpYGMy5vkBrPdBULUaFGYGHiC0tV09/i2h8+492Wmr5mNSw0V1mHIFi7TRmQZQZIrnLlA QyPkrG1CnCI1gy3//FQBinLlUW+BsB4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-61-Rra_508PPTmzmoVbi6CsZQ-1; Fri, 06 Mar 2020 03:47:08 -0500 X-MC-Unique: Rra_508PPTmzmoVbi6CsZQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 34389107ACCA; Fri, 6 Mar 2020 08:47:06 +0000 (UTC) Received: from [10.36.116.59] (ovpn-116-59.ams2.redhat.com [10.36.116.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 267F75DA76; Fri, 6 Mar 2020 08:47:01 +0000 (UTC) Subject: Re: [kvm-unit-tests PATCH v3 09/14] arm/arm64: ITS: Device and collection Initialization To: Andrew Jones References: <20200128103459.19413-1-eric.auger@redhat.com> <20200128103459.19413-10-eric.auger@redhat.com> <20200207125140.656ctxlmk3d4au7g@kamzik.brq.redhat.com> From: Auger Eric Message-ID: <4d7f5611-e8e1-c143-1f2b-074222fda4c4@redhat.com> Date: Fri, 6 Mar 2020 09:47:00 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20200207125140.656ctxlmk3d4au7g@kamzik.brq.redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com, kvm@vger.kernel.org, maz@kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org, andre.przywara@arm.com, yuzenghui@huawei.com, alexandru.elisei@arm.com, kvmarm@lists.cs.columbia.edu, eric.auger.pro@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Drew, On 2/7/20 1:51 PM, Andrew Jones wrote: > On Tue, Jan 28, 2020 at 11:34:54AM +0100, Eric Auger wrote: >> Introduce an helper functions to register >> - a new device, characterized by its device id and the >> max number of event IDs that dimension its ITT (Interrupt >> Translation Table). The function allocates the ITT. >> >> - a new collection, characterized by its ID and the >> target processing engine (PE). >> >> Signed-off-by: Eric Auger >> >> --- >> >> v2 -> v3: >> - s/report_abort/assert >> >> v1 -> v2: >> - s/nb_/nr_ >> --- >> lib/arm/asm/gic-v3-its.h | 20 +++++++++++++++++- >> lib/arm/gic-v3-its.c | 44 ++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 63 insertions(+), 1 deletion(-) >> >> diff --git a/lib/arm/asm/gic-v3-its.h b/lib/arm/asm/gic-v3-its.h >> index fe73c04..acd97a9 100644 >> --- a/lib/arm/asm/gic-v3-its.h >> +++ b/lib/arm/asm/gic-v3-its.h >> @@ -31,6 +31,19 @@ struct its_baser { >> }; >> >> #define GITS_BASER_NR_REGS 8 >> +#define GITS_MAX_DEVICES 8 >> +#define GITS_MAX_COLLECTIONS 8 >> + >> +struct its_device { >> + u32 device_id; /* device ID */ >> + u32 nr_ites; /* Max Interrupt Translation Entries */ >> + void *itt; /* Interrupt Translation Table GPA */ >> +}; >> + >> +struct its_collection { >> + u64 target_address; >> + u16 col_id; >> +}; >> >> struct its_data { >> void *base; >> @@ -38,6 +51,10 @@ struct its_data { >> struct its_baser baser[GITS_BASER_NR_REGS]; >> struct its_cmd_block *cmd_base; >> struct its_cmd_block *cmd_write; >> + struct its_device devices[GITS_MAX_DEVICES]; >> + u32 nr_devices; /* Allocated Devices */ >> + struct its_collection collections[GITS_MAX_COLLECTIONS]; >> + u32 nr_collections; /* Allocated Collections */ >> }; >> >> extern struct its_data its_data; >> @@ -90,7 +107,6 @@ extern struct its_data its_data; >> #define GITS_BASER_TYPE_DEVICE 1 >> #define GITS_BASER_TYPE_COLLECTION 4 >> >> - >> struct its_cmd_block { >> u64 raw_cmd[4]; >> }; >> @@ -100,6 +116,8 @@ extern void its_init(void); >> extern int its_parse_baser(int i, struct its_baser *baser); >> extern struct its_baser *its_lookup_baser(int type); >> extern void its_enable_defaults(void); >> +extern struct its_device *its_create_device(u32 dev_id, int nr_ites); >> +extern struct its_collection *its_create_collection(u32 col_id, u32 target_pe); >> >> #else /* __arm__ */ >> >> diff --git a/lib/arm/gic-v3-its.c b/lib/arm/gic-v3-its.c >> index d1e7e52..c2dcd01 100644 >> --- a/lib/arm/gic-v3-its.c >> +++ b/lib/arm/gic-v3-its.c >> @@ -175,3 +175,47 @@ void its_enable_defaults(void) >> >> writel(GITS_CTLR_ENABLE, its_data.base + GITS_CTLR); >> } >> + >> +struct its_device *its_create_device(u32 device_id, int nr_ites) >> +{ >> + struct its_baser *baser; >> + struct its_device *new; >> + unsigned long n, order; >> + >> + assert(its_data.nr_devices < GITS_MAX_DEVICES); >> + >> + baser = its_lookup_baser(GITS_BASER_TYPE_DEVICE); >> + if (!baser) >> + return NULL; > > Should we assert here if we can't find a GITS_BASER_TYPE_DEVICE ? > It seems none of the callers of its_create_device are checking > for null. I removed that code which is useless. > >> + >> + new = &its_data.devices[its_data.nr_devices]; >> + >> + new->device_id = device_id; >> + new->nr_ites = nr_ites; >> + >> + n = (its_data.typer.ite_size * nr_ites) >> PAGE_SHIFT; >> + order = is_power_of_2(n) ? fls(n) : fls(n) + 1; > > I've seen this calculation several times now, so I think an > arch-neutral order calculator is in order: > > int get_order(size_t size); > >> + new->itt = (void *)virt_to_phys(alloc_pages(order)); I added this get_order helper in lib/alloc_page.h/c > > If this is a physical address then shouldn't itt be phys_addr_t ? > >> + >> + its_data.nr_devices++; >> + return new; >> +} ITT now is a GVA (void *). >> + >> +struct its_collection *its_create_collection(u32 col_id, u32 pe) >> +{ >> + struct its_collection *new; >> + >> + assert(its_data.nr_collections < GITS_MAX_COLLECTIONS); >> + >> + new = &its_data.collections[its_data.nr_collections]; >> + >> + new->col_id = col_id; >> + >> + if (its_data.typer.pta) >> + new->target_address = (u64)gicv3_data.redist_base[pe]; >> + else >> + new->target_address = pe << 16; >> + >> + its_data.nr_collections++; >> + return new; >> +} >> -- >> 2.20.1 >> > > Thanks, > drew > Thanks Eric 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 X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3373BC10DCE for ; Fri, 6 Mar 2020 08:47:21 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 9F9572073D for ; Fri, 6 Mar 2020 08:47:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="eznmStnX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F9572073D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id EACDE4ACE9; Fri, 6 Mar 2020 03:47:19 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@redhat.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Gs3I1gL1Wo35; Fri, 6 Mar 2020 03:47:13 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 81ECC4AC89; Fri, 6 Mar 2020 03:47:13 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id C5A7D4AC69 for ; Fri, 6 Mar 2020 03:47:11 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zLn+RFQE+Azo for ; Fri, 6 Mar 2020 03:47:10 -0500 (EST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 90F994A98A for ; Fri, 6 Mar 2020 03:47:10 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583484430; 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=sq19uiYcnGylfdNqIKtaPqUrfK1PWX84fJ9AJQFeyjo=; b=eznmStnX0mZ/uuChIPQrbPV8To9rTVyB2aKWN7juFYoa0EM/C9ORDfYyTptxlwO8nXAwm7 qggFs1LpUBWr5iJW24JWkom22JOGkjt6Dp2eITAzKsqDB4NC3lmV0X0bXH3ujb6FLnMmsY dHFTRtv6x5n6VQ4rNTnnAUm/0ucsSCU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-61-Rra_508PPTmzmoVbi6CsZQ-1; Fri, 06 Mar 2020 03:47:08 -0500 X-MC-Unique: Rra_508PPTmzmoVbi6CsZQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 34389107ACCA; Fri, 6 Mar 2020 08:47:06 +0000 (UTC) Received: from [10.36.116.59] (ovpn-116-59.ams2.redhat.com [10.36.116.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 267F75DA76; Fri, 6 Mar 2020 08:47:01 +0000 (UTC) Subject: Re: [kvm-unit-tests PATCH v3 09/14] arm/arm64: ITS: Device and collection Initialization To: Andrew Jones References: <20200128103459.19413-1-eric.auger@redhat.com> <20200128103459.19413-10-eric.auger@redhat.com> <20200207125140.656ctxlmk3d4au7g@kamzik.brq.redhat.com> From: Auger Eric Message-ID: <4d7f5611-e8e1-c143-1f2b-074222fda4c4@redhat.com> Date: Fri, 6 Mar 2020 09:47:00 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20200207125140.656ctxlmk3d4au7g@kamzik.brq.redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Cc: thuth@redhat.com, kvm@vger.kernel.org, maz@kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org, andre.przywara@arm.com, kvmarm@lists.cs.columbia.edu, eric.auger.pro@gmail.com X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu Hi Drew, On 2/7/20 1:51 PM, Andrew Jones wrote: > On Tue, Jan 28, 2020 at 11:34:54AM +0100, Eric Auger wrote: >> Introduce an helper functions to register >> - a new device, characterized by its device id and the >> max number of event IDs that dimension its ITT (Interrupt >> Translation Table). The function allocates the ITT. >> >> - a new collection, characterized by its ID and the >> target processing engine (PE). >> >> Signed-off-by: Eric Auger >> >> --- >> >> v2 -> v3: >> - s/report_abort/assert >> >> v1 -> v2: >> - s/nb_/nr_ >> --- >> lib/arm/asm/gic-v3-its.h | 20 +++++++++++++++++- >> lib/arm/gic-v3-its.c | 44 ++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 63 insertions(+), 1 deletion(-) >> >> diff --git a/lib/arm/asm/gic-v3-its.h b/lib/arm/asm/gic-v3-its.h >> index fe73c04..acd97a9 100644 >> --- a/lib/arm/asm/gic-v3-its.h >> +++ b/lib/arm/asm/gic-v3-its.h >> @@ -31,6 +31,19 @@ struct its_baser { >> }; >> >> #define GITS_BASER_NR_REGS 8 >> +#define GITS_MAX_DEVICES 8 >> +#define GITS_MAX_COLLECTIONS 8 >> + >> +struct its_device { >> + u32 device_id; /* device ID */ >> + u32 nr_ites; /* Max Interrupt Translation Entries */ >> + void *itt; /* Interrupt Translation Table GPA */ >> +}; >> + >> +struct its_collection { >> + u64 target_address; >> + u16 col_id; >> +}; >> >> struct its_data { >> void *base; >> @@ -38,6 +51,10 @@ struct its_data { >> struct its_baser baser[GITS_BASER_NR_REGS]; >> struct its_cmd_block *cmd_base; >> struct its_cmd_block *cmd_write; >> + struct its_device devices[GITS_MAX_DEVICES]; >> + u32 nr_devices; /* Allocated Devices */ >> + struct its_collection collections[GITS_MAX_COLLECTIONS]; >> + u32 nr_collections; /* Allocated Collections */ >> }; >> >> extern struct its_data its_data; >> @@ -90,7 +107,6 @@ extern struct its_data its_data; >> #define GITS_BASER_TYPE_DEVICE 1 >> #define GITS_BASER_TYPE_COLLECTION 4 >> >> - >> struct its_cmd_block { >> u64 raw_cmd[4]; >> }; >> @@ -100,6 +116,8 @@ extern void its_init(void); >> extern int its_parse_baser(int i, struct its_baser *baser); >> extern struct its_baser *its_lookup_baser(int type); >> extern void its_enable_defaults(void); >> +extern struct its_device *its_create_device(u32 dev_id, int nr_ites); >> +extern struct its_collection *its_create_collection(u32 col_id, u32 target_pe); >> >> #else /* __arm__ */ >> >> diff --git a/lib/arm/gic-v3-its.c b/lib/arm/gic-v3-its.c >> index d1e7e52..c2dcd01 100644 >> --- a/lib/arm/gic-v3-its.c >> +++ b/lib/arm/gic-v3-its.c >> @@ -175,3 +175,47 @@ void its_enable_defaults(void) >> >> writel(GITS_CTLR_ENABLE, its_data.base + GITS_CTLR); >> } >> + >> +struct its_device *its_create_device(u32 device_id, int nr_ites) >> +{ >> + struct its_baser *baser; >> + struct its_device *new; >> + unsigned long n, order; >> + >> + assert(its_data.nr_devices < GITS_MAX_DEVICES); >> + >> + baser = its_lookup_baser(GITS_BASER_TYPE_DEVICE); >> + if (!baser) >> + return NULL; > > Should we assert here if we can't find a GITS_BASER_TYPE_DEVICE ? > It seems none of the callers of its_create_device are checking > for null. I removed that code which is useless. > >> + >> + new = &its_data.devices[its_data.nr_devices]; >> + >> + new->device_id = device_id; >> + new->nr_ites = nr_ites; >> + >> + n = (its_data.typer.ite_size * nr_ites) >> PAGE_SHIFT; >> + order = is_power_of_2(n) ? fls(n) : fls(n) + 1; > > I've seen this calculation several times now, so I think an > arch-neutral order calculator is in order: > > int get_order(size_t size); > >> + new->itt = (void *)virt_to_phys(alloc_pages(order)); I added this get_order helper in lib/alloc_page.h/c > > If this is a physical address then shouldn't itt be phys_addr_t ? > >> + >> + its_data.nr_devices++; >> + return new; >> +} ITT now is a GVA (void *). >> + >> +struct its_collection *its_create_collection(u32 col_id, u32 pe) >> +{ >> + struct its_collection *new; >> + >> + assert(its_data.nr_collections < GITS_MAX_COLLECTIONS); >> + >> + new = &its_data.collections[its_data.nr_collections]; >> + >> + new->col_id = col_id; >> + >> + if (its_data.typer.pta) >> + new->target_address = (u64)gicv3_data.redist_base[pe]; >> + else >> + new->target_address = pe << 16; >> + >> + its_data.nr_collections++; >> + return new; >> +} >> -- >> 2.20.1 >> > > Thanks, > drew > Thanks Eric _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm