From patchwork Tue Feb 27 00:34:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 206982 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp2415206dyb; Mon, 26 Feb 2024 16:37:33 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWqlz1f6/Bw7CvL4nFDnMJFYR2BW3tDb3wo2mzMwy6oMNzQWcSvkV5ikGmbnO69DeHnh72sp6CIeRpM/7Wj4ZEug7WfeQ== X-Google-Smtp-Source: AGHT+IHy+oljOLit46+wI4zAtWAiiKVF2Z3ApoeLHh4yNTxZDHrrrd4uK+/YIPhVIXuQZ5LoIS18 X-Received: by 2002:aa7:d349:0:b0:565:be3f:bc4e with SMTP id m9-20020aa7d349000000b00565be3fbc4emr4049722edr.29.1708994253040; Mon, 26 Feb 2024 16:37:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708994253; cv=pass; d=google.com; s=arc-20160816; b=f6b3rjwAgXoj+DwokNKI/dIcKvo8qAtegsX1ZoJJ4uPguiewLs8QwhTfgx4oU3/N6R qZbtO7+yAcidoqdsBMtTbGRBtCeSik9ry7VtP3zRegthRV2q04BsSujY3egVo8ulyEnV zY36h1lczccCvD3HvC6BFc1Oi7GN4Zwrm/AK8mQsddK/zCz98ZZjNq/7+D27jv53gTcJ pAYZyZlBpqftijY9IISVTTxTOOTNSgny+S2OJUqQBi3gG7IpsyFT83Z5bsqy+Y8v18Pm MB0ReYHBRCYs9MvXVHLtNp6RVhlH90LCAnJLMMJUNGX8yDTtj0lZdKPYtFLUjpqOcb+T qWyw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=xj3OP08z+QmSADpUch3bINy+udg5hxpgq6aJUETENlU=; fh=qgALqhvBfwh64qlTOA5xcM4euFCRJESH/+60UMp8eRY=; b=Iy8GvoBHRFkKxk952QmOI7kTBjOnaaRa0iZ1AP+nEJEhUOjiOGFWCGnJoCcr7Gtdby guMiMDB4ueQ41DfpCe50kuiaRUyyVgsulKhV/3NhUecrt/l9YKFu0qCi9rGAm/Qgac7C UyWNVFWBexCpL4DqWPrx7in4tQc8afDoeDmtzbOclr5yExeQvkh2pMZV60LwwlsBHqMa Z0E3FdGVmaPY7ptkT0qZXmDMmBHcnyfJ/l+bhPofGmE7yHF5K+WWiaI0Vnwhd0Kpejre 526TNeahxikbJ8EBZqCUKq0JlIH3k8UsqfpwVSS7seNtCkbRMRDl7vOf5vnbOXYT8iI7 Idww==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=dYYQggaD; arc=pass (i=1 spf=pass spfdomain=sifive.com dkim=pass dkdomain=sifive.com dmarc=pass fromdomain=sifive.com); spf=pass (google.com: domain of linux-kernel+bounces-82470-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82470-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=sifive.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id k15-20020a508acf000000b00560c674e301si217085edk.667.2024.02.26.16.37.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 16:37:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-82470-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=dYYQggaD; arc=pass (i=1 spf=pass spfdomain=sifive.com dkim=pass dkdomain=sifive.com dmarc=pass fromdomain=sifive.com); spf=pass (google.com: domain of linux-kernel+bounces-82470-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82470-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=sifive.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id A67231F220A3 for ; Tue, 27 Feb 2024 00:37:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 36DFF8C06; Tue, 27 Feb 2024 00:36:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sifive.com header.i=@sifive.com header.b="dYYQggaD" Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 245E61848 for ; Tue, 27 Feb 2024 00:36:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708994197; cv=none; b=oRO+7HpRVqvru9yP/Z1QVII4K+LihTxiWRHbejFnKDhd9D8fTFqL6WkX2UDcKh/fl9FQGUGYLmegzKQ/V8PInhyQD6lrhNQx7Q0YhZGtDcTtO1l81nf4FoafIi7wNRvoDeIvwMEllqtuBTdB1xOExLJGRvpEw1/71/00VKKSHHs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708994197; c=relaxed/simple; bh=yfuDmq0tSBnwHEFGusBHNjVaLXcr5VaOBNNiZ8nN2dA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AbYAqo+y16yZbxgahVGRfwsJRrZXnvoVaGMSVvtCIR71rCen6ZG/AA1zyIwsE9vfBIcPy703aGMW9pQltHUAhZx1hMJt6+UBpEtXOnghXhJqTQL10BxpVHsVUqr5SnKvscGqLS3OBYKIg0+R2tW9IWjnVufyTeK/i5EjyMjF60U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=sifive.com; spf=pass smtp.mailfrom=sifive.com; dkim=pass (2048-bit key) header.d=sifive.com header.i=@sifive.com header.b=dYYQggaD; arc=none smtp.client-ip=209.85.210.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=sifive.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sifive.com Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6e43ee3f6fbso3349206b3a.3 for ; Mon, 26 Feb 2024 16:36:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1708994195; x=1709598995; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xj3OP08z+QmSADpUch3bINy+udg5hxpgq6aJUETENlU=; b=dYYQggaDAjShGq2ob4iTzg7eF9N3d0jPQjnbmEYE3n1u0cUBGFyI3ZzvgZ8NILompq Bl+gbJRdDzODSmWmfMsgO186VklypNMwMdI2ECG37u5HeCsdW5SijC6MSJwkyy/tpEqR x/RcwZcLLaIMPrhFviFTnzRaPIvOf/40/d2kCbiCC1zSElNYPemWZ766bdigc3z7uBuW 7r4ZHi17i4fJSVINtY4Mo70MfCaiFRMtCYt2wghEUFmirMM0PyUY4TSVUZ5CKBsSYC8P ZoK+s4MLTxbgRUYCZaLFWFRLsmuYmimD60mKyR1lqc/VBQTnFcTJbeo4lb0oR4l0saLx qBcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708994195; x=1709598995; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xj3OP08z+QmSADpUch3bINy+udg5hxpgq6aJUETENlU=; b=GmibWoerqSlV/Tm7J7/MSNMO+cnaen3HGb0NxqscHdoCXH5AXCVE/lD78QZiaN0Ocy CVKdh8HX6bzyZhVBWzUtBKvffUJgqEgNAtwTMmwt47Q6ZhDZ1kwVIwafrVJjquwOq6jC MbKQiK7im0K44+3rFUS1HAr0w5NYmWznT7e2FOQM3weOk5mMsuBvV4FXSnI2gbZ1ax6M OS+oh5rhw97cJBAxeyOX5hoZp3luWbEYu4KXhjomUeV0/fkztU4iKj1v+qj5hy+xJP1j RkGwtLOgxHtZSxnsZ88xSf17+YgX/cerzDpY9Af/wFJwqVBnY2WqUQ73fJV6wdzB7W53 dSYQ== X-Gm-Message-State: AOJu0Yx6SDemmQ6MerU2pM87L4JaKxxjtQQh1GH8hUaFuMFEVSHfaWU5 pDQg7RNk9XatMv4dD+A5Tn7b/oj3N2DyjYkJfGd+f45fPuRRWM1BSE0HJ5lHUx4= X-Received: by 2002:a05:6a21:910c:b0:1a1:fb:7586 with SMTP id tn12-20020a056a21910c00b001a100fb7586mr944213pzb.57.1708994195402; Mon, 26 Feb 2024 16:36:35 -0800 (PST) Received: from sw06.internal.sifive.com ([4.53.31.132]) by smtp.gmail.com with ESMTPSA id z25-20020a631919000000b005dc85821c80sm4504117pgl.12.2024.02.26.16.36.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 16:36:35 -0800 (PST) From: Samuel Holland To: Palmer Dabbelt , linux-riscv@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH 2/4] riscv: Fix loading 64-bit NOMMU kernels past the start of RAM Date: Mon, 26 Feb 2024 16:34:47 -0800 Message-ID: <20240227003630.3634533-3-samuel.holland@sifive.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240227003630.3634533-1-samuel.holland@sifive.com> References: <20240227003630.3634533-1-samuel.holland@sifive.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792010358072618943 X-GMAIL-MSGID: 1792010358072618943 commit 3335068f8721 ("riscv: Use PUD/P4D/PGD pages for the linear mapping") added logic to allow using RAM below the kernel load address. However, this does not work for NOMMU, where PAGE_OFFSET is fixed to the kernel load address. Since that range of memory corresponds to PFNs below ARCH_PFN_OFFSET, mm initialization runs off the beginning of mem_map and corrupts adjacent kernel memory. Fix this by restoring the previous behavior for NOMMU kernels. Fixes: 3335068f8721 ("riscv: Use PUD/P4D/PGD pages for the linear mapping") Signed-off-by: Samuel Holland --- arch/riscv/include/asm/page.h | 2 +- arch/riscv/mm/init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/page.h index 57e887bfa34c..94b3d6930fc3 100644 --- a/arch/riscv/include/asm/page.h +++ b/arch/riscv/include/asm/page.h @@ -89,7 +89,7 @@ typedef struct page *pgtable_t; #define PTE_FMT "%08lx" #endif -#ifdef CONFIG_64BIT +#if defined(CONFIG_64BIT) && defined(CONFIG_MMU) /* * We override this value as its generic definition uses __pa too early in * the boot process (before kernel_map.va_pa_offset is set). diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index fa34cf55037b..0c00efc75643 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -232,7 +232,7 @@ static void __init setup_bootmem(void) * In 64-bit, any use of __va/__pa before this point is wrong as we * did not know the start of DRAM before. */ - if (IS_ENABLED(CONFIG_64BIT)) + if (IS_ENABLED(CONFIG_64BIT) && IS_ENABLED(CONFIG_MMU)) kernel_map.va_pa_offset = PAGE_OFFSET - phys_ram_base; /*