From patchwork Thu Aug 19 09:32:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Bulwahn X-Patchwork-Id: 1518554 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=kvm-ppc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=tFZEIbDl; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Gr01C2bSGz9t0p for ; Thu, 19 Aug 2021 19:32:47 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237216AbhHSJdW (ORCPT ); Thu, 19 Aug 2021 05:33:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229745AbhHSJdV (ORCPT ); Thu, 19 Aug 2021 05:33:21 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66DB8C061575; Thu, 19 Aug 2021 02:32:45 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id f10so3441637wml.2; Thu, 19 Aug 2021 02:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9E+b7yEFyl2AwVZRyoTJe5CWMWvjWa59eGiPsrwe3Mo=; b=tFZEIbDlHNE+xia5g8/hRiyMaPYwdmhyoL9uigWW2I+3GMS/h/BxVaRI9BRlTGzgaM 3zq8mZmaYkg06Bzc3/TM511P0YOg3YD1FH3toNrTY6xq9402Ndrn1a94K+2KS97AXIWE mGWS0oqr6BMMhPZYeBiCgjJXEhU0ZmyxrFbs43wvT9T85E51DqlAAqlwLK2nmNOO3OlR nSj2sPa1theke08K4vpuohL7HrOo9KM4O8YPLajfW5v1bKri3BvP3P3c/8Fnv1hcv8qp wAGePiin/nEJY8Q0Gvz9YdAF4Jd+JJKnLjHU4QIsFLLXrBz2sdnxW2h2H1l4NS5Ny6qd Gq3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9E+b7yEFyl2AwVZRyoTJe5CWMWvjWa59eGiPsrwe3Mo=; b=b39KZq11/ad+v5oNNQ/T+zXUOGN/0H51K8gt+WYEFvOKLwADlersWWxB1RJROEk5q5 oOHJKwYOg65KNTbe/RKTmmggTcMMLORotbRH1/IPuHvqfyagy1hqh9VJdUFPA1rl+vss h9eo1tm+MMpyU1C9pjYjsLezl0gaSP/fdDDNnFhNSLsjPQfkR2I8U/EB9lN3dUnJUudB HxGq2qttG3evuhpBCs/qm4h499gR0glfrYY4JUqWX4U36Xgcvh4fUcBtmywNKaem4fgy kCVCKrKbpP47YmSg22lUPRuIADsUNAY+x9dD3Z630GyBRpzVoNe1XYE+qt6u20fAmSTq hmDA== X-Gm-Message-State: AOAM532QA4wBA62v0xoflaWIWRjhwXjC8VXYmEH3lNj/GySbP3TzfStw qYhY1aWLc5v9YgLJJepfZ2M= X-Google-Smtp-Source: ABdhPJwIwVlI9d/xhjmdxG9trJ2BKi+LKFHcS50VjOHOgZfRQ86q4w2s4Ld6XT/GuXYT9nWNu28yFQ== X-Received: by 2002:a7b:cf37:: with SMTP id m23mr894890wmg.147.1629365564031; Thu, 19 Aug 2021 02:32:44 -0700 (PDT) Received: from localhost.localdomain (arl-84-90-178-246.netvisao.pt. [84.90.178.246]) by smtp.gmail.com with ESMTPSA id h11sm8485061wmc.23.2021.08.19.02.32.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 02:32:43 -0700 (PDT) From: Lukas Bulwahn To: Paul Mackerras , Michael Ellerman , Benjamin Herrenschmidt , Michael Neuling , Anshuman Khandual , kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Cc: stable@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [PATCH 1/2] powerpc: kvm: rectify selection to PPC_DAWR Date: Thu, 19 Aug 2021 11:32:25 +0200 Message-Id: <20210819093226.13955-2-lukas.bulwahn@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210819093226.13955-1-lukas.bulwahn@gmail.com> References: <20210819093226.13955-1-lukas.bulwahn@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Commit a278e7ea608b ("powerpc: Fix compile issue with force DAWR") selects the non-existing config PPC_DAWR_FORCE_ENABLE for config KVM_BOOK3S_64_HANDLER. As this commit also introduces a config PPC_DAWR, it probably intends to select PPC_DAWR instead. Rectify the selection in config KVM_BOOK3S_64_HANDLER to PPC_DAWR. The issue was identified with ./scripts/checkkconfigsymbols.py. Fixes: a278e7ea608b ("powerpc: Fix compile issue with force DAWR") Signed-off-by: Lukas Bulwahn --- arch/powerpc/kvm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig index e45644657d49..aa29ea56c80a 100644 --- a/arch/powerpc/kvm/Kconfig +++ b/arch/powerpc/kvm/Kconfig @@ -38,7 +38,7 @@ config KVM_BOOK3S_32_HANDLER config KVM_BOOK3S_64_HANDLER bool select KVM_BOOK3S_HANDLER - select PPC_DAWR_FORCE_ENABLE + select PPC_DAWR config KVM_BOOK3S_PR_POSSIBLE bool From patchwork Thu Aug 19 09:32:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Bulwahn X-Patchwork-Id: 1518555 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=kvm-ppc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=BM4IKNhC; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Gr01H0MCKz9t0p for ; Thu, 19 Aug 2021 19:32:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237752AbhHSJdY (ORCPT ); Thu, 19 Aug 2021 05:33:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237735AbhHSJdX (ORCPT ); Thu, 19 Aug 2021 05:33:23 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8668CC061575; Thu, 19 Aug 2021 02:32:47 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id q10so8074991wro.2; Thu, 19 Aug 2021 02:32:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FO+lf3R/yjc9KGpGIWIOuNRXRBvu2rIu+mbHK5sUlLs=; b=BM4IKNhCtQRKZxA0sZ4q1/jIzjHv+b7LZPW+AfBbbBQ0vP4MQlKD2NXPkieTMmquaD kcLfOqxYwR9WnKn/TcY4IhyUUtuBXi0laK22N8HqvBPCS/HGQ7ha4TNeQUThChMpwL2t xv7+CCGEd1IcRlV2AzP2hrh5omnShKYloHOw+uCVsvHLpiaOzNiTxgnzmQmb8z3272N1 M0WyPaS4B2PuFpjGPoU8W9Q3qGiKCVeaBlrPjz5sUJPlZbJm0wzxyxYKeExKrUP/G5ki VliwdIAAhjkMCw0xOCmUp1eWu2bG1NPFs6Kf2Q6AmmdOaGl6+/kDVzap1r2qLSaMrTcQ tpMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FO+lf3R/yjc9KGpGIWIOuNRXRBvu2rIu+mbHK5sUlLs=; b=qo1dTgnvQrp/GNj+ScNeD7EpNOczpNnSraA5e/J3IYSdQnhMFyBYgcP748jvSSavQV cNofDrsrZSUY7EJUecHcFO2H4e3KZljAMcHPkm3yhmcUos60jHozRnkd/0f//ZsfC0aF NCxAS+tCFch0u5P/Xnmyl7y9fLzoseYFtz40rJeNYsNASjs6xkr+wGYUkAORl+BaraP+ vdlvH7k5zCpaIseSnnWGXIjTHpOGVizqWqw1GZKYJC75KMK+QGnrZGorTcbVALx6YeHL QW+SYsZBDuXVVo4cGnndR5pIKd8tKsCMLPoZNtCtiOfUZWCe0tBrOUaKE7K6iaOy378/ yb7w== X-Gm-Message-State: AOAM530h0xqOjGwmZ8JLxk7sTsriK/1aDR3IYheZ94JghUzjB8paqC17 H4IcooCQIBzMIAtM/ZOsGkE= X-Google-Smtp-Source: ABdhPJwu7l1e14z3CvBWCEbrYHKKMJmpt16r4+Dcm6OhP5DvDOyQWjLUEWmRVRqIBmTBER8QJHSQKQ== X-Received: by 2002:a5d:4586:: with SMTP id p6mr2620112wrq.55.1629365566140; Thu, 19 Aug 2021 02:32:46 -0700 (PDT) Received: from localhost.localdomain (arl-84-90-178-246.netvisao.pt. [84.90.178.246]) by smtp.gmail.com with ESMTPSA id h11sm8485061wmc.23.2021.08.19.02.32.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 02:32:45 -0700 (PDT) From: Lukas Bulwahn To: Paul Mackerras , Michael Ellerman , Benjamin Herrenschmidt , Michael Neuling , Anshuman Khandual , kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Cc: stable@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [PATCH 2/2] powerpc: rectify selection to ARCH_ENABLE_SPLIT_PMD_PTLOCK Date: Thu, 19 Aug 2021 11:32:26 +0200 Message-Id: <20210819093226.13955-3-lukas.bulwahn@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210819093226.13955-1-lukas.bulwahn@gmail.com> References: <20210819093226.13955-1-lukas.bulwahn@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Commit 66f24fa766e3 ("mm: drop redundant ARCH_ENABLE_SPLIT_PMD_PTLOCK") selects the non-existing config ARCH_ENABLE_PMD_SPLIT_PTLOCK in ./arch/powerpc/platforms/Kconfig.cputype, but clearly it intends to select ARCH_ENABLE_SPLIT_PMD_PTLOCK here (notice the word swapping!), as this commit does select that for all other architectures. Rectify selection to ARCH_ENABLE_SPLIT_PMD_PTLOCK instead. Fixes: 66f24fa766e3 ("mm: drop redundant ARCH_ENABLE_SPLIT_PMD_PTLOCK") Signed-off-by: Lukas Bulwahn --- arch/powerpc/platforms/Kconfig.cputype | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 6794145603de..a208997ade88 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -98,7 +98,7 @@ config PPC_BOOK3S_64 select PPC_HAVE_PMU_SUPPORT select HAVE_ARCH_TRANSPARENT_HUGEPAGE select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION - select ARCH_ENABLE_PMD_SPLIT_PTLOCK + select ARCH_ENABLE_SPLIT_PMD_PTLOCK select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE select ARCH_SUPPORTS_HUGETLBFS select ARCH_SUPPORTS_NUMA_BALANCING