From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758379AbYBGMRU (ORCPT ); Thu, 7 Feb 2008 07:17:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755572AbYBGMRN (ORCPT ); Thu, 7 Feb 2008 07:17:13 -0500 Received: from www.tglx.de ([62.245.132.106]:52181 "EHLO www.tglx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755475AbYBGMRM (ORCPT ); Thu, 7 Feb 2008 07:17:12 -0500 Date: Thu, 7 Feb 2008 13:16:04 +0100 (CET) From: Thomas Gleixner To: Greg KH cc: Chuck Ebbert , Ingo Molnar , linux-kernel , Andi Kleen , Gerd Hoffmann , Andrew Morton , Linus Torvalds , Stable Team Subject: Re: [stable] The SMP alternatives code breaks exception fixup? In-Reply-To: <20080206231020.GB12395@kroah.com> Message-ID: References: <479504F6.4080005@redhat.com> <47964FD5.6020801@redhat.com> <20080206231020.GB12395@kroah.com> User-Agent: Alpine 1.00 (LFD 882 2007-12-20) MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="8323328-1756878557-1202386566=:9204" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323328-1756878557-1202386566=:9204 Content-Type: TEXT/PLAIN; charset=US-ASCII On Wed, 6 Feb 2008, Greg KH wrote: > On Tue, Jan 22, 2008 at 03:19:33PM -0500, Chuck Ebbert wrote: > > On 01/22/2008 07:35 AM, Thomas Gleixner wrote: > > > > > > That's a long standing bug in both the PI futex and the standard futex > > > code. Needs to go to stable as well. > > > > > > > Here's the 2.6.23 version: > > > > > > Subject: x86: fix missing exception entry for SMP alternatives in futex macros > > From: Thomas Gleixner > > I don't see this in Linus's tree, am I just missing it? Do you have a > git commit id? http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9d55b9923a1b7ea8193b8875c57ec940dc2ff027 I did a simpler version by just replacing LOCK_PREFIX with lock. The reason is, that we would need a separate implementation for __futex_atomic_op1() as well, due to: case FUTEX_OP_ADD: __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval, And it's not really worth the trouble. Backport to 2.6.24 and 2.6.23 attached. Thanks, tglx --8323328-1756878557-1202386566=:9204 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=futex-2-6-23.patch Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=futex-2-6-23.patch U3ViamVjdDogeDg2OiByZXBsYWNlIExPQ0tfUFJFRklYIGluIGZ1dGV4LmgN CkZyb206IFRob21hcyBHbGVpeG5lciA8dGdseEBsaW51dHJvbml4LmRlPg0K RGF0ZTogVGh1LCAwNyBGZWIgMjAwOCAxMzowNToxOSArMDEwMA0KDQpUaGUg ZXhjZXB0aW9uIGZpeHVwIGZvciB0aGUgZnV0ZXggbWFjcm9zIF9fZnV0ZXhf YXRvbWljX29wMS8yIGFuZA0KZnV0ZXhfYXRvbWljX2NtcHhjaGdfaW5hdG9t aWMoKSBpcyBtaXNzaW5nIGFuIGVudHJ5IHdoZW4gdGhlIGxvY2sNCnByZWZp eCBpcyByZXBsYWNlZCBieSBhIE5PUCB2aWEgU01QIGFsdGVybmF0aXZlcy4N Cg0KQ2h1Y2sgRWJlcnQgdHJhY2tlZCB0aGlzIGRvd24gZnJvbSB0aGUgaW5m b3JtYXRpb24gcHJvdmlkZWQgaW46DQpodHRwczovL2J1Z3ppbGxhLnJlZGhh dC5jb20vc2hvd19idWcuY2dpP2lkPTQyOTQxMg0KDQpBIHBvc3NpYmxlIHNv bHV0aW9uIHdvdWxkIGJlIHRvIGFkZCBhbm90aGVyIGZpeHVwIGFmdGVyIHRo ZQ0KTE9DS19QUkVGSVgsIHNvIGJvdGggdGhlIExPQ0sgYW5kIE5PUCBjYXNl IGhhdmUgdGhlaXIgb3duIGVudHJ5IGluIHRoZQ0KZXhjZXB0aW9uIHRhYmxl LCBidXQgaXQncyBub3QgcmVhbGx5IHdvcnRoIHRoZSB0cm91YmxlLg0KDQpT aW1wbHkgcmVwbGFjZSBMT0NLX1BSRUZJWCB3aXRoIGxvY2sgYW5kIGtlZXAg dGhvc2UgdW50b3VjaGVkIGJ5IFNNUA0KYWx0ZXJuYXRpdmVzLg0KDQpTaWdu ZWQtb2ZmLWJ5OiBUaG9tYXMgR2xlaXhuZXIgPHRnbHhAbGludXRyb25peC5k ZT4NCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICANCkluZGV4OiBsaW51eC0yLjYuMjMv aW5jbHVkZS9hc20taTM4Ni9mdXRleC5oDQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09DQotLS0gbGludXgtMi42LjIzLm9yaWcvaW5jbHVkZS9hc20taTM4Ni9m dXRleC5oCTIwMDgtMDItMDcgMTM6MDg6MDMuMDAwMDAwMDAwICswMTAwDQor KysgbGludXgtMi42LjIzL2luY2x1ZGUvYXNtLWkzODYvZnV0ZXguaAkyMDA4 LTAyLTA3IDEzOjA5OjM5LjAwMDAwMDAwMCArMDEwMA0KQEAgLTI4LDcgKzI4 LDcgQEANCiAiMToJbW92bAklMiwgJTBcblwNCiAJbW92bAklMCwgJTNcbiIJ CQkJCVwNCiAJaW5zbiAiXG4iCQkJCQkJXA0KLSIyOgkiIExPQ0tfUFJFRklY ICJjbXB4Y2hnbCAlMywgJTJcblwNCisiMjoJbG9jayBjbXB4Y2hnbCAlMywg JTJcblwNCiAJam56CTFiXG5cDQogMzoJLnNlY3Rpb24gLmZpeHVwLFwiYXhc IlxuXA0KIDQ6CW1vdgklNSwgJTFcblwNCkBAIC02OCw3ICs2OCw3IEBAIGZ1 dGV4X2F0b21pY19vcF9pbnVzZXIgKGludCBlbmNvZGVkX29wLCANCiAjZW5k aWYNCiAJCXN3aXRjaCAob3ApIHsNCiAJCWNhc2UgRlVURVhfT1BfQUREOg0K LQkJCV9fZnV0ZXhfYXRvbWljX29wMShMT0NLX1BSRUZJWCAieGFkZGwgJTAs ICUyIiwgcmV0LA0KKwkJCV9fZnV0ZXhfYXRvbWljX29wMSgibG9jayB4YWRk bCAlMCwgJTIiLCByZXQsDQogCQkJCQkgICBvbGR2YWwsIHVhZGRyLCBvcGFy Zyk7DQogCQkJYnJlYWs7DQogCQljYXNlIEZVVEVYX09QX09SOg0KQEAgLTEx MSw3ICsxMTEsNyBAQCBmdXRleF9hdG9taWNfY21weGNoZ19pbmF0b21pYyhp bnQgX191c2VyDQogCQlyZXR1cm4gLUVGQVVMVDsNCiANCiAJX19hc21fXyBf X3ZvbGF0aWxlX18oDQotCQkiMToJIiBMT0NLX1BSRUZJWCAiY21weGNoZ2wg JTMsICUxCQlcbiINCisJCSIxOglsb2NrIGNtcHhjaGdsICUzLCAlMQkJCVxu Ig0KIA0KIAkJIjI6CS5zZWN0aW9uIC5maXh1cCwgXCJheFwiCQkJXG4iDQog CQkiMzoJbW92ICAgICAlMiwgJTAJCQkJXG4iDQpJbmRleDogbGludXgtMi42 LjIzL2luY2x1ZGUvYXNtLXg4Nl82NC9mdXRleC5oDQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09DQotLS0gbGludXgtMi42LjIzLm9yaWcvaW5jbHVkZS9hc20t eDg2XzY0L2Z1dGV4LmgJMjAwOC0wMi0wNyAxMzowODowMy4wMDAwMDAwMDAg KzAxMDANCisrKyBsaW51eC0yLjYuMjMvaW5jbHVkZS9hc20teDg2XzY0L2Z1 dGV4LmgJMjAwOC0wMi0wNyAxMzowOTozOS4wMDAwMDAwMDAgKzAxMDANCkBA IC0yNyw3ICsyNyw3IEBADQogIjE6CW1vdmwJJTIsICUwXG5cDQogCW1vdmwJ JTAsICUzXG4iCQkJCQlcDQogCWluc24gIlxuIgkJCQkJCVwNCi0iMjoJIiBM T0NLX1BSRUZJWCAiY21weGNoZ2wgJTMsICUyXG5cDQorIjI6CSJsb2NrIGNt cHhjaGdsICUzLCAlMlxuXA0KIAlqbnoJMWJcblwNCiAzOgkuc2VjdGlvbiAu Zml4dXAsXCJheFwiXG5cDQogNDoJbW92CSU1LCAlMVxuXA0KQEAgLTYyLDcg KzYyLDcgQEAgZnV0ZXhfYXRvbWljX29wX2ludXNlciAoaW50IGVuY29kZWRf b3AsIA0KIAkJX19mdXRleF9hdG9taWNfb3AxKCJ4Y2hnbCAlMCwgJTIiLCBy ZXQsIG9sZHZhbCwgdWFkZHIsIG9wYXJnKTsNCiAJCWJyZWFrOw0KIAljYXNl IEZVVEVYX09QX0FERDoNCi0JCV9fZnV0ZXhfYXRvbWljX29wMShMT0NLX1BS RUZJWCAieGFkZGwgJTAsICUyIiwgcmV0LCBvbGR2YWwsDQorCQlfX2Z1dGV4 X2F0b21pY19vcDEoImxvY2sgeGFkZGwgJTAsICUyIiwgcmV0LCBvbGR2YWws DQogCQkJCSAgIHVhZGRyLCBvcGFyZyk7DQogCQlicmVhazsNCiAJY2FzZSBG VVRFWF9PUF9PUjoNCkBAIC0xMDEsNyArMTAxLDcgQEAgZnV0ZXhfYXRvbWlj X2NtcHhjaGdfaW5hdG9taWMoaW50IF9fdXNlcg0KIAkJcmV0dXJuIC1FRkFV TFQ7DQogDQogCV9fYXNtX18gX192b2xhdGlsZV9fKA0KLQkJIjE6CSIgTE9D S19QUkVGSVggImNtcHhjaGdsICUzLCAlMQkJXG4iDQorCQkiMToJbG9jayBj bXB4Y2hnbCAlMywgJTEJCQlcbiINCiANCiAJCSIyOgkuc2VjdGlvbiAuZml4 dXAsIFwiYXhcIgkJCVxuIg0KIAkJIjM6CW1vdiAgICAgJTIsICUwCQkJCVxu Ig0K --8323328-1756878557-1202386566=:9204 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=futex-2-6-24.patch Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: attachment; filename=futex-2-6-24.patch U3ViamVjdDogeDg2OiByZXBsYWNlIExPQ0tfUFJFRklYIGluIGZ1dGV4LmgN CkZyb206IFRob21hcyBHbGVpeG5lciA8dGdseEBsaW51dHJvbml4LmRlPg0K RGF0ZTogVGh1LCAwNyBGZWIgMjAwOCAxMzowNjowMiArMDEwMA0KDQpUaGUg ZXhjZXB0aW9uIGZpeHVwIGZvciB0aGUgZnV0ZXggbWFjcm9zIF9fZnV0ZXhf YXRvbWljX29wMS8yIGFuZA0KZnV0ZXhfYXRvbWljX2NtcHhjaGdfaW5hdG9t aWMoKSBpcyBtaXNzaW5nIGFuIGVudHJ5IHdoZW4gdGhlIGxvY2sNCnByZWZp eCBpcyByZXBsYWNlZCBieSBhIE5PUCB2aWEgU01QIGFsdGVybmF0aXZlcy4N Cg0KQ2h1Y2sgRWJlcnQgdHJhY2tlZCB0aGlzIGRvd24gZnJvbSB0aGUgaW5m b3JtYXRpb24gcHJvdmlkZWQgaW46DQpodHRwczovL2J1Z3ppbGxhLnJlZGhh dC5jb20vc2hvd19idWcuY2dpP2lkPTQyOTQxMg0KDQpBIHBvc3NpYmxlIHNv bHV0aW9uIHdvdWxkIGJlIHRvIGFkZCBhbm90aGVyIGZpeHVwIGFmdGVyIHRo ZQ0KTE9DS19QUkVGSVgsIHNvIGJvdGggdGhlIExPQ0sgYW5kIE5PUCBjYXNl IGhhdmUgdGhlaXIgb3duIGVudHJ5IGluIHRoZQ0KZXhjZXB0aW9uIHRhYmxl LCBidXQgaXQncyBub3QgcmVhbGx5IHdvcnRoIHRoZSB0cm91YmxlLg0KDQpT aW1wbHkgcmVwbGFjZSBMT0NLX1BSRUZJWCB3aXRoIGxvY2sgYW5kIGtlZXAg dGhvc2UgdW50b3VjaGVkIGJ5IFNNUA0KYWx0ZXJuYXRpdmVzLg0KDQpTaWdu ZWQtb2ZmLWJ5OiBUaG9tYXMgR2xlaXhuZXIgPHRnbHhAbGludXRyb25peC5k ZT4NCkluZGV4OiBsaW51eC0yLjYuMjQvaW5jbHVkZS9hc20teDg2L2Z1dGV4 XzMyLmgNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBsaW51eC0yLjYu MjQub3JpZy9pbmNsdWRlL2FzbS14ODYvZnV0ZXhfMzIuaAkyMDA4LTAyLTA3 IDEzOjA1OjM5LjAwMDAwMDAwMCArMDEwMA0KKysrIGxpbnV4LTIuNi4yNC9p bmNsdWRlL2FzbS14ODYvZnV0ZXhfMzIuaAkyMDA4LTAyLTA3IDEzOjA3OjIw LjAwMDAwMDAwMCArMDEwMA0KQEAgLTI4LDcgKzI4LDcgQEANCiAiMToJbW92 bAklMiwgJTBcblwNCiAJbW92bAklMCwgJTNcbiIJCQkJCVwNCiAJaW5zbiAi XG4iCQkJCQkJXA0KLSIyOgkiIExPQ0tfUFJFRklYICJjbXB4Y2hnbCAlMywg JTJcblwNCisiMjoJbG9jayBjbXB4Y2hnbCAlMywgJTJcblwNCiAJam56CTFi XG5cDQogMzoJLnNlY3Rpb24gLmZpeHVwLFwiYXhcIlxuXA0KIDQ6CW1vdgkl NSwgJTFcblwNCkBAIC02OCw3ICs2OCw3IEBAIGZ1dGV4X2F0b21pY19vcF9p bnVzZXIgKGludCBlbmNvZGVkX29wLCANCiAjZW5kaWYNCiAJCXN3aXRjaCAo b3ApIHsNCiAJCWNhc2UgRlVURVhfT1BfQUREOg0KLQkJCV9fZnV0ZXhfYXRv bWljX29wMShMT0NLX1BSRUZJWCAieGFkZGwgJTAsICUyIiwgcmV0LA0KKwkJ CV9fZnV0ZXhfYXRvbWljX29wMSgibG9jayB4YWRkbCAlMCwgJTIiLCByZXQs DQogCQkJCQkgICBvbGR2YWwsIHVhZGRyLCBvcGFyZyk7DQogCQkJYnJlYWs7 DQogCQljYXNlIEZVVEVYX09QX09SOg0KQEAgLTExMSw3ICsxMTEsNyBAQCBm dXRleF9hdG9taWNfY21weGNoZ19pbmF0b21pYyhpbnQgX191c2VyDQogCQly ZXR1cm4gLUVGQVVMVDsNCiANCiAJX19hc21fXyBfX3ZvbGF0aWxlX18oDQot CQkiMToJIiBMT0NLX1BSRUZJWCAiY21weGNoZ2wgJTMsICUxCQlcbiINCisJ CSIxOglsb2NrIGNtcHhjaGdsICUzLCAlMQkJCVxuIg0KIA0KIAkJIjI6CS5z ZWN0aW9uIC5maXh1cCwgXCJheFwiCQkJXG4iDQogCQkiMzoJbW92ICAgICAl MiwgJTAJCQkJXG4iDQpJbmRleDogbGludXgtMi42LjI0L2luY2x1ZGUvYXNt LXg4Ni9mdXRleF82NC5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0g bGludXgtMi42LjI0Lm9yaWcvaW5jbHVkZS9hc20teDg2L2Z1dGV4XzY0LmgJ MjAwOC0wMi0wNyAxMzowNTozOS4wMDAwMDAwMDAgKzAxMDANCisrKyBsaW51 eC0yLjYuMjQvaW5jbHVkZS9hc20teDg2L2Z1dGV4XzY0LmgJMjAwOC0wMi0w NyAxMzowNjo0NS4wMDAwMDAwMDAgKzAxMDANCkBAIC0yNyw3ICsyNyw3IEBA DQogIjE6CW1vdmwJJTIsICUwXG5cDQogCW1vdmwJJTAsICUzXG4iCQkJCQlc DQogCWluc24gIlxuIgkJCQkJCVwNCi0iMjoJIiBMT0NLX1BSRUZJWCAiY21w eGNoZ2wgJTMsICUyXG5cDQorIjI6CSJsb2NrIGNtcHhjaGdsICUzLCAlMlxu XA0KIAlqbnoJMWJcblwNCiAzOgkuc2VjdGlvbiAuZml4dXAsXCJheFwiXG5c DQogNDoJbW92CSU1LCAlMVxuXA0KQEAgLTYyLDcgKzYyLDcgQEAgZnV0ZXhf YXRvbWljX29wX2ludXNlciAoaW50IGVuY29kZWRfb3AsIA0KIAkJX19mdXRl eF9hdG9taWNfb3AxKCJ4Y2hnbCAlMCwgJTIiLCByZXQsIG9sZHZhbCwgdWFk ZHIsIG9wYXJnKTsNCiAJCWJyZWFrOw0KIAljYXNlIEZVVEVYX09QX0FERDoN Ci0JCV9fZnV0ZXhfYXRvbWljX29wMShMT0NLX1BSRUZJWCAieGFkZGwgJTAs ICUyIiwgcmV0LCBvbGR2YWwsDQorCQlfX2Z1dGV4X2F0b21pY19vcDEoImxv Y2sgeGFkZGwgJTAsICUyIiwgcmV0LCBvbGR2YWwsDQogCQkJCSAgIHVhZGRy LCBvcGFyZyk7DQogCQlicmVhazsNCiAJY2FzZSBGVVRFWF9PUF9PUjoNCkBA IC0xMDEsNyArMTAxLDcgQEAgZnV0ZXhfYXRvbWljX2NtcHhjaGdfaW5hdG9t aWMoaW50IF9fdXNlcg0KIAkJcmV0dXJuIC1FRkFVTFQ7DQogDQogCV9fYXNt X18gX192b2xhdGlsZV9fKA0KLQkJIjE6CSIgTE9DS19QUkVGSVggImNtcHhj aGdsICUzLCAlMQkJXG4iDQorCQkiMToJbG9jayBjbXB4Y2hnbCAlMywgJTEJ CQlcbiINCiANCiAJCSIyOgkuc2VjdGlvbiAuZml4dXAsIFwiYXhcIgkJCVxu Ig0KIAkJIjM6CW1vdiAgICAgJTIsICUwCQkJCVxuIg0K --8323328-1756878557-1202386566=:9204--