From patchwork Tue Sep 3 16:08:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 172880 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp105375ily; Tue, 3 Sep 2019 09:49:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqw09PBuFScgnuntHHtijY7ZsgSloFbhQRD/l6XAyjG/mzPszG1UWiJ3Yj+qE6JUUZ7GmVGj X-Received: by 2002:ae9:e00a:: with SMTP id m10mr13545188qkk.167.1567529362235; Tue, 03 Sep 2019 09:49:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567529362; cv=none; d=google.com; s=arc-20160816; b=aXZCSG5gqLtG+d/MG7gfyChPARv/FmUZE8f0l34yNf37YpO0nOhV0Q8FAbjSi3Mulo QEJURmXXBNWB3RSE7A4qMQ1cnWvMPu/G20LKp7PWHI86HNzpWx5kUhpX51CLmFOtv0Pz PHVMJH3g81NIqDCqTJh1LL7EA6TW4KW2Tfwb7I5wKnaBynP6GLxbgW9eh+IauoTUaNVw rlmv47bez1ba2+dvTcnG3PN4uUaTKL2l8NUYP1Nehl0p5jRY4ylegx/Y4srKIu2OLaAk 8K3Keo3JHxm89TKXInu0S+IWe/EWvAO13Aqt9xz92Vt5dSjvlp6u6rzngmfZGISgObKe lOzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=rllUpWe62ZsfU+30fAApU6qKY3XDd69Sp3kh5Sw9sOs=; b=jUnyhKjvD0OZpPP5m2Dz3NVYBNcZndEiFXbpgZu5ReT+leTOcvukoQvOExYE2jEbVU Jtw04Udxt+9ExATusHxEeBT8+lkWzxhjLzFovwVAwnZLDHFiGYvY/D6kj9Xtec9W49BG lUzVNzdBu52Ys3dThxI7IGOXmJILSt6NX1BCTyNHQ4yxFGQcUNeKEPzaK/C04pjeav7p x0jt3UOVfrx1IaJFq2elIRIsL3n4U4nJeaLt7xQom4c/PDTMMS9ucoNU95rx7IC7HG+R Tc+byWkpHrKU5voFb2HesDKQ0bEHFTYqNVjd3u3M5Fnc7g3XX3AGZ9WGr4cNGIn2Pege S/aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qZ0vUAel; 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 v123si13137171qkh.374.2019.09.03.09.49.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Sep 2019 09:49:22 -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=qZ0vUAel; 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]:49280 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5Bzd-0003Up-Gd for patch@linaro.org; Tue, 03 Sep 2019 12:49:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37504) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5BNI-0001m2-Bd for qemu-devel@nongnu.org; Tue, 03 Sep 2019 12:09:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5BNH-000479-83 for qemu-devel@nongnu.org; Tue, 03 Sep 2019 12:09:44 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]:35448) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5BNH-00046F-2T for qemu-devel@nongnu.org; Tue, 03 Sep 2019 12:09:43 -0400 Received: by mail-pf1-x42b.google.com with SMTP id 205so8619790pfw.2 for ; Tue, 03 Sep 2019 09:09:43 -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; bh=rllUpWe62ZsfU+30fAApU6qKY3XDd69Sp3kh5Sw9sOs=; b=qZ0vUAelF0LSqC6ZaXDi4av155T2gRPVH15s3jA40kwgJLa6rzAl3dv4rT+BbU+/O4 Un+h8pynsM41v6I4TFGwTU8vU+zfSOEHw107k0jorvZh5GjQfcsNCXF7wFFz/84aqNXS yW76dsqeP/XIihETGnaQRex5aZzTKCt0Hy/k58YizaxaeTHn95vo/jzRamTXXALG5VHo tGE2eYy3ABKIEPCCcm3ArMmQx01rXbT78n/uf8wNBfjzUKhlWn89+5bCs+wVNbeHZqOf nPTmtOGN5Pi00PT8u6Slj47VVAdTspeInA6i+exD+JGEgLaS9tGypj8q92oXPgGyMJeZ XKow== 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; bh=rllUpWe62ZsfU+30fAApU6qKY3XDd69Sp3kh5Sw9sOs=; b=AyMk2wTJaC85mQVPZZw1ti0Tag1YL9pXZNIILnkDfJE/x9EZ7oFQThtoY2Cw7dZoiL VdnSkq3Wbat5fjumD64xYkj0IAtGmDpra8dL6KFJUkuUky5/vKSzJGJnyPx2W+iJwHUY moU3K6rqQOyfxz5OXwNIB11coB0/MEsQMUj0ZPMJv/VlG9HlmFJgnPptoXGcalHcMqFe VBVAQNVfITiwmW3za193VBTRDdZ+nLYE+7NTGeuAWXIX1PNP6206nZ2NeEMFHPeOmezi iARFKJRvPn4QiUXm9izjHrbnwpKuzqzgZH3hY/bUpz40O+D2KLuWWR+PiJi1yB/7aaNi JM/g== X-Gm-Message-State: APjAAAW+KVhF5PKtfgQJy+vmQ2FMJoq8Qfnz+VvTr/7NmVOhnXKjw9GF K7wpDuPk75e4R6oMu7D2Irl0zfKg5O8= X-Received: by 2002:a63:4846:: with SMTP id x6mr19144731pgk.332.1567526981618; Tue, 03 Sep 2019 09:09:41 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id 127sm28089711pfy.56.2019.09.03.09.09.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Sep 2019 09:09:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 3 Sep 2019 09:08:56 -0700 Message-Id: <20190903160858.5296-35-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190903160858.5296-1-richard.henderson@linaro.org> References: <20190903160858.5296-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::42b Subject: [Qemu-devel] [PATCH 34/36] s390x/tcg: Pass a size to probe_write() in do_csst() 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: peter.maydell@linaro.org, David Hildenbrand Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: David Hildenbrand ... and also call it for CONFIG_USER_ONLY. This function probably will also need some refactoring in regards to probing, however, we'll have to come back to that later, once cleaning up the other mem helpers. The alignment check always makes sure that the write access falls into a single page. Reviewed-by: Richard Henderson Signed-off-by: David Hildenbrand Message-Id: <20190826075112.25637-8-david@redhat.com> Signed-off-by: Richard Henderson --- target/s390x/mem_helper.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.17.1 diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index fdff60ce5d..29fcce426e 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -1443,9 +1443,7 @@ static uint32_t do_csst(CPUS390XState *env, uint32_t r3, uint64_t a1, } /* Sanity check writability of the store address. */ -#ifndef CONFIG_USER_ONLY - probe_write(env, a2, 0, mem_idx, ra); -#endif + probe_write(env, a2, 1 << sc, mem_idx, ra); /* * Note that the compare-and-swap is atomic, and the store is atomic,