From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 BD1E046BF for ; Wed, 17 Jul 2024 02:05:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721181910; cv=none; b=tsnwrHmx97Erkgu1+oWSdUA2fi7xDw5wt6Op7PW7JRBhVFWLktjBabfi7lc+SFeXGlOl8yRC5jRqpkQ12SVtaWOIpYuoeSwiorjB9RKkUG1w7lujmVckZeKfgBv0cnxM+dFWsvb5xZU+3m+X0cIOaTx4cy+Embae9RqVDs8o1WQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721181910; c=relaxed/simple; bh=2aijUZqRvbSMAZJItNF8/iGr6po/mjEBfQUPAwaBiSk=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=Vf6ElFuae0vRNzuL8TK16eNk+A7dQu6mxVSF0tXdSadZSi4YoBFgF4kMXwNjFoQyjyWjzTxWG/gvUOPCO3daZNPLUk7bdU4yN4cK9RNp6txy/tTrSnwX/dUZ8hzwCnyC1MPTcPe79ApWxAymj9f6k7Tz0XpURMClbjEaVwGNbUI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=AtNEV0IK; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="AtNEV0IK" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1fbfb8e5e0cso43494215ad.0 for ; Tue, 16 Jul 2024 19:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1721181908; x=1721786708; darn=vger.kernel.org; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=i8QRegxtd6+FgIkF6diGK9DWIR0YDnVslVz04u7ogUM=; b=AtNEV0IKLNnfPx69+ffB+qmfk5Hu4GcwLj2b+r0/qr2Ivu1egHGr6BE7n3SPIleqT5 /Qo8y0qzPWNZJqMkhmPrVidF2ECqHCv+KVZXNnzJ6x3OsrWyKQ9hP8ys5BbiEFjbrVFi xQzr4x+4XhE1STulSctGkDaM19KD57Fl8SoCgnySkijfy7+AZWISQYrcTykQI4Si6Bh9 CErAAFQBH8EuBe7KZqSqUsADk4gTW/Krp/G/+67K1wfUbZVFVL4zV5WtuXMR6rwYvUca TtXI6GMJ6oyasb5HP6ETXN2BVsYIjgUgnxrzgrRS+z/yVOJvIrVSJB1tjgKRatQcUHYg 0PHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721181908; x=1721786708; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=i8QRegxtd6+FgIkF6diGK9DWIR0YDnVslVz04u7ogUM=; b=eYUWw6PBDu8jLHYbPbVK7dpfYEiQVhuNvKSoMHLM/KJHucaATNqqJF3OmDE3bikpHP frb/PxFBjvQbBP5FmnZTCmUuL8Rqa847Oziib79pfW1i7/Y/YxHDXI7VWCzy94B3cBSH uFVknd0IuXmvReyBKcLrYCE7FdTloXiTI1jZe0Sihggy3dBXgGE0zPNLphWDK0Twj2yq c2SJsH6n7Xj+dswZqnDYLvqQVTfXssqnNGRyLdHArDjt7Hrf5lbLnQK53Z4vPezuSCfS OiwCtcT3PGlwXaNwYbdT5aSEZZaORCCeEXbl4B/i9RHMjJACU79LitnpXxmeA5aHO0SD 043Q== X-Forwarded-Encrypted: i=1; AJvYcCXSW52BZJY2v6WwEPzo7LUOHUUQsxAflG/3yNNHBpY6syhgDY1GeFELKM4V4LiS3nCYiWwQEV7JuMSwiHRU6nfYwEUMFV4hQSdWDQ6y X-Gm-Message-State: AOJu0YzpBECtHlB/kuS4EOs6DLKSvxSgM5LOwKCkmRMraI0db3iY29yC Nvw6xVzzyxx4jfQ3GuZKkGg31klB+DqJypVmwH/Lb3CVjGsVnFGyYmtIREqLL8A= X-Google-Smtp-Source: AGHT+IE2KzNPcTth+gMo267NV2Jd+oHot7f6l6m3xb5YAhTJAAFsLZacsEiGAChpR0B8dRp+Zw50zg== X-Received: by 2002:a05:6a21:710a:b0:1c2:8e3f:a49 with SMTP id adf61e73a8af0-1c3fdcc006fmr450858637.3.1721181907982; Tue, 16 Jul 2024 19:05:07 -0700 (PDT) Received: from localhost ([2804:14d:7e39:8470:4ae3:bddc:48f7:36a0]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2caedbf733esm7067534a91.20.2024.07.16.19.05.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jul 2024 19:05:07 -0700 (PDT) From: Thiago Jung Bauermann To: Mark Brown Cc: Catalin Marinas , Will Deacon , Jonathan Corbet , Andrew Morton , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Arnd Bergmann , Oleg Nesterov , Eric Biederman , Shuah Khan , "Rick P. Edgecombe" , Deepak Gupta , Ard Biesheuvel , Szabolcs Nagy , Kees Cook , "H.J. Lu" , Paul Walmsley , Palmer Dabbelt , Albert Ou , Florian Weimer , Christian Brauner , Ross Burton , linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, kvmarm@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org Subject: Re: [PATCH v9 20/39] arm64/gcs: Ensure that new threads have a GCS In-Reply-To: <20240625-arm64-gcs-v9-20-0f634469b8f0@kernel.org> (Mark Brown's message of "Tue, 25 Jun 2024 15:57:48 +0100") References: <20240625-arm64-gcs-v9-0-0f634469b8f0@kernel.org> <20240625-arm64-gcs-v9-20-0f634469b8f0@kernel.org> Date: Tue, 16 Jul 2024 23:05:04 -0300 Message-ID: <87bk2wu627.fsf@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain Mark Brown writes: > diff --git a/arch/arm64/mm/gcs.c b/arch/arm64/mm/gcs.c > index b0a67efc522b..4a3ce8e3bdfb 100644 > --- a/arch/arm64/mm/gcs.c > +++ b/arch/arm64/mm/gcs.c > @@ -8,6 +8,139 @@ > #include > #include > > +static unsigned long alloc_gcs(unsigned long addr, unsigned long size, > + unsigned long token_offset, bool set_res_tok) The token_offset and set_res_tok arguments aren't used in this function, so they can be removed. > +{ > + int flags = MAP_ANONYMOUS | MAP_PRIVATE; > + struct mm_struct *mm = current->mm; > + unsigned long mapped_addr, unused; > + > + if (addr) > + flags |= MAP_FIXED_NOREPLACE; > + > + mmap_write_lock(mm); > + mapped_addr = do_mmap(NULL, addr, size, PROT_READ | PROT_WRITE, flags, > + VM_SHADOW_STACK, 0, &unused, NULL); > + mmap_write_unlock(mm); > + > + return mapped_addr; > +} > + > +static unsigned long gcs_size(unsigned long size) > +{ > + if (size) > + return PAGE_ALIGN(size); > + > + /* Allocate RLIMIT_STACK/2 with limits of PAGE_SIZE..2G */ > + size = PAGE_ALIGN(min_t(unsigned long long, > + rlimit(RLIMIT_STACK) / 2, SZ_2G)); > + return max(PAGE_SIZE, size); > +} > + > +static bool gcs_consume_token(struct mm_struct *mm, unsigned long user_addr) > +{ > + u64 expected = GCS_CAP(user_addr); > + u64 val; > + int ret; > + > + /* This should really be an atomic cpmxchg. It is not. */ s/cpmxchg/cmpxchg/ The same typo is also in arch/x86/kernel/shstk.c, from the "fork: Support shadow stacks in clone3()" patch series. > + ret = access_remote_vm(mm, user_addr, &val, sizeof(val), > + FOLL_FORCE); > + if (ret != sizeof(val)) > + return false; > + > + if (val != expected) > + return false; > + > + val = 0; > + ret = access_remote_vm(mm, user_addr, &val, sizeof(val), > + FOLL_FORCE | FOLL_WRITE); > + if (ret != sizeof(val)) > + return false; > + > + return true; > +} -- Thiago