From patchwork Mon Mar 6 00:38:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 659159 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp1573147wrb; Sun, 5 Mar 2023 16:44:18 -0800 (PST) X-Google-Smtp-Source: AK7set/TnGpznzaq5sE05Km+rrTlwQs4wVwyWoGPaoArgom1kuSXCx/x5eDQmnV/rsoLbC9gmbeN X-Received: by 2002:a05:6214:250a:b0:56e:a980:e8f1 with SMTP id gf10-20020a056214250a00b0056ea980e8f1mr17899287qvb.32.1678063458322; Sun, 05 Mar 2023 16:44:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678063458; cv=none; d=google.com; s=arc-20160816; b=M9No3eRM5gAJf9PkTUlcAA2w+oHt4m98mnBVYjbLFYw8qpK3R3+HZp4RZc1o6Qku35 GxU2GhbdxHBVlSCGOWJClve8FLzj6Veei5mbpoiQ5pqLdeRufphkVXAf2nHqn4hvGi5E lKXDaaFZDpBBQcI3k+9XEAwxD+4gAGWoPDZVYdSRu9dgFm7nUR6S4cISm2xdQ3vi2GG1 yn68FpHEGrUD2hL2Un246kywCHsy2lOy2dpFzklmS27MScbaxE02gqBJJ6SmkZeroucY Rlju8S6cJ+PxKSPkAuf9wohiqOYxYvg3kJAzxDwrAz+QWEe2OC8fNO9CJkMvt90bgWWY /7EA== 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=IAxYS/NLsp62C58QNtXkZeKbxEYzefJWF0ZeIzVuJpA=; b=vVd2+cU1htTdngGvRTbxtr5UQHwfb2OvfEnOpU5J2ukiDAwaiD8ELSFTEnMwe3d0CC KLdNiLX49GYsZZYyAuR6ZoZh0PNDXWi6mQc5etBTJmcILbIhY+rQy0+R9QV483sFy6f6 vGMqD/eGrdBUjTE7gl4Mx2/zgJeRq0vjS41I5DZcr3AxZMWPGWLPVcVwiPmgoAtaloOZ bcvpKCsbraL5JaZGuGlc+7FPrQfkvL8c19JQk3SwjjZ7O+HAhSyNW7I+Ld1tV/Cl3gJN VRo0pAo09OxctLp3ELnAp4GUYRD1GSSBFrJNO8RnxvqZK4oZwVwOpHBiCFSGSTilbek3 TUJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fmYprNiK; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f15-20020a0ccc8f000000b0056ec162350csi6742964qvl.340.2023.03.05.16.44.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 05 Mar 2023 16:44:18 -0800 (PST) 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=fmYprNiK; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYyta-0004OE-Rm; Sun, 05 Mar 2023 19:40:07 -0500 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 1pYytY-0004Nu-La for qemu-devel@nongnu.org; Sun, 05 Mar 2023 19:40:04 -0500 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pYytW-0006ND-Fn for qemu-devel@nongnu.org; Sun, 05 Mar 2023 19:40:04 -0500 Received: by mail-pj1-x1036.google.com with SMTP id h17-20020a17090aea9100b0023739b10792so7390660pjz.1 for ; Sun, 05 Mar 2023 16:40:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678063200; 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=IAxYS/NLsp62C58QNtXkZeKbxEYzefJWF0ZeIzVuJpA=; b=fmYprNiKMwj8CErJ3zbjU6GBhpbyKslkf2xF34+7bnbXfTSHD8r4LBPeh0JsjoodBD Wn9zzjKY4f50GtgzSWHtVY3a49OEX/iCXeRftYeY0Oe302JhFq2r1mzcnYQLG4SUGcLI ktWdhKC5gTD9HZFMJdxQSSlw5cIQ2tGfy7dDXgzz3BH1Eee/3nOtvZEvd6oO2f4VRRO/ XRbFTFh8BIXx9Az/w9uHk12SX8oN8Iy+D9SldHKv9ulHBZsiUW/f+MFEWRRn/hLJdGfW 282ESe912lN6qnM0/LBqsdpdSvraHzzEqYP6n1sRadMRSfHt0T0zxdZnG1GC0n/0fjEO BoYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678063200; 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=IAxYS/NLsp62C58QNtXkZeKbxEYzefJWF0ZeIzVuJpA=; b=bfxNjWrK/bfMXTREUBI9KKL2h8NBSF8alUTDDr3BjDiQVyuMBON3CmUIPytQaT6XqA 3cC8JMeNXZqkONMnOGtVkL5x6XaGPxxIaSXt8Swn0+PglIPzvte8BswgfORiysnC9i4u dbyMKw5joCzGMv9QEofSJFnWhb1afPp8xRdthqp5u0WG3fYnmp/2UnaP2xv1DVNBVXFh DtqmTcBUjp54+G+XwG5aH2roNB6EBPt/3so0Pp5EqNSSZ1kWMgVU5nOzsfrvJqZcmPmW 4Wl0JGzQ5boy4Re7HIIFqkcJJal82lqH3oEPyZcz7UQsTAmLva+UaH8TRO16sHY6hgCT Fa5Q== X-Gm-Message-State: AO0yUKVRYs0gh7QyZeNP3vq/j9KBbY12L2OL8Fp6vT0OCDtcN+1NKtww acHQdnoDLwIYBifds3gYMqQIHQ6PPFdrQIJXnSoH6A== X-Received: by 2002:a17:90b:4c43:b0:237:cbcb:efba with SMTP id np3-20020a17090b4c4300b00237cbcbefbamr10049725pjb.17.1678063200409; Sun, 05 Mar 2023 16:40:00 -0800 (PST) Received: from stoup.. ([2602:ae:154a:9f01:87cc:49bb:2900:c08b]) by smtp.gmail.com with ESMTPSA id r13-20020a17090b050d00b002372106a5c2sm6567901pjz.37.2023.03.05.16.39.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Mar 2023 16:40:00 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org Subject: [PULL 05/84] accel/tcg: Retain prot flags from tlb_fill Date: Sun, 5 Mar 2023 16:38:35 -0800 Message-Id: <20230306003954.1866998-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306003954.1866998-1-richard.henderson@linaro.org> References: <20230306003954.1866998-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1036; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1036.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 While changes are made to prot within tlb_set_page_full, they are an implementation detail of softmmu. Retain the original for any target use of probe_access_full. Fixes: 4047368938f6 ("accel/tcg: Introduce tlb_set_page_full") Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- accel/tcg/cputlb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 008ae7a66d..deafcc7f15 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1250,7 +1250,6 @@ void tlb_set_page_full(CPUState *cpu, int mmu_idx, desc->fulltlb[index] = *full; desc->fulltlb[index].xlat_section = iotlb - vaddr_page; desc->fulltlb[index].phys_addr = paddr_page; - desc->fulltlb[index].prot = prot; /* Now calculate the new entry */ tn.addend = addend - vaddr_page;