Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp3003689ybi; Mon, 17 Jun 2019 14:28:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqyCfWW3iI1/S2o1OEyszRidFt+qFIR+XNKG/mxvJ2JEpZKbWQ36xGlxzVTTobdjIsH/yYKs X-Received: by 2002:a17:902:e512:: with SMTP id ck18mr4204649plb.53.1560806905862; Mon, 17 Jun 2019 14:28:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560806905; cv=none; d=google.com; s=arc-20160816; b=j4Vm44QECmORr+ETscnXKKjAuB8f++babV203NeUgKXu54d6r4nQWlpM12KZwr7m0c MX/efxH/A8qGgB2TI7/qefHnSkNb4zJOSCeQxpDLdL1Zu5+6orWWGkkJeTD4vm5+XlCN bASkEeCIwzbPHjqtovkltxFMSI2+XAGFbRD79dxHd/JeXnwsr9MgRM2DPgHKRjPgL0OE pyO2PXxjUWfX98cYCExLBB5jkPJ9jkQEK+dFh0j755+0/Ybd1j4xVA+J4SV993GhpQvc VIdX4XIwJbNeC2XtyD6aBgdwNxJdjLF1ZjCLePEqj4ROn+9UTTK3Rf3nXkX8SGlSXo8v No7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FVP1hyJN53aHWYf2AhV6GIPwA6Sj1LZIJJ/iUW6wrZk=; b=ox8ob9Up2LMDwWuRHJBGlxPLiIdNPRJTHqdtAzzIEgYS8x32brQa4/2EH4KzSCdS/k 6z9cydHGSVsdXI17yLDNktoIfOIcwkyAsBVQKMOLsOFnZMkGhveg/WdBrlyc6FknbLBs xjVulK+dX74fpi2dw7R36lr2ar/RrObRwWIdj5LZ1GYtFr1wJAw6bnyVD8b2u0pynnFj Oi8YwP5iZ+l6dWko3/+SPQJQByFd7K5vAywzCYmCZ2hPxqMuhd0snbZ9U4k9IZOcDkdn ju83OYdH2sCo0DlS7xPd4FmSmIlK91f05At/pZj4keLliBoXBybQ98TfJZbZ9uX+waMj xYNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tEjzN2Lr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r11si10914559plo.360.2019.06.17.14.28.10; Mon, 17 Jun 2019 14:28:25 -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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=tEjzN2Lr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730414AbfFQV1d (ORCPT + 99 others); Mon, 17 Jun 2019 17:27:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:54562 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728967AbfFQV1c (ORCPT ); Mon, 17 Jun 2019 17:27:32 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 955E2208E4; Mon, 17 Jun 2019 21:27:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560806851; bh=FSFXtZJkL9X7zdl8EW5+2gIrlqAmjxup/ATjnuMEnyo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tEjzN2LrCXkfVCHwyTgniEHXoKU+d4nQHH8Nnjzlo/FyhP0RrRxApEfVCVUXin6NL pGNFrp+waxchbl2ezaGCYVW9h5gDvD0C/KCq6nitKGaT9JJ+sAMVx41tgHuBpe/KTv d1vy6kn7ll2EskRcUEMReDdQXIDDEhNjqHX/OnNA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Prarit Bhargava , Thomas Gleixner , Fenghua Yu , Reinette Chatre , Borislav Petkov , "H. Peter Anvin" Subject: [PATCH 4.19 72/75] x86/resctrl: Prevent NULL pointer dereference when local MBM is disabled Date: Mon, 17 Jun 2019 23:10:23 +0200 Message-Id: <20190617210756.057833262@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190617210752.799453599@linuxfoundation.org> References: <20190617210752.799453599@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Prarit Bhargava commit c7563e62a6d720aa3b068e26ddffab5f0df29263 upstream. Booting with kernel parameter "rdt=cmt,mbmtotal,memlocal,l3cat,mba" and executing "mount -t resctrl resctrl -o mba_MBps /sys/fs/resctrl" results in a NULL pointer dereference on systems which do not have local MBM support enabled.. BUG: kernel NULL pointer dereference, address: 0000000000000020 PGD 0 P4D 0 Oops: 0000 [#1] SMP PTI CPU: 0 PID: 722 Comm: kworker/0:3 Not tainted 5.2.0-0.rc3.git0.1.el7_UNSUPPORTED.x86_64 #2 Workqueue: events mbm_handle_overflow RIP: 0010:mbm_handle_overflow+0x150/0x2b0 Only enter the bandwith update loop if the system has local MBM enabled. Fixes: de73f38f7680 ("x86/intel_rdt/mba_sc: Feedback loop to dynamically update mem bandwidth") Signed-off-by: Prarit Bhargava Signed-off-by: Thomas Gleixner Cc: Fenghua Yu Cc: Reinette Chatre Cc: Borislav Petkov Cc: "H. Peter Anvin" Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20190610171544.13474-1-prarit@redhat.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/intel_rdt_monitor.c | 3 +++ 1 file changed, 3 insertions(+) --- a/arch/x86/kernel/cpu/intel_rdt_monitor.c +++ b/arch/x86/kernel/cpu/intel_rdt_monitor.c @@ -371,6 +371,9 @@ static void update_mba_bw(struct rdtgrou struct list_head *head; struct rdtgroup *entry; + if (!is_mbm_local_enabled()) + return; + r_mba = &rdt_resources_all[RDT_RESOURCE_MBA]; closid = rgrp->closid; rmid = rgrp->mon.rmid;