From nobody Thu Dec 18 08:32:15 2025 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 94EAC171A1 for ; Wed, 17 Jul 2024 06:02:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721196158; cv=none; b=Ij/Elri9iLvKIlVIQUoz5knOIKj4i+mwcRzDsGx58AdPgOgRuXhWBrcJHRNmpPUZN4mCfeyQgaAf1Sqx902JD5lk13MQATgyphl078yr1zRLmGwivrXMWfskds+9x5aMTXhzd3PIDZzlDUhD1AatShL1uwyHJwmma6944OZaDSo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721196158; c=relaxed/simple; bh=LZA4zhT5BIJyw4yEug/ytb1tl/M2pa5AKaP9gougVIs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Fofk7xY82GJ+mL3BMs1idGw43j3lr+bXJtGrGuwnPtYtl6QysmeBB7lxRpFWvvA/8hIurQSaWhuA7QTTj3/HTxhhu0bHMPjFQntcxClIPt3z8eYDPhgRL5x4A0qzOmBIKUnyBz1Kcx0wFXZwfys/tpQ4dLhmRS9Q1aVeJD4y7r0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=N4Bgf5Is; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="N4Bgf5Is" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-427b1d4da32so2184165e9.0 for ; Tue, 16 Jul 2024 23:02:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1721196155; x=1721800955; 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=pXmippFvjJBdPaOFd0Bb9N+zo48IbYES3OA/c/+iV6I=; b=N4Bgf5IsURrP2XiDcAL8Fd0i078+Eqi1JTXItVF/nc/JDZCf25b4rat5tbeNpyK2vA jqrW/gB/UtlINm6eL+CC0sURipJj5AfqvX5ZiXTPAwavTeusbqoMmyT4VOTqWiYyIKiM aowvGK2+MHhdPGhTCNB8u3nBOX5+LpGv4925iiNRN9cqzA4V+Pe2kE6dlQhMAehDHoLx E6uH5qm/fuZSEXYsOARn3NKizzUwBJ4sP6LjzgYRq9jsjUSajlC8sbogpOVZppnibK4p keaoChdIKTjFOgn08yLRxlMWLfOzjnJDHwQ2RrgQfpEDTZ/cYwKt9FgxISenE6nog2El FTng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721196155; x=1721800955; 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=pXmippFvjJBdPaOFd0Bb9N+zo48IbYES3OA/c/+iV6I=; b=vJ9QPuTnRMtqBJcDjsFFqqTCP4YRXqDcjPag5WkB8Nqg6ahJbaFjqohKCZDddCxql9 VKHKkUToPIAmJta1n6aY0VTRtYnXtTL1QRbc5bev5K7+BwSSVyo9keZL3U0z1cASskHp D37Nq0G8qsCPYOjPits7Lbbap8UbHU2+T5s+BxVkETnUB2/1d31PCygN1QrVI7dsHec/ esNLyTbOUfac+zvcQ1OJ/LRo2HcI/oSzjzUFyrYI121tn3+TKjlPZ+hUmb47oeD7aaaE Aa85pTHmhuZFG4meFY6NMAKVonXVJLSuXnjo3T7fbRTM7FRTyHURIVrzOnY2k7wFqLCs FWrw== X-Forwarded-Encrypted: i=1; AJvYcCXoijUYLvMv66K+TZrTJMDgLhNxqb2nnaQEtQXn9DzxzhHunZBVfXpAJOVjAONud9oSkenG+mfc4uweoPKldCWzKzCq8BOpjQTxDI8R X-Gm-Message-State: AOJu0YxDAH8C5tuix2en6PtBD8oKqsQfMsIYKUYCiTRzjKlJ+6vKSDu4 rnVGSHTxkCSlI4e0BKNcvkM2JTVdT0X4OgxdyPPUUwPC5VNvk8RCOIkAQcKNCB4= X-Google-Smtp-Source: AGHT+IEsqNOSqGgGsp+64azNiE6BQN3Oyun3IARQaHDYKamOpOynPrKTjcW0Bs4EgmHDicXeJE1Lzg== X-Received: by 2002:a05:600c:3c83:b0:426:706c:a55a with SMTP id 5b1f17b1804b1-427bb67fcfcmr30629405e9.2.1721196154921; Tue, 16 Jul 2024 23:02:34 -0700 (PDT) Received: from alex-rivos.home (amontpellier-656-1-456-62.w92-145.abo.wanadoo.fr. [92.145.124.62]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4279f09d1d8sm188634835e9.0.2024.07.16.23.02.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jul 2024 23:02:34 -0700 (PDT) From: Alexandre Ghiti To: Conor Dooley , Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Palmer Dabbelt , Albert Ou , Ved Shanbhogue , Matt Evans , yunhui cui , Anup Patel , linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org Cc: Alexandre Ghiti , Conor Dooley Subject: [PATCH v4 1/4] riscv: Add ISA extension parsing for Svvptc Date: Wed, 17 Jul 2024 08:01:22 +0200 Message-Id: <20240717060125.139416-2-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240717060125.139416-1-alexghiti@rivosinc.com> References: <20240717060125.139416-1-alexghiti@rivosinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add support to parse the Svvptc string in the riscv,isa string. Signed-off-by: Alexandre Ghiti Reviewed-by: Conor Dooley --- arch/riscv/include/asm/hwcap.h | 1 + arch/riscv/kernel/cpufeature.c | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/riscv/include/asm/hwcap.h b/arch/riscv/include/asm/hwcap.h index e17d0078a651..6dd0dd8beb30 100644 --- a/arch/riscv/include/asm/hwcap.h +++ b/arch/riscv/include/asm/hwcap.h @@ -81,6 +81,7 @@ #define RISCV_ISA_EXT_ZTSO 72 #define RISCV_ISA_EXT_ZACAS 73 #define RISCV_ISA_EXT_XANDESPMU 74 +#define RISCV_ISA_EXT_SVVPTC 75 =20 #define RISCV_ISA_EXT_XLINUXENVCFG 127 =20 diff --git a/arch/riscv/kernel/cpufeature.c b/arch/riscv/kernel/cpufeature.c index 5ef48cb20ee1..60780d246743 100644 --- a/arch/riscv/kernel/cpufeature.c +++ b/arch/riscv/kernel/cpufeature.c @@ -305,6 +305,7 @@ const struct riscv_isa_ext_data riscv_isa_ext[] =3D { __RISCV_ISA_EXT_DATA(svnapot, RISCV_ISA_EXT_SVNAPOT), __RISCV_ISA_EXT_DATA(svpbmt, RISCV_ISA_EXT_SVPBMT), __RISCV_ISA_EXT_DATA(xandespmu, RISCV_ISA_EXT_XANDESPMU), + __RISCV_ISA_EXT_DATA(svvptc, RISCV_ISA_EXT_SVVPTC), }; =20 const size_t riscv_isa_ext_count =3D ARRAY_SIZE(riscv_isa_ext); --=20 2.39.2 From nobody Thu Dec 18 08:32:15 2025 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 C828710A1C for ; Wed, 17 Jul 2024 06:03:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721196219; cv=none; b=c1+yfWUrwxVTnJsaFnfcgKMd1Br9CEO8by9bR4IddXVxUi/+p/HI+XfegPvoLSa2o5BoZxLg/oCK+i/LZTfZPviUKp6N307pcljQNXWsPJJxi1JAZYQ+xaijRKdGjiBwLf/PXd+X+DDZF+BmFe3Zafl6XnE+er7epYecxuntTNg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721196219; c=relaxed/simple; bh=ASIZxkswmDtZ+ZGB+DAdAIDL+TY12awedCwg0AK29lc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iNnQ/CpX3NRSjSJ2Dv6CG3pGIlJt9KuMtMsoZCyxO1GRlPyRe2neQHu0z8IX3JpXzMhFWKRildTrQWk/OLbogbZHftBd1j36y1tM1KkkybZXAOgDT5uo+g+Z65qtXenFFXKWFJ5g6+8QpvxTTjGUPEkjZKNj3c7w5iz5kVjjglc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=AGLklqya; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="AGLklqya" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-426526d30aaso45300535e9.0 for ; Tue, 16 Jul 2024 23:03:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1721196216; x=1721801016; 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=ArkPBFGt6K1MFhrYQ24ruK4j4xzpePBZL9fawM1R2H4=; b=AGLklqyaVbodhgMwRwXc2aa/0ZC0UDJoHkQqHptxZmpMCxa6MSe+IJ/XY1E/P3t2gd 6lGjJKtpTNpfqnf2ugbnD5UDAb+kBBjfevLuJlIXf/rIuwxMhSzSXKlTr8dQohv4lt80 dj6A78nDVcXRUCwot+v2UmClJkw6ZLOyD7MF9/jfaynQqi4FmpVY6CcUyCZWtAo/ZqgI zKVNl4uPEFcBvYZCKDY61t3LZl/2E4XaYg7mfCkPExhIJLH9X1ewraDwy4+yRC8K4qTk dv+CZ1D3MrudHD8a31jCXw7hIY+Xqr0Vu8731D/gaHJcDoFFVML3iQ9/Gs/wqTN8hG7n yKMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721196216; x=1721801016; 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=ArkPBFGt6K1MFhrYQ24ruK4j4xzpePBZL9fawM1R2H4=; b=Fo0U66bOBgxsbY/YD8GGu+KjbuY2Nqrz6d/ImFJbn4tJbhxOEEZATmnnmndWrdxCS2 z0IUGvotIk4f0v2LJcSaH4xcU3IrHvJsY2EYH116NQLCXkP4W8PT2PDdeFLoTT9k6kAH TnZkcphX2TeVfzI7jJpHwcJBus585QnF7GdQGXXzclTZsxTXD8m8zPvRC/KCmNlGGSLi 4BYOcXSI8T+hX2H8tqsEIOLjKLVxh5514Gb46UuZtrnHJfyZw8l7liGZmoxN7yHcERs7 Pf3nytj15Wer+VrbG8vjCO7PgrPg1d8vjyLUCHthtWZz5S76EN679Y4xaTkxQCQ+8jGh qS4Q== X-Forwarded-Encrypted: i=1; AJvYcCV4ZtLuZ6C6Pso+Nv/mrffMomOV3XwGwjuaneHMFCRBlZcpbfqjV8lpOvXzxGBQ0UfW8aaiOMhaHhOXBMmmN8cUtxgPVeBn8SUhOJYt X-Gm-Message-State: AOJu0YwGdqJOoloEkuxxSHNzdDvoQ3mGBeF3Am+zOssImC5YsxYJH1hT ZubI0iiTBcChZ/U1nkCK1MzkKFg/1b5dxzuDw5H501KwgPylE2BxcTDgFZXm3/Q= X-Google-Smtp-Source: AGHT+IEGysgZPMM4acl6H0WMyDhumNTRPZzYYEvhuxVrBFVR//wZJdXVjhzyWhOID+qrmJtwitm53g== X-Received: by 2002:a05:600c:4e94:b0:426:6f0e:a60 with SMTP id 5b1f17b1804b1-427c2ce4a57mr4782015e9.17.1721196215982; Tue, 16 Jul 2024 23:03:35 -0700 (PDT) Received: from alex-rivos.home (amontpellier-656-1-456-62.w92-145.abo.wanadoo.fr. [92.145.124.62]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427a5e8387fsm154887365e9.20.2024.07.16.23.03.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jul 2024 23:03:35 -0700 (PDT) From: Alexandre Ghiti To: Conor Dooley , Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Palmer Dabbelt , Albert Ou , Ved Shanbhogue , Matt Evans , yunhui cui , Anup Patel , linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org Cc: Alexandre Ghiti , Conor Dooley Subject: [PATCH v4 2/4] dt-bindings: riscv: Add Svvptc ISA extension description Date: Wed, 17 Jul 2024 08:01:23 +0200 Message-Id: <20240717060125.139416-3-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240717060125.139416-1-alexghiti@rivosinc.com> References: <20240717060125.139416-1-alexghiti@rivosinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add description for the Svvptc ISA extension which was ratified recently. Signed-off-by: Alexandre Ghiti Acked-by: Conor Dooley --- Documentation/devicetree/bindings/riscv/extensions.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/riscv/extensions.yaml b/Docu= mentation/devicetree/bindings/riscv/extensions.yaml index 468c646247aa..b52375bea512 100644 --- a/Documentation/devicetree/bindings/riscv/extensions.yaml +++ b/Documentation/devicetree/bindings/riscv/extensions.yaml @@ -171,6 +171,13 @@ properties: memory types as ratified in the 20191213 version of the privil= eged ISA specification. =20 + - const: svvptc + description: + The standard Svvptc supervisor-level extension for + address-translation cache behaviour with respect to invalid en= tries + as ratified at commit 4a69197e5617 ("Update to ratified state"= ) of + riscv-svvptc. + - const: zacas description: | The Zacas extension for Atomic Compare-and-Swap (CAS) instruct= ions --=20 2.39.2 From nobody Thu Dec 18 08:32:15 2025 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 49B0A171A5 for ; Wed, 17 Jul 2024 06:04:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721196281; cv=none; b=X27r8TbJFlazPKFih903d97ASqT6N1fSWq+j9K/iDtdhWqL1sJz49BHQyQdKAIgIvQenqLBg66nu8Fr4f0R5eB628ZSQLTGHwWyhwZC/Jt7nH6Nrb80H8tKALB4FSimefEYn2TvohgYCUvAezK7XF2NGYOrVcsOVQhwEKbT9o/s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721196281; c=relaxed/simple; bh=7bTxG5imj5sFfK+xP870BFlpbNNJHAopLGEAnTGTUvU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qPt5WqqoimOFA2+qgjZoTXkLKZJ3XLYX26bIrJU6EUT3d+jiVHu/cZGh0RxaD+iYU36CGMIczAiB3AC7kmYaNmCJE+24mmhsYjMeB2oBLyxmsUCmAMaevodb3ZsKqhnphi0RgzyZRSbQOVamKwDAQsxqi+1RZTvqL8lFJBH06E0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=nBMYIPwp; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="nBMYIPwp" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4265b7514fcso2109935e9.1 for ; Tue, 16 Jul 2024 23:04:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1721196277; x=1721801077; 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=8dbUbbFULfsrE+nsrlyCzBk7XNc7NNIs5oq3jJIx/UQ=; b=nBMYIPwp6wdb0e0Gh/je9vO0yByYX6eEblqmYIr32z8Nrlf+BJE0tzbARHl+m+oACt X475oius8lmdBu8FVG5QGLp4h3HCY8wdyKBF1zauwiZSAGscezkS5Ph9TLlVyPkjthQy kyZwcJ3HKgtDHPNN3wGaE97IaE3u3OuV8QuSGtJOFWxgM4XCzwoL293/RnQAvJZhmqS+ f2E3eJqV0MVw/gIiCL2EouwZCCNgiBossIkXTnyslDyF+4jLTiePZlmMn4iu9y1PTAtL UXB4yoT7KF4VfkBTdTVBlKthOKUe20dt1tNdg8SOxsxLEUS++qF1q7XuZhVeZLr8Sceh 71lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721196277; x=1721801077; 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=8dbUbbFULfsrE+nsrlyCzBk7XNc7NNIs5oq3jJIx/UQ=; b=jxHW5G2Qz7ObkUeba9tGDB2jSrbaYymRPImjRiCGqdDBt0loUn1nDOEawLuToJMqxn sVMwxBKuipQ50XP7glXb+fO4qJlQ9dHDcr0Iq+gwaL7xdwRvhLUox045KzhBpO45W27p tGNn1yftM4nOJj/NflrwXKgf1c+xqPhyJ8FddnZ6ZRVJqYbwaJ9MsR/LEfWnQb7GrjS5 oI1t2ZDtqOqmwTqnPjGN83wRy3V5/So5qyOYNpOvBlz40iF6U/yn1h78YW/f3vDQ0ACc b2K37qufiKugmsrgd23gF+KNj8EmeyfDkZ+7OwL7SynsskiBvOIwbmKcqHTgOjf4EDyQ YG1w== X-Forwarded-Encrypted: i=1; AJvYcCWlRfLS1BPxDAYHbkNpiSQ1GBHua674i0aO37oA2403E6m+uuQV7cUO2DfwLb5cK5Q3TPyXg9cH5eMbMcnYYpB2Zdi2jOMaALhTD0OV X-Gm-Message-State: AOJu0YzVxJYxHew/BhcR8RycfYQmuHJnRLTNzdh7prj/yslcjJtyHM+C S+YJmhHY0zwClFik6NhPV1M6uTH0kEn81T6b/6dGevSVE9HUp6xPKReHyblgeeM= X-Google-Smtp-Source: AGHT+IGgTBw59SAll6q8f849Ql4AF2T90E5dzsLW36EmpJYdcpnIk4GBd2+w+Nbh6vr0y5veXIlAlA== X-Received: by 2002:adf:f206:0:b0:360:8c88:ab82 with SMTP id ffacd0b85a97d-36831694075mr404751f8f.30.1721196277153; Tue, 16 Jul 2024 23:04:37 -0700 (PDT) Received: from alex-rivos.home (amontpellier-656-1-456-62.w92-145.abo.wanadoo.fr. [92.145.124.62]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3680dabf195sm10708915f8f.42.2024.07.16.23.04.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jul 2024 23:04:36 -0700 (PDT) From: Alexandre Ghiti To: Conor Dooley , Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Palmer Dabbelt , Albert Ou , Ved Shanbhogue , Matt Evans , yunhui cui , Anup Patel , linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org Cc: Alexandre Ghiti Subject: [PATCH v4 3/4] riscv: Stop emitting preventive sfence.vma for new vmalloc mappings Date: Wed, 17 Jul 2024 08:01:24 +0200 Message-Id: <20240717060125.139416-4-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240717060125.139416-1-alexghiti@rivosinc.com> References: <20240717060125.139416-1-alexghiti@rivosinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In 6.5, we removed the vmalloc fault path because that can't work (see [1] [2]). Then in order to make sure that new page table entries were seen by the page table walker, we had to preventively emit a sfence.vma on all harts [3] but this solution is very costly since it relies on IPI. And even there, we could end up in a loop of vmalloc faults if a vmalloc allocation is done in the IPI path (for example if it is traced, see [4]), which could result in a kernel stack overflow. Those preventive sfence.vma needed to be emitted because: - if the uarch caches invalid entries, the new mapping may not be observed by the page table walker and an invalidation may be needed. - if the uarch does not cache invalid entries, a reordered access could "miss" the new mapping and traps: in that case, we would actually only need to retry the access, no sfence.vma is required. So this patch removes those preventive sfence.vma and actually handles the possible (and unlikely) exceptions. And since the kernel stacks mappings lie in the vmalloc area, this handling must be done very early when the trap is taken, at the very beginning of handle_exception: this also rules out the vmalloc allocations in the fault path. Link: https://lore.kernel.org/linux-riscv/20230531093817.665799-1-bjorn@ker= nel.org/ [1] Link: https://lore.kernel.org/linux-riscv/20230801090927.2018653-1-dylan@an= destech.com [2] Link: https://lore.kernel.org/linux-riscv/20230725132246.817726-1-alexghiti= @rivosinc.com/ [3] Link: https://lore.kernel.org/lkml/20200508144043.13893-1-joro@8bytes.org/ = [4] Signed-off-by: Alexandre Ghiti Reviewed-by: Yunhui Cui --- arch/riscv/include/asm/cacheflush.h | 18 +++++- arch/riscv/include/asm/thread_info.h | 7 +++ arch/riscv/kernel/asm-offsets.c | 7 +++ arch/riscv/kernel/entry.S | 87 ++++++++++++++++++++++++++++ arch/riscv/mm/init.c | 2 + 5 files changed, 120 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/cacheflush.h b/arch/riscv/include/asm/c= acheflush.h index ce79c558a4c8..8de73f91bfa3 100644 --- a/arch/riscv/include/asm/cacheflush.h +++ b/arch/riscv/include/asm/cacheflush.h @@ -46,7 +46,23 @@ do { \ } while (0) =20 #ifdef CONFIG_64BIT -#define flush_cache_vmap(start, end) flush_tlb_kernel_range(start, end) +extern u64 new_vmalloc[NR_CPUS / sizeof(u64) + 1]; +extern char _end[]; +#define flush_cache_vmap flush_cache_vmap +static inline void flush_cache_vmap(unsigned long start, unsigned long end) +{ + if (is_vmalloc_or_module_addr((void *)start)) { + int i; + + /* + * We don't care if concurrently a cpu resets this value since + * the only place this can happen is in handle_exception() where + * an sfence.vma is emitted. + */ + for (i =3D 0; i < ARRAY_SIZE(new_vmalloc); ++i) + new_vmalloc[i] =3D -1ULL; + } +} #define flush_cache_vmap_early(start, end) local_flush_tlb_kernel_range(st= art, end) #endif =20 diff --git a/arch/riscv/include/asm/thread_info.h b/arch/riscv/include/asm/= thread_info.h index 5d473343634b..0ddf1123b5ba 100644 --- a/arch/riscv/include/asm/thread_info.h +++ b/arch/riscv/include/asm/thread_info.h @@ -60,6 +60,13 @@ struct thread_info { void *scs_base; void *scs_sp; #endif +#ifdef CONFIG_64BIT + /* + * Used in handle_exception() to save a0, a1 and a2 before knowing if we + * can access the kernel stack. + */ + unsigned long a0, a1, a2; +#endif }; =20 #ifdef CONFIG_SHADOW_CALL_STACK diff --git a/arch/riscv/kernel/asm-offsets.c b/arch/riscv/kernel/asm-offset= s.c index b09ca5f944f7..e94180ba432f 100644 --- a/arch/riscv/kernel/asm-offsets.c +++ b/arch/riscv/kernel/asm-offsets.c @@ -36,6 +36,8 @@ void asm_offsets(void) OFFSET(TASK_THREAD_S9, task_struct, thread.s[9]); OFFSET(TASK_THREAD_S10, task_struct, thread.s[10]); OFFSET(TASK_THREAD_S11, task_struct, thread.s[11]); + + OFFSET(TASK_TI_CPU, task_struct, thread_info.cpu); OFFSET(TASK_TI_FLAGS, task_struct, thread_info.flags); OFFSET(TASK_TI_PREEMPT_COUNT, task_struct, thread_info.preempt_count); OFFSET(TASK_TI_KERNEL_SP, task_struct, thread_info.kernel_sp); @@ -43,6 +45,11 @@ void asm_offsets(void) #ifdef CONFIG_SHADOW_CALL_STACK OFFSET(TASK_TI_SCS_SP, task_struct, thread_info.scs_sp); #endif +#ifdef CONFIG_64BIT + OFFSET(TASK_TI_A0, task_struct, thread_info.a0); + OFFSET(TASK_TI_A1, task_struct, thread_info.a1); + OFFSET(TASK_TI_A2, task_struct, thread_info.a2); +#endif =20 OFFSET(TASK_TI_CPU_NUM, task_struct, thread_info.cpu); OFFSET(TASK_THREAD_F0, task_struct, thread.fstate.f[0]); diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index 68a24cf9481a..d80b90f99bc1 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -19,6 +19,79 @@ =20 .section .irqentry.text, "ax" =20 +.macro new_vmalloc_check + REG_S a0, TASK_TI_A0(tp) + csrr a0, CSR_CAUSE + /* Exclude IRQs */ + blt a0, zero, _new_vmalloc_restore_context_a0 + + REG_S a1, TASK_TI_A1(tp) + /* Only check new_vmalloc if we are in page/protection fault */ + li a1, EXC_LOAD_PAGE_FAULT + beq a0, a1, _new_vmalloc_kernel_address + li a1, EXC_STORE_PAGE_FAULT + beq a0, a1, _new_vmalloc_kernel_address + li a1, EXC_INST_PAGE_FAULT + bne a0, a1, _new_vmalloc_restore_context_a1 + +_new_vmalloc_kernel_address: + /* Is it a kernel address? */ + csrr a0, CSR_TVAL + bge a0, zero, _new_vmalloc_restore_context_a1 + + /* Check if a new vmalloc mapping appeared that could explain the trap */ + REG_S a2, TASK_TI_A2(tp) + /* + * Computes: + * a0 =3D &new_vmalloc[BIT_WORD(cpu)] + * a1 =3D BIT_MASK(cpu) + */ + REG_L a2, TASK_TI_CPU(tp) + /* + * Compute the new_vmalloc element position: + * (cpu / 64) * 8 =3D (cpu >> 6) << 3 + */ + srli a1, a2, 6 + slli a1, a1, 3 + la a0, new_vmalloc + add a0, a0, a1 + /* + * Compute the bit position in the new_vmalloc element: + * bit_pos =3D cpu % 64 =3D cpu - (cpu / 64) * 64 =3D cpu - (cpu >> 6) <<= 6 + * =3D cpu - ((cpu >> 6) << 3) << 3 + */ + slli a1, a1, 3 + sub a1, a2, a1 + /* Compute the "get mask": 1 << bit_pos */ + li a2, 1 + sll a1, a2, a1 + + /* Check the value of new_vmalloc for this cpu */ + REG_L a2, 0(a0) + and a2, a2, a1 + beq a2, zero, _new_vmalloc_restore_context + + /* Atomically reset the current cpu bit in new_vmalloc */ + amoxor.d a0, a1, (a0) + + /* Only emit a sfence.vma if the uarch caches invalid entries */ + ALTERNATIVE("sfence.vma", "nop", 0, RISCV_ISA_EXT_SVVPTC, 1) + + REG_L a0, TASK_TI_A0(tp) + REG_L a1, TASK_TI_A1(tp) + REG_L a2, TASK_TI_A2(tp) + csrw CSR_SCRATCH, x0 + sret + +_new_vmalloc_restore_context: + REG_L a2, TASK_TI_A2(tp) +_new_vmalloc_restore_context_a1: + REG_L a1, TASK_TI_A1(tp) +_new_vmalloc_restore_context_a0: + REG_L a0, TASK_TI_A0(tp) +.endm + + SYM_CODE_START(handle_exception) /* * If coming from userspace, preserve the user thread pointer and load @@ -30,6 +103,20 @@ SYM_CODE_START(handle_exception) =20 .Lrestore_kernel_tpsp: csrr tp, CSR_SCRATCH + +#ifdef CONFIG_64BIT + /* + * The RISC-V kernel does not eagerly emit a sfence.vma after each + * new vmalloc mapping, which may result in exceptions: + * - if the uarch caches invalid entries, the new mapping would not be + * observed by the page table walker and an invalidation is needed. + * - if the uarch does not cache invalid entries, a reordered access + * could "miss" the new mapping and traps: in that case, we only need + * to retry the access, no sfence.vma is required. + */ + new_vmalloc_check +#endif + REG_S sp, TASK_TI_KERNEL_SP(tp) =20 #ifdef CONFIG_VMAP_STACK diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index e3405e4b99af..2367a156c33b 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -36,6 +36,8 @@ =20 #include "../kernel/head.h" =20 +u64 new_vmalloc[NR_CPUS / sizeof(u64) + 1]; + struct kernel_mapping kernel_map __ro_after_init; EXPORT_SYMBOL(kernel_map); #ifdef CONFIG_XIP_KERNEL --=20 2.39.2 From nobody Thu Dec 18 08:32:15 2025 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 0C52B156E4 for ; Wed, 17 Jul 2024 06:05:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721196341; cv=none; b=T+kBrL9rgHv3Mfz5fiY0mZjdmXCVE9Rc9KGl52cdywe4vcncI2RC7Qk5Hod/D+aMI7XtH/Hy3DPkC/RlcTgL2HJmtICJT9+rRGh+Y90ceIwnUj3hIHDS4/x+uH0wiJYz2WwUufQGqa/ziyNTNBLVNXXHtUKsh21t3Z5na88UaVA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721196341; c=relaxed/simple; bh=pNd9EqGFksnIK/7GkzVmDm9ZBVm1ziejUj+6/dwC34s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UZBChMzpZ6J01tVaWbLPICkntH/AMjU/xA7NjUHTGsi8w/ViXHJKwEXytGaqeLxtlM7OJNb5Lwz8/mOGB2RCTD5nerdYrBVayRGPTcd0GBGJY+/l6IOW+wYulw4jPrLndl0n2VLAOVKNaOnRJ+0wKAxmmD2tNal7AimYi0wxnG8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=mVjLtzqw; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="mVjLtzqw" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-3678f36f154so3812087f8f.2 for ; Tue, 16 Jul 2024 23:05:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1721196338; x=1721801138; 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=ZQT7T4D4OYiXP5aLvX/ZPT3Ko40XHhQXHQMq6Si+lCQ=; b=mVjLtzqwBcKahv1weN+BXuxMqlmeno2SjfHSADpGN4d3oZ35yhE6uUOKOWekkKzGtR W78xBD41x3aNX3For33cIXtsg6Ggeczld4Jwf1ZXyYz9MXoCSLNPFe/3N/HlX9M+AaJR acIbEwYtFOjZTjDkwTG71E94PjUuq8tnaA6tEost4gS3dr9V4yrG8iYWfGfe61jEBsIn f3ZWd5Vs9wxSuZ9KqTAv3RsQV4RnFaMvfZK7s+AoYXR9Ay9nqnC/aiYi6LkNknwtG8z/ Myyf89CS3A0SEzCBOt5jCQeEXh3KYlkXm5mSE2m/Fq/UVyLyaPDUFxPsQ5gzO3ZJx2Iv pklw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721196338; x=1721801138; 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=ZQT7T4D4OYiXP5aLvX/ZPT3Ko40XHhQXHQMq6Si+lCQ=; b=qILTqzTUS/IeSRoWOnU5M24vUXvbSvlDnJqyEUZGNSPYvUiaAy2ydVD/RW7AhGrzl2 dFpijgubvBS/o3A2nDhp0/9pnXKMTNDg7ga62QYJ/OkL9EhFgiHVf0/KkBr3mtiDtmVG 9I8RD6xnmuCLpgzasdxAmDG2ZZb1zOGi7yeZO1P94F3Jc4lMCAea+7LTHibQD3R+oAUj AUe8m+HHWJdNCz8swy4i3bQvPhWWe2pi0diN/bFDrHr3aVcECV6P3/Qdk9juw6qi9UNV WbPMOc2EiLbPJGaSSzaHZzIpF719hWCsJ+Mz5L6TcJyonWbfjppZuhjMW5lld5+6Bm5Z mXdg== X-Forwarded-Encrypted: i=1; AJvYcCWFdw+352qD5G6V+FxfaUnTDCTBAuAB3ekesbr2SBcofzRdmE6GpNv6nzcFQYeFNOs3O+ZGr+lI0enlPROYjnwGLa6wInx+eJ0w8JzX X-Gm-Message-State: AOJu0Yx3mVbVMDVsbivgo+MgYcehvya7+YFGtw5xtJKgOsZSh6d3IqfV cfDVn2OWqQa6a0JHaeZszRoB58QIzEc86Qs0oXMtmDJ0/+ER1rugAJYqktXr2gQ= X-Google-Smtp-Source: AGHT+IEQqqsHVBQzuLlWNCNqvz+HzbR2Qu8oxbxrJwmk7GCmEw2/2fyCAGSldEtDwshPiZQG+MKGzw== X-Received: by 2002:a5d:624b:0:b0:365:8547:90b1 with SMTP id ffacd0b85a97d-36831657d1amr462626f8f.39.1721196338221; Tue, 16 Jul 2024 23:05:38 -0700 (PDT) Received: from alex-rivos.home (amontpellier-656-1-456-62.w92-145.abo.wanadoo.fr. [92.145.124.62]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3680dab3cc6sm10834293f8f.11.2024.07.16.23.05.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jul 2024 23:05:37 -0700 (PDT) From: Alexandre Ghiti To: Conor Dooley , Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Palmer Dabbelt , Albert Ou , Ved Shanbhogue , Matt Evans , yunhui cui , Anup Patel , linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org Cc: Alexandre Ghiti Subject: [PATCH v4 4/4] riscv: Stop emitting preventive sfence.vma for new userspace mappings with Svvptc Date: Wed, 17 Jul 2024 08:01:25 +0200 Message-Id: <20240717060125.139416-5-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240717060125.139416-1-alexghiti@rivosinc.com> References: <20240717060125.139416-1-alexghiti@rivosinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The preventive sfence.vma were emitted because new mappings must be made visible to the page table walker but Svvptc guarantees that it will happen within a bounded timeframe, so no need to sfence.vma for the uarchs that implement this extension, we will then take gratuitous (but very unlikely) page faults, similarly to x86 and arm64. This allows to drastically reduce the number of sfence.vma emitted: * Ubuntu boot to login: Before: ~630k sfence.vma After: ~200k sfence.vma * ltp - mmapstress01 Before: ~45k After: ~6.3k * lmbench - lat_pagefault Before: ~665k After: 832 (!) * lmbench - lat_mmap Before: ~546k After: 718 (!) Signed-off-by: Alexandre Ghiti --- arch/riscv/include/asm/pgtable.h | 16 +++++++++++++++- arch/riscv/mm/pgtable.c | 13 +++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgta= ble.h index aad8b8ca51f1..4ed85329317d 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -476,6 +476,9 @@ static inline void update_mmu_cache_range(struct vm_fau= lt *vmf, struct vm_area_struct *vma, unsigned long address, pte_t *ptep, unsigned int nr) { + asm goto(ALTERNATIVE("nop", "j %l[svvptc]", 0, RISCV_ISA_EXT_SVVPTC, 1) + : : : : svvptc); + /* * The kernel assumes that TLBs don't cache invalid entries, but * in RISC-V, SFENCE.VMA specifies an ordering constraint, not a @@ -485,12 +488,23 @@ static inline void update_mmu_cache_range(struct vm_f= ault *vmf, */ while (nr--) local_flush_tlb_page(address + nr * PAGE_SIZE); + +svvptc:; + /* + * Svvptc guarantees that the new valid pte will be visible within + * a bounded timeframe, so when the uarch does not cache invalid + * entries, we don't have to do anything. + */ } #define update_mmu_cache(vma, addr, ptep) \ update_mmu_cache_range(NULL, vma, addr, ptep, 1) =20 #define __HAVE_ARCH_UPDATE_MMU_TLB -#define update_mmu_tlb update_mmu_cache +static inline void update_mmu_tlb(struct vm_area_struct *vma, + unsigned long address, pte_t *ptep) +{ + flush_tlb_range(vma, address, address + PAGE_SIZE); +} =20 static inline void update_mmu_cache_pmd(struct vm_area_struct *vma, unsigned long address, pmd_t *pmdp) diff --git a/arch/riscv/mm/pgtable.c b/arch/riscv/mm/pgtable.c index 533ec9055fa0..4ae67324f992 100644 --- a/arch/riscv/mm/pgtable.c +++ b/arch/riscv/mm/pgtable.c @@ -9,6 +9,9 @@ int ptep_set_access_flags(struct vm_area_struct *vma, unsigned long address, pte_t *ptep, pte_t entry, int dirty) { + asm goto(ALTERNATIVE("nop", "j %l[svvptc]", 0, RISCV_ISA_EXT_SVVPTC, 1) + : : : : svvptc); + if (!pte_same(ptep_get(ptep), entry)) __set_pte_at(vma->vm_mm, ptep, entry); /* @@ -16,6 +19,16 @@ int ptep_set_access_flags(struct vm_area_struct *vma, * the case that the PTE changed and the spurious fault case. */ return true; + +svvptc: + if (!pte_same(ptep_get(ptep), entry)) { + __set_pte_at(vma->vm_mm, ptep, entry); + /* Here only not svadu is impacted */ + flush_tlb_page(vma, address); + return true; + } + + return false; } =20 int ptep_test_and_clear_young(struct vm_area_struct *vma, --=20 2.39.2