From patchwork Wed May 15 15:08:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 796975 Delivered-To: patch@linaro.org Received: by 2002:a5d:452e:0:b0:34e:ceec:bfcd with SMTP id j14csp3033686wra; Wed, 15 May 2024 08:11:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXnr+bnf+e8Aj8tGmHJFoEEUvtMPdtuzvL1r343q5JKjVE+jrTkpzpUETMNcsVDTZEXVt50SF3yq2XvgXDSf596 X-Google-Smtp-Source: AGHT+IEO0qJtQKQ5wm5P6NvB5fPDoVoZTem5SZReef2nTcrl3ic7X4KF+3GprLWiEOUpSYRrbE1M X-Received: by 2002:a05:6214:5502:b0:6a0:cc01:5c7b with SMTP id 6a1803df08f44-6a16815fe8amr176396756d6.24.1715785910325; Wed, 15 May 2024 08:11:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715785910; cv=none; d=google.com; s=arc-20160816; b=QrW37NUvilUafZO/6P0Y+y8vV2BvkOz1XwF5IPFLrx0ShYcDhz4I0Xdxk3+3OasfXH a3qQg2x/hFxzoE4aTKlUThxwbVYjlaZTR0wR+PawU9wJOsqJ4LbmIMrXyG+1g5A8EiFh msJpbmuwj2G5Ep3MpS8B9mIFb6YKF6sOaqUZMkOoIZPeDwN5xdr/YWuN0KyG/JtKkjxV QljKsIAB6gVwLt/XMoR+OGqPerP89XepRD++MCZEEOcCByicEvy+J36NQl6HBO3+btv5 K9kyUPLHRiBwH8MoTv1zOf5LzwHcI5/QW1mfITHMNCAUp02Hz/N4zvsRM6erzcCTU1+2 Dqow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=Ah4RAfb74Ry/QSCvgzicI92Xf6jvMyFD3fqYCPKUsdU=; fh=X011yTyqhApvEaDulZV+xVgKKBTjUS9dtQWFbmf3LLM=; b=0myyVrpJtiFpexx5STzxhvm1gEzrCqBL9dXDKgVyF/IPPR6d1/7nzyGqJ9sPw61C1X 6t0dykHQ+0ynUNtv7sMDyXDTgzm5LG3fSAnJPCFpRTInUtnPe3DJ+GQl9cIHm62HtjEW q7G37/ODFbrqktO07M6iEI/AsvlNVukf1XAbQiBYZtLG/onir4ycOlZk+/Af+A+F3k3a DqSeUEs006vpThSMRg2oa8nuM6v+yLfXP7uVkThKrZqLjhmn3OZGRFRA1CGOId/MezPB ysC8Ry35ady78QLl0ia4iS1V7863W+g1qEpNFYK7HyADoIGGN/nuAz4jxUOcwQ3fbL/D fUQQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iQBgzp6k; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6a15f2f6ba5si135742276d6.527.2024.05.15.08.11.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 May 2024 08:11:50 -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=fail header.i=@linaro.org header.s=google header.b=iQBgzp6k; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s7GFj-00040v-P8; Wed, 15 May 2024 11:09:11 -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 1s7GFe-0003y5-1n for qemu-devel@nongnu.org; Wed, 15 May 2024 11:09:06 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s7GFa-0003FH-VN for qemu-devel@nongnu.org; Wed, 15 May 2024 11:09:05 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-42011507a54so25965105e9.0 for ; Wed, 15 May 2024 08:09:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1715785741; x=1716390541; 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=Ah4RAfb74Ry/QSCvgzicI92Xf6jvMyFD3fqYCPKUsdU=; b=iQBgzp6kEUFiPWy4dO+UHQO87wVow4hKxUgE2M4S5hsdDIlooCrMrXXQucixbuT7P+ 2dFBrm3WfpiILmNCxbokAfZXINkl65x7g6vjE/d/GlQeVNFGZ/o7tpA/WuxWBWvCRWj7 Ss2KqJQ+p4QaxC4gsBUYt/A+/qbu+VbM0mOShLCsnMfBolVk/VNScP6E2c8PxEUJSbF9 clMP270ULe1rAtFlUi9NI8oT/LwS9RPLVw1NNckJlICr8QMApwhbuXNAWZSuLuDySnFA /SVRoS9U+ehqme/QgHwDhIL1Zw8jvrtugZ5OtHiQAn4AiBUEo/2fT0fxIGSZcjj6y0qM OVDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715785741; x=1716390541; 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=Ah4RAfb74Ry/QSCvgzicI92Xf6jvMyFD3fqYCPKUsdU=; b=gEC5QfHFGEF/yRGL9E3SVChChWrsi5rpZW81ApxQjYHI49103gXjvOC43xVqGQMtBY 8sALIR0Fb8+IfuMITAhacQqz2LDeC1ZFlwbU9+22FjZN8FFVie/UaY0E7l5nW/FO0rfu UWn06TAjZgRKkZaRaSi6SadTi1zMOq9xzg3y3+6ESEd6WrjnH7Oopwk0vvwy9jrt7wdJ 99/XDUzwucLsKBDUraKsa1JD6hMASS/ANFyhSpEReeN/HXUmufncdo5t8CfY2xyfde6i infLj0yjhKfp/2FazbBm6NE/v85WsrEnYpj5APWx6h55MpgZvbRF2ojws0CoiNXXXi+s SLBA== X-Gm-Message-State: AOJu0YwOzbm3m3OC2LM5Nat5sK+qGXS8EA1w3M2eTu8wyX/WuBTaY/yh Qd22lCb5CTmMLAAI6Zytfzl+1zTqu2MqzD9pYzfbC71X1u+DrZfSiUZb9SMUgzqexWfH0yeItgI GlBk= X-Received: by 2002:a05:600c:4754:b0:41f:ae5a:c72f with SMTP id 5b1f17b1804b1-41fbc91f419mr185164525e9.1.1715785740796; Wed, 15 May 2024 08:09:00 -0700 (PDT) Received: from stoup.. ([149.14.240.163]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42013c5fa61sm132080825e9.40.2024.05.15.08.09.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 May 2024 08:09:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, laurent@vivier.eu Subject: [PATCH v3 27/28] target/i386: Pass host pointer and size to cpu_x86_{fxsave, fxrstor} Date: Wed, 15 May 2024 17:08:36 +0200 Message-Id: <20240515150837.259747-28-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240515150837.259747-1-richard.henderson@linaro.org> References: <20240515150837.259747-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32b.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 We have already validated the memory region in the course of validating the signal frame. No need to do it again within the helper function. Reviewed-by: Paolo Bonzini Signed-off-by: Richard Henderson --- target/i386/cpu.h | 4 ++-- linux-user/i386/signal.c | 13 +++++-------- target/i386/tcg/fpu_helper.c | 26 ++++++++++++++++---------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 2897faccb9..dbd91c064d 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2243,8 +2243,8 @@ int cpu_x86_get_descr_debug(CPUX86State *env, unsigned int selector, void cpu_x86_load_seg(CPUX86State *s, X86Seg seg_reg, int selector); void cpu_x86_fsave(CPUX86State *s, void *host, size_t len); void cpu_x86_frstor(CPUX86State *s, void *host, size_t len); -void cpu_x86_fxsave(CPUX86State *s, target_ulong ptr); -void cpu_x86_fxrstor(CPUX86State *s, target_ulong ptr); +void cpu_x86_fxsave(CPUX86State *s, void *host, size_t len); +void cpu_x86_fxrstor(CPUX86State *s, void *host, size_t len); void cpu_x86_xsave(CPUX86State *s, target_ulong ptr, uint64_t rbfm); void cpu_x86_xrstor(CPUX86State *s, target_ulong ptr, uint64_t rbfm); diff --git a/linux-user/i386/signal.c b/linux-user/i386/signal.c index 816e8ab2a9..1f5a3e9a0b 100644 --- a/linux-user/i386/signal.c +++ b/linux-user/i386/signal.c @@ -294,14 +294,11 @@ static abi_ptr get_sigframe(struct target_sigaction *ka, CPUX86State *env, * Set up a signal frame. */ -static void fxsave_sigcontext(CPUX86State *env, X86LegacyXSaveArea *fxstate, - abi_ptr fxstate_addr) +static void fxsave_sigcontext(CPUX86State *env, X86LegacyXSaveArea *fxstate) { struct target_fpx_sw_bytes *sw = (void *)&fxstate->sw_reserved; - /* fxstate_addr must be 16 byte aligned for fxsave */ - assert(!(fxstate_addr & 0xf)); - cpu_x86_fxsave(env, fxstate_addr); + cpu_x86_fxsave(env, fxstate, sizeof(*fxstate)); __put_user(0, &sw->magic1); } @@ -412,7 +409,7 @@ static void setup_sigcontext(CPUX86State *env, xsave_sigcontext(env, fxstate, fpstate_addr, fxstate_addr, fpend_addr); break; case FPSTATE_FXSAVE: - fxsave_sigcontext(env, fxstate, fxstate_addr); + fxsave_sigcontext(env, fxstate); break; default: break; @@ -669,7 +666,7 @@ static bool xrstor_sigcontext(CPUX86State *env, FPStateKind fpkind, break; } - cpu_x86_fxrstor(env, fxstate_addr); + cpu_x86_fxrstor(env, fxstate, sizeof(*fxstate)); return true; } @@ -687,7 +684,7 @@ static bool frstor_sigcontext(CPUX86State *env, FPStateKind fpkind, } break; case FPSTATE_FXSAVE: - cpu_x86_fxrstor(env, fxstate_addr); + cpu_x86_fxrstor(env, fxstate, sizeof(*fxstate)); break; case FPSTATE_FSAVE: break; diff --git a/target/i386/tcg/fpu_helper.c b/target/i386/tcg/fpu_helper.c index 05db16a152..0e5368951f 100644 --- a/target/i386/tcg/fpu_helper.c +++ b/target/i386/tcg/fpu_helper.c @@ -3041,22 +3041,28 @@ void cpu_x86_frstor(CPUX86State *env, void *host, size_t len) do_frstor(&ac, 0, true); } -void cpu_x86_fxsave(CPUX86State *env, target_ulong ptr) +void cpu_x86_fxsave(CPUX86State *env, void *host, size_t len) { - X86Access ac; + X86Access ac = { + .haddr1 = host, + .size = sizeof(X86LegacyXSaveArea), + .env = env, + }; - access_prepare(&ac, env, ptr, sizeof(X86LegacyXSaveArea), - MMU_DATA_STORE, 0); - do_fxsave(&ac, ptr); + assert(ac.size <= len); + do_fxsave(&ac, 0); } -void cpu_x86_fxrstor(CPUX86State *env, target_ulong ptr) +void cpu_x86_fxrstor(CPUX86State *env, void *host, size_t len) { - X86Access ac; + X86Access ac = { + .haddr1 = host, + .size = sizeof(X86LegacyXSaveArea), + .env = env, + }; - access_prepare(&ac, env, ptr, sizeof(X86LegacyXSaveArea), - MMU_DATA_LOAD, 0); - do_fxrstor(&ac, ptr); + assert(ac.size <= len); + do_fxrstor(&ac, 0); } void cpu_x86_xsave(CPUX86State *env, target_ulong ptr, uint64_t rfbm)