Skip to contentSkip to conversation

2.6.32.12: Build warning due to 78ce64a384 / missing in 2.6.33?

PATCH In review Jan Kiszka 5 participants 12 messages Apr 26, 2010 – May 7, 2010

Subsystems (3)
x86 KVM KVM x86
lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

Gleb,

I'm getting a build warning with latest 2.6.32.12 due to "Fix segment descriptor loading". load_segment_descriptor_to_kvm_desct is unused after that patch. I assume it's just forgotten code and did not accidentally become unused, right?

The fact that 2.6.33.3 does not generate this makes me wonder why it obviously lacks the above patch. Not required or not yet queued?

Jan

#1 lore raw
Quoted 7 lines · Jan Kiszka

Gleb,

I'm getting a build warning with latest 2.6.32.12 due to "Fix segment descriptor loading". load_segment_descriptor_to_kvm_desct is unused after that patch. I assume it's just forgotten code and did not accidentally become unused, right?

Yes, the function was use only in one place and was removed by upstream commit e01c2426149.

Quoted 3 lines

The fact that 2.6.33.3 does not generate this makes me wonder why it obviously lacks the above patch. Not required or not yet queued?

Doesn't make much sense to include it in stable-32, but not stable-33. I think stable-32 just has more attention since it is used by many distribution as base kernel.

--
Gleb.

#2 lore raw
Quoted 9 lines · Gleb Natapov
Quoted 5 lines

The fact that 2.6.33.3 does not generate this makes me wonder why it obviously lacks the above patch. Not required or not yet queued?

Doesn't make much sense to include it in stable-32, but not stable-33. I think stable-32 just has more attention since it is used by many distribution as base kernel.

This was due to the previous process of mindlessly applying patches to stable without testing/looking at them first. Hopefully the new process will deliver better results.

Gleb, can you look at 2.6.33 and see if it is missing something, or maybe the warning is gone for another reason?

Signature · 1 line
Do not meddle in the internals of kernels, for they are subtle and quick to panic.
#3 lore raw
Quoted 9 lines · Avi Kivity
Quoted 7 lines · Gleb Natapov
Quoted 4 lines

The fact that 2.6.33.3 does not generate this makes me wonder why it obviously lacks the above patch. Not required or not yet queued?

Doesn't make much sense to include it in stable-32, but not stable-33. I think stable-32 just has more attention since it is used by many distribution as base kernel.

Quoted 7 lines

This was due to the previous process of mindlessly applying patches to stable without testing/looking at them first. Hopefully the new process will deliver better results.

Gleb, can you look at 2.6.33 and see if it is missing something, or maybe the warning is gone for another reason?

Already looked at it. 2.6.33-stable misses the patch that cause warning in 2.6.32-stable.

--
Gleb.

#4 lore raw

PATCH 1/1 KVM: remove unused load_segment_descriptor_to_kvm_desct

Function is now unused.

Signed-off-by Marcelo Tosatti <[email protected]>
arch/x86/kvm/x86.c +0 -12
index 389fc55..2782509 100644
@@ -4155,18 +4155,6 @@ static u16 get_segment_selector(struct kvm_vcpu *vcpu, int seg)
 	return kvm_seg.selector;
 }
 
-static int load_segment_descriptor_to_kvm_desct(struct kvm_vcpu *vcpu,
-						u16 selector,
-						struct kvm_segment *kvm_seg)
-{
-	struct desc_struct seg_desc;
-
-	if (load_guest_segment_descriptor(vcpu, selector, &seg_desc))
-		return 1;
-	seg_desct_to_kvm_desct(&seg_desc, selector, kvm_seg);
-	return 0;
-}
-
 static int kvm_load_realmode_segment(struct kvm_vcpu *vcpu, u16 selector, int seg)
 {
 	struct kvm_segment segvar = {
#5 lore raw

Re: [PATCH 2.6.32.12] KVM: remove unused load_segment_descriptor_to_kvm_desct

Quoted 4 lines · Marcelo Tosatti

Function is now unused.

Signed-off-by Marcelo Tosatti <[email protected]>

Was this patch also upstream? Why does stable need it?

thanks,

greg k-h

#6 lore raw

Re: [PATCH 2.6.32.12] KVM: remove unused load_segment_descriptor_to_kvm_desct

Quoted 8 lines · Greg KH
Quoted 4 lines · Marcelo Tosatti

Function is now unused.

Signed-off-by Marcelo Tosatti <[email protected]>

Was this patch also upstream? Why does stable need it?

It is upstream, but as part of another commit. My guess is that when patches were ported to stable this chunk was lost due to wrong merge resolving.

--
Gleb.

#7 lore raw

Re: [PATCH 2.6.32.12] KVM: remove unused load_segment_descriptor_to_kvm_desct

Quoted 5 lines · Gleb Natapov
Quoted 4 lines · Greg KH
Quoted 3 lines · Marcelo Tosatti

Function is now unused.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Marcelo Tosatti <[email protected]>

Was this patch also upstream? Why does stable need it?

It is upstream, but as part of another commit. My guess is that when patches were ported to stable this chunk was lost due to wrong merge resolving.

Ok, but as this patch doesn't do anything, why is it needed in -stable?

Also, this type of information (why it isn't upstream), is REQUIRED in order to be accepted. Please include it.

thanks,

greg k-h

#8 lore raw

Re: [PATCH 2.6.32.12] KVM: remove unused load_segment_descriptor_to_kvm_desct

Quoted 8 lines · Greg KH
Quoted 7 lines · Gleb Natapov
Quoted 6 lines · Greg KH
Quoted 4 lines · Marcelo Tosatti

Function is now unused.

Signed-off-by Marcelo Tosatti <[email protected]>
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

Was this patch also upstream? Why does stable need it?

It is upstream, but as part of another commit. My guess is that when patches were ported to stable this chunk was lost due to wrong merge resolving.

Ok, but as this patch doesn't do anything, why is it needed in -stable?

Because it fixes a warning reported on the mailing list.

Quoted 2 lines

Also, this type of information (why it isn't upstream), is REQUIRED in order to be accepted. Please include it.

Sorry about that, will include proper changelog in the future.

#9 lore raw

Re: [PATCH 2.6.32.12] KVM: remove unused load_segment_descriptor_to_kvm_desct

Quoted 11 lines · Marcelo Tosatti
Quoted 10 lines · Greg KH
Quoted 9 lines · Gleb Natapov
Quoted 8 lines · Greg KH
Quoted 4 lines · Marcelo Tosatti

Function is now unused.

Signed-off-by Marcelo Tosatti <[email protected]>

Was this patch also upstream? Why does stable need it?

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

It is upstream, but as part of another commit. My guess is that when patches were ported to stable this chunk was lost due to wrong merge resolving.

Ok, but as this patch doesn't do anything, why is it needed in -stable?

Because it fixes a warning reported on the mailing list.

What mailing list?

Quoted 4 lines
Quoted 2 lines

Also, this type of information (why it isn't upstream), is REQUIRED in order to be accepted. Please include it.

Sorry about that, will include proper changelog in the future.

Can you resend this one, with such changelog information, so I can apply it?

thanks,

greg k-h

#10 lore raw

PATCH 1/1 KVM: remove unused load_segment_descriptor_to_kvm_desct

Commit 78ce64a384 in v2.6.32.12 introduced a warning due to unused load_segment_descriptor_to_kvm_desct helper, which has been opencoded by this commit.

On upstream, the helper was removed as part of a different commit.

Remove the now unused function.

Signed-off-by Marcelo Tosatti <[email protected]>
arch/x86/kvm/x86.c +0 -12
index 389fc55..2782509 100644
@@ -4155,18 +4155,6 @@ static u16 get_segment_selector(struct kvm_vcpu *vcpu, int seg)
 	return kvm_seg.selector;
 }
 
-static int load_segment_descriptor_to_kvm_desct(struct kvm_vcpu *vcpu,
-						u16 selector,
-						struct kvm_segment *kvm_seg)
-{
-	struct desc_struct seg_desc;
-
-	if (load_guest_segment_descriptor(vcpu, selector, &seg_desc))
-		return 1;
-	seg_desct_to_kvm_desct(&seg_desc, selector, kvm_seg);
-	return 0;
-}
-
 static int kvm_load_realmode_segment(struct kvm_vcpu *vcpu, u16 selector, int seg)
 {
 	struct kvm_segment segvar = {
#11 lore raw

patch kvm-remove-unused-load_segment_descriptor_to_kvm_desct.patch added to 2.6.32-stable tree

This is a note to let you know that we have just queued up the patch titled

Subject: KVM: remove unused load_segment_descriptor_to_kvm_desct

to the 2.6.32-stable tree. Its filename is

kvm-remove-unused-load_segment_descriptor_to_kvm_desct.patch

A git repo of this tree can be found at
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

Quoted 1 line

From [email protected] Fri May 7 15:13:09 2010

From: Marcelo Tosatti <[email protected]>
Date: Tue, 27 Apr 2010 13:35:26 -0300
Subject: KVM: remove unused load_segment_descriptor_to_kvm_desct
To: Greg KH <[email protected]>
Cc: kvm <[email protected]>, Jan Kiszka <[email protected]>, [email protected], Gleb Natapov <[email protected]>, Avi Kivity <[email protected]>
Message-ID: <[email protected]>
Content-Disposition: inline

From: Marcelo Tosatti <[email protected]>

Commit 78ce64a384 in v2.6.32.12 introduced a warning due to unused load_segment_descriptor_to_kvm_desct helper, which has been opencoded by this commit.

On upstream, the helper was removed as part of a different commit.

Remove the now unused function.

Signed-off-by Marcelo Tosatti <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 arch/x86/kvm/x86.c |   12 ------------
 1 file changed, 12 deletions(-)
arch/x86/kvm/x86.c +0 -12
@@ -4155,18 +4155,6 @@ static u16 get_segment_selector(struct k
 	return kvm_seg.selector;
 }
 
-static int load_segment_descriptor_to_kvm_desct(struct kvm_vcpu *vcpu,
-						u16 selector,
-						struct kvm_segment *kvm_seg)
-{
-	struct desc_struct seg_desc;
-
-	if (load_guest_segment_descriptor(vcpu, selector, &seg_desc))
-		return 1;
-	seg_desct_to_kvm_desct(&seg_desc, selector, kvm_seg);
-	return 0;
-}
-
 static int kvm_load_realmode_segment(struct kvm_vcpu *vcpu, u16 selector, int seg)
 {
 	struct kvm_segment segvar = {

Patches currently in stable-queue which might be from [email protected] are

queue-2.6.32/kvm-remove-unused-load_segment_descriptor_to_kvm_desct.patch