From: Borislav Petkov <bp@alien8.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Juergen Gross <jgross@suse.com>,
x86@kernel.org, virtualization@lists.linux-foundation.org
Subject: [PATCH v2] x86/paravirt: Get rid of patch_site and patch_default labels
Date: Fri, 7 Sep 2018 22:10:50 +0200 [thread overview]
Message-ID: <20180907201050.GF12849__11295.9018945277$1536350941$gmane$org@zn.tnic> (raw)
In-Reply-To: <20180907105112.GD12849@zn.tnic>
On Fri, Sep 07, 2018 at 12:51:12PM +0200, Borislav Petkov wrote:
> Whoops, no, it is still being used. Lemme see if I can remove all the
> labels in that function.
Ok, I think I've gotten rid of them all, in both 32- and 64-bit
versions. It boots here and a bunch of all*config builds pass.
---
From: Borislav Petkov <bp@suse.de>
Date: Fri, 7 Sep 2018 12:47:10 +0200
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Juergen Gross <jgross@suse.com>
Cc: x86@kernel.org
Cc: virtualization@lists.linux-foundation.org
---
arch/x86/kernel/paravirt_patch_32.c | 21 ++++++++++-----------
arch/x86/kernel/paravirt_patch_64.c | 20 +++++++++-----------
2 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/arch/x86/kernel/paravirt_patch_32.c b/arch/x86/kernel/paravirt_patch_32.c
index d460cbcabcfe..af57f0d0789f 100644
--- a/arch/x86/kernel/paravirt_patch_32.c
+++ b/arch/x86/kernel/paravirt_patch_32.c
@@ -34,14 +34,16 @@ 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;
+ const unsigned char *start __maybe_unused, *end __maybe_unused;
unsigned ret;
#define PATCH_SITE(ops, x) \
case PARAVIRT_PATCH(ops.x): \
start = start_##ops##_##x; \
end = end_##ops##_##x; \
- goto patch_site
+ \
+ return paravirt_patch_insns(ibuf, len, start, end);
+
switch (type) {
#ifdef CONFIG_PARAVIRT_XXL
PATCH_SITE(irq, irq_disable);
@@ -58,27 +60,24 @@ unsigned native_patch(u8 type, void *ibuf, unsigned long addr, unsigned len)
if (pv_is_native_spin_unlock()) {
start = start_lock_queued_spin_unlock;
end = end_lock_queued_spin_unlock;
- goto patch_site;
+
+ return paravirt_patch_insns(ibuf, len, start, end);
}
- goto patch_default;
+ 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;
+
+ return paravirt_patch_insns(ibuf, len, start, end);
}
- goto patch_default;
+ 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;
}
#undef PATCH_SITE
return ret;
diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
index 5ad5bcda9dc6..2db6c615932f 100644
--- a/arch/x86/kernel/paravirt_patch_64.c
+++ b/arch/x86/kernel/paravirt_patch_64.c
@@ -42,14 +42,15 @@ 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;
+ const unsigned char *start __maybe_unused, *end __maybe_unused;
unsigned ret;
#define PATCH_SITE(ops, x) \
case PARAVIRT_PATCH(ops.x): \
start = start_##ops##_##x; \
end = end_##ops##_##x; \
- goto patch_site
+ \
+ return paravirt_patch_insns(ibuf, len, start, end);
switch(type) {
#ifdef CONFIG_PARAVIRT_XXL
PATCH_SITE(irq, restore_fl);
@@ -68,27 +69,24 @@ unsigned native_patch(u8 type, void *ibuf, unsigned long addr, unsigned len)
if (pv_is_native_spin_unlock()) {
start = start_lock_queued_spin_unlock;
end = end_lock_queued_spin_unlock;
- goto patch_site;
+
+ return paravirt_patch_insns(ibuf, len, start, end);
}
- goto patch_default;
+ 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;
+
+ return paravirt_patch_insns(ibuf, len, start, end);
}
- goto patch_default;
+ 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;
}
#undef PATCH_SITE
return ret;
--
2.17.0.582.gccdcbd54c
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
next prev parent reply other threads:[~2018-09-07 20:10 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-07 10:49 [PATCH] x86/paravirt: Get rid of patch_site label Borislav Petkov
2018-09-07 10:51 ` Borislav Petkov
2018-09-07 20:10 ` [PATCH v2] x86/paravirt: Get rid of patch_site and patch_default labels Borislav Petkov
2018-09-08 5:45 ` Juergen Gross
2018-09-08 5:45 ` Juergen Gross
2018-09-08 15:28 ` [PATCH] x86/paravirt: Cleanup native_patch() Borislav Petkov
2018-09-08 15:28 ` Borislav Petkov
2018-09-10 6:54 ` Juergen Gross
2018-09-10 7:01 ` Borislav Petkov
2018-09-10 7:01 ` Borislav Petkov
2018-09-10 8:33 ` Juergen Gross
2018-09-10 8:33 ` Juergen Gross
2018-09-11 9:15 ` [PATCH v2] " Borislav Petkov
2018-09-11 9:44 ` Juergen Gross
2018-09-11 9:44 ` Juergen Gross
2018-09-11 15:34 ` [tip:x86/paravirt] x86/paravirt: Clean up native_patch() tip-bot for Borislav Petkov
2018-09-11 9:15 ` [PATCH v2] x86/paravirt: Cleanup native_patch() Borislav Petkov
2018-09-10 6:54 ` [PATCH] " Juergen Gross
2018-09-07 20:10 ` Borislav Petkov [this message]
2018-09-07 10:51 ` [PATCH] x86/paravirt: Get rid of patch_site label Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='20180907201050.GF12849__11295.9018945277$1536350941$gmane$org@zn.tnic' \
--to=bp@alien8.de \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.