From nobody Tue Feb 10 12:13:50 2026 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=1629319051; cv=none; d=zohomail.com; s=zohoarc; b=geQnBGX9ZNQg+vpoLw+/IsR2NUrgSIOa04xchspUoEF2o2XvZP0ourHWiKvpeOIt5rm+vl1rnbZsnNcrnrh5qmLyA8zGBu+x7dMX8JBsnkII5ijhthODf1ti/aEBbzOxCvvBS8QyEkSu3j5jqQwVKMxvQ8bXGnglE4g+otaWK44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629319051; h=Content-Transfer-Encoding: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=dLKp0mDnjjRjPauDQA0yKsYIxkun+14IJ8e0NroxfP0=; b=c0j1q8I5xEeOm9KE40MYzaoYE3w4EhD63N0NhXiN/6bgTa1vFUGOReOnkjbZZ35VEBC6YG7lsviKajHG8yxjphm4BGI8R5HqONsjnhHET8qUhDmG2bnWV/GQ3S0fDKtUugcMkYlqw216fAy5j21GGCJ6Tz+dgJGFxbeNj2B0Iqk= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162931905171126.53406458963832; Wed, 18 Aug 2021 13:37:31 -0700 (PDT) Received: from localhost ([::1]:59878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mGSJW-0008Hq-Ni for importer@patchew.org; Wed, 18 Aug 2021 16:37:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mGS2N-00088T-CV for qemu-devel@nongnu.org; Wed, 18 Aug 2021 16:19:47 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:38466) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mGS2K-0006Eg-AE for qemu-devel@nongnu.org; Wed, 18 Aug 2021 16:19:47 -0400 Received: by mail-pf1-x436.google.com with SMTP id a21so3338394pfh.5 for ; Wed, 18 Aug 2021 13:19:43 -0700 (PDT) Received: from localhost.localdomain ([173.197.107.15]) by smtp.gmail.com with ESMTPSA id x13sm619621pjh.30.2021.08.18.13.19.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Aug 2021 13:19:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=dLKp0mDnjjRjPauDQA0yKsYIxkun+14IJ8e0NroxfP0=; b=GjB/NbVw8c/qldv19W4yn+SplSDazvAR4v+6xK6LORpPnHxueKRFeb4MYOfCrUQAlt ftIfq60avd7E3zDS19MIKBE1WK0G9OVrzWGz9ShkKh9bwOIFqnRqZzubipDSqPRTd5kH u/ETyGYNafabrcbxqnOiE4fxri7VnlZChK9mI9VVR2Bb8qKn7QtLT5iG6By6yUtSx2hl RJssyFuiV5BJfP4P0xaf4BSjd5HGKSGozu9P5S486sf8oDWyhRZVMUN2sAgBbqPKxbrU B1QFKYiEoZuo1AYiPT1Xg+uESjQFQ4FryjSASwYwj3eqoNMBtH0k9VYpnnwdyJ5+whZL BK7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dLKp0mDnjjRjPauDQA0yKsYIxkun+14IJ8e0NroxfP0=; b=h7+osDcfeT89N7aGujNdwl37MFBGWA+t0Uq83QbKdDuXE0YA0pBPKah6ljO5OJhzMj wcluKczbDD07/a33lboOJFMp97Zir6P74KCEwTJrjUutocP6ygDMbkb99MwNs4N4exBZ kooiljQMSda6kafD95YxOVUj9Lfsg/XGlFKwHQcmQM7QyX7pHvrJ6tbS1gxbIClfMP/4 33iP6KUiZtOaRrrDxykqQASIr4fsTmvnEQKqTuWp8WX76lNSrHvJ8BFDwJGcECAZW/+v NAqQYvnvf547OO/bRguTi9WYlXYPcCdm4zAqwekeez7yIQci5MBZlQn6V0GT3Jrwoctn VmRg== X-Gm-Message-State: AOAM532GldZmr+Lr/9I6JDtkxkjQoanDKIaiCIAZDxz1mjhCCXZ+fxXs uqXXIG4bMXeJ71IPfBdeieM9GMDG1CrAxQ== X-Google-Smtp-Source: ABdhPJzBIZdcYlRlmaXu33vv/LYxJSiiHIiuhBWh0FcDCQl88m5rqZWo2uUuQmn4kKJRBJXjf8oT+w== X-Received: by 2002:a63:fd54:: with SMTP id m20mr10564431pgj.104.1629317983053; Wed, 18 Aug 2021 13:19:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 09/16] tcg/mips: Drop special alignment for code_gen_buffer Date: Wed, 18 Aug 2021 10:19:24 -1000 Message-Id: <20210818201931.393394-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210818201931.393394-1-richard.henderson@linaro.org> References: <20210818201931.393394-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::436; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x436.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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1629319052685100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tcg/region.c | 91 ---------------------------------------------------- 1 file changed, 91 deletions(-) diff --git a/tcg/region.c b/tcg/region.c index e64c3ea230..9cc30d4922 100644 --- a/tcg/region.c +++ b/tcg/region.c @@ -467,38 +467,6 @@ static size_t tcg_n_regions(size_t tb_size, unsigned m= ax_cpus) (DEFAULT_CODE_GEN_BUFFER_SIZE_1 < MAX_CODE_GEN_BUFFER_SIZE \ ? DEFAULT_CODE_GEN_BUFFER_SIZE_1 : MAX_CODE_GEN_BUFFER_SIZE) =20 -#ifdef __mips__ -/* - * In order to use J and JAL within the code_gen_buffer, we require - * that the buffer not cross a 256MB boundary. - */ -static inline bool cross_256mb(void *addr, size_t size) -{ - return ((uintptr_t)addr ^ ((uintptr_t)addr + size)) & ~0x0ffffffful; -} - -/* - * We weren't able to allocate a buffer without crossing that boundary, - * so make do with the larger portion of the buffer that doesn't cross. - * Returns the new base and size of the buffer in *obuf and *osize. - */ -static inline void split_cross_256mb(void **obuf, size_t *osize, - void *buf1, size_t size1) -{ - void *buf2 =3D (void *)(((uintptr_t)buf1 + size1) & ~0x0ffffffful); - size_t size2 =3D buf1 + size1 - buf2; - - size1 =3D buf2 - buf1; - if (size1 < size2) { - size1 =3D size2; - buf1 =3D buf2; - } - - *obuf =3D buf1; - *osize =3D size1; -} -#endif - #ifdef USE_STATIC_CODE_GEN_BUFFER static uint8_t static_code_gen_buffer[DEFAULT_CODE_GEN_BUFFER_SIZE] __attribute__((aligned(CODE_GEN_ALIGN))); @@ -526,12 +494,6 @@ static int alloc_code_gen_buffer(size_t tb_size, int s= plitwx, Error **errp) size =3D QEMU_ALIGN_DOWN(tb_size, qemu_real_host_page_size); } =20 -#ifdef __mips__ - if (cross_256mb(buf, size)) { - split_cross_256mb(&buf, &size, buf, size); - } -#endif - region.start_aligned =3D buf; region.total_size =3D size; =20 @@ -573,39 +535,6 @@ static int alloc_code_gen_buffer_anon(size_t size, int= prot, return -1; } =20 -#ifdef __mips__ - if (cross_256mb(buf, size)) { - /* - * Try again, with the original still mapped, to avoid re-acquiring - * the same 256mb crossing. - */ - size_t size2; - void *buf2 =3D mmap(NULL, size, prot, flags, -1, 0); - switch ((int)(buf2 !=3D MAP_FAILED)) { - case 1: - if (!cross_256mb(buf2, size)) { - /* Success! Use the new buffer. */ - munmap(buf, size); - break; - } - /* Failure. Work with what we had. */ - munmap(buf2, size); - /* fallthru */ - default: - /* Split the original buffer. Free the smaller half. */ - split_cross_256mb(&buf2, &size2, buf, size); - if (buf =3D=3D buf2) { - munmap(buf + size2, size - size2); - } else { - munmap(buf, size - size2); - } - size =3D size2; - break; - } - buf =3D buf2; - } -#endif - region.start_aligned =3D buf; region.total_size =3D size; return prot; @@ -620,35 +549,15 @@ static bool alloc_code_gen_buffer_splitwx_memfd(size_= t size, Error **errp) void *buf_rw =3D NULL, *buf_rx =3D MAP_FAILED; int fd =3D -1; =20 -#ifdef __mips__ - /* Find space for the RX mapping, vs the 256MiB regions. */ - if (alloc_code_gen_buffer_anon(size, PROT_NONE, - MAP_PRIVATE | MAP_ANONYMOUS | - MAP_NORESERVE, errp) < 0) { - return false; - } - /* The size of the mapping may have been adjusted. */ - buf_rx =3D region.start_aligned; - size =3D region.total_size; -#endif - buf_rw =3D qemu_memfd_alloc("tcg-jit", size, 0, &fd, errp); if (buf_rw =3D=3D NULL) { goto fail; } =20 -#ifdef __mips__ - void *tmp =3D mmap(buf_rx, size, PROT_READ | PROT_EXEC, - MAP_SHARED | MAP_FIXED, fd, 0); - if (tmp !=3D buf_rx) { - goto fail_rx; - } -#else buf_rx =3D mmap(NULL, size, PROT_READ | PROT_EXEC, MAP_SHARED, fd, 0); if (buf_rx =3D=3D MAP_FAILED) { goto fail_rx; } -#endif =20 close(fd); region.start_aligned =3D buf_rw; --=20 2.25.1