From patchwork Fri Oct 8 10:00:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 1538284 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=YVXWhtES; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HQkH41K7Xz9t0k for ; Fri, 8 Oct 2021 21:01:20 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mYmgk-0007dE-7A; Fri, 08 Oct 2021 10:01:14 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mYmgh-0007cS-Aw for kernel-team@lists.ubuntu.com; Fri, 08 Oct 2021 10:01:11 +0000 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 2B9E43F499 for ; Fri, 8 Oct 2021 10:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1633687271; bh=WlXNzVxfSCDkbj/GhblN7k/G8yvYw8Ze+uo+0c/2QIE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YVXWhtESYzJZTtiAegjPZFNMqYKfIxyCkNeW2YIhnJ2PFpvCmlc5Ho+6I+CUBXSCH Js6ruhy1tyT9klTIL+Jo2T7BQMo2j6nKmHj4a9Sr40t3WsSGvzQsdHLZAZKVhD1oer iiYQVfFZyayda83vKUMCIW/zqmO5pVrsrLAa+tzDaGaBUr+PjFUt9JwgC9XGfRu+01 BbMVe2qGJgGKvDou45N1Q6iqz5h+gIhO1ILmYLpfp459VKa1IXT1fR+LOacNA4xTkB rsCCnXEag4z4zKqDWpIIKCVL9SrGsuDu7x0QHEeJveTWJ/0R+1oa7wh/OybeDW4mu1 i0wxneOvi0MKw== Received: by mail-wr1-f71.google.com with SMTP id d13-20020adf9b8d000000b00160a94c235aso6911670wrc.2 for ; Fri, 08 Oct 2021 03:01:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WlXNzVxfSCDkbj/GhblN7k/G8yvYw8Ze+uo+0c/2QIE=; b=sPyj4DfH16z3CtQNDBlDktga+OMklLtVVZPWrezStW1EsBI4PVX1onSeoHd/VsMsK2 UbuwdRHktO0LfFHzOhBxlkcrDcZhtnAPYTr9qDd2dC0udGr+wyjSf6T75PdXnOUW3oSt 7e1sfXM1AEbM7WOg5Dcqj/aCRSNWntajckVUVcGXwSma5nE1uClGZ+Wu0gMk15o+6nIk UMLibZWRN8DOgQu9ltjK7jOwdQ8m0FBQp5XREivnB5l8yU89tQV9u5zTGJLsvX7YYdQ7 a+rklwz6MtYydDxT59X66XpA+hAgNG8xbxY2EtfMIfK/0ElK5wLDh/yGGZYj0Cy2CL0T ghkQ== X-Gm-Message-State: AOAM530dqnzXu5VQbqhSau1om4iypd33Fr4mrBliJGjCxH82Z/FEDMt4 Dm6tKu0CgeUTXQhy6EB4/gEJxko3ilytQxaAzH41PNJHtYTEdl5HEhqO1zeyQi+2Pa7uDfHQJdT UYMIh6N1PyISMJyx7S/cw9EKCiNtAuWrLJK9xJe5Axw== X-Received: by 2002:a1c:208:: with SMTP id 8mr2453618wmc.114.1633687270532; Fri, 08 Oct 2021 03:01:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDhWE8A2i2oRFXICh6UvmQ4hhL/FA+r8thYplTimjQ+2iR3Z01LJvQw44FfJPHFBtEADjqig== X-Received: by 2002:a1c:208:: with SMTP id 8mr2453601wmc.114.1633687270366; Fri, 08 Oct 2021 03:01:10 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-186-13.adslplus.ch. [188.155.186.13]) by smtp.gmail.com with ESMTPSA id r27sm1870776wrr.70.2021.10.08.03.01.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Oct 2021 03:01:09 -0700 (PDT) From: Krzysztof Kozlowski To: kernel-team@lists.ubuntu.com Subject: [SRU][B][PATCH 1/1] UBUNTU: SAUCE: Revert "x86/mm: Don't free P4D table when it is folded at runtime" Date: Fri, 8 Oct 2021 12:00:33 +0200 Message-Id: <20211008100033.105538-2-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211008100033.105538-1-krzysztof.kozlowski@canonical.com> References: <20211008100033.105538-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1946464 This reverts commit 5047ef5725ed1b31e405e1f1a90881e44d1f0816 (commit 0e311d237d7f3022b7dafb639b42541bfb42fe94 upstream) which should not be backported to v4.15: 1. It adds pgtable_l5_enabled which does not exist in v4.15, 2. It is marked as v4.17+, 3. It is marked as fixing commit which does not exist in v4.15 and was not backported there. Signed-off-by: Krzysztof Kozlowski Acked-by: Thadeu Lima de Souza Cascardo --- arch/x86/include/asm/pgalloc.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h index 8df72517aafc..aff42e1da6ee 100644 --- a/arch/x86/include/asm/pgalloc.h +++ b/arch/x86/include/asm/pgalloc.h @@ -182,9 +182,6 @@ static inline p4d_t *p4d_alloc_one(struct mm_struct *mm, unsigned long addr) static inline void p4d_free(struct mm_struct *mm, p4d_t *p4d) { - if (!pgtable_l5_enabled) - return; - BUG_ON((unsigned long)p4d & (PAGE_SIZE-1)); free_page((unsigned long)p4d); }