From patchwork Thu Apr 24 00:48:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883858 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp3205241wrs; Wed, 23 Apr 2025 18:14:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVaHh1NpXSRyrILhPJhbm4ZNmnTtlCDfcXCP4DYOajmc7oUnkArMy2vjk96A56146ThcJSVuA==@linaro.org X-Google-Smtp-Source: AGHT+IEf1Z5hWqzqScE6STqPHLvQDq05rkH8vmQCXTsS2iob89zgJCxGNO47TkcrzTPRuGNS6ftA X-Received: by 2002:a05:622a:1495:b0:477:6bf4:4f5d with SMTP id d75a77b69052e-47eb2791c61mr7697821cf.7.1745457283231; Wed, 23 Apr 2025 18:14:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745457283; cv=none; d=google.com; s=arc-20240605; b=Lq5XdDxv+nRd8MdRGQbKtqKrIfs7m1w8UEpA1P1LWiKY9GTwhWDkFpTgdZVhCKamTA mTmezBOwp0ag7cNr9XzE99u7usPJxV2raa3I453J2lTmxrD7axvqrAVmjHb/H0OEzfEc 7tytgP+pIw2PqqKutr2+PAZU9ibbMj2sPvRPobjX+cdi/gE9H3hbijIuvM0TA59XUn03 pTn+u+I2xznwUAjrMK204uLzxhhhYhnPUTj1qrarfUy0DlN8ELCP0CO4ppHG440mA805 TqDVUErC/AbGA7qg4cPXitBxkQzj5u5Bq662UjptS04xraPmvYVG9S316HS5v3mpLvch 0zpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FNsYq0CLsO6lFu+oOVVyImJDoiCdKLFU/pHo4cHTdc0=; fh=vm85eyWrvOAHduw3sqEA+cYBqvHB7M0MHFcRJg7VWOo=; b=VnvLPbvx59RlKesKMj1UTMMM2IRIxHAxP0oVBXT1ZfQ3n0ESNnaMS26zs+fvHvwjNW Eqq6G+w5L2VcaMScTbpIZpMAPd1u8gjXfMclNURb4J4SZ7RvcTD+d2SiNGU3UoyHDRpX HXxSRsPMMVAaWFQcelUtaEkzJ75yuzcMiMZbbk0izSi9dvE7Hw+uuouYSnP8KiJxCiP2 b/C2lHWVy2JPi4iZVAA2v7FPy1DNJo5eAufuHm+py4lcri/hE6U7/dcDZ4Ipy9XKUmPv JUM3IxaZrO2lqRJdRgC9U4ZSYme/Lk8w1zThwvQwIdcGwDie9pVbKbgjuSwo9bXjFmru fc+A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="s/haL0KP"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47ea198757asi5131871cf.253.2025.04.23.18.14.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 23 Apr 2025 18:14:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="s/haL0KP"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7kra-00053q-Qy; Wed, 23 Apr 2025 20:54:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7kqX-00015f-Mx for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:53:46 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7kqG-0004kE-M7 for qemu-devel@nongnu.org; Wed, 23 Apr 2025 20:53:30 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-736aaeed234so340041b3a.0 for ; Wed, 23 Apr 2025 17:53:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745456007; x=1746060807; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FNsYq0CLsO6lFu+oOVVyImJDoiCdKLFU/pHo4cHTdc0=; b=s/haL0KPcA6LsOe6TjsLJ9UKkGXCC6kTHIiGigpk5E8/1r3KfZJQawYmoxC0+edGvt o4B98tqGhauEGbRsAI75QXb02xcWiCasotJRGHbgxHFLOBMksJbKwTjEBluc0E5wfIWN AtjpYu7s+a6W12bVwbmJ84J9b02fXRBF2S7lCgRrRlxE9sxv1QHCaeBO/nCt8dKv3+2g tFwLtlzgtnqANrGcsM5/e2JhrKGJJwz1DmMigYXlGBP6D+6o4p8J1Ll7eWG7d7ryaA+N b1fdsFFp5TZigPE4SSGYTza3m4+PfyFYNUzEEBlvb3oJ2t65gaXRnTXbXSRP3o4irDpk yfnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745456007; x=1746060807; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FNsYq0CLsO6lFu+oOVVyImJDoiCdKLFU/pHo4cHTdc0=; b=tYpuZEKlQvxluDSAlOCuL44XezL1b+2kP+bwWf9QL5rSjH1Xv2fDsO/ceS+KYZBcMP IEplPnkGQEnROgBagjq9V3FLvJpWuM5MgEGLVJoy2wJPdHmcRKtGEXAR3XD23V/TMCkg d7rNWstb3fsvuUNiVO8v/uZtUT3mRiQ3DaTUshyPkfhkP2zzDHg/0snC2jQfVZ0kwtFo 0aw+0jsg4/7vCEvuKfc18ssHAi4dZeSpbySj+e2Hjcmiihotn5SQUYTDMf6t+udHLQj7 SE/hg95G50D1rFeHvd4Y9IGMbXAFdh/14vgFXv4DfEX+06pD5HhwokMGJwtNVeI1a/mk yfTw== X-Gm-Message-State: AOJu0YypgxYtSrF3AsbYoh3rLNrnxBAIoAfhS5htj4hKz9qmFo1YrNer t2F7KaQ2SGMiPKoUcidjl8jIWdvuAra96OBOFMq1PWPzQSsYW38ddHs9Vtq1TukB+y+vs4hLC5M S X-Gm-Gg: ASbGnctuG1LaucNgtGCFrPWaFP74wlgsC2aRTGaBuxw79w/+QTQ5vigDIIut8O3MgTx EgGQ9ZJTDNfgTtOCpWEhD4xJjV29H8NAXRsSAcKGelM1jHLa52n07o9rjv6gwI0VhuXF85CIRZa hgVmVm3AIoiqT+9f1jBpkb+B8ddkSbpL5f+7Cvta8mNroYHNxRtMV49ppCzZg9ejEOdkCHbWH4h 0xjLO19qpDU0dqre0PyJ9N2ZaYGu7dwT5ikaa/Aql7HKHZYrOkIf3Zn+NQh9EcG/xjMvZhbK9/g WoLd5jlpbCCNbMf+mI/4LpPxkIHLSgZTKqFxh8o1XAzaCY6y39uDQEnAtU8Ex3o6R6r4zFQsvHs = X-Received: by 2002:a05:6a20:6f89:b0:1f5:86ce:126a with SMTP id adf61e73a8af0-20444fdbf4dmr926372637.40.1745456007089; Wed, 23 Apr 2025 17:53:27 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25a6a971sm209353b3a.103.2025.04.23.17.53.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 17:53:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PULL 069/148] accel/tcg: Remove page_protect Date: Wed, 23 Apr 2025 17:48:14 -0700 Message-ID: <20250424004934.598783-70-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250424004934.598783-1-richard.henderson@linaro.org> References: <20250424004934.598783-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x430.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Merge the user-only page_protect function with the user-only implementation of tb_lock_page0. This avoids pulling page-protection.h into tb-internal.h. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- accel/tcg/tb-internal.h | 11 +++-------- include/user/page-protection.h | 1 - accel/tcg/user-exec.c | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/accel/tcg/tb-internal.h b/accel/tcg/tb-internal.h index 68aa8d17f4..f7c2073e29 100644 --- a/accel/tcg/tb-internal.h +++ b/accel/tcg/tb-internal.h @@ -51,28 +51,23 @@ #endif /* CONFIG_SOFTMMU */ +void tb_lock_page0(tb_page_addr_t); + #ifdef CONFIG_USER_ONLY -#include "user/page-protection.h" /* * For user-only, page_protect sets the page read-only. * Since most execution is already on read-only pages, and we'd need to * account for other TBs on the same page, defer undoing any page protection * until we receive the write fault. */ -static inline void tb_lock_page0(tb_page_addr_t p0) -{ - page_protect(p0); -} - static inline void tb_lock_page1(tb_page_addr_t p0, tb_page_addr_t p1) { - page_protect(p1); + tb_lock_page0(p1); } static inline void tb_unlock_page1(tb_page_addr_t p0, tb_page_addr_t p1) { } static inline void tb_unlock_pages(TranslationBlock *tb) { } #else -void tb_lock_page0(tb_page_addr_t); void tb_lock_page1(tb_page_addr_t, tb_page_addr_t); void tb_unlock_page1(tb_page_addr_t, tb_page_addr_t); void tb_unlock_pages(TranslationBlock *); diff --git a/include/user/page-protection.h b/include/user/page-protection.h index 51daa18648..d5c8748d49 100644 --- a/include/user/page-protection.h +++ b/include/user/page-protection.h @@ -16,7 +16,6 @@ #include "exec/target_long.h" #include "exec/translation-block.h" -void page_protect(tb_page_addr_t page_addr); int page_unprotect(tb_page_addr_t address, uintptr_t pc); int page_get_flags(target_ulong address); diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 667c5e0354..72a9809c2d 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -657,7 +657,7 @@ target_ulong page_find_range_empty(target_ulong min, target_ulong max, } } -void page_protect(tb_page_addr_t address) +void tb_lock_page0(tb_page_addr_t address) { PageFlagsNode *p; target_ulong start, last;