From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linutronix.de (193.142.43.55:993) by crypto-ml.lab.linutronix.de with IMAP4-SSL for ; 31 Oct 2019 22:13:08 -0000 Received: from us-smtp-2.mimecast.com ([207.211.31.81] helo=us-smtp-delivery-1.mimecast.com) by Galois.linutronix.de with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1iQIgk-0001QY-Np for speck@linutronix.de; Thu, 31 Oct 2019 23:13:07 +0100 Received: by mail-wm1-f70.google.com with SMTP id d140so3402004wmd.1 for ; Thu, 31 Oct 2019 15:13:00 -0700 (PDT) Received: from [192.168.20.72] (94.222.26.109.rev.sfr.net. [109.26.222.94]) by smtp.gmail.com with ESMTPSA id r5sm4903742wrl.86.2019.10.31.15.12.58 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 31 Oct 2019 15:12:59 -0700 (PDT) Subject: [MODERATED] Re: ***UNCHECKED*** Re: [PATCH v7 0/5] NX 0 References: <1571902455-22638-1-git-send-email-pbonzini@redhat.com> <20191028160203.GB838@suse.de> <20191031210054.GG19327@elm> From: Paolo Bonzini Message-ID: <36d392a0-f4af-9038-6be2-83b0204c2dfd@redhat.com> Date: Thu, 31 Oct 2019 23:13:02 +0100 MIME-Version: 1.0 In-Reply-To: <20191031210054.GG19327@elm> Content-Type: multipart/mixed; boundary="MbuqxiCf5mZtqn7QEVknQEVCr2dEC9zaq"; protected-headers="v1" To: speck@linutronix.de List-ID: This is an OpenPGP/MIME encrypted message (RFC 4880 and 3156) --MbuqxiCf5mZtqn7QEVknQEVCr2dEC9zaq Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 31/10/19 22:00, speck for Tyler Hicks wrote: >> diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c >> index 0fccd8c0312e..86f531fea9d0 100644 >> --- a/drivers/base/cpu.c >> +++ b/drivers/base/cpu.c >=20 > I hate to make this thread more of a mess than it already is but I > noticed that you dropped a hunk that shouldn't have been dropped. The > following needs to be applied on top of this patch: Thank you Tyler. Let me just pick Thomas's bundles and send the final version. Paolo > diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c > index 86f531fea9d0..7fbc022a235b 100644 > --- a/drivers/base/cpu.c > +++ b/drivers/base/cpu.c > @@ -561,6 +561,12 @@ ssize_t __weak cpu_show_tsx_async_abort(struct dev= ice *dev, > return sprintf(buf, "Not affected\n"); > } > =20 > +ssize_t __weak cpu_show_itlb_multihit(struct device *dev, > + struct device_attribute *attr, char *buf) > +{ > + return sprintf(buf, "Not affected\n"); > +} > + > static DEVICE_ATTR(meltdown, 0444, cpu_show_meltdown, NULL); > static DEVICE_ATTR(spectre_v1, 0444, cpu_show_spectre_v1, NULL); > static DEVICE_ATTR(spectre_v2, 0444, cpu_show_spectre_v2, NULL); >=20 >> @@ -568,6 +568,7 @@ static DEVICE_ATTR(spec_store_bypass, 0444, cpu_sh= ow_spec_store_bypass, NULL); >> static DEVICE_ATTR(l1tf, 0444, cpu_show_l1tf, NULL); >> static DEVICE_ATTR(mds, 0444, cpu_show_mds, NULL); >> static DEVICE_ATTR(tsx_async_abort, 0444, cpu_show_tsx_async_abort, N= ULL); >> +static DEVICE_ATTR(itlb_multihit, 0444, cpu_show_itlb_multihit, NULL)= ; >> =20 >> static struct attribute *cpu_root_vulnerabilities_attrs[] =3D { >> &dev_attr_meltdown.attr, >> @@ -577,6 +578,7 @@ static struct attribute *cpu_root_vulnerabilities_= attrs[] =3D { >> &dev_attr_l1tf.attr, >> &dev_attr_mds.attr, >> &dev_attr_tsx_async_abort.attr, >> + &dev_attr_itlb_multihit.attr, >> NULL >> }; >> =20 >> diff --git a/include/linux/cpu.h b/include/linux/cpu.h >> index f35369f79771..2a093434e975 100644 >> --- a/include/linux/cpu.h >> +++ b/include/linux/cpu.h >> @@ -62,6 +62,8 @@ extern ssize_t cpu_show_mds(struct device *dev, >> extern ssize_t cpu_show_tsx_async_abort(struct device *dev, >> struct device_attribute *attr, >> char *buf); >> +extern ssize_t cpu_show_itlb_multihit(struct device *dev, >> + struct device_attribute *attr, char *buf); >> =20 >> extern __printf(4, 5) >> struct device *cpu_device_create(struct device *parent, void *drvdata= , >> --=20 >> 2.16.4 >> --MbuqxiCf5mZtqn7QEVknQEVCr2dEC9zaq--