From:   Christophe Leroy <christophe.leroy@csgroup.eu>
To:     Benjamin Herrenschmidt <benh@kernel.crashing.org>,
        Paul Mackerras <paulus@samba.org>,
        Michael Ellerman <mpe@ellerman.id.au>
CC:     Christophe Leroy <christophe.leroy@csgroup.eu>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>,
        Maxime Bizon <mbizon@freebox.fr>,
        Russell Currey <ruscur@russell.cc>
Subject: [PATCH v2 1/2] powerpc/set_memory: Avoid spinlock recursion in
 change_page_attr()
Thread-Topic: [PATCH v2 1/2] powerpc/set_memory: Avoid spinlock recursion in
 change_page_attr()
Thread-Index: AQHX8qUBgZlGk5AZtkeEGUMOS24Aew==
Date:   Thu, 16 Dec 2021 17:47:33 +0000
Message-ID: <112b55c5fe019fefc284e3361772b00345fa0967.1639676816.git.christophe.leroy@csgroup.eu>
Accept-Language: fr-FR, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?a6sg6mO/ePGeXAkw9MZSrr2wCrDKAlR4hK7XiU1I+/V1UtrygLWazg82x1?=
 =?iso-8859-1?Q?YnPqA2hHCpjmag8UcYX/0MSbUcXAONpZWSdKG4QgXoqNKBGDbx+8SyzIgy?=
 =?iso-8859-1?Q?7NG7uPA0H1vCTk+kAp6LjVFE42bmW7jWu9e7SoYAqrfLaNSrZ8h9Fwrofl?=
 =?iso-8859-1?Q?R8FAzVB0Y/4iXNB//yvBpksp2SZDGSzTErWcKCe4Rway9+sZoIl/56fzj/?=
 =?iso-8859-1?Q?jIHcuzpe1gvJ6wpDPVaQIGMCmEzB7JYVsQL7jKFgfuMJA0MpwNF9h9tDKh?=
 =?iso-8859-1?Q?p6HAdw2ERuZkDKUMfGDpL1SwHH8jjx14Zzsp1g/YPZv4riU1b2XuO3hTdi?=
 =?iso-8859-1?Q?NQKw1jkvhTQFiyiMGdihJbGFnY5DNTBA3/Qa49naQs7JYMUlSRIXb2svmw?=
 =?iso-8859-1?Q?mq0N0KooqgodYz0qUNNU8zaYJ9SZmzt+nqbby2WO92ZmYSqUG+n1zZEpjF?=
 =?iso-8859-1?Q?i2frUcL7fAJy6s0T73dONvg+HkG50Y+1UeNcQfr1C0S5MNtmbr2k7XXt7O?=
 =?iso-8859-1?Q?Zev8Dtyig8TKMZ0VDOzSRINQ1FJsyeDCkJpKmHqaqhG5hulhABfFDSSvvH?=
 =?iso-8859-1?Q?ZYmN33vLUOlalnkHrMcAjsE/P5swLIQJj8nXRf9dA4lJW4gRfNxO2qsBYy?=
 =?iso-8859-1?Q?95/Cb998GCsOiw82LCKibAg/EpjR1x7vIKvL/5EiysLQR9f09DQimuQFe6?=
 =?iso-8859-1?Q?f1wSVJogQpPA8KAA/zGEY2rWR3L0SuybvgrBKi5AuKrvsncZHnDEHUiQeK?=
 =?iso-8859-1?Q?FII1IqVfvrYL/oMvJZAzpyTlFsZCKBpw5vm72e9SJRjwGlqi2oa+q8+zsu?=
 =?iso-8859-1?Q?kJL6eUBMv/m5AMFuxIV+4kcgh0AhgXUSKSEbSNjE1RaNcZurmwkIEFixy7?=
 =?iso-8859-1?Q?1Pb/LGxZ4mfVPFmz+GTC4TEDDAYATGaIoOUcxRn3tH5m8HQQZyAolzcHe/?=
 =?iso-8859-1?Q?JO+WdD8B53RaLVC4iu/cJnKeuD6HWv47BcSlCJCmFW/TCXGbKKF6AYatnd?=
 =?iso-8859-1?Q?0lWQAxrhbuNglWYBFAeNZzmf3yAyX9gtUjPSXLM6Akgo9txdH2tAvMCdDj?=
 =?iso-8859-1?Q?5qbznNEpuah/ct2Y/FpKz6a/wwPiql1UKpox0nYMIhPIGGeiFGdMYxCjey?=
 =?iso-8859-1?Q?WVXmY2Iu0TUiZfTpP4Z7reShgjFDWKaY819pqjLiEbTgLH0nuwUOn/hqFk?=
 =?iso-8859-1?Q?lRy/aVwtLk0u7Av/ijZhAJjKWHTTKnMBuv08+aE8ry8xgwz3plMGhsfnG9?=
 =?iso-8859-1?Q?vwkULsaT+HjlqVYiZhGApNX5JOG7fojcJZ9kCASD0VigTmIsoz5/t+ZTE6?=
 =?iso-8859-1?Q?hOOrA0AMCjN7ePKfrHFMVW4hZtHaAzR5l30HlyB7WdsX+VnLvHrdDZFOu9?=
 =?iso-8859-1?Q?X7C29a+kZP2MSYy2hzi7k7jNLod484Vo/Uod+jrErkxtmyA54fnhIGJDz3?=
 =?iso-8859-1?Q?1tGkuzd2wIIPXTGmvkeBi0R3R9XxJ5f3WFE/6NkKP2ELioEgG0y7o7AF3n?=
 =?iso-8859-1?Q?2wJwn4xPxUvzmUS/pVEZ4Tm2rQ85uUYaSYKH9vJAHYKigRnkRvM5Dwelkh?=
 =?iso-8859-1?Q?Vbf4UGbEFyHFRhzNqveLA7JVXmHVNG5GGVYNJ5c8yQbHKIr8WmuI/Dc6Z1?=
 =?iso-8859-1?Q?UAUCUuUfKWTxUeI8eeUozdmFkdukx/NDSW8sqgm/O5/yqksEZwOZmfXwp+?=
 =?iso-8859-1?Q?p19LQCoAWOcs1e6U/mFD2pjUfsy4VreuKoODzDV9umOhZyIQcvOG1OiQ1A?=
 =?iso-8859-1?Q?Uvl1TuuixfGaMs2buHr6R/Pt0=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
X-OriginatorOrg: csgroup.eu
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: MR1P264MB2980.FRAP264.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-Network-Message-Id: 55fae6c4-bfab-4981-6ec5-08d9c0bc23d2
X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Dec 2021 17:47:33.5978
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 9914def7-b676-4fda-8815-5d49fb3b45c8
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: tY3AdsZPbRoyG8OTMFdtb6TeKTvtEpxvevttWZO9GHejmzC9gd6CpsPH6ZKzviHnX1XQYPlQRrW39UQvi1W3aHcZq8UQs3cPbGshlIp4R8w=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MRXP264MB0040
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Commit 1f9ad21c3b38 ("powerpc/mm: Implement set_memory() routines")
included a spin_lock() to change_page_attr() in order to
safely perform the three step operations. But then
commit 9f7853d7609d ("powerpc/mm: Fix set_memory_*() against
concurrent accesses") modify it to use pte_update() and do
the operation atomically.

In the meantime, Maxime reported some spinlock recursion.

[   15.351649] BUG: spinlock recursion on CPU#0, kworker/0:2/217
[   15.357540]  lock: init_mm+0x3c/0x420, .magic: dead4ead, .owner: kworker/0:2/217, .owner_cpu: 0
[   15.366563] CPU: 0 PID: 217 Comm: kworker/0:2 Not tainted 5.15.0+ #523
[   15.373350] Workqueue: events do_free_init
[   15.377615] Call Trace:
[   15.380232] [e4105ac0] [800946a4] do_raw_spin_lock+0xf8/0x120 (unreliable)
[   15.387340] [e4105ae0] [8001f4ec] change_page_attr+0x40/0x1d4
[   15.393413] [e4105b10] [801424e0] __apply_to_page_range+0x164/0x310
[   15.400009] [e4105b60] [80169620] free_pcp_prepare+0x1e4/0x4a0
[   15.406045] [e4105ba0] [8016c5a0] free_unref_page+0x40/0x2b8
[   15.411979] [e4105be0] [8018724c] kasan_depopulate_vmalloc_pte+0x6c/0x94
[   15.418989] [e4105c00] [801424e0] __apply_to_page_range+0x164/0x310
[   15.425451] [e4105c50] [80187834] kasan_release_vmalloc+0xbc/0x134
[   15.431898] [e4105c70] [8015f7a8] __purge_vmap_area_lazy+0x4e4/0xdd8
[   15.438560] [e4105d30] [80160d10] _vm_unmap_aliases.part.0+0x17c/0x24c
[   15.445283] [e4105d60] [801642d0] __vunmap+0x2f0/0x5c8
[   15.450684] [e4105db0] [800e32d0] do_free_init+0x68/0x94
[   15.456181] [e4105dd0] [8005d094] process_one_work+0x4bc/0x7b8
[   15.462283] [e4105e90] [8005d614] worker_thread+0x284/0x6e8
[   15.468227] [e4105f00] [8006aaec] kthread+0x1f0/0x210
[   15.473489] [e4105f40] [80017148] ret_from_kernel_thread+0x14/0x1c

Remove the spin_lock() in change_page_attr().

Reported-by: Maxime Bizon <mbizon@freebox.fr>
Link: https://lore.kernel.org/all/20211212112152.GA27070@sakura/
Cc: Russell Currey <ruscur@russell.cc>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
 arch/powerpc/mm/pageattr.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/powerpc/mm/pageattr.c b/arch/powerpc/mm/pageattr.c
index edea388e9d3f..308adc51da9d 100644
--- a/arch/powerpc/mm/pageattr.c
+++ b/arch/powerpc/mm/pageattr.c
@@ -30,8 +30,6 @@ static int change_page_attr(pte_t *ptep, unsigned long addr, void *data)
 	long action = (long)data;
 	pte_t pte;
 
-	spin_lock(&init_mm.page_table_lock);
-
 	pte = ptep_get(ptep);
 
 	/* modify the PTE bits as desired, then apply */
@@ -61,8 +59,6 @@ static int change_page_attr(pte_t *ptep, unsigned long addr, void *data)
 
 	flush_tlb_kernel_range(addr, addr + PAGE_SIZE);
 
-	spin_unlock(&init_mm.page_table_lock);
-
 	return 0;
 }
 
-- 
2.33.1