From mboxrd@z Thu Jan 1 00:00:00 1970 From: Borislav Petkov Subject: [PATCH] x86/paravirt: Cleanup native_patch() Date: Sat, 8 Sep 2018 17:28:00 +0200 Message-ID: <20180908152800.GA8286@zn.tnic> References: <20180907104917.12502-1-bp@alien8.de> <20180907105112.GD12849@zn.tnic> <20180907201050.GF12849@zn.tnic> <65bb69fa-855f-9efc-19ba-c0fab69f468c@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <65bb69fa-855f-9efc-19ba-c0fab69f468c@suse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: Juergen Gross Cc: x86@kernel.org, LKML , virtualization@lists.linux-foundation.org List-Id: virtualization@lists.linuxfoundation.org V2hlbiBDT05GSUdfUEFSQVZJUlRfU1BJTkxPQ0tTPW4sIGl0IGZpcmVzCgogIGFyY2gveDg2L2tl cm5lbC9wYXJhdmlydF9wYXRjaF82NC5jOiBJbiBmdW5jdGlvbiDigJhuYXRpdmVfcGF0Y2jigJk6 CiAgYXJjaC94ODYva2VybmVsL3BhcmF2aXJ0X3BhdGNoXzY0LmM6ODk6MTogd2FybmluZzogbGFi ZWwg4oCYcGF0Y2hfc2l0ZeKAmSBkZWZpbmVkIGJ1dCBub3QgdXNlZCBbLVd1bnVzZWQtbGFiZWxd CiAgIHBhdGNoX3NpdGU6CgpidXQgdGhvc2UgbGFiZWxzIGNhbiBzaW1wbHkgYmUgcmVtb3ZlZCBi eSBkaXJlY3RseSBjYWxsaW5nIHRoZQpyZXNwZWN0aXZlIGZ1bmN0aW9ucyB0aGVyZS4KCkdldCBy aWQgb2YgbG9jYWwgdmFyaWFibGVzIHRvbywgd2hpbGUgYXQgaXQuCgpTaWduZWQtb2ZmLWJ5OiBC b3Jpc2xhdiBQZXRrb3YgPGJwQHN1c2UuZGU+CkNjOiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3Vz ZS5jb20+CkNjOiB4ODZAa2VybmVsLm9yZwpDYzogdmlydHVhbGl6YXRpb25AbGlzdHMubGludXgt Zm91bmRhdGlvbi5vcmcKLS0tCgpJdCBsb29rcyBldmVuIG1vcmUgY2xlYW5lciBub3cuIDopCgog YXJjaC94ODYva2VybmVsL3BhcmF2aXJ0X3BhdGNoXzMyLmMgfCA0OCArKysrKysrKysrKy0tLS0t LS0tLS0tLS0tLS0tCiBhcmNoL3g4Ni9rZXJuZWwvcGFyYXZpcnRfcGF0Y2hfNjQuYyB8IDQ5ICsr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDM5IGluc2VydGlv bnMoKyksIDU4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FyY2gveDg2L2tlcm5lbC9wYXJh dmlydF9wYXRjaF8zMi5jIGIvYXJjaC94ODYva2VybmVsL3BhcmF2aXJ0X3BhdGNoXzMyLmMKaW5k ZXggZDQ2MGNiY2FiY2ZlLi4wODY1MzIzYzI3MTYgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L2tlcm5l bC9wYXJhdmlydF9wYXRjaF8zMi5jCisrKyBiL2FyY2gveDg2L2tlcm5lbC9wYXJhdmlydF9wYXRj aF8zMi5jCkBAIC0zNCwxNCArMzQsMTAgQEAgZXh0ZXJuIGJvb2wgcHZfaXNfbmF0aXZlX3ZjcHVf aXNfcHJlZW1wdGVkKHZvaWQpOwogCiB1bnNpZ25lZCBuYXRpdmVfcGF0Y2godTggdHlwZSwgdm9p ZCAqaWJ1ZiwgdW5zaWduZWQgbG9uZyBhZGRyLCB1bnNpZ25lZCBsZW4pCiB7Ci0JY29uc3QgdW5z aWduZWQgY2hhciAqc3RhcnQsICplbmQ7Ci0JdW5zaWduZWQgcmV0OwotCiAjZGVmaW5lIFBBVENI X1NJVEUob3BzLCB4KQkJCQkJXAotCQljYXNlIFBBUkFWSVJUX1BBVENIKG9wcy54KToJCQlcCi0J CQlzdGFydCA9IHN0YXJ0XyMjb3BzIyNfIyN4OwkJXAotCQkJZW5kID0gZW5kXyMjb3BzIyNfIyN4 OwkJCVwKLQkJCWdvdG8gcGF0Y2hfc2l0ZQorCWNhc2UgUEFSQVZJUlRfUEFUQ0gob3BzLngpOgkJ CQlcCisJCXJldHVybiBwYXJhdmlydF9wYXRjaF9pbnNucyhpYnVmLCBsZW4sIHN0YXJ0XyMjb3Bz IyNfIyN4LCBlbmRfIyNvcHMjI18jI3gpCisKIAlzd2l0Y2ggKHR5cGUpIHsKICNpZmRlZiBDT05G SUdfUEFSQVZJUlRfWFhMCiAJCVBBVENIX1NJVEUoaXJxLCBpcnFfZGlzYWJsZSk7CkBAIC01NCwz MiArNTAsMjYgQEAgdW5zaWduZWQgbmF0aXZlX3BhdGNoKHU4IHR5cGUsIHZvaWQgKmlidWYsIHVu c2lnbmVkIGxvbmcgYWRkciwgdW5zaWduZWQgbGVuKQogCQlQQVRDSF9TSVRFKG1tdSwgd3JpdGVf Y3IzKTsKICNlbmRpZgogI2lmIGRlZmluZWQoQ09ORklHX1BBUkFWSVJUX1NQSU5MT0NLUykKLQkJ Y2FzZSBQQVJBVklSVF9QQVRDSChsb2NrLnF1ZXVlZF9zcGluX3VubG9jayk6Ci0JCQlpZiAocHZf aXNfbmF0aXZlX3NwaW5fdW5sb2NrKCkpIHsKLQkJCQlzdGFydCA9IHN0YXJ0X2xvY2tfcXVldWVk X3NwaW5fdW5sb2NrOwotCQkJCWVuZCAgID0gZW5kX2xvY2tfcXVldWVkX3NwaW5fdW5sb2NrOwot CQkJCWdvdG8gcGF0Y2hfc2l0ZTsKLQkJCX0KLQkJCWdvdG8gcGF0Y2hfZGVmYXVsdDsKKwljYXNl IFBBUkFWSVJUX1BBVENIKGxvY2sucXVldWVkX3NwaW5fdW5sb2NrKToKKwkJaWYgKHB2X2lzX25h dGl2ZV9zcGluX3VubG9jaygpKQorCQkJcmV0dXJuIHBhcmF2aXJ0X3BhdGNoX2luc25zKGlidWYs IGxlbiwKKwkJCQkJCSAgICBzdGFydF9sb2NrX3F1ZXVlZF9zcGluX3VubG9jaywKKwkJCQkJCSAg ICBlbmRfbG9ja19xdWV1ZWRfc3Bpbl91bmxvY2spOworCQllbHNlCisJCQlyZXR1cm4gcGFyYXZp cnRfcGF0Y2hfZGVmYXVsdCh0eXBlLCBpYnVmLCBhZGRyLCBsZW4pOwogCi0JCWNhc2UgUEFSQVZJ UlRfUEFUQ0gobG9jay52Y3B1X2lzX3ByZWVtcHRlZCk6Ci0JCQlpZiAocHZfaXNfbmF0aXZlX3Zj cHVfaXNfcHJlZW1wdGVkKCkpIHsKLQkJCQlzdGFydCA9IHN0YXJ0X2xvY2tfdmNwdV9pc19wcmVl bXB0ZWQ7Ci0JCQkJZW5kICAgPSBlbmRfbG9ja192Y3B1X2lzX3ByZWVtcHRlZDsKLQkJCQlnb3Rv IHBhdGNoX3NpdGU7Ci0JCQl9Ci0JCQlnb3RvIHBhdGNoX2RlZmF1bHQ7CisJY2FzZSBQQVJBVklS VF9QQVRDSChsb2NrLnZjcHVfaXNfcHJlZW1wdGVkKToKKwkJaWYgKHB2X2lzX25hdGl2ZV92Y3B1 X2lzX3ByZWVtcHRlZCgpKQorCQkJcmV0dXJuIHBhcmF2aXJ0X3BhdGNoX2luc25zKGlidWYsIGxl biwKKwkJCQkJCSAgICBzdGFydF9sb2NrX3ZjcHVfaXNfcHJlZW1wdGVkLAorCQkJCQkJICAgIGVu ZF9sb2NrX3ZjcHVfaXNfcHJlZW1wdGVkKTsKKwkJZWxzZQorCQkJcmV0dXJuIHBhcmF2aXJ0X3Bh dGNoX2RlZmF1bHQodHlwZSwgaWJ1ZiwgYWRkciwgbGVuKTsKICNlbmRpZgogCiAJZGVmYXVsdDoK LXBhdGNoX2RlZmF1bHQ6IF9fbWF5YmVfdW51c2VkCi0JCXJldCA9IHBhcmF2aXJ0X3BhdGNoX2Rl ZmF1bHQodHlwZSwgaWJ1ZiwgYWRkciwgbGVuKTsKLQkJYnJlYWs7Ci0KLXBhdGNoX3NpdGU6Ci0J CXJldCA9IHBhcmF2aXJ0X3BhdGNoX2luc25zKGlidWYsIGxlbiwgc3RhcnQsIGVuZCk7Ci0JCWJy ZWFrOworCQlyZXR1cm4gcGFyYXZpcnRfcGF0Y2hfZGVmYXVsdCh0eXBlLCBpYnVmLCBhZGRyLCBs ZW4pOwogCX0KICN1bmRlZiBQQVRDSF9TSVRFCi0JcmV0dXJuIHJldDsKKwlyZXR1cm4gMDsKIH0K ZGlmZiAtLWdpdCBhL2FyY2gveDg2L2tlcm5lbC9wYXJhdmlydF9wYXRjaF82NC5jIGIvYXJjaC94 ODYva2VybmVsL3BhcmF2aXJ0X3BhdGNoXzY0LmMKaW5kZXggNWFkNWJjZGE5ZGM2Li4zNTQ5ZjVm OWQ2ODUgMTAwNjQ0Ci0tLSBhL2FyY2gveDg2L2tlcm5lbC9wYXJhdmlydF9wYXRjaF82NC5jCisr KyBiL2FyY2gveDg2L2tlcm5lbC9wYXJhdmlydF9wYXRjaF82NC5jCkBAIC00MiwxNSArNDIsMTEg QEAgZXh0ZXJuIGJvb2wgcHZfaXNfbmF0aXZlX3ZjcHVfaXNfcHJlZW1wdGVkKHZvaWQpOwogCiB1 bnNpZ25lZCBuYXRpdmVfcGF0Y2godTggdHlwZSwgdm9pZCAqaWJ1ZiwgdW5zaWduZWQgbG9uZyBh ZGRyLCB1bnNpZ25lZCBsZW4pCiB7Ci0JY29uc3QgdW5zaWduZWQgY2hhciAqc3RhcnQsICplbmQ7 Ci0JdW5zaWduZWQgcmV0OwotCiAjZGVmaW5lIFBBVENIX1NJVEUob3BzLCB4KQkJCQkJXAotCQlj YXNlIFBBUkFWSVJUX1BBVENIKG9wcy54KToJCQlcCi0JCQlzdGFydCA9IHN0YXJ0XyMjb3BzIyNf IyN4OwkJXAotCQkJZW5kID0gZW5kXyMjb3BzIyNfIyN4OwkJCVwKLQkJCWdvdG8gcGF0Y2hfc2l0 ZQotCXN3aXRjaCh0eXBlKSB7CisJY2FzZSBQQVJBVklSVF9QQVRDSChvcHMueCk6CQkJCVwKKwkJ cmV0dXJuIHBhcmF2aXJ0X3BhdGNoX2luc25zKGlidWYsIGxlbiwgc3RhcnRfIyNvcHMjI18jI3gs IGVuZF8jI29wcyMjXyMjeCkKKworCXN3aXRjaCAodHlwZSkgewogI2lmZGVmIENPTkZJR19QQVJB VklSVF9YWEwKIAkJUEFUQ0hfU0lURShpcnEsIHJlc3RvcmVfZmwpOwogCQlQQVRDSF9TSVRFKGly cSwgc2F2ZV9mbCk7CkBAIC02NCwzMiArNjAsMjcgQEAgdW5zaWduZWQgbmF0aXZlX3BhdGNoKHU4 IHR5cGUsIHZvaWQgKmlidWYsIHVuc2lnbmVkIGxvbmcgYWRkciwgdW5zaWduZWQgbGVuKQogCQlQ QVRDSF9TSVRFKG1tdSwgd3JpdGVfY3IzKTsKICNlbmRpZgogI2lmIGRlZmluZWQoQ09ORklHX1BB UkFWSVJUX1NQSU5MT0NLUykKLQkJY2FzZSBQQVJBVklSVF9QQVRDSChsb2NrLnF1ZXVlZF9zcGlu X3VubG9jayk6Ci0JCQlpZiAocHZfaXNfbmF0aXZlX3NwaW5fdW5sb2NrKCkpIHsKLQkJCQlzdGFy dCA9IHN0YXJ0X2xvY2tfcXVldWVkX3NwaW5fdW5sb2NrOwotCQkJCWVuZCAgID0gZW5kX2xvY2tf cXVldWVkX3NwaW5fdW5sb2NrOwotCQkJCWdvdG8gcGF0Y2hfc2l0ZTsKLQkJCX0KLQkJCWdvdG8g cGF0Y2hfZGVmYXVsdDsKKwljYXNlIFBBUkFWSVJUX1BBVENIKGxvY2sucXVldWVkX3NwaW5fdW5s b2NrKToKKwkJaWYgKHB2X2lzX25hdGl2ZV9zcGluX3VubG9jaygpKQorCQkJcmV0dXJuIHBhcmF2 aXJ0X3BhdGNoX2luc25zKGlidWYsIGxlbiwKKwkJCQkJCSAgICBzdGFydF9sb2NrX3F1ZXVlZF9z cGluX3VubG9jaywKKwkJCQkJCSAgICBlbmRfbG9ja19xdWV1ZWRfc3Bpbl91bmxvY2spOworCQll bHNlCisJCQlyZXR1cm4gcGFyYXZpcnRfcGF0Y2hfZGVmYXVsdCh0eXBlLCBpYnVmLCBhZGRyLCBs ZW4pOwogCi0JCWNhc2UgUEFSQVZJUlRfUEFUQ0gobG9jay52Y3B1X2lzX3ByZWVtcHRlZCk6Ci0J CQlpZiAocHZfaXNfbmF0aXZlX3ZjcHVfaXNfcHJlZW1wdGVkKCkpIHsKLQkJCQlzdGFydCA9IHN0 YXJ0X2xvY2tfdmNwdV9pc19wcmVlbXB0ZWQ7Ci0JCQkJZW5kICAgPSBlbmRfbG9ja192Y3B1X2lz X3ByZWVtcHRlZDsKLQkJCQlnb3RvIHBhdGNoX3NpdGU7Ci0JCQl9Ci0JCQlnb3RvIHBhdGNoX2Rl ZmF1bHQ7CisJY2FzZSBQQVJBVklSVF9QQVRDSChsb2NrLnZjcHVfaXNfcHJlZW1wdGVkKToKKwkJ aWYgKHB2X2lzX25hdGl2ZV92Y3B1X2lzX3ByZWVtcHRlZCgpKQorCQkJcmV0dXJuIHBhcmF2aXJ0 X3BhdGNoX2luc25zKGlidWYsIGxlbiwKKwkJCQkJCSAgICBzdGFydF9sb2NrX3ZjcHVfaXNfcHJl ZW1wdGVkLAorCQkJCQkJICAgIGVuZF9sb2NrX3ZjcHVfaXNfcHJlZW1wdGVkKTsKKwkJZWxzZQor CQkJcmV0dXJuIHBhcmF2aXJ0X3BhdGNoX2RlZmF1bHQodHlwZSwgaWJ1ZiwgYWRkciwgbGVuKTsK ICNlbmRpZgogCiAJZGVmYXVsdDoKLXBhdGNoX2RlZmF1bHQ6IF9fbWF5YmVfdW51c2VkCi0JCXJl dCA9IHBhcmF2aXJ0X3BhdGNoX2RlZmF1bHQodHlwZSwgaWJ1ZiwgYWRkciwgbGVuKTsKLQkJYnJl YWs7Ci0KLXBhdGNoX3NpdGU6Ci0JCXJldCA9IHBhcmF2aXJ0X3BhdGNoX2luc25zKGlidWYsIGxl biwgc3RhcnQsIGVuZCk7CisJCXJldHVybiBwYXJhdmlydF9wYXRjaF9kZWZhdWx0KHR5cGUsIGli dWYsIGFkZHIsIGxlbik7CiAJCWJyZWFrOwogCX0KICN1bmRlZiBQQVRDSF9TSVRFCi0JcmV0dXJu IHJldDsKKwlyZXR1cm4gMDsKIH0KLS0gCjIuMTcuMC41ODIuZ2NjZGNiZDU0YwoKCi0tIApSZWdh cmRzL0dydXNzLAogICAgQm9yaXMuCgpHb29kIG1haWxpbmcgcHJhY3RpY2VzIGZvciA0MDA6IGF2 b2lkIHRvcC1wb3N0aW5nIGFuZCB0cmltIHRoZSByZXBseS4KX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KVmlydHVhbGl6YXRpb24gbWFpbGluZyBsaXN0ClZp cnR1YWxpemF0aW9uQGxpc3RzLmxpbnV4LWZvdW5kYXRpb24ub3JnCmh0dHBzOi8vbGlzdHMubGlu dXhmb3VuZGF0aW9uLm9yZy9tYWlsbWFuL2xpc3RpbmZvL3ZpcnR1YWxpemF0aW9u From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5922C433F5 for ; Sat, 8 Sep 2018 15:28:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5032A204EC for ; Sat, 8 Sep 2018 15:28:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5032A204EC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=alien8.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727645AbeIHUOV (ORCPT ); Sat, 8 Sep 2018 16:14:21 -0400 Received: from mail.skyhub.de ([5.9.137.197]:38064 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726314AbeIHUOU (ORCPT ); Sat, 8 Sep 2018 16:14:20 -0400 X-Virus-Scanned: Nedap ESD1 at mail.skyhub.de Received: from mail.skyhub.de ([127.0.0.1]) by localhost (blast.alien8.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id btxtBE60Ot2u; Sat, 8 Sep 2018 17:28:08 +0200 (CEST) Received: from zn.tnic (p200300EC2BD9EB00329C23FFFEA6A903.dip0.t-ipconnect.de [IPv6:2003:ec:2bd9:eb00:329c:23ff:fea6:a903]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 79A181EC02D1; Sat, 8 Sep 2018 17:28:08 +0200 (CEST) Date: Sat, 8 Sep 2018 17:28:00 +0200 From: Borislav Petkov To: Juergen Gross Cc: LKML , x86@kernel.org, virtualization@lists.linux-foundation.org Subject: [PATCH] x86/paravirt: Cleanup native_patch() Message-ID: <20180908152800.GA8286@zn.tnic> References: <20180907104917.12502-1-bp@alien8.de> <20180907105112.GD12849@zn.tnic> <20180907201050.GF12849@zn.tnic> <65bb69fa-855f-9efc-19ba-c0fab69f468c@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <65bb69fa-855f-9efc-19ba-c0fab69f468c@suse.com> User-Agent: Mutt/1.9.5 (2018-04-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CONFIG_PARAVIRT_SPINLOCKS=n, it fires arch/x86/kernel/paravirt_patch_64.c: In function ‘native_patch’: arch/x86/kernel/paravirt_patch_64.c:89:1: warning: label ‘patch_site’ defined but not used [-Wunused-label] patch_site: but those labels can simply be removed by directly calling the respective functions there. Get rid of local variables too, while at it. Signed-off-by: Borislav Petkov Cc: Juergen Gross Cc: x86@kernel.org Cc: virtualization@lists.linux-foundation.org --- It looks even more cleaner now. :) arch/x86/kernel/paravirt_patch_32.c | 48 +++++++++++----------------- arch/x86/kernel/paravirt_patch_64.c | 49 ++++++++++++----------------- 2 files changed, 39 insertions(+), 58 deletions(-) diff --git a/arch/x86/kernel/paravirt_patch_32.c b/arch/x86/kernel/paravirt_patch_32.c index d460cbcabcfe..0865323c2716 100644 --- a/arch/x86/kernel/paravirt_patch_32.c +++ b/arch/x86/kernel/paravirt_patch_32.c @@ -34,14 +34,10 @@ extern bool pv_is_native_vcpu_is_preempted(void); unsigned native_patch(u8 type, void *ibuf, unsigned long addr, unsigned len) { - const unsigned char *start, *end; - unsigned ret; - #define PATCH_SITE(ops, x) \ - case PARAVIRT_PATCH(ops.x): \ - start = start_##ops##_##x; \ - end = end_##ops##_##x; \ - goto patch_site + case PARAVIRT_PATCH(ops.x): \ + return paravirt_patch_insns(ibuf, len, start_##ops##_##x, end_##ops##_##x) + switch (type) { #ifdef CONFIG_PARAVIRT_XXL PATCH_SITE(irq, irq_disable); @@ -54,32 +50,26 @@ unsigned native_patch(u8 type, void *ibuf, unsigned long addr, unsigned len) PATCH_SITE(mmu, write_cr3); #endif #if defined(CONFIG_PARAVIRT_SPINLOCKS) - case PARAVIRT_PATCH(lock.queued_spin_unlock): - if (pv_is_native_spin_unlock()) { - start = start_lock_queued_spin_unlock; - end = end_lock_queued_spin_unlock; - goto patch_site; - } - goto patch_default; + case PARAVIRT_PATCH(lock.queued_spin_unlock): + if (pv_is_native_spin_unlock()) + return paravirt_patch_insns(ibuf, len, + start_lock_queued_spin_unlock, + end_lock_queued_spin_unlock); + else + return paravirt_patch_default(type, ibuf, addr, len); - case PARAVIRT_PATCH(lock.vcpu_is_preempted): - if (pv_is_native_vcpu_is_preempted()) { - start = start_lock_vcpu_is_preempted; - end = end_lock_vcpu_is_preempted; - goto patch_site; - } - goto patch_default; + case PARAVIRT_PATCH(lock.vcpu_is_preempted): + if (pv_is_native_vcpu_is_preempted()) + return paravirt_patch_insns(ibuf, len, + start_lock_vcpu_is_preempted, + end_lock_vcpu_is_preempted); + else + return paravirt_patch_default(type, ibuf, addr, len); #endif default: -patch_default: __maybe_unused - ret = paravirt_patch_default(type, ibuf, addr, len); - break; - -patch_site: - ret = paravirt_patch_insns(ibuf, len, start, end); - break; + return paravirt_patch_default(type, ibuf, addr, len); } #undef PATCH_SITE - return ret; + return 0; } diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c index 5ad5bcda9dc6..3549f5f9d685 100644 --- a/arch/x86/kernel/paravirt_patch_64.c +++ b/arch/x86/kernel/paravirt_patch_64.c @@ -42,15 +42,11 @@ extern bool pv_is_native_vcpu_is_preempted(void); unsigned native_patch(u8 type, void *ibuf, unsigned long addr, unsigned len) { - const unsigned char *start, *end; - unsigned ret; - #define PATCH_SITE(ops, x) \ - case PARAVIRT_PATCH(ops.x): \ - start = start_##ops##_##x; \ - end = end_##ops##_##x; \ - goto patch_site - switch(type) { + case PARAVIRT_PATCH(ops.x): \ + return paravirt_patch_insns(ibuf, len, start_##ops##_##x, end_##ops##_##x) + + switch (type) { #ifdef CONFIG_PARAVIRT_XXL PATCH_SITE(irq, restore_fl); PATCH_SITE(irq, save_fl); @@ -64,32 +60,27 @@ unsigned native_patch(u8 type, void *ibuf, unsigned long addr, unsigned len) PATCH_SITE(mmu, write_cr3); #endif #if defined(CONFIG_PARAVIRT_SPINLOCKS) - case PARAVIRT_PATCH(lock.queued_spin_unlock): - if (pv_is_native_spin_unlock()) { - start = start_lock_queued_spin_unlock; - end = end_lock_queued_spin_unlock; - goto patch_site; - } - goto patch_default; + case PARAVIRT_PATCH(lock.queued_spin_unlock): + if (pv_is_native_spin_unlock()) + return paravirt_patch_insns(ibuf, len, + start_lock_queued_spin_unlock, + end_lock_queued_spin_unlock); + else + return paravirt_patch_default(type, ibuf, addr, len); - case PARAVIRT_PATCH(lock.vcpu_is_preempted): - if (pv_is_native_vcpu_is_preempted()) { - start = start_lock_vcpu_is_preempted; - end = end_lock_vcpu_is_preempted; - goto patch_site; - } - goto patch_default; + case PARAVIRT_PATCH(lock.vcpu_is_preempted): + if (pv_is_native_vcpu_is_preempted()) + return paravirt_patch_insns(ibuf, len, + start_lock_vcpu_is_preempted, + end_lock_vcpu_is_preempted); + else + return paravirt_patch_default(type, ibuf, addr, len); #endif default: -patch_default: __maybe_unused - ret = paravirt_patch_default(type, ibuf, addr, len); - break; - -patch_site: - ret = paravirt_patch_insns(ibuf, len, start, end); + return paravirt_patch_default(type, ibuf, addr, len); break; } #undef PATCH_SITE - return ret; + return 0; } -- 2.17.0.582.gccdcbd54c -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply.