Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3390024imu; Mon, 14 Jan 2019 02:03:50 -0800 (PST) X-Google-Smtp-Source: ALg8bN7hXytd5UE/0wkU48vA/znIL38H/9WAB0fbUrT+sf+U+8uOdrjnDmyZ2cE8xnjW+UvSfapI X-Received: by 2002:a17:902:a83:: with SMTP id 3mr23231061plp.276.1547460230390; Mon, 14 Jan 2019 02:03:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547460230; cv=none; d=google.com; s=arc-20160816; b=WVTa9LsBO0WIHnW4deJBxAXcIB0l++PNgb98VnOMe7EPdIF+bt5geBp7gQXUYxi/gn /AbqwQLmzX6lIDNkc/e79awkOkKIDFGqHGklF8AmZs8etQY6f/9/hcDWa+51ArFmm3D2 fdUTp892DcIx/YWGboNYlCaMQKdgk00ORIoueYyEQtEZotBFOpTJNZQmK1UNedPcXro2 D3Z/C0mFolGt48Tf1qPwzACQuGoj5IQLKy7CiD1M6mH0S8HdS+b5jwDLLKGJcbPLkflb i5+lP4RG70YE1MfnU9Ktf03IYIJxPkRdZqVxzBDaZ1hqu93RQg1tIirxWAP9Al3ylu2U YpSg== 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 :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=ShTV3nkfCPy3fU2ECGx6tyGc2ce77Yissx1+tunmRoA=; b=bgOr/9BsWeHH2cacJSe2tMfbIYDRCwvZVrRscnh6lC0ZxUt8TBhhC9OSJB4LKWy3ae KJJjehgJr7Hq7npd3Jk20jXYriHUyFxgBjUcJzQOLECzXUEn12gUg0vjSA3WcnVnuR6q Ie0qfojR6fAMc3Nc+3P1eLKBhJHmYGzdPE+JzzTI9wMyYWuJWIv5WtDKooCy8o4Gw70s NmcKJXkbolixVF2ffa0F2s7P2KTy+NCEdfOa0VjWqAtUnIcwcH1Cc4THjaWePRs+uxyc lIpP62mPNynOxXbrxzYzvomCHJzMkW6WZJzHg+529r7ElYzFtGz5FyOl+0nz/rdVLjhY Z+LQ== ARC-Authentication-Results: i=1; mx.google.com; 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 r18si51027217pfc.199.2019.01.14.02.03.33; Mon, 14 Jan 2019 02:03:50 -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; 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 S1726641AbfANKC1 (ORCPT + 99 others); Mon, 14 Jan 2019 05:02:27 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:57740 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726649AbfANKC1 (ORCPT ); Mon, 14 Jan 2019 05:02:27 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 64C6CA78; Mon, 14 Jan 2019 02:02:26 -0800 (PST) Received: from [10.1.196.93] (en101.cambridge.arm.com [10.1.196.93]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EACA23F5AF; Mon, 14 Jan 2019 02:02:22 -0800 (PST) Subject: Re: [PATCH v3 1/7] sysfs/cpu: Allow individual architectures to select vulnerabilities To: jeremy.linton@arm.com, linux-arm-kernel@lists.infradead.org Cc: catalin.marinas@arm.com, will.deacon@arm.com, marc.zyngier@arm.com, dave.martin@arm.com, shankerd@codeaurora.org, linux-kernel@vger.kernel.org, ykaukab@suse.de, julien.thierry@arm.com, mlangsdo@redhat.com, Steven.Price@arm.com, stefan.wahren@i2se.com, gregkh@linuxfoundation.org, rafael@kernel.org, tglx@linutronix.de, jpoimboe@redhat.com, konrad.wilk@oracle.com, mingo@kernel.org, longman@redhat.com, ak@linux.intel.com, jkosina@suse.cz References: <20190109235544.2992426-1-jeremy.linton@arm.com> <20190109235544.2992426-2-jeremy.linton@arm.com> From: Suzuki K Poulose Message-ID: <901f2f29-aa06-13ad-1995-f9f22184e39d@arm.com> Date: Mon, 14 Jan 2019 10:02:21 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <20190109235544.2992426-2-jeremy.linton@arm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/01/2019 23:55, Jeremy Linton wrote: > As suggested on the list, https://lkml.org/lkml/2019/1/4/282, there are > a number of cases where its useful for a system to avoid exporting a > sysfs entry for a given vulnerability. This set adds an architecture > specific callback which returns the bitmap of vulnerabilities the > architecture would like to advertise. > > Signed-off-by: Jeremy Linton > Cc: Greg Kroah-Hartman > Cc: Rafael J. Wysocki > Cc: Thomas Gleixner > Cc: Josh Poimboeuf > Cc: Konrad Rzeszutek Wilk > Cc: Ingo Molnar > Cc: Waiman Long > Cc: Andi Kleen > Cc: Jiri Kosina > --- > drivers/base/cpu.c | 19 +++++++++++++++++++ > include/linux/cpu.h | 7 +++++++ > 2 files changed, 26 insertions(+) > > diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c > index eb9443d5bae1..35f6dfb24cd6 100644 > --- a/drivers/base/cpu.c > +++ b/drivers/base/cpu.c > @@ -561,6 +561,11 @@ static struct attribute *cpu_root_vulnerabilities_attrs[] = { > NULL > }; > > +uint __weak arch_supported_vuln_attr_fields(void) > +{ > + return VULN_MELTDOWN|VULN_SPECTREV1|VULN_SPECTREV2|VULN_SSB|VULN_L1TF; > +} > + > static const struct attribute_group cpu_root_vulnerabilities_group = { > .name = "vulnerabilities", > .attrs = cpu_root_vulnerabilities_attrs, > @@ -568,6 +573,20 @@ static const struct attribute_group cpu_root_vulnerabilities_group = { > > static void __init cpu_register_vulnerabilities(void) > { > + int fld; > + int max_fields = ARRAY_SIZE(cpu_root_vulnerabilities_attrs) - 1; > + struct attribute **hd = cpu_root_vulnerabilities_attrs; > + uint enabled_fields = arch_supported_vuln_attr_fields(); > + > + /* only enable entries requested by the arch code */ > + for (fld = 0; fld < max_fields; fld++) { > + if (enabled_fields & 1 << fld) { > + *hd = cpu_root_vulnerabilities_attrs[fld]; > + hd++; > + } > + } > + *hd = NULL; > + nit: Could we use "is_visible" callback in the attribute group to check this dynamically ? > if (sysfs_create_group(&cpu_subsys.dev_root->kobj, > &cpu_root_vulnerabilities_group)) > pr_err("Unable to register CPU vulnerabilities\n"); > diff --git a/include/linux/cpu.h b/include/linux/cpu.h > index 218df7f4d3e1..5e45814bcc24 100644 > --- a/include/linux/cpu.h > +++ b/include/linux/cpu.h > @@ -189,4 +189,11 @@ static inline void cpu_smt_check_topology_early(void) { } > static inline void cpu_smt_check_topology(void) { } > #endif > > +/* generic cpu vulnerability attributes */ > +#define VULN_MELTDOWN 0x01 > +#define VULN_SPECTREV1 0x02 > +#define VULN_SPECTREV2 0x04 > +#define VULN_SSB 0x08 > +#define VULN_L1TF 0x10 nit: May use BIT() ? Cheers Suzuki