From nobody Tue Mar 21 14:00:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PgtY85vkhz40Lh1; Tue, 21 Mar 2023 14:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PgtY85McJz3CkN; Tue, 21 Mar 2023 14:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679407244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZC7xgGp4icbRtfHDgkaobLhqiM63WM8w+/Ap5FUz8yg=; b=RP9x4KrJatil76IZZBngKkV9iQooge6jywrx9t9MSXFcfzBGFNz0bzl4saNaaWQZpRw3YH KRaqkyw9CTPjpqDpNYCPkq79q3lpgxcXtnL2+X4m2nEWnERvwnSlAZDzyG/mvnV5aeVLWj HJvL5CNBo0cKDSujuZJVsRuW0gb2VUWoah8BO+unPnbryEh2CFqI8iu/njOk1dkUZZVQnl M0g8qbhlWZZqHuuLKFyAkvYaoXBgugjHqtgWNr+MmBo+ckqo3RRoRx54yEv1T8N0iMmzJC 0A/i7OVUNtm1bMvt01rHqziPcezq4qHPIUeroaKhnzucZvWrPvyp+AUAq/q3Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679407244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZC7xgGp4icbRtfHDgkaobLhqiM63WM8w+/Ap5FUz8yg=; b=RlSf7prJ2g+nRjPEmPYJr1dhNeym8T8UF5xxRWDsaY5B8vnG12Ee8/04ur5pz5vHUC0UFI zWY0IcaBIU6SE20RR1jJkeKcYtII3HeFDHa/mdYp/j2+B85cN9IQeW8bXEgSX/VI3QTCxx 60ROEfVFrZfQsO7FV9qjnRwE6zUHN3jjKhzmJ8mas4JoNdYMY/MhUrIfmpVsBcFCN4Pob8 rbisMaAk0x+0sZYQnhtpUezr1wVskMzIkT8A/lEgaIXTp4LNXg6++Bo1ci1eutrcQipiAq lDgmIGV0UfYWE5UebB6Fa72b6Cwo9aKzT6G7zs4OLlGEFG3lqlWxmnHNFaaNkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679407244; a=rsa-sha256; cv=none; b=QR8Y1oClJIxo8lF4vrvbYamZuq1vi2IK5MiS1X+RcOKIwCPC+8rtn8rmGdg4OpNQycE0AS viR++Kx9CXkUYdXAFkQtIOfkOCw5Cj6qsHmfwqv/JtbQQ+Oap9elvQvaUIiYa6hVJzb1Co iEzBCZxr0q0+7SHVdYiC9sA0Jp8GDmW1+45wCDccdYjrPD19MnqWI/gM6NSqV6oNsSI7jI PD+hHChmXYyKqkTliSA/BcGryxSFNEWn2oCv8CbHdgtK50AGTlYUe1KSjWfYyiGgsQ6bDh zqvkt6U0YjVdgwhJLNEgH1e0ivUYfWfxqoLq+Q0NH2thtwwva0Sh6lgjnjJy4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PgtY84SLszFCS; Tue, 21 Mar 2023 14:00:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32LE0iDk087111; Tue, 21 Mar 2023 14:00:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LE0iJP087110; Tue, 21 Mar 2023 14:00:44 GMT (envelope-from git) Date: Tue, 21 Mar 2023 14:00:44 GMT Message-Id: <202303211400.32LE0iJP087110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 379e14ba6c61 - main - powerpc/pmap: Account for a potential NULL pmap in pmap_sync_icache List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 379e14ba6c61634cc1f50272b6f8f147758ec92f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=379e14ba6c61634cc1f50272b6f8f147758ec92f commit 379e14ba6c61634cc1f50272b6f8f147758ec92f Author: Justin Hibbits AuthorDate: 2023-03-21 13:18:18 +0000 Commit: Justin Hibbits CommitDate: 2023-03-21 13:56:26 +0000 powerpc/pmap: Account for a potential NULL pmap in pmap_sync_icache It's apparently possible for pcpu->pc_curpmap to be NULL at some point, leading to a panic. Account for this as is done with the other 64-bit AIM pmap. Reported by: pkubaj Tested by: pkubaj Fixes: 6f0b2a235a1 ("Add pmap_sync_icache() for radix pmap") MFC after: 3 days --- sys/powerpc/aim/mmu_radix.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/powerpc/aim/mmu_radix.c b/sys/powerpc/aim/mmu_radix.c index 1e7661ba8068..c95de527f554 100644 --- a/sys/powerpc/aim/mmu_radix.c +++ b/sys/powerpc/aim/mmu_radix.c @@ -5929,6 +5929,9 @@ mmu_radix_sync_icache(pmap_t pm, vm_offset_t va, vm_size_t sz) vm_paddr_t pa = 0; int sync_sz; + if (__predict_false(pm == NULL)) + pm = &curthread->td_proc->p_vmspace->vm_pmap; + while (sz > 0) { pa = pmap_extract(pm, va); sync_sz = PAGE_SIZE - (va & PAGE_MASK);