From mboxrd@z Thu Jan 1 00:00:00 1970 From: Borislav Petkov Subject: [PATCH 06/10] x86/cpufeature: Kill cpu_has_clflush Date: Tue, 29 Mar 2016 17:41:59 +0200 Message-ID: <1459266123-21878-7-git-send-email-bp@alien8.de> References: <1459266123-21878-1-git-send-email-bp@alien8.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.skyhub.de (mail.skyhub.de [IPv6:2a01:4f8:120:8448::d00d]) by gabe.freedesktop.org (Postfix) with ESMTP id 443C96E69F for ; Tue, 29 Mar 2016 15:42:16 +0000 (UTC) In-Reply-To: <1459266123-21878-1-git-send-email-bp@alien8.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: X86 ML Cc: intel-gfx@lists.freedesktop.org, LKML , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogQm9yaXNsYXYgUGV0a292IDxicEBzdXNlLmRlPgoKVXNlIHRoZSBmYXN0IHZhcmlhbnQg aW4gdGhlIERSTSBjb2RlLgoKU2lnbmVkLW9mZi1ieTogQm9yaXNsYXYgUGV0a292IDxicEBzdXNl LmRlPgpDYzogZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpDYzogaW50ZWwtZ2Z4QGxp c3RzLmZyZWVkZXNrdG9wLm9yZwotLS0KIGFyY2gveDg2L2luY2x1ZGUvYXNtL2NwdWZlYXR1cmUu aCAgICAgICAgICB8IDEgLQogYXJjaC94ODYva2VybmVsL2NwdS9pbnRlbC5jICAgICAgICAgICAg ICAgIHwgMiArLQogYXJjaC94ODYva2VybmVsL3RjZV82NC5jICAgICAgICAgICAgICAgICAgIHwg MiArLQogYXJjaC94ODYvbW0vcGFnZWF0dHIuYyAgICAgICAgICAgICAgICAgICAgIHwgMiArLQog ZHJpdmVycy9ncHUvZHJtL2RybV9jYWNoZS5jICAgICAgICAgICAgICAgIHwgNiArKystLS0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyB8IDIgKy0KIDYgZmlsZXMg Y2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Fy Y2gveDg2L2luY2x1ZGUvYXNtL2NwdWZlYXR1cmUuaCBiL2FyY2gveDg2L2luY2x1ZGUvYXNtL2Nw dWZlYXR1cmUuaAppbmRleCA2OTNiNGFhNDM5MDguLmE3NTE1NDIzMmRiNSAxMDA2NDQKLS0tIGEv YXJjaC94ODYvaW5jbHVkZS9hc20vY3B1ZmVhdHVyZS5oCisrKyBiL2FyY2gveDg2L2luY2x1ZGUv YXNtL2NwdWZlYXR1cmUuaApAQCAtMTI5LDcgKzEyOSw2IEBAIGV4dGVybiBjb25zdCBjaGFyICog Y29uc3QgeDg2X2J1Z19mbGFnc1tOQlVHSU5UUyozMl07CiAjZGVmaW5lIGNwdV9oYXNfYWVzCQli b290X2NwdV9oYXMoWDg2X0ZFQVRVUkVfQUVTKQogI2RlZmluZSBjcHVfaGFzX2F2eAkJYm9vdF9j cHVfaGFzKFg4Nl9GRUFUVVJFX0FWWCkKICNkZWZpbmUgY3B1X2hhc19hdngyCQlib290X2NwdV9o YXMoWDg2X0ZFQVRVUkVfQVZYMikKLSNkZWZpbmUgY3B1X2hhc19jbGZsdXNoCQlib290X2NwdV9o YXMoWDg2X0ZFQVRVUkVfQ0xGTFVTSCkKICNkZWZpbmUgY3B1X2hhc19wYXQJCWJvb3RfY3B1X2hh cyhYODZfRkVBVFVSRV9QQVQpCiAjZGVmaW5lIGNwdV9oYXNfeHNhdmUJCWJvb3RfY3B1X2hhcyhY ODZfRkVBVFVSRV9YU0FWRSkKICNkZWZpbmUgY3B1X2hhc194c2F2ZXMJCWJvb3RfY3B1X2hhcyhY ODZfRkVBVFVSRV9YU0FWRVMpCmRpZmYgLS1naXQgYS9hcmNoL3g4Ni9rZXJuZWwvY3B1L2ludGVs LmMgYi9hcmNoL3g4Ni9rZXJuZWwvY3B1L2ludGVsLmMKaW5kZXggMWY3ZmRiOTFhODE4Li42Mjhh OWY4NTNiODQgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L2tlcm5lbC9jcHUvaW50ZWwuYworKysgYi9h cmNoL3g4Ni9rZXJuZWwvY3B1L2ludGVsLmMKQEAgLTQ2OCw3ICs0NjgsNyBAQCBzdGF0aWMgdm9p ZCBpbml0X2ludGVsKHN0cnVjdCBjcHVpbmZvX3g4NiAqYykKIAkJCXNldF9jcHVfY2FwKGMsIFg4 Nl9GRUFUVVJFX1BFQlMpOwogCX0KIAotCWlmIChjLT54ODYgPT0gNiAmJiBjcHVfaGFzX2NsZmx1 c2ggJiYKKwlpZiAoYy0+eDg2ID09IDYgJiYgYm9vdF9jcHVfaGFzKFg4Nl9GRUFUVVJFX0NMRkxV U0gpICYmCiAJICAgIChjLT54ODZfbW9kZWwgPT0gMjkgfHwgYy0+eDg2X21vZGVsID09IDQ2IHx8 IGMtPng4Nl9tb2RlbCA9PSA0NykpCiAJCXNldF9jcHVfYnVnKGMsIFg4Nl9CVUdfQ0xGTFVTSF9N T05JVE9SKTsKIApkaWZmIC0tZ2l0IGEvYXJjaC94ODYva2VybmVsL3RjZV82NC5jIGIvYXJjaC94 ODYva2VybmVsL3RjZV82NC5jCmluZGV4IGFiNDA5NTRlMTEzZS4uZjM4NmJhZDA5ODRlIDEwMDY0 NAotLS0gYS9hcmNoL3g4Ni9rZXJuZWwvdGNlXzY0LmMKKysrIGIvYXJjaC94ODYva2VybmVsL3Rj ZV82NC5jCkBAIC00MCw3ICs0MCw3IEBACiBzdGF0aWMgaW5saW5lIHZvaWQgZmx1c2hfdGNlKHZv aWQqIHRjZWFkZHIpCiB7CiAJLyogYSBzaW5nbGUgdGNlIGNhbid0IGNyb3NzIGEgY2FjaGUgbGlu ZSAqLwotCWlmIChjcHVfaGFzX2NsZmx1c2gpCisJaWYgKGJvb3RfY3B1X2hhcyhYODZfRkVBVFVS RV9DTEZMVVNIKSkKIAkJY2xmbHVzaCh0Y2VhZGRyKTsKIAllbHNlCiAJCXdiaW52ZCgpOwpkaWZm IC0tZ2l0IGEvYXJjaC94ODYvbW0vcGFnZWF0dHIuYyBiL2FyY2gveDg2L21tL3BhZ2VhdHRyLmMK aW5kZXggZmIyMGMyZWUwMDkyLi5iYmY0NjJmZjk3NDUgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L21t L3BhZ2VhdHRyLmMKKysrIGIvYXJjaC94ODYvbW0vcGFnZWF0dHIuYwpAQCAtMTQ2MCw3ICsxNDYw LDcgQEAgc3RhdGljIGludCBjaGFuZ2VfcGFnZV9hdHRyX3NldF9jbHIodW5zaWduZWQgbG9uZyAq YWRkciwgaW50IG51bXBhZ2VzLAogCSAqIGVycm9yIGNhc2Ugd2UgZmFsbCBiYWNrIHRvIGNwYV9m bHVzaF9hbGwgKHdoaWNoIHVzZXMKIAkgKiBXQklOVkQpOgogCSAqLwotCWlmICghcmV0ICYmIGNw dV9oYXNfY2xmbHVzaCkgeworCWlmICghcmV0ICYmIGJvb3RfY3B1X2hhcyhYODZfRkVBVFVSRV9D TEZMVVNIKSkgewogCQlpZiAoY3BhLmZsYWdzICYgKENQQV9QQUdFU19BUlJBWSB8IENQQV9BUlJB WSkpIHsKIAkJCWNwYV9mbHVzaF9hcnJheShhZGRyLCBudW1wYWdlcywgY2FjaGUsCiAJCQkJCWNw YS5mbGFncywgcGFnZXMpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9jYWNoZS5j IGIvZHJpdmVycy9ncHUvZHJtL2RybV9jYWNoZS5jCmluZGV4IDY3NDNmZjdkY2NmYS4uMDU5Zjdj MzljNTgyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2NhY2hlLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2RybV9jYWNoZS5jCkBAIC03Miw3ICs3Miw3IEBAIGRybV9jbGZsdXNoX3Bh Z2VzKHN0cnVjdCBwYWdlICpwYWdlc1tdLCB1bnNpZ25lZCBsb25nIG51bV9wYWdlcykKIHsKIAog I2lmIGRlZmluZWQoQ09ORklHX1g4NikKLQlpZiAoY3B1X2hhc19jbGZsdXNoKSB7CisJaWYgKHN0 YXRpY19jcHVfaGFzKFg4Nl9GRUFUVVJFX0NMRkxVU0gpKSB7CiAJCWRybV9jYWNoZV9mbHVzaF9j bGZsdXNoKHBhZ2VzLCBudW1fcGFnZXMpOwogCQlyZXR1cm47CiAJfQpAQCAtMTA1LDcgKzEwNSw3 IEBAIHZvaWQKIGRybV9jbGZsdXNoX3NnKHN0cnVjdCBzZ190YWJsZSAqc3QpCiB7CiAjaWYgZGVm aW5lZChDT05GSUdfWDg2KQotCWlmIChjcHVfaGFzX2NsZmx1c2gpIHsKKwlpZiAoc3RhdGljX2Nw dV9oYXMoWDg2X0ZFQVRVUkVfQ0xGTFVTSCkpIHsKIAkJc3RydWN0IHNnX3BhZ2VfaXRlciBzZ19p dGVyOwogCiAJCW1iKCk7CkBAIC0xMjksNyArMTI5LDcgQEAgdm9pZAogZHJtX2NsZmx1c2hfdmly dF9yYW5nZSh2b2lkICphZGRyLCB1bnNpZ25lZCBsb25nIGxlbmd0aCkKIHsKICNpZiBkZWZpbmVk KENPTkZJR19YODYpCi0JaWYgKGNwdV9oYXNfY2xmbHVzaCkgeworCWlmIChzdGF0aWNfY3B1X2hh cyhYODZfRkVBVFVSRV9DTEZMVVNIKSkgewogCQljb25zdCBpbnQgc2l6ZSA9IGJvb3RfY3B1X2Rh dGEueDg2X2NsZmx1c2hfc2l6ZTsKIAkJdm9pZCAqZW5kID0gYWRkciArIGxlbmd0aDsKIAkJYWRk ciA9ICh2b2lkICopKCgodW5zaWduZWQgbG9uZylhZGRyKSAmIC1zaXplKTsKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwppbmRleCAxMzI4YmM1MDIxYjQuLmI4NDVm NDY4ZGQ3NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZXhlY2J1 ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2V4ZWNidWZmZXIuYwpA QCAtNDg4LDcgKzQ4OCw3IEBAIGk5MTVfZ2VtX2V4ZWNidWZmZXJfcmVsb2NhdGVfZW50cnkoc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwKIAkJcmV0ID0gcmVsb2NhdGVfZW50cnlfY3B1 KG9iaiwgcmVsb2MsIHRhcmdldF9vZmZzZXQpOwogCWVsc2UgaWYgKG9iai0+bWFwX2FuZF9mZW5j ZWFibGUpCiAJCXJldCA9IHJlbG9jYXRlX2VudHJ5X2d0dChvYmosIHJlbG9jLCB0YXJnZXRfb2Zm c2V0KTsKLQllbHNlIGlmIChjcHVfaGFzX2NsZmx1c2gpCisJZWxzZSBpZiAoc3RhdGljX2NwdV9o YXMoWDg2X0ZFQVRVUkVfQ0xGTFVTSCkpCiAJCXJldCA9IHJlbG9jYXRlX2VudHJ5X2NsZmx1c2go b2JqLCByZWxvYywgdGFyZ2V0X29mZnNldCk7CiAJZWxzZSB7CiAJCVdBUk5fT05DRSgxLCAiSW1w b3NzaWJsZSBjYXNlIGluIHJlbG9jYXRpb24gaGFuZGxpbmdcbiIpOwotLSAKMi43LjMKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWls aW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932352AbcC2Pnk (ORCPT ); Tue, 29 Mar 2016 11:43:40 -0400 Received: from mail.skyhub.de ([78.46.96.112]:50470 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757386AbcC2PmR (ORCPT ); Tue, 29 Mar 2016 11:42:17 -0400 From: Borislav Petkov To: X86 ML Cc: LKML , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH 06/10] x86/cpufeature: Kill cpu_has_clflush Date: Tue, 29 Mar 2016 17:41:59 +0200 Message-Id: <1459266123-21878-7-git-send-email-bp@alien8.de> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1459266123-21878-1-git-send-email-bp@alien8.de> References: <1459266123-21878-1-git-send-email-bp@alien8.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov Use the fast variant in the DRM code. Signed-off-by: Borislav Petkov Cc: dri-devel@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org --- arch/x86/include/asm/cpufeature.h | 1 - arch/x86/kernel/cpu/intel.c | 2 +- arch/x86/kernel/tce_64.c | 2 +- arch/x86/mm/pageattr.c | 2 +- drivers/gpu/drm/drm_cache.c | 6 +++--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index 693b4aa43908..a75154232db5 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -129,7 +129,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; #define cpu_has_aes boot_cpu_has(X86_FEATURE_AES) #define cpu_has_avx boot_cpu_has(X86_FEATURE_AVX) #define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2) -#define cpu_has_clflush boot_cpu_has(X86_FEATURE_CLFLUSH) #define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT) #define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE) #define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES) diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 1f7fdb91a818..628a9f853b84 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -468,7 +468,7 @@ static void init_intel(struct cpuinfo_x86 *c) set_cpu_cap(c, X86_FEATURE_PEBS); } - if (c->x86 == 6 && cpu_has_clflush && + if (c->x86 == 6 && boot_cpu_has(X86_FEATURE_CLFLUSH) && (c->x86_model == 29 || c->x86_model == 46 || c->x86_model == 47)) set_cpu_bug(c, X86_BUG_CLFLUSH_MONITOR); diff --git a/arch/x86/kernel/tce_64.c b/arch/x86/kernel/tce_64.c index ab40954e113e..f386bad0984e 100644 --- a/arch/x86/kernel/tce_64.c +++ b/arch/x86/kernel/tce_64.c @@ -40,7 +40,7 @@ static inline void flush_tce(void* tceaddr) { /* a single tce can't cross a cache line */ - if (cpu_has_clflush) + if (boot_cpu_has(X86_FEATURE_CLFLUSH)) clflush(tceaddr); else wbinvd(); diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index fb20c2ee0092..bbf462ff9745 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -1460,7 +1460,7 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages, * error case we fall back to cpa_flush_all (which uses * WBINVD): */ - if (!ret && cpu_has_clflush) { + if (!ret && boot_cpu_has(X86_FEATURE_CLFLUSH)) { if (cpa.flags & (CPA_PAGES_ARRAY | CPA_ARRAY)) { cpa_flush_array(addr, numpages, cache, cpa.flags, pages); diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c index 6743ff7dccfa..059f7c39c582 100644 --- a/drivers/gpu/drm/drm_cache.c +++ b/drivers/gpu/drm/drm_cache.c @@ -72,7 +72,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages) { #if defined(CONFIG_X86) - if (cpu_has_clflush) { + if (static_cpu_has(X86_FEATURE_CLFLUSH)) { drm_cache_flush_clflush(pages, num_pages); return; } @@ -105,7 +105,7 @@ void drm_clflush_sg(struct sg_table *st) { #if defined(CONFIG_X86) - if (cpu_has_clflush) { + if (static_cpu_has(X86_FEATURE_CLFLUSH)) { struct sg_page_iter sg_iter; mb(); @@ -129,7 +129,7 @@ void drm_clflush_virt_range(void *addr, unsigned long length) { #if defined(CONFIG_X86) - if (cpu_has_clflush) { + if (static_cpu_has(X86_FEATURE_CLFLUSH)) { const int size = boot_cpu_data.x86_clflush_size; void *end = addr + length; addr = (void *)(((unsigned long)addr) & -size); diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 1328bc5021b4..b845f468dd74 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -488,7 +488,7 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj, ret = relocate_entry_cpu(obj, reloc, target_offset); else if (obj->map_and_fenceable) ret = relocate_entry_gtt(obj, reloc, target_offset); - else if (cpu_has_clflush) + else if (static_cpu_has(X86_FEATURE_CLFLUSH)) ret = relocate_entry_clflush(obj, reloc, target_offset); else { WARN_ONCE(1, "Impossible case in relocation handling\n"); -- 2.7.3