From patchwork Thu Oct 26 10:19:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 158487 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp563397vqb; Thu, 26 Oct 2023 03:21:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEoNpZ7QR/a5mmclodZGbPDLJc0Ri6SU/uW3To54VMVR6u87Q1Dx3mJBx3hBx4zb6tiX6sI X-Received: by 2002:a05:620a:880d:b0:775:985e:f5c2 with SMTP id qj13-20020a05620a880d00b00775985ef5c2mr15617490qkn.17.1698315680708; Thu, 26 Oct 2023 03:21:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698315680; cv=none; d=google.com; s=arc-20160816; b=ixKAjjQR4VD2el/5JAtrbhU7ppqmxib6tiS7kGpJJEu8LOdB98tinb8VDmztLDJKR8 RtJp4c6K5979NPbkGmGdYhgOU8eNdnGHspE61IrhFYfJ5+D7qRN72gpo36uLHA6qPKHn KQR9f1J6BLXpZR7N8pGgD3FchoDQfmYgPwtErIJKV5SBGlBy8VoW/yCUmo32gTajvhCz J6YF+iIMeulNX9+vNqId3Uisk4txABqwyRCVCd9GyVVEdv2pxx8zXUE0pyl9qmn1lYTk rNBSJTAcz2u+VvIqqgWSeRMv8TNvZQ52+0Kdn9pVwHg/wWON4EVFo4txAt/C08mLI8dP 7bpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=a+Jtdpt8QwCrIC0UvvwWf8k7feh4hQOECqUK/5Gk8TQ=; fh=6hH0D9thUxT78feSTqBu3xnjTqMtzMeYcbUcYnexwyg=; b=lHjCzH+yCMMvs1+20AjNSX55GsrVEumjcK1xzwRbadge1cyHti260wIOMWDzDpr3pJ gF5Rn13LxcBkpAtXn57O3erTXjr1kmmMGz+t/3i8VNHS0eYsLeQJ6cqCMFSveGeJLdUc mtV3NjMdDS/IopP3RqIENVcrEOavlF/S2MnYGekeDy4S+hFQ6JMcjuMU+vDediGs2/3t 9cpugRo0WsVvYd4gAALUNFQBMoRpsem4Sz1WgYzQW4IVX0D4WhSpYYCJR4oH+8Zi8Srd iSkaSiC2dBYWmaFD/H70PzVnHKzBC2P/T/Fl0r6PqfyDCzQHz1VfaYwbQ3ySBzrGJlAn R5mA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qEKGSub5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id 206-20020a2516d7000000b00da0adbe2580si1096957ybw.536.2023.10.26.03.21.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 03:21:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qEKGSub5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 9FF0C809E70E; Thu, 26 Oct 2023 03:20:41 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235048AbjJZKUc (ORCPT + 27 others); Thu, 26 Oct 2023 06:20:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235029AbjJZKUU (ORCPT ); Thu, 26 Oct 2023 06:20:20 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E233D6F for ; Thu, 26 Oct 2023 03:20:11 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4116C433C8; Thu, 26 Oct 2023 10:20:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698315611; bh=HTgDnY6nOK0UE+C53lOyr46cNkU6RAJxBArDMZcQUKU=; h=From:To:Cc:Subject:Date:From; b=qEKGSub5Z8oLBiMI2J2SXGHlKosMfJIrdE7oOGvTW868BjkOGFtbdWjJL86QAidw5 mhTFMJTTrBo8LxwDa5KjbPWRd78e3xrmv9+DMSIC82qXgtq8qjeA84mkoOlbKyCoMW Fx+WWkmhglTC3EsALOLaBZy5vAEviAgKF6yIXf7Xjr3NuMJdRgKWKghkpqJNbS3FBd XRSxLTYa+qznnJyM0fSt+bUalLwCloCTdAhF7dJxtDDOguVTcqwMrJUlVZFOoKT3Hp 273IYM2XKujF1fLy/lNsTa0THgh7H6OpcF18Y25wgQE6jSUTU8saXaWUaacaJn3CYL FYxJcHFl7bLPw== From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: Anup Patel Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Thomas Gleixner , linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, x86@kernel.org Subject: [RFC PATCH] genirq/matrix: Dynamic bitmap allocation Date: Thu, 26 Oct 2023 12:19:57 +0200 Message-Id: <20231026101957.320572-1-bjorn@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 26 Oct 2023 03:20:41 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780813063163804568 X-GMAIL-MSGID: 1780813063163804568 From: Björn Töpel Some (future) users of the irq matrix allocator, do not know the size of the matrix bitmaps at compile time. To avoid wasting memory on unnecessary large bitmaps, size the bitmap at matrix allocation time. Signed-off-by: Björn Töpel --- Here's a cleaned up, boot tested, proper patch. Thomas, this is just FYI/RFC. This change would only make sense, if the RISC-V AIA series starts using the IRQ matrix allocator. Björn --- arch/x86/include/asm/hw_irq.h | 2 -- kernel/irq/matrix.c | 28 +++++++++++++++++----------- 2 files changed, 17 insertions(+), 13 deletions(-) base-commit: 611da07b89fdd53f140d7b33013f255bf0ed8f34 diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h index 551829884734..dcfaa3812306 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h @@ -16,8 +16,6 @@ #include -#define IRQ_MATRIX_BITS NR_VECTORS - #ifndef __ASSEMBLY__ #include diff --git a/kernel/irq/matrix.c b/kernel/irq/matrix.c index 1698e77645ac..996cbb46d654 100644 --- a/kernel/irq/matrix.c +++ b/kernel/irq/matrix.c @@ -8,8 +8,6 @@ #include #include -#define IRQ_MATRIX_SIZE (BITS_TO_LONGS(IRQ_MATRIX_BITS)) - struct cpumap { unsigned int available; unsigned int allocated; @@ -17,8 +15,8 @@ struct cpumap { unsigned int managed_allocated; bool initialized; bool online; - unsigned long alloc_map[IRQ_MATRIX_SIZE]; - unsigned long managed_map[IRQ_MATRIX_SIZE]; + unsigned long *managed_map; + unsigned long alloc_map[]; }; struct irq_matrix { @@ -32,8 +30,8 @@ struct irq_matrix { unsigned int total_allocated; unsigned int online_maps; struct cpumap __percpu *maps; - unsigned long scratch_map[IRQ_MATRIX_SIZE]; - unsigned long system_map[IRQ_MATRIX_SIZE]; + unsigned long *system_map; + unsigned long scratch_map[]; }; #define CREATE_TRACE_POINTS @@ -50,24 +48,32 @@ __init struct irq_matrix *irq_alloc_matrix(unsigned int matrix_bits, unsigned int alloc_start, unsigned int alloc_end) { + unsigned int cpu, matrix_size = BITS_TO_LONGS(matrix_bits); struct irq_matrix *m; - if (matrix_bits > IRQ_MATRIX_BITS) - return NULL; - - m = kzalloc(sizeof(*m), GFP_KERNEL); + m = kzalloc(struct_size(m, scratch_map, matrix_size * 2), GFP_KERNEL); if (!m) return NULL; + m->system_map = &m->scratch_map[matrix_size]; + m->matrix_bits = matrix_bits; m->alloc_start = alloc_start; m->alloc_end = alloc_end; m->alloc_size = alloc_end - alloc_start; - m->maps = alloc_percpu(*m->maps); + m->maps = __alloc_percpu(struct_size(m->maps, alloc_map, matrix_size * 2), + __alignof__(*m->maps)); if (!m->maps) { kfree(m); return NULL; } + + for_each_possible_cpu(cpu) { + struct cpumap *cm = per_cpu_ptr(m->maps, cpu); + + cm->managed_map = &cm->alloc_map[matrix_size]; + } + return m; }