Message ID | 20200128135824.089383317@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=oJ2n=3R=vger.kernel.org=stable-owner@kernel.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0895C33CB3 for <stable@archiver.kernel.org>; Tue, 28 Jan 2020 14:06:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 85A9F24681 for <stable@archiver.kernel.org>; Tue, 28 Jan 2020 14:06:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220403; bh=cbYy2+euM7xYchVQx+xCkIdw6yAt6rfHSmNFuVYtaoU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pCSxk9Y/2mpixDshiHYO7apsqDcmOd0RQJf7tjc2LbRi48sPppExWWdtc0JR3yxvj zGvKVo94Wezb6G1JaXpaOajz27NDidafGrMvscsQgvc7dZ5tsThiv0dSZCBJcrAzqJ SE5T3F0cZ5PjxwWeWOfYE8Tcak5lc2dPkWsPIlHo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728080AbgA1OE2 (ORCPT <rfc822;stable@archiver.kernel.org>); Tue, 28 Jan 2020 09:04:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:51680 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728073AbgA1OE2 (ORCPT <rfc822;stable@vger.kernel.org>); Tue, 28 Jan 2020 09:04:28 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E043E24692; Tue, 28 Jan 2020 14:04:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220267; bh=cbYy2+euM7xYchVQx+xCkIdw6yAt6rfHSmNFuVYtaoU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KYAUHxRSFbCsjGpW3aj9gqrgARWLJEuZAHvEBBbFRtO3obmiCbTRfqzotYoMM0sjD wf2Ua/COOwqoNEPVUZ1errskU7JGJubK6yCsMm4bAXJTm6XG6UA4myBakBbehF5Bju q+8XBjl+L+lKX2Ah7rbIUPnEJr6I7OtfOv/8i2Pk= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Christian Marillat <marillat@debian.org>, Romain Dolbeau <romain@dolbeau.org>, "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>, Michael Ellerman <mpe@ellerman.id.au> Subject: [PATCH 5.4 046/104] powerpc/mm/hash: Fix sharing context ids between kernel & userspace Date: Tue, 28 Jan 2020 15:00:07 +0100 Message-Id: <20200128135824.089383317@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135817.238524998@linuxfoundation.org> References: <20200128135817.238524998@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/arch/powerpc/include/asm/book3s/64/mmu-hash.h +++ b/arch/powerpc/include/asm/book3s/64/mmu-hash.h @@ -600,8 +600,11 @@ extern void slb_set_size(u16 size); * */ #define MAX_USER_CONTEXT ((ASM_CONST(1) << CONTEXT_BITS) - 2) + +// The + 2 accounts for INVALID_REGION and 1 more to avoid overlap with kernel #define MIN_USER_CONTEXT (MAX_KERNEL_CTX_CNT + MAX_VMALLOC_CTX_CNT + \ - MAX_IO_CTX_CNT + MAX_VMEMMAP_CTX_CNT) + MAX_IO_CTX_CNT + MAX_VMEMMAP_CTX_CNT + 2) + /* * For platforms that support on 65bit VA we limit the context bits */