CINXE.COM
LKML: Li Shaohua: [RFC 1/6]SEP initialization rework
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>LKML: Li Shaohua: [RFC 1/6]SEP initialization rework</title><link href="/css/message.css" rel="stylesheet" type="text/css" /><link href="/css/wrap.css" rel="alternate stylesheet" type="text/css" title="wrap" /><link href="/css/nowrap.css" rel="stylesheet" type="text/css" title="nowrap" /><link href="/favicon.ico" rel="shortcut icon" /><script src="/js/simple-calendar.js" type="text/javascript"></script><script src="/js/styleswitcher.js" type="text/javascript"></script><link rel="alternate" type="application/rss+xml" title="lkml.org : last 100 messages" href="/rss.php" /><link rel="alternate" type="application/rss+xml" title="lkml.org : last messages by Li Shaohua" href="/groupie.php?aid=22284" /><!--Matomo--><script> var _paq = window._paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(["setDoNotTrack", true]); _paq.push(["disableCookies"]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u="//m.lkml.org/"; _paq.push(['setTrackerUrl', u+'matomo.php']); _paq.push(['setSiteId', '1']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s); })(); </script><!--End Matomo Code--></head><body onload="es.jasper.simpleCalendar.init();" itemscope="itemscope" itemtype="http://schema.org/BlogPosting"><table border="0" cellpadding="0" cellspacing="0"><tr><td width="180" align="center"><a href="/"><img style="border:0;width:135px;height:32px" src="/images/toprowlk.gif" alt="lkml.org" /></a></td><td width="32">聽</td><td class="nb"><div><a class="nb" href="/lkml"> [lkml]</a> 聽 <a class="nb" href="/lkml/2005"> [2005]</a> 聽 <a class="nb" href="/lkml/2005/4"> [Apr]</a> 聽 <a class="nb" href="/lkml/2005/4/3"> [3]</a> 聽 <a class="nb" href="/lkml/last100"> [last100]</a> 聽 <a href="/rss.php"><img src="/images/rss-or.gif" border="0" alt="RSS Feed" /></a></div><div>Views: <a href="#" class="nowrap" onclick="setActiveStyleSheet('wrap');return false;">[wrap]</a><a href="#" class="wrap" onclick="setActiveStyleSheet('nowrap');return false;">[no wrap]</a> 聽 <a class="nb" href="/lkml/mheaders/2005/4/3/153" onclick="this.href='/lkml/headers'+'/2005/4/3/153';">[headers]</a>聽 <a href="/lkml/bounce/2005/4/3/153">[forward]</a>聽 </div></td><td width="32">聽</td></tr><tr><td valign="top"><div class="es-jasper-simpleCalendar" baseurl="/lkml/"></div><div class="threadlist">Messages in this thread</div><ul class="threadlist"><li class="root"><a href="/lkml/2005/4/3/153">First message in thread</a></li><li class="origin"><a href="/lkml/2005/4/4/53">Li Shaohua</a><ul><li><a href="/lkml/2005/4/4/53">Pavel Machek</a><ul><li><a href="/lkml/2005/4/4/56">Li Shaohua</a></li></ul></li><li><a href="/lkml/2005/4/4/171">Zwane Mwaikambo</a><ul><li><a href="/lkml/2005/4/4/319">Li Shaohua</a><ul><li><a href="/lkml/2005/4/5/51">Zwane Mwaikambo</a></li></ul></li></ul></li><li><a href="/lkml/2005/4/6/171">Martin Waitz</a></li></ul></li></ul><div class="threadlist">Patch in this message</div><ul class="threadlist"><li><a href="/lkml/diff/2005/4/3/153/1">Get diff 1</a></li></ul></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerl.gif" width="32" height="32" alt="/" /></td><td class="c" rowspan="2" valign="top" style="padding-top: 1em"><table><tr><td><table><tr><td class="lp">Subject</td><td class="rp" itemprop="name">[RFC 1/6]SEP initialization rework</td></tr><tr><td class="lp">From</td><td class="rp" itemprop="author">Li Shaohua <></td></tr><tr><td class="lp">Date</td><td class="rp" itemprop="datePublished">Mon, 04 Apr 2005 10:05:56 +0800</td></tr></table></td><td></td></tr></table><pre itemprop="articleBody"><br />Make SEP init per-cpu, so is hotplug safe.<br /><br />Thanks,<br />Shaohua<br /><br />---<br /><br /> linux-2.6.11-root/arch/i386/kernel/smpboot.c | 6 ++++++<br /> linux-2.6.11-root/arch/i386/kernel/sysenter.c | 10 ++++++----<br /> linux-2.6.11-root/arch/i386/mach-voyager/voyager_smp.c | 6 ++++++<br /> 3 files changed, 18 insertions(+), 4 deletions(-)<br /><br />diff -puN arch/i386/kernel/sysenter.c~sep_init_cleanup arch/i386/kernel/sysenter.c<br />--- linux-2.6.11/arch/i386/kernel/sysenter.c~sep_init_cleanup 2005-03-28 09:32:30.936304248 +0800<br />+++ linux-2.6.11-root/arch/i386/kernel/sysenter.c 2005-03-28 09:58:20.703703792 +0800<br />@@ -26,6 +26,11 @@ void enable_sep_cpu(void *info)<br /> int cpu = get_cpu();<br /> struct tss_struct *tss = &per_cpu(init_tss, cpu);<br /> <br />+ if (!boot_cpu_has(X86_FEATURE_SEP)) {<br />+ put_cpu();<br />+ return;<br />+ }<br />+<br /> tss->ss1 = __KERNEL_CS;<br /> tss->esp1 = sizeof(struct tss_struct) + (unsigned long) tss;<br /> wrmsr(MSR_IA32_SYSENTER_CS, __KERNEL_CS, 0);<br />@@ -41,7 +46,7 @@ void enable_sep_cpu(void *info)<br /> extern const char vsyscall_int80_start, vsyscall_int80_end;<br /> extern const char vsyscall_sysenter_start, vsyscall_sysenter_end;<br /> <br />-static int __init sysenter_setup(void)<br />+int __init sysenter_setup(void)<br /> {<br /> void *page = (void *)get_zeroed_page(GFP_ATOMIC);<br /> <br />@@ -58,8 +63,5 @@ static int __init sysenter_setup(void)<br /> &vsyscall_sysenter_start,<br /> &vsyscall_sysenter_end - &vsyscall_sysenter_start);<br /> <br />- on_each_cpu(enable_sep_cpu, NULL, 1, 1);<br /> return 0;<br /> }<br />-<br />-__initcall(sysenter_setup);<br />diff -puN arch/i386/kernel/smpboot.c~sep_init_cleanup arch/i386/kernel/smpboot.c<br />--- linux-2.6.11/arch/i386/kernel/smpboot.c~sep_init_cleanup 2005-03-28 09:33:49.972288952 +0800<br />+++ linux-2.6.11-root/arch/i386/kernel/smpboot.c 2005-03-28 09:46:01.814032096 +0800<br />@@ -415,6 +415,8 @@ static void __init smp_callin(void)<br /> <br /> static int cpucount;<br /> <br />+extern int sysenter_setup(void);<br />+extern void enable_sep_cpu(void *);<br /> /*<br /> * Activate a secondary processor.<br /> */<br />@@ -445,6 +447,7 @@ static void __init start_secondary(void <br /> <br /> /* We can take interrupts now: we're officially "up". */<br /> local_irq_enable();<br />+ enable_sep_cpu(NULL);<br /> <br /> wmb();<br /> cpu_idle();<br />@@ -913,6 +916,9 @@ static void __init smp_boot_cpus(unsigne<br /> cpus_clear(cpu_sibling_map[0]);<br /> cpu_set(0, cpu_sibling_map[0]);<br /> <br />+ sysenter_setup();<br />+ enable_sep_cpu(NULL);<br />+<br /> /*<br /> * If we couldn't find an SMP configuration at boot time,<br /> * get out of here now!<br />diff -puN arch/i386/mach-voyager/voyager_smp.c~sep_init_cleanup arch/i386/mach-voyager/voyager_smp.c<br />--- linux-2.6.11/arch/i386/mach-voyager/voyager_smp.c~sep_init_cleanup 2005-03-28 09:48:27.909822160 +0800<br />+++ linux-2.6.11-root/arch/i386/mach-voyager/voyager_smp.c 2005-03-28 09:51:37.896939728 +0800<br />@@ -441,6 +441,8 @@ setup_trampoline(void)<br /> return virt_to_phys((__u8 *)trampoline_base);<br /> }<br /> <br />+extern void enable_sep_cpu(void *);<br />+extern int sysenter_setup(void);<br /> /* Routine initially called when a non-boot CPU is brought online */<br /> static void __init<br /> start_secondary(void *unused)<br />@@ -499,6 +501,7 @@ start_secondary(void *unused)<br /> while (!cpu_isset(cpuid, smp_commenced_mask))<br /> rep_nop();<br /> local_irq_enable();<br />+ enable_sep_cpu(NULL);<br /> <br /> local_flush_tlb();<br /> <br />@@ -696,6 +699,9 @@ smp_boot_cpus(void)<br /> printk("CPU%d: ", boot_cpu_id);<br /> print_cpu_info(&cpu_data[boot_cpu_id]);<br /> <br />+ sysenter_setup();<br />+ enable_sep_cpu(NULL);<br />+<br /> if(is_cpu_quad()) {<br /> /* booting on a Quad CPU */<br /> printk("VOYAGER SMP: Boot CPU is Quad\n");<br />_<br /><br />-<br />To unsubscribe from this list: send the line "unsubscribe linux-kernel" in<br />the body of a message to majordomo@vger.kernel.org<br />More majordomo info at <a href="http://vger.kernel.org/majordomo-info.html">http://vger.kernel.org/majordomo-info.html</a><br />Please read the FAQ at <a href="http://www.tux.org/lkml/">http://www.tux.org/lkml/</a><br /><br /></pre></td><td width="32" rowspan="2" class="c" valign="top"><img src="/images/icornerr.gif" width="32" height="32" alt="\" /></td></tr><tr><td align="right" valign="bottom"> 聽 </td></tr><tr><td align="right" valign="bottom">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerl.gif" width="32" height="32" alt="\" /></td><td class="c">聽</td><td class="c" valign="bottom" style="padding-bottom: 0px"><img src="/images/bcornerr.gif" width="32" height="32" alt="/" /></td></tr><tr><td align="right" valign="top" colspan="2"> 聽 </td><td class="lm">Last update: 2005-04-06 13:31 聽聽 [from the cache]<br />漏2003-2020 <a href="http://blog.jasper.es/"><span itemprop="editor">Jasper Spaans</span></a>|hosted at <a href="https://www.digitalocean.com/?refcode=9a8e99d24cf9">Digital Ocean</a> and my Meterkast|<a href="http://blog.jasper.es/categories.html#lkml-ref">Read the blog</a></td><td>聽</td></tr></table><script language="javascript" src="/js/styleswitcher.js" type="text/javascript"></script></body></html>