From nobody Sat May 4 21:27:40 2024 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=1616259552; cv=none; d=zohomail.com; s=zohoarc; b=bqlSPm8DeDVzzpLioevfqONf1ur9V69wISrbkqcZmv/yLeA08+GBPHriAbUcoawKYNyPMyU79BJjRRGTqUHgGo8IXWtFeJ1bVcNSdsj5DObrnomYTyqxE87Zz5J6Ak/QwyEl2AwEZoZDXXnbC3Yu9zPT5sd+FKAJW12W9kaXhNA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616259552; 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=xTmOGRmWlxYDLMPIzZzQo2atHTryh01K+coHON9Ait0=; b=c4ebdsVHhLLANCNj3oCaxcS4rnNNLHusMcIWLxry0eKlz5bK9g6knQlVMhFiSab2Q5iHbVqUQkXY9+vtKvWPYDHjaSLteTTeJdWkOTmj47wjZAT3G/xCH2bm83XYmhxp17XXtN+FF3AWFkib8gGj/Eqck+6r/lhApKiOjmkRf6Q= 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 1616259552744491.5278622922997; Sat, 20 Mar 2021 09:59:12 -0700 (PDT) Received: from localhost ([::1]:45616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lNewR-0005Rp-N2 for importer@patchew.org; Sat, 20 Mar 2021 12:59:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58540) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNeus-0004YZ-8t for qemu-devel@nongnu.org; Sat, 20 Mar 2021 12:57:34 -0400 Received: from mail-oo1-xc2b.google.com ([2607:f8b0:4864:20::c2b]:45751) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lNeuj-00038s-4P for qemu-devel@nongnu.org; Sat, 20 Mar 2021 12:57:34 -0400 Received: by mail-oo1-xc2b.google.com with SMTP id n6-20020a4ac7060000b02901b50acc169fso3087178ooq.12 for ; Sat, 20 Mar 2021 09:57:24 -0700 (PDT) Received: from localhost.localdomain (fixed-187-189-51-144.totalplay.net. [187.189.51.144]) by smtp.gmail.com with ESMTPSA id i11sm1953966otp.76.2021.03.20.09.57.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Mar 2021 09:57:23 -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=xTmOGRmWlxYDLMPIzZzQo2atHTryh01K+coHON9Ait0=; b=p17mT/JwiiBbDmTLFuCxcRx6+DppibSMH/kOyFetgk29YQLVRqi+JhGtFCdPDTI5HH TKixMXZryXlv2y4tjZip18H5fbHCor7F+beAWI7joew1dddMGFRA2SLPmnfiSUod9WsO tk5zyspMqETkW8MYOFFzqd2yJgHSIILyhOIjyyMNzdqAk5UK+pM+ggTWRqwmmyPBxb/E BCqJtJcExnqkIzdBj/AQGSKr4htwlU0K8LwTSntWGnGWn0AvowEhkIsr3cyQSlJ7i/BK bzNQmLRM+raHmwB72PHQK/MY9HoUZ/AZUaFEEavaWV5WShJDSOzuAop+jq4YnKjkJu1e T1Ug== 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=xTmOGRmWlxYDLMPIzZzQo2atHTryh01K+coHON9Ait0=; b=aJ8jgZwpf8gO87DBv09UIjaM+wudKumpi4rmhE/fcZuOrLJOyca33bCGnnPaM3W7C5 mT3u20BFZ/FBRVCFCamedEqkh6NizzTAzaP/cGClVukWH+dsDEXbGGWJSXdqCmNne6cj WRoT4Fq2eP4sjAIdrjEMbz6szWkWbrr43wZTy9AMpineaRAY6kuBzu1t2g8ET/q1ML1X WCVWPLgUGpPdysP9mz4otXPXrewQ18mHRPWo4az8gkw3CB8SLSVJXv8MobADRdWt5nQi 9rxqeX3nStYYggpMHFm40eR+GR0Qj/jhogW0CPCcYcZiNmQN5/Npzpub43fyie1gXjbp hkYQ== X-Gm-Message-State: AOAM5308vM+7q8MCwEW/oc4VZ8SSLrJFHGGPmfpI3afHzkNR0nBu7smV DWXFhdnuvIXcHlQLFnf6oxPS+Ay5mr5LfXsQ X-Google-Smtp-Source: ABdhPJycV83pswRhrDwPhxLstsg9830ybCvOCYtGoTXnqz97p5yqlWbSsRsjFOM3dSgn3KDHlVf8PQ== X-Received: by 2002:a4a:d1da:: with SMTP id a26mr5771791oos.58.1616259443974; Sat, 20 Mar 2021 09:57:23 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 for-6.0 1/2] tcg: Do not set guard pages on the rx portion of code_gen_buffer Date: Sat, 20 Mar 2021 10:57:19 -0600 Message-Id: <20210320165720.1813545-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210320165720.1813545-1-richard.henderson@linaro.org> References: <20210320165720.1813545-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::c2b; envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc2b.google.com 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: r.bolshakov@yadro.com, j@getutm.app 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" The rw portion of the buffer is the only one in which overruns can be generated. Allow the rx portion to be more completely covered by huge pages. Signed-off-by: Richard Henderson Reviewed-by: Roman Bolshakov Tested-by: Roman Bolshakov --- tcg/tcg.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index de91bb6e9e..88c9e6f8a4 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -828,7 +828,6 @@ void tcg_region_init(void) size_t region_size; size_t n_regions; size_t i; - uintptr_t splitwx_diff; =20 n_regions =3D tcg_n_regions(); =20 @@ -858,8 +857,11 @@ void tcg_region_init(void) /* account for that last guard page */ region.end -=3D page_size; =20 - /* set guard pages */ - splitwx_diff =3D tcg_splitwx_diff; + /* + * Set guard pages in the rw buffer, as that's the one into which + * buffer overruns could occur. Do not set guard pages in the rx + * buffer -- let that one use hugepages throughout. + */ for (i =3D 0; i < region.n; i++) { void *start, *end; int rc; @@ -867,10 +869,6 @@ void tcg_region_init(void) tcg_region_bounds(i, &start, &end); rc =3D qemu_mprotect_none(end, page_size); g_assert(!rc); - if (splitwx_diff) { - rc =3D qemu_mprotect_none(end + splitwx_diff, page_size); - g_assert(!rc); - } } =20 tcg_region_trees_init(); --=20 2.25.1 From nobody Sat May 4 21:27:40 2024 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=1616259718; cv=none; d=zohomail.com; s=zohoarc; b=UoTnogdvGLny7CS5baPTIVDFipuZu+W/ZVEQUP9ibMhe6JdFKKTi9jC4xntu3S8J/OJ04ep3LbYEHdcH6KFSwUMx3DkFXGjd+octKFDstRnFA04JQzrrwlGXzZJX+A1sDJXTqwTL7Gp6OI40asL4Q2598WfUvSvTPPGSBjPI3sw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616259718; 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=0jLCRbOfP8b7p8Z2vRhheskl97O3VX3ZegE0fpM6SkE=; b=URW1rCL+DI4Wlq4zubPHtTWeTkaAfK/yfRG7NeaMxol8MnuR8rtTEgS7OhBmW4dRIdBokyQsAE6uH3aNIG68TsdcNL9v8eajKTI0jgu3N53MwzSamtvhgHVF60kpKjsdh7cqdl65KxKAidVT1oQaGsl5MaBXjmlcs2kePQGrFWc= 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 1616259718720428.5886514418636; Sat, 20 Mar 2021 10:01:58 -0700 (PDT) Received: from localhost ([::1]:49086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lNez7-0006yT-Gl for importer@patchew.org; Sat, 20 Mar 2021 13:01:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58550) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNeut-0004Z6-Qp for qemu-devel@nongnu.org; Sat, 20 Mar 2021 12:57:36 -0400 Received: from mail-oo1-xc30.google.com ([2607:f8b0:4864:20::c30]:44918) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lNeuk-000390-DN for qemu-devel@nongnu.org; Sat, 20 Mar 2021 12:57:35 -0400 Received: by mail-oo1-xc30.google.com with SMTP id p2-20020a4aa8420000b02901bc7a7148c4so3090920oom.11 for ; Sat, 20 Mar 2021 09:57:25 -0700 (PDT) Received: from localhost.localdomain (fixed-187-189-51-144.totalplay.net. [187.189.51.144]) by smtp.gmail.com with ESMTPSA id i11sm1953966otp.76.2021.03.20.09.57.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Mar 2021 09:57:24 -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=0jLCRbOfP8b7p8Z2vRhheskl97O3VX3ZegE0fpM6SkE=; b=auXJFJlCl5tHNojb9R7EmjqhQFElUU8z3T6ZlJc072yLEzk5v26fssPBkeJVOOdUSP Dz7z5t2FYq/H/vVAaCr28SnWo7kUfyjeH+KmsSCCzZpp9g6xKObF31v4REJvPLpwxbIz hQbiwNXegyBNurvlsAvHTbsJmbTYglE4ujgHCx3XwEqKopXX8IEpmubaLabVIok6sUw5 7rvuLIqUUqxE7hxwEG8HEo4JgbSqXZrscQ0bdLcYAW2aBteptJ3tc4BsuCMhASnAnn/R ekq7eWpBh9TBDMjgic2lf1A9NjeSwJFqqfjluyRw4MNySGESwYlqsYHymi754q6ax310 sGqA== 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=0jLCRbOfP8b7p8Z2vRhheskl97O3VX3ZegE0fpM6SkE=; b=G2vsiOGWvI+S0Qs+O0EYEErbxKUCuedelnJY/kDw9Ig7KRpBWbcfxD9ytLBYc4yw5W AQmbnks4zxSKsAWJTzBzgZmCc+4YBM7YI4e1GAY8jDEtD/ijHwJ10/K23t+GVRxZLCbg UmqwpZU3NIGNTM6IWCxIGct7OaoOiR6XDdbUQaiXMtOUPpYMk5QB6Ftx0ZRbaU9/i07s wTM2gL7nZT84S/3+O8jN/9VXf6OkeI4wMyx1lAMxjq+PKIDA68snkGxtCbIdi8pbvLtC m0yTizFbNeqEAmbGmVE7z0hA7jqS3qx5Ad0SQ4POSGSmvvnnGBlujn9affOJ9yrizxz+ CmRA== X-Gm-Message-State: AOAM530Ja+D9lPim4YoVBOPRiAMqOU2c+gTl7Jwff//PhfiK9NoR+l3j nHwaNWzU3ycHf15sz4684QepcEBNE6SkB0qZ X-Google-Smtp-Source: ABdhPJzU6kLdeLQQfpsDAcLNQQ4HiSMr6+D5u6YHY7L6mG2JQa5PzbaMIx/twD0L60ahBHBe4xCf7A== X-Received: by 2002:a4a:d0ce:: with SMTP id u14mr5689275oor.36.1616259445025; Sat, 20 Mar 2021 09:57:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 for-6.0 2/2] tcg: Workaround macOS 11.2 mprotect bug Date: Sat, 20 Mar 2021 10:57:20 -0600 Message-Id: <20210320165720.1813545-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210320165720.1813545-1-richard.henderson@linaro.org> References: <20210320165720.1813545-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::c30; envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc30.google.com 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: r.bolshakov@yadro.com, j@getutm.app 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" There's a change in mprotect() behaviour [1] in the latest macOS on M1 and it's not yet clear if it's going to be fixed by Apple. As a short-term fix, ignore failures setting up the guard pages. [1] https://gist.github.com/hikalium/75ae822466ee4da13cbbe486498a191f Buglink: https://bugs.launchpad.net/qemu/+bug/1914849 Signed-off-by: Richard Henderson Reviewed-by: Roman Bolshakov Tested-by: Roman Bolshakov --- tcg/tcg.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index 88c9e6f8a4..1fbe0b686d 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -864,11 +864,15 @@ void tcg_region_init(void) */ for (i =3D 0; i < region.n; i++) { void *start, *end; - int rc; =20 tcg_region_bounds(i, &start, &end); - rc =3D qemu_mprotect_none(end, page_size); - g_assert(!rc); + + /* + * macOS 11.2 has a bug (Apple Feedback FB8994773) in which mprote= ct + * rejects a permission change from RWX -> NONE. Guard pages are + * nice for bug detection but are not essential; ignore any failur= e. + */ + (void)qemu_mprotect_none(end, page_size); } =20 tcg_region_trees_init(); --=20 2.25.1