From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752574AbdLNOSq (ORCPT ); Thu, 14 Dec 2017 09:18:46 -0500 Received: from Galois.linutronix.de ([146.0.238.70]:37585 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751098AbdLNOSo (ORCPT ); Thu, 14 Dec 2017 09:18:44 -0500 Date: Thu, 14 Dec 2017 15:17:38 +0100 (CET) From: Thomas Gleixner To: Jan Beulich cc: Juergen Gross , mingo@elte.hu, xen-devel , Boris Ostrovsky , sds@tycho.nsa.gov, linux-kernel@vger.kernel.org, hpa@zytor.com Subject: Re: [PATCH 1/2] x86: consider effective protection attributes in W+X check In-Reply-To: <5A32959902000078001975D6@prv-mh.provo.novell.com> Message-ID: References: <5A2FBC570200007800196B3E@prv-mh.provo.novell.com> <5A2FBE0A0200007800196B4F@suse.com> <5A32959902000078001975D6@prv-mh.provo.novell.com> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 14 Dec 2017, Jan Beulich wrote: > >>> On 14.12.17 at 15:04, wrote: > > On 12/12/17 11:31, Jan Beulich wrote: > >> @@ -335,42 +346,45 @@ static inline bool kasan_page_table(stru > >> > >> #if PTRS_PER_PMD > 1 > >> > >> -static void walk_pmd_level(struct seq_file *m, struct pg_state *st, pud_t addr, unsigned long P) > >> +static void walk_pmd_level(struct seq_file *m, struct pg_state *st, pud_t addr, > >> + pgprotval_t eff_in, unsigned long P) > >> { > >> int i; > >> pmd_t *start, *pmd_start; > >> - pgprotval_t prot; > >> + pgprotval_t prot, eff; > >> > >> pmd_start = start = (pmd_t *)pud_page_vaddr(addr); > >> for (i = 0; i < PTRS_PER_PMD; i++) { > >> st->current_address = normalize_addr(P + i * PMD_LEVEL_MULT); > >> if (!pmd_none(*start)) { > >> + prot = pmd_flags(*start); > >> + eff = effective_prot(eff_in, prot); > >> if (pmd_large(*start) || !pmd_present(*start)) { > >> - prot = pmd_flags(*start); > >> - note_page(m, st, __pgprot(prot), 4); > >> + note_page(m, st, __pgprot(prot), eff, 4); > >> } else if (!kasan_page_table(m, st, pmd_start)) { > >> - walk_pte_level(m, st, *start, > >> + walk_pte_level(m, st, *start, eff, > >> P + i * PMD_LEVEL_MULT); > >> } > > > > You can drop the braces for both cases. Applies to similar > > constructs below, too. > > I did consider that, but decided against to allow the patch to show > more clearly what it is that is actually being changed. > > > With that fixed you can add my: > > > > Reviewed-by: Juergen Gross > > Thanks. I'd like to wait for the x86 maintainer's opinion, and hence > won't add your R-b unless you tell me that's fine either way, or > unless they too would prefer resulting code cleanliness over patch > readability. If you remove the braces the code readability degrades because it's not a single line statement. Thanks, tglx From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Gleixner Subject: Re: [PATCH 1/2] x86: consider effective protection attributes in W+X check Date: Thu, 14 Dec 2017 15:17:38 +0100 (CET) Message-ID: References: <5A2FBC570200007800196B3E@prv-mh.provo.novell.com> <5A2FBE0A0200007800196B4F@suse.com> <5A32959902000078001975D6@prv-mh.provo.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ePUKU-0005DP-Eu for xen-devel@lists.xenproject.org; Thu, 14 Dec 2017 14:17:42 +0000 In-Reply-To: <5A32959902000078001975D6@prv-mh.provo.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Jan Beulich Cc: Juergen Gross , linux-kernel@vger.kernel.org, hpa@zytor.com, xen-devel , mingo@elte.hu, sds@tycho.nsa.gov, Boris Ostrovsky List-Id: xen-devel@lists.xenproject.org T24gVGh1LCAxNCBEZWMgMjAxNywgSmFuIEJldWxpY2ggd3JvdGU6Cj4gPj4+IE9uIDE0LjEyLjE3 IGF0IDE1OjA0LCA8amdyb3NzQHN1c2UuY29tPiB3cm90ZToKPiA+IE9uIDEyLzEyLzE3IDExOjMx LCBKYW4gQmV1bGljaCB3cm90ZToKPiA+PiBAQCAtMzM1LDQyICszNDYsNDUgQEAgc3RhdGljIGlu bGluZSBib29sIGthc2FuX3BhZ2VfdGFibGUoc3RydQo+ID4+ICAKPiA+PiAgI2lmIFBUUlNfUEVS X1BNRCA+IDEKPiA+PiAgCj4gPj4gLXN0YXRpYyB2b2lkIHdhbGtfcG1kX2xldmVsKHN0cnVjdCBz ZXFfZmlsZSAqbSwgc3RydWN0IHBnX3N0YXRlICpzdCwgcHVkX3QgYWRkciwgdW5zaWduZWQgbG9u ZyBQKQo+ID4+ICtzdGF0aWMgdm9pZCB3YWxrX3BtZF9sZXZlbChzdHJ1Y3Qgc2VxX2ZpbGUgKm0s IHN0cnVjdCBwZ19zdGF0ZSAqc3QsIHB1ZF90IGFkZHIsCj4gPj4gKwkJCSAgIHBncHJvdHZhbF90 IGVmZl9pbiwgdW5zaWduZWQgbG9uZyBQKQo+ID4+ICB7Cj4gPj4gIAlpbnQgaTsKPiA+PiAgCXBt ZF90ICpzdGFydCwgKnBtZF9zdGFydDsKPiA+PiAtCXBncHJvdHZhbF90IHByb3Q7Cj4gPj4gKwlw Z3Byb3R2YWxfdCBwcm90LCBlZmY7Cj4gPj4gIAo+ID4+ICAJcG1kX3N0YXJ0ID0gc3RhcnQgPSAo cG1kX3QgKilwdWRfcGFnZV92YWRkcihhZGRyKTsKPiA+PiAgCWZvciAoaSA9IDA7IGkgPCBQVFJT X1BFUl9QTUQ7IGkrKykgewo+ID4+ICAJCXN0LT5jdXJyZW50X2FkZHJlc3MgPSBub3JtYWxpemVf YWRkcihQICsgaSAqIFBNRF9MRVZFTF9NVUxUKTsKPiA+PiAgCQlpZiAoIXBtZF9ub25lKCpzdGFy dCkpIHsKPiA+PiArCQkJcHJvdCA9IHBtZF9mbGFncygqc3RhcnQpOwo+ID4+ICsJCQllZmYgPSBl ZmZlY3RpdmVfcHJvdChlZmZfaW4sIHByb3QpOwo+ID4+ICAJCQlpZiAocG1kX2xhcmdlKCpzdGFy dCkgfHwgIXBtZF9wcmVzZW50KCpzdGFydCkpIHsKPiA+PiAtCQkJCXByb3QgPSBwbWRfZmxhZ3Mo KnN0YXJ0KTsKPiA+PiAtCQkJCW5vdGVfcGFnZShtLCBzdCwgX19wZ3Byb3QocHJvdCksIDQpOwo+ ID4+ICsJCQkJbm90ZV9wYWdlKG0sIHN0LCBfX3BncHJvdChwcm90KSwgZWZmLCA0KTsKPiA+PiAg CQkJfSBlbHNlIGlmICgha2FzYW5fcGFnZV90YWJsZShtLCBzdCwgcG1kX3N0YXJ0KSkgewo+ID4+ IC0JCQkJd2Fsa19wdGVfbGV2ZWwobSwgc3QsICpzdGFydCwKPiA+PiArCQkJCXdhbGtfcHRlX2xl dmVsKG0sIHN0LCAqc3RhcnQsIGVmZiwKPiA+PiAgCQkJCQkgICAgICAgUCArIGkgKiBQTURfTEVW RUxfTVVMVCk7Cj4gPj4gIAkJCX0KPiA+IAo+ID4gWW91IGNhbiBkcm9wIHRoZSBicmFjZXMgZm9y IGJvdGggY2FzZXMuIEFwcGxpZXMgdG8gc2ltaWxhcgo+ID4gY29uc3RydWN0cyBiZWxvdywgdG9v Lgo+IAo+IEkgZGlkIGNvbnNpZGVyIHRoYXQsIGJ1dCBkZWNpZGVkIGFnYWluc3QgdG8gYWxsb3cg dGhlIHBhdGNoIHRvIHNob3cKPiBtb3JlIGNsZWFybHkgd2hhdCBpdCBpcyB0aGF0IGlzIGFjdHVh bGx5IGJlaW5nIGNoYW5nZWQuCj4gCj4gPiBXaXRoIHRoYXQgZml4ZWQgeW91IGNhbiBhZGQgbXk6 Cj4gPiAKPiA+IFJldmlld2VkLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5jb20+Cj4g Cj4gVGhhbmtzLiBJJ2QgbGlrZSB0byB3YWl0IGZvciB0aGUgeDg2IG1haW50YWluZXIncyBvcGlu aW9uLCBhbmQgaGVuY2UKPiB3b24ndCBhZGQgeW91ciBSLWIgdW5sZXNzIHlvdSB0ZWxsIG1lIHRo YXQncyBmaW5lIGVpdGhlciB3YXksIG9yCj4gdW5sZXNzIHRoZXkgdG9vIHdvdWxkIHByZWZlciBy ZXN1bHRpbmcgY29kZSBjbGVhbmxpbmVzcyBvdmVyIHBhdGNoCj4gcmVhZGFiaWxpdHkuCgpJZiB5 b3UgcmVtb3ZlIHRoZSBicmFjZXMgdGhlIGNvZGUgcmVhZGFiaWxpdHkgZGVncmFkZXMgYmVjYXVz ZSBpdCdzIG5vdCBhCnNpbmdsZSBsaW5lIHN0YXRlbWVudC4KClRoYW5rcywKCgl0Z2x4CgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFp bGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhl bnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs