From patchwork Mon May 17 18:14:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 440211 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1350587jac; Mon, 17 May 2021 11:50:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwY9rab0w10UWkPDM5HzHLpTcv6l42zDZImZKdvFy9fW/zpigl/Jz6oiKc3tCifS/YaCKMU X-Received: by 2002:a05:6602:2bef:: with SMTP id d15mr1128546ioy.13.1621277400407; Mon, 17 May 2021 11:50:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621277400; cv=none; d=google.com; s=arc-20160816; b=HHJdx0QrXrUkmVyWJjQimQisWOR6PPo5Gf4oIBu86y1pmv1DSx68L9V0lsCR+WyFUz xxQKSo4kLNxSKc1o2ggaLqMHpXCAgX6T96k6XFVxuyiq8blxgMLFqeXigf+RWNdesg78 TGulbT353DQLdUy4hAqig/SvJC/H9C3uoM6AX0pSBl/cka8SF53bZIt+2bhj+nejIXwf 1G4Y34RTYRUzn4CAjSBT+I1jZNMgFrmLz0ubBtr4PKwsHTwhqXT4YWgPk7n9TAuFMq0S KLoEhZTnRINwBbJoko5pPdFQFGVHjBmM7kyGWSiiPHqlM88nDMKgzKsm0OWmwtleA3I8 vrng== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=Vo6Dl1Qp9eZdyZcBtl1QOozIJdh7pRc5aLtRTUKEkQ0=; b=oPMEF2RFp+wmWkeG9rqht/2HBBmSmyrnRC3KrIhh3IzoClf5T+ZQRvSbC4Leeu3ZEo 2gAZfH2HoJxKHEQg+rsGmz1/FlIhlrm2TajREGH5OMzBJqlt63WzcG3XV1tzv+k8Fd00 jcSBbcQXRgap6uLwVNfylON/wqFwE4+b2Jki7zkV0239Bm8Tqy5fUA3VpPRYczvPUyE6 GPDArEMFdKmclshsSsFsVt/H7WpbIOjLcYT7szwgc4p1gGDtOBZYH3sUJKXEKHvLNHX5 7QsQ9XopThtGyMKjFuPaboz9xHk2t25YYp2Z0ef9qc5iPdiUS9WqnIppYEu+dO64kMKh Df4Q== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z17si17950399jat.5.2021.05.17.11.50.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 May 2021 11:50:00 -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; 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" Received: from localhost ([::1]:34072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1liiJT-0002nH-Q3 for patch@linaro.org; Mon, 17 May 2021 14:49:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihlp-0006mJ-FK for qemu-devel@nongnu.org; Mon, 17 May 2021 14:15:20 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:56203) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lihlU-0004X5-Pp for qemu-devel@nongnu.org; Mon, 17 May 2021 14:15:13 -0400 Received: from quad ([82.142.31.78]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mae7u-1lB1da1mSA-00c6Ad; Mon, 17 May 2021 20:14:48 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 42/59] linux-user/s390x: Set psw.mask properly for the signal handler Date: Mon, 17 May 2021 20:14:07 +0200 Message-Id: <20210517181424.8093-43-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517181424.8093-1-laurent@vivier.eu> References: <20210517181424.8093-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:6IReWl6JAyMjJRItCT4ijpOILZtyJ3e0QPHpZzCTjbWFLidergE h0D1eyxXY+XpiQ6UwzDfNsE6AXrg3KwHUnOm0XOhZRojJ8ORMFUS8gLisJyyPppzQd9Eo+H ONOJ7GEUTBdP9dPtJrnF5/sxO7QECh9zSKyAX1KaUZsKWNdITjTM9UJsalYdZcukWYyW4X4 HzNFYIkj8YsnCDlhxDcMg== X-UI-Out-Filterresults: notjunk:1; V03:K0:nz8jY8gIjaY=:dyfC39603CeHXYPBDuV4f3 IAqooIdVrdebahoIfqpuISue3xBpShd/jDZJIqpjaVeFryr1otlQ0DVxpIqIfAA0lOoyJ+M0F /WVCmMExdElsYXmXG4eXn0wRd/Ey4DFja6mtBecsrVcQzGouZQ7ser0z8fgD/0aWTGJ2VGC+F EjqLKflvatcXForpFV/0Zdq5CqU6NCSutqyKzQynLlTG3RLBgitlUHmOANxWrH+Cq27aj5OtZ O3WD3XaPqW19L5KcPfNG3eqOchbpTqQRQHuPB4U9sSzBLddxAqEfKq3oY+b5SK/t3CuMqkk84 APhVUVeZolhB9UHNmJQ0fsaxsGjz3zdsp7+imSTHnsEG+jFUbZ4jocNUe8HPKJtTKFqCCvmGr aGDpS09Gvw+BwS9FgBvkCGxTBMWJxKiPEpvgGnvebDZ6ldnYfOCDaf5aFZ4IvlToLFkVjvGrU 5baUo5uA7Ag/LaJyNx21TQxiwFMHtf9HnBCwAK5UnzrsOipZw8DOfOt4P8VRfLMijKSQ+RaZ6 mn859adSt3pqxxCm4UGYvg= Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=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: , Cc: Richard Henderson , Laurent Vivier , David Hildenbrand Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Note that PSW_ADDR_{64,32} are called PSW_MASK_{EA,BA} in the kernel source. Signed-off-by: Richard Henderson Reviewed-by: David Hildenbrand Message-Id: <20210428193408.233706-11-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/s390x/signal.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.31.1 diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c index 64a9eab09770..17f617c65581 100644 --- a/linux-user/s390x/signal.c +++ b/linux-user/s390x/signal.c @@ -162,6 +162,9 @@ void setup_frame(int sig, struct target_sigaction *ka, /* Set up registers for signal handler */ env->regs[15] = frame_addr; + /* Force default amode and default user address space control. */ + env->psw.mask = PSW_MASK_64 | PSW_MASK_32 | PSW_ASC_PRIMARY + | (env->psw.mask & ~PSW_MASK_ASC); env->psw.addr = ka->_sa_handler; env->regs[2] = sig; //map_signal(sig); @@ -215,6 +218,9 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, /* Set up registers for signal handler */ env->regs[15] = frame_addr; + /* Force default amode and default user address space control. */ + env->psw.mask = PSW_MASK_64 | PSW_MASK_32 | PSW_ASC_PRIMARY + | (env->psw.mask & ~PSW_MASK_ASC); env->psw.addr = ka->_sa_handler; env->regs[2] = sig; //map_signal(sig);