From patchwork Wed Apr 11 01:02:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 10334687 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EDC266053C for ; Wed, 11 Apr 2018 01:03:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB6B126253 for ; Wed, 11 Apr 2018 01:03:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DFD36285DB; Wed, 11 Apr 2018 01:03:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8C2DC26253 for ; Wed, 11 Apr 2018 01:03:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 585556E34D; Wed, 11 Apr 2018 01:02:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by gabe.freedesktop.org (Postfix) with ESMTPS id 04B8C6E0C4 for ; Wed, 11 Apr 2018 01:02:54 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id r14so15421pgq.4 for ; Tue, 10 Apr 2018 18:02:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=vjfMdQW2qqANENkY55bBcrTsKlYRfZRl/r97fU0VU4w=; b=eSktvWvbUy8mJrRjQR+s4OdT5Zn7ArRulXllIRT0KmNF1OTWUUQTtblziC76G7+Ni9 mje34fy+dcRXQCp0Dv4uP1EgUYYxAdCBpcJ6HepMMQ372t5i0ewxtc5oF14YmNhX9DJ4 3k0i6mqIpYszhJEbq7jOQbuRfPKGT0SJS3xVGIoW9fpNizVjPGQK28FRFcmOykqMn61w SzyqZlXAVfs9P9/QCYgTK7Yk2axny6LouUQU3fJDkQYvIgvxyt3oL10ZQDPNr+j9jQJ+ gHKbidU/mZtOe6CdKNs4AA3lWgmfXgiKfdE94tdqYr87ZTU5VCkXd2yIlehU1bfFFtRb vZ+A== X-Gm-Message-State: ALQs6tAGqoUHlA32sgyoVguQ/cbfCtaS/EdFJhW4bBgcg76N0ZRMl2Is sSBu5UI8VMnpb2nqQID6PDpZAg== X-Google-Smtp-Source: AIpwx49GmhOysqSlFmGp5xMSC6LM+fTX/eaaSjTvaeHBoTHYM3PlDZiUK/ajvcK+4p0xOUUPYr/+rQ== X-Received: by 10.99.146.83 with SMTP id s19mr1894588pgn.104.1523408574356; Tue, 10 Apr 2018 18:02:54 -0700 (PDT) Received: from labbott-redhat.redhat.com ([2601:602:9802:a8dc:4eb2:6dae:ab32:e5b0]) by smtp.gmail.com with ESMTPSA id e87sm8238339pfd.136.2018.04.10.18.02.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Apr 2018 18:02:53 -0700 (PDT) From: Laura Abbott To: Oded Gabbay , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "David (ChunMing) Zhou" , Felix Kuehling Subject: [PATCHv2] drm/amdkfd: Remove vla Date: Tue, 10 Apr 2018 18:02:43 -0700 Message-Id: <20180411010243.17771-1-labbott@redhat.com> X-Mailer: git-send-email 2.14.3 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kees Cook , kernel-hardening@lists.openwall.com, David Airlie , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP There's an ongoing effort to remove VLAs[1] from the kernel to eventually turn on -Wvla. Switch to a constant value that covers all hardware. [1] https://lkml.org/lkml/2018/3/7/621 Signed-off-by: Laura Abbott --- v2: Switch to a larger size to account for other hardware --- drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c b/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c index 035c351f47c5..c3a5a80e31ae 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c @@ -139,10 +139,12 @@ static void interrupt_wq(struct work_struct *work) { struct kfd_dev *dev = container_of(work, struct kfd_dev, interrupt_work); + uint32_t ih_ring_entry[8]; - uint32_t ih_ring_entry[DIV_ROUND_UP( - dev->device_info->ih_ring_entry_size, - sizeof(uint32_t))]; + if (dev->device_info->ih_ring_entry_size > (8 * sizeof(uint32_t))) { + dev_err(kfd_chardev(), "Ring entry too small\n"); + return; + } while (dequeue_ih_ring_entry(dev, ih_ring_entry)) dev->device_info->event_interrupt_class->interrupt_wq(dev,