Numaq in 2.4 and 2.6
While comparing numaq support in 2.4.23 and 2.6.0-test11 came accross following...
In 2.4.23 mpparse.c we do :
phys_cpu_present_map |= apicid_to_phys_cpu_present(m->mpc_apicid);
and then launch the cpus using NMI and logical addressing in the order phys_cpu_present_map indicates.
In 2.6.0-test11mpparse.c we do :
tmp = apicid_to_cpu_present(apicid); physids_or(phys_cpu_present_map, phys_cpu_present_map, tmp);
where apicid is the result of :
static inline int generate_logical_apicid(int quad, int phys_apicid)
{
return (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1);}
and phys_apicid == m->mpc_apicid
Again we lauch the cpus using NMI and logical addressing.
So the the set of apicids fed to do_boot_cpu() in 2.4 and 2.6 must be different using the same mp table. And both use logical addressing. Seems that 2.4 expects mpc_apicid to be something like (quad | cpu) and 2.6 only cpu, the quad comes from the translation table.
The conclusion is that the same mp table can't work in 2.4 and 2.6? No?
--Mika
Quoted 14 lines · Mika Penttil?
While comparing numaq support in 2.4.23 and 2.6.0-test11 came accross following...
In 2.4.23mpparse.cwe do :phys_cpu_present_map |= apicid_to_phys_cpu_present(m->mpc_apicid); and then launch the cpus using NMI and logical addressing in the order phys_cpu_present_map indicates. In 2.6.0-test11mpparse.c we do : tmp = apicid_to_cpu_present(apicid); physids_or(phys_cpu_present_map, phys_cpu_present_map, tmp); where apicid is the result of : static inline int generate_logical_apicid(int quad, int phys_apicid) { return (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1); }
Quoted 2 lines
and
phys_apicid==m->mpc_apicid
Again we lauch the cpus using NMI and logical addressing.
The sole purposes of this (AFAICT) are for reassigning physical ID's of the IO-APIC's, and cpu wakeup. You're noticing the first of several inconsistencies:
(a) The NUMA-Q BIOS stores logical (clustered hierarchical) APIC ID's in the MP table instead of physical APIC ID's. This confuses various things.
(b) NUMA-Q's are P-III -based, i.e. serial APIC. The global phys_cpu_present_map does not suffice to represent the things, though some sort of mangled physical APIC ID's are kept in it. To properly describe serial APIC systems of its kind, there needs to be one analogue of phys_cpu_present_map per-node, as each node has a separate APIC bus with its own domain for physical APIC ID's. This explains (a) as it's impossible to have distinct physical APIC ID's for > 15 cpus on serial APIC -based systems.
(c) The 2.6 code actually decodes the logical APIC ID to generate a fake xAPIC-like physical APIC ID and uses that as an index into the phys_cpu_present_map. This is used essentially for cpu enumeration.
(d) The rest of the setup phys_cpu_present_map is used for is already done by the BIOS. The code cheats by ignoring the IO-APIC renumbering phase entirely for NUMA_Q. Granted, it's supposed to be there to doublecheck the BIOS.
Quoted 5 lines · Mika Penttil?
So the the set of apicids fed to
do_boot_cpu()in 2.4 and 2.6 must be different using the same mp table. And both use logical addressing. Seems that 2.4 expectsmpc_apicidto be something like (quad | cpu) and 2.6 only cpu, the quad comes from the translation table.
The conclusion is that the same mp table can't work in 2.4 and 2.6? No?
It's all okay, albeit ugly and obfuscated as the code doesn't truly describe the hardware.
-- wli
Quoted 58 lines · William Lee Irwin III
Quoted 9 lines · Mika Penttil?
While comparing numaq support in 2.4.23 and 2.6.0-test11 came accross following...
In 2.4.23mpparse.cwe do :
phys_cpu_present_map|=apicid_to_phys_cpu_present(m->mpc_apicid);
and then launch the cpus using NMI and logical addressing in the orderphys_cpu_present_mapindicates. In2.6.0-test11mpparse.cwe do :
tmp =apicid_to_cpu_present(apicid);
physids_or(phys_cpu_present_map, phys_cpu_present_map, tmp);
where apicid is the result of :
static inline intgenerate_logical_apicid(int quad, int phys_apicid)Quoted 7 lines
{ return (quad << 4) + (phys_apicid ? phys_apicid << 1 : 1);}
andphys_apicid==m->mpc_apicid
Again we lauch the cpus using NMI and logical addressing.The sole purposes of this (AFAICT) are for reassigning physical ID's of the IO-APIC's, and cpu wakeup. You're noticing the first of several inconsistencies:
(a) The NUMA-Q BIOS stores logical (clustered hierarchical) APIC ID's in the MP table instead of physical APIC ID's. This confuses various things.
(b) NUMA-Q's are P-III -based, i.e. serial APIC. The globalphys_cpu_present_mapdoes not suffice to represent the things, though some sort of mangled physical APIC ID's are kept in it. To properly describe serial APIC systems of its kind, there needs to be one analogue ofphys_cpu_present_mapper-node, as each node has a separate APIC bus with its own domain for physical APIC ID's. This explains (a) as it's impossible to have distinct physical APIC ID's for > 15 cpus on serial APIC -based systems.
(c) The 2.6 code actually decodes the logical APIC ID to generate a fake xAPIC-like physical APIC ID and uses that as an index into thephys_cpu_present_map. This is used essentially for cpu enumeration.
(d) The rest of the setupphys_cpu_present_mapis used for is already done by the BIOS. The code cheats by ignoring the IO-APIC renumbering phase entirely forNUMA_Q. Granted, it's supposed to be there to doublecheck the BIOS.Quoted 4 lines · Mika Penttil?
So the the set of apicids fed to
do_boot_cpu()in 2.4 and 2.6 must be different using the same mp table. And both use logical addressing. Seems that 2.4 expectsmpc_apicidto be something like (quad | cpu) and 2.6 only cpu, the quad comes from the translation table. The conclusion is that the same mp table can't work in 2.4 and 2.6? No?It's all okay, albeit ugly and obfuscated as the code doesn't truly describe the hardware.
Quoted 8 lines
-- wli
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Ok...the only thing that still confuses is the apicid to actually used to start the cpu. In NUMA-Q case we don't program the LDRs in either 2.4 or 2.6, the bios does this. So the NMI IPI must have the same destinations in both 2.4 and 2.6 in order to lauch the same cpus.
In 2.4, the mpc_apicids are used as such as NMI IPI destinations. In 2.6, the mangled ones (by generate_logical_apicid()) are used as NMI IPI destinations. If the mpc_apicid is already in sort of (cluster, cpu) format (and used in 2.4 NMI IPI), it can't be the same after mangling?
--Mika
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 4 lines · Mika Penttil?
Ok...the only thing that still confuses is the apicid to actually used to start the cpu. In NUMA-Q case we don't program the LDRs in either 2.4 or 2.6, the bios does this. So the NMI IPI must have the same destinations in both 2.4 and 2.6 in order to lauch the same cpus.
Quoted 4 lines · Mika Penttil?
In 2.4, the
mpc_apicidsare used as such as NMI IPI destinations. In 2.6, the mangled ones (bygenerate_logical_apicid()) are used as NMI IPI destinations. If thempc_apicidis already in sort of (cluster, cpu) format (and used in 2.4 NMI IPI), it can't be the same after mangling?
The mangled physical APIC ID used as an index into phys_cpu_present_map happens to determine the clustered hierarchical logical APIC ID, and so wakeup_secondary_cpu() (switched via #ifdef) gets the right number. There is a correspondence between (node, physical APIC ID) pairs and logical APIC ID's that's part of the BIOS's bootstrap protocol. The calculations you're looking at are based on that, and the logical APIC ID's are encoded in that paired format by the BIOS, and in the mangled format as indices into phys_cpu_present_map.
Both 2.4 and 2.6 use cpu_present_to_apicid() to do that translation on the fly given an index into phys_cpu_present_map().
-- wli
Quoted 23 lines · William Lee Irwin III
Quoted 3 lines · Mika Penttil?
Ok...the only thing that still confuses is the apicid to actually used to start the cpu. In NUMA-Q case we don't program the LDRs in either 2.4 or 2.6, the bios does this. So the NMI IPI must have the same destinations in both 2.4 and 2.6 in order to lauch the same cpus.
Quoted 3 lines · Mika Penttil?
In 2.4, the
mpc_apicidsare used as such as NMI IPI destinations. In 2.6, the mangled ones (bygenerate_logical_apicid()) are used as NMI IPI destinations. If thempc_apicidis already in sort of (cluster, cpu) format (and used in 2.4 NMI IPI), it can't be the same after mangling?The mangled physical APIC ID used as an index into
phys_cpu_present_maphappens to determine the clustered hierarchical logical APIC ID, and sowakeup_secondary_cpu()(switched via #ifdef) gets the right number. There is a correspondence between (node, physical APIC ID) pairs and logical APIC ID's that's part of the BIOS's bootstrap protocol. The calculations you're looking at are based on that, and the logical APIC ID's are encoded in that paired format by the BIOS, and in the mangled format as indices intophys_cpu_present_map.
Quoted 7 lines
Both 2.4 and 2.6 use
cpu_present_to_apicid()to do that translation on the fly given an index intophys_cpu_present_map().-- wli
Thanks, I understand what's happening in 2.6. So I think there might be a problem with 2.4.23 then. In mpparse.c :
void __init MP_processor_info (struct mpc_config_processor *m) {
int ver, quad, logical_apicid;
if (!(m->mpc_cpuflag & CPU_ENABLED))
return;
logical_apicid = m->mpc_apicid;
if (clustered_apic_mode == CLUSTERED_APIC_NUMAQ) { quad = translation_table[mpc_record]->trans_quad; logical_apicid = (quad << 4) +
(m->mpc_apicid ? m->mpc_apicid << 1 : 1); printk("Processor #%d %s APIC version %d (quad %d, apic %d)\n", m->mpc_apicid,mpc_family((m->mpc_cpufeature & CPU_FAMILY_MASK)>>8 , (m->mpc_cpufeature & CPU_MODEL_MASK)>>4), m->mpc_apicver, quad, logical_apicid);
.....
and later in same function :
phys_cpu_present_map |= apicid_to_phys_cpu_present(m->mpc_apicid);
but _not_
phys_cpu_present_map |= apicid_to_phys_cpu_present(logical_apicid);
as one would expect (and would make it identical to 2.6 behaviour).... A bug?
--Mika
Quoted 6 lines · Mika Penttil?
and later in same function :
phys_cpu_present_map|=apicid_to_phys_cpu_present(m->mpc_apicid); but _not_phys_cpu_present_map|=apicid_to_phys_cpu_present(logical_apicid); as one would expect (and would make it identical to 2.6 behaviour).... A bug?
You may very well have just debugged an issue I've had with 2.4 on the things. =)
-- wli
Quoted 11 lines · William Lee Irwin III
Quoted 7 lines · Mika Penttil?
and later in same function :
phys_cpu_present_map|=apicid_to_phys_cpu_present(m->mpc_apicid); but _not_phys_cpu_present_map|=apicid_to_phys_cpu_present(logical_apicid); as one would expect (and would make it identical to 2.6 behaviour).... A bug?
Quoted 6 lines
You may very well have just debugged an issue I've had with 2.4 on the things. =)
And that would explain my confusion in the first place...I don't have the hardware, so feel free to submit a patch to someone responsible for this area if you like... Anyway thanks for your explanations!
--Mika
Quoted 2 lines · William Lee Irwin III
Quoted 2 lines
You may very well have just debugged an issue I've had with 2.4 on the things. =)
Quoted 3 lines · Mika Penttil?
And that would explain my confusion in the first place...I don't have the hardware, so feel free to submit a patch to someone responsible for this area if you like... Anyway thanks for your explanations!
My testing bandwidth isn't particularly high at the moment, but when I get a chance, I'll try it out and send it in to Marcelo.
-- wli