From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (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 4D4E527703B for ; Tue, 6 May 2025 10:10:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746526239; cv=none; b=YQ0Wn3drgG4zcUyUef2rScafSzKlRxpTNatr5zgAZCd+t1N+NOCLl/d3dx4TFscWu+tx0tQqVme0gnQXNItFP2k97gnl8bm7BDfflIuEvD91x+X2wUEeTXHyvSVQAiB9kYxM8v1GryXJF16MPxVI0hw+uBuVyx2DUzhLlDPi6UM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746526239; c=relaxed/simple; bh=/HBE0X80tekKwVpe/I6rSG6afei1xLRG1IopLTv4b90=; h=Mime-Version:Content-Type:Date:Message-Id:Subject:Cc:To:From: References:In-Reply-To; b=ZSXmBJiRqLw6Hc2HMNX58oNn5pLFQj17Ets/ndKwKRuYyGyVZfuKx0EX5uQdfJWBsDozqdt+i+Zx1oOr4AY6I1GV91dOZHJx3GhuaBLQdjprTftuyX4HFjjt9fTPi/7s098oZKj8chQhC6eKN9y2ectZg1xLTBKYXcQj6hO/Fjg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com; spf=pass smtp.mailfrom=ventanamicro.com; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b=k3yezd4p; arc=none smtp.client-ip=209.85.221.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="k3yezd4p" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-3912a28e629so138513f8f.1 for ; Tue, 06 May 2025 03:10:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1746526235; x=1747131035; darn=vger.kernel.org; h=in-reply-to:references:from:to:cc:subject:message-id:date :content-transfer-encoding:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=MDlCPukG676ZkXDqA7+irYPpUi8ypltoa/WLU7iYTZw=; b=k3yezd4pHOP993DCvnJYvnnrLQ1mQCRimlX6KF3OwLBGIjRxOc3HI5AcNZB8pZhuWj pzuW1eppoxocBCntG/gAypFjNT0c2K33klUSjcfO5TClCnm76dz3JLIX/z5ESFhaprPT nRwfLtrtLlpz8HVBl5tXVu+qSANl+Vudwd5La9yJ9av/tFmsKPxcvsVmai85Yg9S0G2j gBYB/Q3FrSGMB3QfoQs0HpjGJymi73TUlgOsy1VraKjWGcyD6teiRQxVunD8dpEx3FX4 iAKFmr0MeOH735cMF502s277NyhW/SvQIBLSEPUkrR6JYMN+955NaiHnc5d/DcCc8Z9d C91w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746526235; x=1747131035; h=in-reply-to:references:from:to:cc:subject:message-id:date :content-transfer-encoding:mime-version:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=MDlCPukG676ZkXDqA7+irYPpUi8ypltoa/WLU7iYTZw=; b=LC+FWaBTzbLx2S2p++LuZuA7hdEFPZWMIb0LAOsX6/sxd2x0XKQZQ7NFr4AA2jL+lL M9caVpb5biqVwWKRIBJfT5mL4cts8Wmxv9upmSjZWi1lDt2pRwVlv8JzClcZK3gwy+XP Py2ewwq2brZ/nYrRP1XiQ1UHyF2/t6i9LtAUeZAWFuCmsV0bv4Yyf2qQ6YB6biM9UY1B Xie4MuOO2jokFa6QE4enQ+Jld+PDYwTGQkVQ+frd/B/MtgI+mS7uzKmp1fPH469tOenr KGes3Wda9o7p9HUlyMuHsBhmXlsVVksIc2UqFHM1WHM0ZrSxHb0e7LgJHwIXn1JHSXtV 5ssA== X-Forwarded-Encrypted: i=1; AJvYcCWIiBQmzDW+Ko8RTvq2fW2SYY3VVGeeIZ0az54NjEJFMrnl2SpNpWQX9FhTDzlZsFVVleZ18+EHDve6@vger.kernel.org X-Gm-Message-State: AOJu0YyPU2fFAP6eiX9y1UwSGhPkLP0cDgkwDdaN0Gl3Un+FrhJpWvcg MRwexNbN0O8oIle+WS3lIyfgE9kHeS0RJKMtUgq/e2NP82sOTej5Nk+bgpEE4Oc= X-Gm-Gg: ASbGncvV0B4+ONiFpTGt9l36eZjjFQv3WyuwSrDdFbF2tDukEioZeZJ+7KlKfORcR8H jJ+CFTgTX/eoJffZ2Hg+oB+46HIsg9leK+xI8rczcbCURUnfoKhfPr/cDtBrY3uCIt3Wzo2XRNd QanmA33KEyrQMP4Lx42k/EnGr1+GmScHBu4oNCBaD7rGpWmzCnjaLkCIDDxDNuGe7ld5vpq6Xlh Ha47Sd82Go0s3Zes8XmOdv8d2LRg/D5GycWv1k/i+T5n8DDCkxTe9lESu73OLOWj/Hq8HL1Dh5U bhA1wAfsT6l0GmRgiaCeg8VgMh3Mj8ACjCL7LFWaT0pdg4X4 X-Google-Smtp-Source: AGHT+IEUjKjGwlmMCjrKZvF7YuhMUsrs5D+dPoN1CPSaPd4oD3QBATAQzTQqUOqU1bgynoQlRYwsyA== X-Received: by 2002:a05:6000:144a:b0:3a0:9f28:2e53 with SMTP id ffacd0b85a97d-3a09f282ec4mr3244079f8f.0.1746526235363; Tue, 06 May 2025 03:10:35 -0700 (PDT) Received: from localhost ([2a02:8308:a00c:e200:d5f0:7802:c94b:10f6]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89cc441sm166448565e9.3.2025.05.06.03.10.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 03:10:35 -0700 (PDT) Precedence: bulk X-Mailing-List: devicetree@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 Date: Tue, 06 May 2025 12:10:34 +0200 Message-Id: Subject: Re: [PATCH v15 05/27] riscv: usercfi state for task and save/restore of CSR_SSP on trap entry/exit Cc: , , , , , , , , , , , , , , , , , , , , , , "Zong Li" , "linux-riscv" To: "Deepak Gupta" , "Thomas Gleixner" , "Ingo Molnar" , "Borislav Petkov" , "Dave Hansen" , , "H. Peter Anvin" , "Andrew Morton" , "Liam R. Howlett" , "Vlastimil Babka" , "Lorenzo Stoakes" , "Paul Walmsley" , "Palmer Dabbelt" , "Albert Ou" , "Conor Dooley" , "Rob Herring" , "Krzysztof Kozlowski" , "Arnd Bergmann" , "Christian Brauner" , "Peter Zijlstra" , "Oleg Nesterov" , "Eric Biederman" , "Kees Cook" , "Jonathan Corbet" , "Shuah Khan" , "Jann Horn" , "Conor Dooley" , "Miguel Ojeda" , "Alex Gaynor" , "Boqun Feng" , "Gary Guo" , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , "Benno Lossin" , "Andreas Hindborg" , "Alice Ryhl" , "Trevor Gross" From: =?utf-8?q?Radim_Kr=C4=8Dm=C3=A1=C5=99?= References: <20250502-v5_user_cfi_series-v15-0-914966471885@rivosinc.com> <20250502-v5_user_cfi_series-v15-5-914966471885@rivosinc.com> In-Reply-To: <20250502-v5_user_cfi_series-v15-5-914966471885@rivosinc.com> [Ah, I missed v13 and v14, feel free to Cc me on next versions.] 2025-05-02T16:30:36-07:00, Deepak Gupta : > diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S > @@ -91,6 +91,32 @@ > +.macro save_userssp tmp, status > + ALTERNATIVE("nops(4)", > + __stringify( \ > + andi \tmp, \status, SR_SPP; \ > + bnez \tmp, skip_ssp_save; \ > + csrrw \tmp, CSR_SSP, x0; \ > + REG_S \tmp, TASK_TI_USER_SSP(tp); \ > + skip_ssp_save:), > + 0, > + RISCV_ISA_EXT_ZICFISS, > + CONFIG_RISCV_USER_CFI) > +.endm > + > +.macro restore_userssp tmp > + ALTERNATIVE("nops(2)", > + __stringify( \ > + REG_L \tmp, TASK_TI_USER_SSP(tp); \ > + csrw CSR_SSP, \tmp), > + 0, > + RISCV_ISA_EXT_ZICFISS, > + CONFIG_RISCV_USER_CFI) > +.endm Do we need to emit the nops when CONFIG_RISCV_USER_CFI isn't selected? (Why not put #ifdef CONFIG_RISCV_USER_CFI around the ALTERNATIVES?) Thanks.