From nobody Sat Nov 15 15:41:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1595608797; cv=none; d=zohomail.com; s=zohoarc; b=LfhQLmNX7uX1y6r9thaC9p5DYaR9VpeXSRakgtIjAthwMOj0xFV9EIwRVNAoAMrytCnpWWHfPQdYnwE+GTe0evZWLH5pGwJnNitfPonI5nupIZ8Sd5kkS+LqYebneYesVVmOKePQdfBnFyq8nUvuTdSwTWLYYTnVws7oTmHvbsc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595608797; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qt22xVqHd5YyzEckOxpQME7xz7JKzheB5mpy8sevhNw=; b=alYOWVl33SwVYh8tv4mHV8kWQ1EF4kisAHZ8iEsOeLIrqy0ZNZxjnKYAfuPFLWaAyMaqzC7chGKY3zYglEIg3hOw49tynoHTlS0Q8/JrCd+xLrIfg8H5Y3F40P2UB/LZ6YiU/5NVX1qAH9tIyi0FRLww8FEUcQzfDn/i92QZrXQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595608797638377.9394694947298; Fri, 24 Jul 2020 09:39:57 -0700 (PDT) Received: from localhost ([::1]:42760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jz0jk-00025x-0B for importer@patchew.org; Fri, 24 Jul 2020 12:39:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz0iq-0000Y4-Mh for qemu-devel@nongnu.org; Fri, 24 Jul 2020 12:39:00 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:41736) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jz0io-0001Tr-Mb for qemu-devel@nongnu.org; Fri, 24 Jul 2020 12:39:00 -0400 Received: by mail-pf1-x442.google.com with SMTP id w126so5298736pfw.8 for ; Fri, 24 Jul 2020 09:38:58 -0700 (PDT) Received: from localhost.localdomain (216-160-65-90.tukw.qwest.net. [216.160.65.90]) by smtp.gmail.com with ESMTPSA id r191sm7261663pfr.181.2020.07.24.09.38.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 09:38:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qt22xVqHd5YyzEckOxpQME7xz7JKzheB5mpy8sevhNw=; b=YfD9sR6zM90w3eAwKCmYtoJ2CTjePq9q+W+oumniCQg5WpnrfhvHtuaI+vrgrPinAA vSW/S0MSFN+OmWoZctNrZYWsA7r7AQJqNFQUsXEmMpJXLeX42GOswB8PJ8rpe0ktZBco f1DlS92F/Rezig+Yzujqd8JgzgniRmzxhlbC4J3L0s2x812Xxe8A0TUmB72HcQDTF+Xu 0BFzwPbcAeVHFTeozHEjDkHV6CgYm4Ffh5Xacnx+I74a5tYidMPRz9ip9NzxJFxpegvt +vBGX62VnpZujoelGEJjuWfbXvKs+1VOLhrFHUgzHZWRIBsUvr/uQZwiX9qfme9KqQfN DlFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qt22xVqHd5YyzEckOxpQME7xz7JKzheB5mpy8sevhNw=; b=jAPit87LyabW4aVl8pgCN+s6569q6UUlGB/aNv6A/maIdDTAHSLZ3oaFIGDv7DbkM3 pN1EzLr1Xl5zVQH1BuG/1CYXKE1JeGn7DwyD1/B9XfCG1JsTpzu0YX4lkhTOUoQZouMX LQ0FJ5XYs8wTz+z2xb6p8O77euL08W+oA5zWy+VVEolxq2WQIVCvaQCvsYZ0hrvhoGoV TfqhHEfLE42Js0/9ITvVrVl4tlTsLXuy+eR+RtPPKQI31w4Qs1K5b9KbqgtaKo55UptC gbLHkl7+rVBxN1z7dtvlXN9KDqYwfK8y9PUe+rLv1xezWOS1CQlxfarEIDbZfbCC6cuL uLvA== X-Gm-Message-State: AOAM531eanJLl3HTnT53OMKjFD5tEWecJE8UHQizHStxiQyxH8AeV1aK G84LF+fPJIWeJLVwEuqjxkWC4dACwkM= X-Google-Smtp-Source: ABdhPJwZEFTrVatJOlWPu/ixbHba6f+ynd+00XfigfZA82wcEX6fKcsrvZRrACkpgfMm58csksk3uA== X-Received: by 2002:a63:eb52:: with SMTP id b18mr9022226pgk.434.1595608737060; Fri, 24 Jul 2020 09:38:57 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/3] hw/arm/boot: Fix PAUTH for EL3 direct kernel boot Date: Fri, 24 Jul 2020 09:38:51 -0700 Message-Id: <20200724163853.504655-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200724163853.504655-1-richard.henderson@linaro.org> References: <20200724163853.504655-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::442; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, vincenzo.frascino@arm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" When booting an EL3 cpu with -kernel, we set up EL3 and then drop down to EL2. We need to enable access to v8.3-PAuth keys and instructions at EL3 before doing so. Signed-off-by: Richard Henderson --- hw/arm/boot.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index fef4072db1..c44fd3382d 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -736,6 +736,9 @@ static void do_cpu_reset(void *opaque) } else { env->pstate =3D PSTATE_MODE_EL1h; } + if (cpu_isar_feature(aa64_pauth, cpu)) { + env->cp15.scr_el3 |=3D SCR_API | SCR_APK; + } /* AArch64 kernels never boot in secure mode */ assert(!info->secure_boot); /* This hook is only supported for AArch32 currently: --=20 2.25.1 From nobody Sat Nov 15 15:41:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1595608895; cv=none; d=zohomail.com; s=zohoarc; b=FgdptSP+37JfKDAKUg9mrXEnlQMJTMWAjgkm/QtW7tNk312SL72WOq5L8j+vUDZ808PbkivtMDoM36lHqkqnWGBmHjnqw36HjMIgDZOnDeKtDpbSs0qBarYcKnWc8fSrfBf3jzjYWNz//2PLsLWPS1mn50wYfYV6mJ6P7ZFSVAA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595608895; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lOHdNtnGRgA8GSOMatWc2CH3AkgDKMG7+oF07eCfw/c=; b=JqOzQUGF8hXJmrED8PLez7xYA3L/ExYxb/ZYym7v8IgGKAEkYkhbKidrqBFIG64WqnVsvN3QSpv38RRpB43BN1LxRt28e5sGKRRCV/NxvPCInK24CWXL4tvq4ieaHOhwNQpcZYypI5Xzrrn3wxf4Nk6nF9f7ISBZikkdeI0XJtE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595608895191323.0372946580661; Fri, 24 Jul 2020 09:41:35 -0700 (PDT) Received: from localhost ([::1]:48482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jz0lJ-0004dI-VP for importer@patchew.org; Fri, 24 Jul 2020 12:41:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz0it-0000bb-5H for qemu-devel@nongnu.org; Fri, 24 Jul 2020 12:39:03 -0400 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:38934) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jz0ir-0001UD-IT for qemu-devel@nongnu.org; Fri, 24 Jul 2020 12:39:02 -0400 Received: by mail-pl1-x641.google.com with SMTP id b9so4749920plx.6 for ; Fri, 24 Jul 2020 09:39:00 -0700 (PDT) Received: from localhost.localdomain (216-160-65-90.tukw.qwest.net. [216.160.65.90]) by smtp.gmail.com with ESMTPSA id r191sm7261663pfr.181.2020.07.24.09.38.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 09:38:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lOHdNtnGRgA8GSOMatWc2CH3AkgDKMG7+oF07eCfw/c=; b=jLJPYVYh6hin9xv3K0vjweMbM5AEPCEJEr/o+Z1tvwk/0HuJDhzzRMFrnDnQumwPVG gKUlIPwyALqzN1UGy5o9cwC6aFw5fqF06i6hM/JaKfDcd4mH2azd9AMU2G7fefTurh80 ERcfxMt6BCVz78DCOLhrsuqobfAz2sBmp9kNi9fbrKN9cm8XYHxWz2IN6C724bbbfyat 0xT3YzAZi3AF5Ny2XtkjRKWPaRG6j7DHwd633v5vRfjRUfitba5JAOnP1uSE7qBZPtQA T9R2VDPc/WCr//R6oqkW+/wvbJ9kFVb+F7NFJ/mOBli/qKcYyDZMGkLUL2FVjvAsd/kn hRcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lOHdNtnGRgA8GSOMatWc2CH3AkgDKMG7+oF07eCfw/c=; b=SKXyZyE/z9lLvka4+fTGJ4qI8E44UZomBm7mrNyIYZaM7GDeX9kgq90U2WCMC5gk4M AxyWW5stIc9uLfsDBXPMWL4BhWfmnW19nK2GDqmPMB6zrKh1k23c6tbUufLICspaNEAU 2+YGj4B1joCL6RJ6QMVzKmLI1vtw2MMpBrOLxeAWqmUKEp8MHMysfM+CWwkcG4unoSrs rM97Sinx4Kt5sok5fkx3xMvTJ9h8fR72BMCGrTBxYVdHIrjqOg5uoP8YrWefzrMuL26L 8cA7PIR5VVnxG3L1ypgDVef/K8OacLrveVRH4IQY1/5ybgzCpBPcRpbI+P9otaZHkhwl Cwfw== X-Gm-Message-State: AOAM532HE7s/ESOfFq1NdoF3iHD3/4wV1dY0Jcdm4VlWaTZFIXgh3x4O GmjTF9o0QRdx0IqFDo+YBzJ6UBkurQM= X-Google-Smtp-Source: ABdhPJyNZdOOCHqEGa6agTWPXMiiJCseXHK9+9EC6PoMDDdJMkfVcmvedfTTiBFnblZSfJrT6JNZqA== X-Received: by 2002:a17:902:e904:: with SMTP id k4mr3448584pld.156.1595608738183; Fri, 24 Jul 2020 09:38:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 2/3] hw/arm/boot: Fix MTE for EL3 direct kernel boot Date: Fri, 24 Jul 2020 09:38:52 -0700 Message-Id: <20200724163853.504655-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200724163853.504655-1-richard.henderson@linaro.org> References: <20200724163853.504655-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::641; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x641.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, vincenzo.frascino@arm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" When booting an EL3 cpu with -kernel, we set up EL3 and then drop down to EL2. We need to enable access to v8.5-MemTag tag allocation at EL3 before doing so. Reported-by: Peter Maydell Signed-off-by: Richard Henderson --- hw/arm/boot.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index c44fd3382d..3e9816af80 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -739,6 +739,9 @@ static void do_cpu_reset(void *opaque) if (cpu_isar_feature(aa64_pauth, cpu)) { env->cp15.scr_el3 |=3D SCR_API | SCR_APK; } + if (cpu_isar_feature(aa64_mte, cpu)) { + env->cp15.scr_el3 |=3D SCR_ATA; + } /* AArch64 kernels never boot in secure mode */ assert(!info->secure_boot); /* This hook is only supported for AArch32 currently: --=20 2.25.1 From nobody Sat Nov 15 15:41:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1595608800; cv=none; d=zohomail.com; s=zohoarc; b=ClqRtvsOaxagqslXFWN0/QX9ywginwd+WvmPEVAvvrNhYEtLAnlVtj1qc2mOWbQetsj9SdoDbgRc9bob8zzlO3u5GHcxD8Qo47RRTl0KWwqQ9OFK3QyCzjO4MAHN8RUMrEOCfaRvdnHeNLYAOtIv90fFtvOg2ZMhYkAHhQbO818= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595608800; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GFpd1WzRdKHPdu50aGofJzb2YYZBrwx+q9wbcazemUg=; b=QHXplo0xhf1I2ykKg0p6jubW8co3NAC13HRF/zUplqZz2WJjZwfPYytA7lMz/SV0C86h5S0vZpcxtDwBT0mXxgovrS3OMWN0xKlQtsAJneSl8npmEOpD5hbQu8XPGe9HTbUe8uN9KFBpfNJbnPVpOvXXU5Ei3PpIC+NX2jlhKfo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595608800856415.04388810892453; Fri, 24 Jul 2020 09:40:00 -0700 (PDT) Received: from localhost ([::1]:43202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jz0jn-0002ID-JG for importer@patchew.org; Fri, 24 Jul 2020 12:39:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jz0it-0000c2-BU for qemu-devel@nongnu.org; Fri, 24 Jul 2020 12:39:03 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:42564) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jz0ir-0001UI-IV for qemu-devel@nongnu.org; Fri, 24 Jul 2020 12:39:03 -0400 Received: by mail-pf1-x442.google.com with SMTP id 1so5462319pfn.9 for ; Fri, 24 Jul 2020 09:39:01 -0700 (PDT) Received: from localhost.localdomain (216-160-65-90.tukw.qwest.net. [216.160.65.90]) by smtp.gmail.com with ESMTPSA id r191sm7261663pfr.181.2020.07.24.09.38.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 09:38:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GFpd1WzRdKHPdu50aGofJzb2YYZBrwx+q9wbcazemUg=; b=O3G1OrLbrwLrIWePvOU2kpOAGF9r2a0c9LcWLH1ACJ0irlTLltKiyua/QusVZovhGV O1zWjY+DWvFZDzJs6/5iv9ZZ5w7w2AxL+p2zY2GO5/SDitfCZSDxi1MzJSrSeGadC83x ndem/2OVIeUA/QzvGX0RdD/yUGV3ibFyrcNB/4g/ZwMg5TSZMYPMJnvHRPG5Raj75V2f b0CEFhQfVZqfC6MB1QZIU4Qf5nIfPrYxdnmJXFF5bWa6r4vn2aNfi2e/TDiTSomp7xi1 kZHR9GGwYH6UX7JmZ6rmb3AzsCv3PLWsbGPv9tyYZ6Ux6dqnLrSiRa49C+sv1PP+ZXdL 6X3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GFpd1WzRdKHPdu50aGofJzb2YYZBrwx+q9wbcazemUg=; b=GcjsGDtNygYLvEGVYR8Gcoqg6ftTvlulN23BRHLeJIEpPBPl/5z8VB9Y4E+VAadzaU 2CP+bd+s6DuC4L5M1nbaKSG71VCgj+3CWp+v0nw4LPLgmzkgvQy7SgPUx8W70ydNUtKE C/zdsXzjydL9BN+tbYDEGPAxogNgsTvPy608vyVdKuKF4KqanK3KuSquSnaMeQLxBQAu +3lXmpruY30cirkPz2BZiLiCMiQS9ZYnwad1jfwH33FCycvVbUT39VFBXHPMxg6sPXAa 6RtfCmFVz/VHmdP8Xs8LQJ4cinfujTbU5s4cIa8p+Ekz5hcCqr49//8vLFHsWnvx5eVx f19g== X-Gm-Message-State: AOAM532meWS7oB6LwK2DbM9s1zGQRZD4ecWAZXjEw5364gTf3hgZmVSe c8M859Eo+HTr9tHSF3nSrzKYs9YBMoc= X-Google-Smtp-Source: ABdhPJxA+PvF2ZfbD0Upm1HIXxpoyILYwd6GnvCqIwXbYOikU+NdgWCFPHhgMrOdjiWlYsb7/3umIw== X-Received: by 2002:a65:620f:: with SMTP id d15mr9034163pgv.270.1595608739240; Fri, 24 Jul 2020 09:38:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 3/3] target/arm: Improve IMPDEF algorithm for IRG Date: Fri, 24 Jul 2020 09:38:53 -0700 Message-Id: <20200724163853.504655-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200724163853.504655-1-richard.henderson@linaro.org> References: <20200724163853.504655-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::442; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, vincenzo.frascino@arm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" When GCR_EL1.RRND=3D=3D1, the choosing of the random value is IMPDEF, and the kernel is not expected to have set RGSR_EL1. Force a non-zero value into SEED, so that we do not continually return the same tag. Reported-by: Vincenzo Frascino Signed-off-by: Richard Henderson --- target/arm/mte_helper.c | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/target/arm/mte_helper.c b/target/arm/mte_helper.c index 5ea57d487a..104752041f 100644 --- a/target/arm/mte_helper.c +++ b/target/arm/mte_helper.c @@ -24,6 +24,8 @@ #include "exec/ram_addr.h" #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" +#include "qapi/error.h" +#include "qemu/guest-random.h" =20 =20 static int choose_nonexcluded_tag(int tag, int offset, uint16_t exclude) @@ -211,16 +213,37 @@ static uint8_t *allocation_tag_mem(CPUARMState *env, = int ptr_mmu_idx, =20 uint64_t HELPER(irg)(CPUARMState *env, uint64_t rn, uint64_t rm) { - int rtag; - - /* - * Our IMPDEF choice for GCR_EL1.RRND=3D=3D1 is to behave as if - * GCR_EL1.RRND=3D=3D0, always producing deterministic results. - */ uint16_t exclude =3D extract32(rm | env->cp15.gcr_el1, 0, 16); + int rrnd =3D extract32(env->cp15.gcr_el1, 16, 1); int start =3D extract32(env->cp15.rgsr_el1, 0, 4); int seed =3D extract32(env->cp15.rgsr_el1, 8, 16); - int offset, i; + int offset, i, rtag; + + /* + * Our IMPDEF choice for GCR_EL1.RRND=3D=3D1 is to continue to use the + * deterministic algorithm. Except that with RRND=3D=3D1 the kernel is + * not required to have set RGSR_EL1.SEED !=3D 0, which is required for + * the deterministic algorithm to function. So we force a non-zero + * SEED for that case. + */ + if (unlikely(seed =3D=3D 0) && rrnd) { + do { + Error *err =3D NULL; + uint16_t two; + + if (qemu_guest_getrandom(&two, sizeof(two), &err) < 0) { + /* + * Failed, for unknown reasons in the crypto subsystem. + * Best we can do is log the reason and use a constant see= d. + */ + qemu_log_mask(LOG_UNIMP, "IRG: Crypto failure: %s\n", + error_get_pretty(err)); + error_free(err); + two =3D 1; + } + seed =3D two; + } while (seed =3D=3D 0); + } =20 /* RandomTag */ for (i =3D offset =3D 0; i < 4; ++i) { --=20 2.25.1