Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3488134imu; Sun, 11 Nov 2018 16:13:42 -0800 (PST) X-Google-Smtp-Source: AJdET5fg6r6flG5p7r+1iWzKCUPzdER4cCFcGQLHKR7GSQiqfDol3AwTOJUa2CWjGSeDHTjg21eQ X-Received: by 2002:a17:902:7595:: with SMTP id j21-v6mr16245035pll.191.1541981622425; Sun, 11 Nov 2018 16:13:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541981622; cv=none; d=google.com; s=arc-20160816; b=WcW8SGoV1O/GtLJru1f8wJHb/GcG7WzajvxUt285IdSZlBiM8aQaiX4LvtAKTOkiis yaTuEnErEaX7Al8FNjVHU/DS2uJip3TU9JgbpGSpxvGa3oGQMILPnnfTYsxMpZ8LuyFu vxBeLLEA0/q4kdSdstqCpyrg4xyMUS+6CttLDDX//4Y6o7Xhng3rrYbtxlHFbpi6vPFd MHG0114QefN6wWzGmKvdw5lMD8H9oGK3dWDmm8NzKC18KJIJNDXihAtG9c540VSjpvq4 h5VQzr0Wd+4nIXCSRk8O23hHWQps9Nmgplqoe0HqdAYcdnC7OR4psUwO1Lx+sQEhe1YM N6Dg== 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=OZdoApbyh0AzYCrRBE5xokTmnHE9J1k97AiC68TEmYI=; b=UpY1L6KL6NFAd/s0iyk17MSf5QRzcygQD3HR1CI0Nymp51doNxidHGVPSKYM9JdptB KlzINleQDvkiwP9kaNU7mdu5Fm4yHDp8IF9ShAlD/MUryTYQmqbu3QOEi9Qq9XLBEsYm VET/qvfgFP6hdo10ASsAKY3VBJuBC9GUn8Jte0xDJC5rPueWmrTzGgFJs5TP4eivOnjW EHyCD36jlYGtnLDa1LAAK9ibqwk1jJGl4pGW2IQ5xPvQeW8ScVosN8Ptugns0MPwhaAV hhk02kDRIHY+R+dkLaYH2QUXKJ2Ld53msuGnY5knXDxtPnxNJpWhMstXKvKynXyqwi0G Vtow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Wfp5rDQI; 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 b24-v6si13136996pgb.50.2018.11.11.16.13.27; Sun, 11 Nov 2018 16:13:42 -0800 (PST) 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=Wfp5rDQI; 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 S1730558AbeKLIRR (ORCPT + 99 others); Mon, 12 Nov 2018 03:17:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:60238 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730385AbeKLIRQ (ORCPT ); Mon, 12 Nov 2018 03:17:16 -0500 Received: from localhost (unknown [206.108.79.134]) (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 9606822360; Sun, 11 Nov 2018 22:27:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541975240; bh=+oE2HIHglIGbz7M2O2my4f2jsuvplK7WhzlCj+JsY2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wfp5rDQIFtP8rcLA+eufkU3U8/w/6Qhj16kKCXMtpuWL77bnNscnFuoI3Si/OkTVh d4xu4C7GLtxDtYQauQCdysbfSpGq+t4IcWn8Jo8DgkgBrf2lDU0wui1hHMamxpi1T3 MuvPUQ/Q2gSsA6mB97SHycTCwEqIXVwF3RBTnSE0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiaochen Shen , Fenghua Yu , Thomas Gleixner , "H Peter Anvin" , "Tony Luck" , Sasha Levin Subject: [PATCH 4.19 083/361] x86/intel_rdt: Show missing resctrl mount options Date: Sun, 11 Nov 2018 14:17:10 -0800 Message-Id: <20181111221631.571894877@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181111221619.915519183@linuxfoundation.org> References: <20181111221619.915519183@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review 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 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xiaochen Shen [ Upstream commit 2cc81c6992248ea37d0241bc325977bab310bc3b ] In resctrl filesystem, mount options exist to enable L3/L2 CDP and MBA Software Controller features if the platform supports them: mount -t resctrl resctrl [-o cdp[,cdpl2][,mba_MBps]] /sys/fs/resctrl But currently only "cdp" option is displayed in /proc/mounts. "cdpl2" and "mba_MBps" options are not shown even when they are active. Before: # mount -t resctrl resctrl -o cdp,mba_MBps /sys/fs/resctrl # grep resctrl /proc/mounts /sys/fs/resctrl /sys/fs/resctrl resctrl rw,relatime,cdp 0 0 After: # mount -t resctrl resctrl -o cdp,mba_MBps /sys/fs/resctrl # grep resctrl /proc/mounts /sys/fs/resctrl /sys/fs/resctrl resctrl rw,relatime,cdp,mba_MBps 0 0 Signed-off-by: Xiaochen Shen Signed-off-by: Fenghua Yu Signed-off-by: Thomas Gleixner Cc: "H Peter Anvin" Cc: "Tony Luck" Link: https://lkml.kernel.org/r/1536796118-60135-1-git-send-email-fenghua.yu@intel.com Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c +++ b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c @@ -2805,6 +2805,13 @@ static int rdtgroup_show_options(struct { if (rdt_resources_all[RDT_RESOURCE_L3DATA].alloc_enabled) seq_puts(seq, ",cdp"); + + if (rdt_resources_all[RDT_RESOURCE_L2DATA].alloc_enabled) + seq_puts(seq, ",cdpl2"); + + if (is_mba_sc(&rdt_resources_all[RDT_RESOURCE_MBA])) + seq_puts(seq, ",mba_MBps"); + return 0; }