{"id":2227366,"url":"http://patchwork.ozlabs.org/api/patches/2227366/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260423135035.50126-9-philmd@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260423135035.50126-9-philmd@linaro.org>","list_archive_url":null,"date":"2026-04-23T13:50:34","name":"[8/9] target/s390x: Compile crypto_helper.c as common unit","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7f5b6329fe2e185979038e393044c74f6118d261","submitter":{"id":85046,"url":"http://patchwork.ozlabs.org/api/people/85046/?format=json","name":"Philippe Mathieu-Daudé","email":"philmd@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260423135035.50126-9-philmd@linaro.org/mbox/","series":[{"id":501199,"url":"http://patchwork.ozlabs.org/api/series/501199/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=501199","date":"2026-04-23T13:50:26","name":"target/s390x/tcg: Compile various files once","version":1,"mbox":"http://patchwork.ozlabs.org/series/501199/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2227366/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2227366/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=nQB3k2Tl;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g1cwb2kdZz1yGs\n\tfor ; Thu, 23 Apr 2026 23:52:31 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wFuT9-0000xj-Jn; Thu, 23 Apr 2026 09:51:51 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1wFuT6-0000x8-C9\n for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:48 -0400","from mail-wm1-x333.google.com ([2a00:1450:4864:20::333])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from ) id 1wFuT4-0006HY-FJ\n for qemu-devel@nongnu.org; Thu, 23 Apr 2026 09:51:48 -0400","by mail-wm1-x333.google.com with SMTP id\n 5b1f17b1804b1-48374014a77so87460165e9.3\n for ; Thu, 23 Apr 2026 06:51:46 -0700 (PDT)","from localhost.localdomain (88-187-86-199.subs.proxad.net.\n [88.187.86.199]) by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-488fb7b2634sm164816635e9.28.2026.04.23.06.51.41\n (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);\n Thu, 23 Apr 2026 06:51:42 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1776952304; x=1777557104; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=USyA8v7aEKp3s5luzNdxwloj99EpgracOTgDV5g1QHE=;\n b=nQB3k2TlA8LEyq/rndt3HYz0xLkamWGaeKtf+crgNmv5nGg8s6eDP8Gv6aLSLpn2Y5\n RN9X4CD+ZQc6GniVaCS98sDt0NndvApHEdV5M2NDJkEP5hcF9yPRdV58T5HcNl0ijAAB\n DpEuJ/HFGBsZ2E+Z8uOGu5AorSFL67iJj7LFc/gm2WOiBrzHA7Sods+TSCQuEldFDUue\n Xv2grj4OvSeZ6pdzYc61sN2XHRPChTEOkGA7+R757gXA5jdHhPiMe4r2/yZyb7w8sOBu\n GHdkPhu8l1k3WwFpXzto5A7DF+uK7CecEt20jeNtwguwm4qmkrG9UvmxCMHinM26h5jv\n Bp5w==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776952304; x=1777557104;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=USyA8v7aEKp3s5luzNdxwloj99EpgracOTgDV5g1QHE=;\n b=QuwubOt5dgE+YOEbDeaOZqHRT9d7ypAuUkDEs8g3yU6P1SFjCTxUrBwBPk3InI8Zdz\n cRrRj1+2imPPaxS/MeE+fDATPEUH50iPtgkDyhb816F6rrEsHJ7QYZ2yLewZIpFHzecj\n 3NVx5RyYrPt3QLS47Np2lS7YZ3zZ6cN2QEdIcDHDxjNfGkfUOuxZwHuA/7z1IYFuDkKf\n LptuPA+qRaMh8hdTRxPkjXMB1kTG07scUrQwWFnkZqnlltDXm2ASB15Mi1c55VlVBP+w\n 3vbDPlDAwYzFUUcjyh3HLFMcFeRvUEjR9lgKzReSAFQJumj5UBesltkAWZqaR9ijX61f\n nHAA==","X-Gm-Message-State":"AOJu0Yyg1FVOW5LaYi+8DaS+WD3JXVAU6yfzRf7lIFXcCw+WpSzDOeZH\n 0D3tnqPw7jUn8asjUeVMa4XhZyBPxNUhiOmc6b1HtIbbc5dVxasPiEej5497dl/FJ3gYaOpLpoh\n UjQfgx4g=","X-Gm-Gg":"AeBDiesixrh4Z06dp4TiVk42GsLumInSW0ety+Saktd4owElDnMJ4ADuag6kMqpLn4A\n FTCmXv3xmimwyGXj6GCsP0OvJL2lxh3SFWLJgsF1g8T6HGPaFC0PIJtLSQ4fXYvGD1jbwljuU2o\n 0TUo1fsY0/POtwCSQQ3x1QubfHsJjieUThq1Aspo4tBWY57xvx/OoaMOs9Jc1F8uA+c+/d2Pr/O\n i3HmoJpaRT18o19+36YXM8/ps6hb2yn+2dmK7JZwph6jslKKtoyP25JbBkKytdb9SPG+Vl5FbBc\n Uu1+SSYbZZbwMRFJFAz4xLM6MYbjMcmVqgOgGyj0fbSgPkkSMedyTD0MX51njEU8t6w0FW8yXjy\n s+5XPKdxXGxf7+epyaf7QPC56somX8s5fPWhQAa0rWrGkOX1S83Q7bLBJSFoVsvIV+2xlp7y/T1\n J4KpjOhT2jG75M1nNO0ITd9sqOwwWfN3NepvwKuwNN/bu6TNymcPB9yZDceYaCJAWYLzv2FGT+r\n 86uLXhETj8=","X-Received":"by 2002:a05:600c:1390:b0:483:709e:f238 with SMTP id\n 5b1f17b1804b1-488fb78ea6fmr391933805e9.29.1776952304388;\n Thu, 23 Apr 2026 06:51:44 -0700 (PDT)","From":"=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ","To":"qemu-devel@nongnu.org","Cc":"Pierrick Bouvier ,\n Ilya Leoshkevich , qemu-s390x@nongnu.org,\n Matthew Rosato ,\n David Hildenbrand ,\n Richard Henderson ,\n Halil Pasic , Cornelia Huck ,\n Eric Farman ,\n Christian Borntraeger ,\n Anton Johansson ,\n =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ","Subject":"[PATCH 8/9] target/s390x: Compile crypto_helper.c as common unit","Date":"Thu, 23 Apr 2026 15:50:34 +0200","Message-ID":"<20260423135035.50126-9-philmd@linaro.org>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260423135035.50126-1-philmd@linaro.org>","References":"<20260423135035.50126-1-philmd@linaro.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2a00:1450:4864:20::333;\n envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n 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":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"In order do build crypto_helper.c as a common unit we need to\nreplace:\n\n \"accel/tcg/cpu-ldst.h\" -> \"accel/tcg/cpu-ldst-common.h\"\n\nand update the cpu_ld/st_be_data_ra() API by cpu_ld/st_mmu() one.\n\nSigned-off-by: Philippe Mathieu-Daudé \n---\n target/s390x/tcg/crypto_helper.c | 39 +++++++++++++++++---------------\n target/s390x/tcg/meson.build | 2 +-\n 2 files changed, 22 insertions(+), 19 deletions(-)","diff":"diff --git a/target/s390x/tcg/crypto_helper.c b/target/s390x/tcg/crypto_helper.c\nindex 074d745eb3f..ae392bce0e7 100644\n--- a/target/s390x/tcg/crypto_helper.c\n+++ b/target/s390x/tcg/crypto_helper.c\n@@ -17,7 +17,7 @@\n #include \"s390x-internal.h\"\n #include \"tcg_s390x.h\"\n #include \"exec/helper-proto.h\"\n-#include \"accel/tcg/cpu-ldst.h\"\n+#include \"accel/tcg/cpu-ldst-common.h\"\n #include \"accel/tcg/cpu-mmu-index.h\"\n \n static uint64_t R(uint64_t x, int c)\n@@ -123,44 +123,44 @@ static void sha512_bda_be64(uint64_t a[8], uint64_t w[16])\n static void sha512_read_icv(CPUS390XState *env, const int mmu_idx,\n uint64_t addr, uint64_t a[8], uintptr_t ra)\n {\n- int i;\n+ const MemOpIdx oi = make_memop_idx(MO_BE | MO_64 | MO_UNALN, mmu_idx);\n \n- for (i = 0; i < 8; i++, addr += 8) {\n+ for (int i = 0; i < 8; i++, addr += 8) {\n addr = wrap_address(env, addr);\n- a[i] = cpu_ldq_be_data_ra(env, addr, ra);\n+ a[i] = cpu_ldq_mmu(env, addr, oi, ra);\n }\n }\n \n static void sha512_write_ocv(CPUS390XState *env, const int mmu_idx,\n uint64_t addr, uint64_t a[8], uintptr_t ra)\n {\n- int i;\n+ const MemOpIdx oi = make_memop_idx(MO_BE | MO_64 | MO_UNALN, mmu_idx);\n \n- for (i = 0; i < 8; i++, addr += 8) {\n+ for (int i = 0; i < 8; i++, addr += 8) {\n addr = wrap_address(env, addr);\n- cpu_stq_be_data_ra(env, addr, a[i], ra);\n+ cpu_stq_mmu(env, addr, a[i], oi, ra);\n }\n }\n \n static void sha512_read_block(CPUS390XState *env, const int mmu_idx,\n uint64_t addr, uint64_t a[16], uintptr_t ra)\n {\n- int i;\n+ const MemOpIdx oi = make_memop_idx(MO_BE | MO_64 | MO_UNALN, mmu_idx);\n \n- for (i = 0; i < 16; i++, addr += 8) {\n+ for (int i = 0; i < 16; i++, addr += 8) {\n addr = wrap_address(env, addr);\n- a[i] = cpu_ldq_be_data_ra(env, addr, ra);\n+ a[i] = cpu_ldq_mmu(env, addr, oi, ra);\n }\n }\n \n static void sha512_read_mbl_be64(CPUS390XState *env, const int mmu_idx,\n uint64_t addr, uint8_t a[16], uintptr_t ra)\n {\n- int i;\n+ const MemOpIdx oi = make_memop_idx(MO_8, mmu_idx);\n \n- for (i = 0; i < 16; i++, addr += 1) {\n+ for (int i = 0; i < 16; i++, addr += 1) {\n addr = wrap_address(env, addr);\n- a[i] = cpu_ldub_data_ra(env, addr, ra);\n+ a[i] = cpu_ldb_mmu(env, addr, oi, ra);\n }\n }\n \n@@ -200,13 +200,14 @@ static int cpacf_sha512(CPUS390XState *env, const int mmu_idx, uintptr_t ra,\n \n /* KLMD: Process partial/empty block last. */\n if (type == S390_FEAT_TYPE_KLMD && len < 128) {\n+ const MemOpIdx oi = make_memop_idx(MO_8, mmu_idx);\n uint8_t x[128];\n \n /* Read the remainder of the message byte-per-byte. */\n for (i = 0; i < len; i++) {\n uint64_t addr = wrap_address(env, *message_reg + processed + i);\n \n- x[i] = cpu_ldub_data_ra(env, addr, ra);\n+ x[i] = cpu_ldb_mmu(env, addr, oi, ra);\n }\n /* Pad the remainder with zero and set the top bit. */\n memset(x + len, 0, 128 - len);\n@@ -248,6 +249,7 @@ static int cpacf_sha512(CPUS390XState *env, const int mmu_idx, uintptr_t ra,\n static void fill_buf_random(CPUS390XState *env, const int mmu_idx, uintptr_t ra,\n uint64_t *buf_reg, uint64_t *len_reg)\n {\n+ const MemOpIdx oi = make_memop_idx(MO_8, mmu_idx);\n uint8_t tmp[256];\n uint64_t len = *len_reg;\n int buf_reg_len = 64;\n@@ -262,7 +264,7 @@ static void fill_buf_random(CPUS390XState *env, const int mmu_idx, uintptr_t ra,\n \n qemu_guest_getrandom_nofail(tmp, block);\n for (size_t i = 0; i < block; ++i) {\n- cpu_stb_data_ra(env, wrap_address(env, *buf_reg), tmp[i], ra);\n+ cpu_stb_mmu(env, wrap_address(env, *buf_reg), tmp[i], oi, ra);\n *buf_reg = deposit64(*buf_reg, 0, buf_reg_len, *buf_reg + 1);\n --*len_reg;\n }\n@@ -279,7 +281,7 @@ uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32_t r3,\n const uint8_t fc = env->regs[0] & 0x7fULL;\n uint8_t subfunc[16] = { 0 };\n uint64_t param_addr;\n- int i;\n+ MemOpIdx oi;\n \n switch (type) {\n case S390_FEAT_TYPE_KMAC:\n@@ -300,9 +302,10 @@ uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32_t r3,\n \n switch (fc) {\n case 0: /* query subfunction */\n- for (i = 0; i < 16; i++) {\n+ oi = make_memop_idx(MO_8, mmu_idx);\n+ for (int i = 0; i < 16; i++) {\n param_addr = wrap_address(env, env->regs[1] + i);\n- cpu_stb_data_ra(env, param_addr, subfunc[i], ra);\n+ cpu_stb_mmu(env, param_addr, subfunc[i], oi, ra);\n }\n break;\n case 3: /* CPACF_*_SHA_512 */\ndiff --git a/target/s390x/tcg/meson.build b/target/s390x/tcg/meson.build\nindex ed6441f6f44..36cb0e079ed 100644\n--- a/target/s390x/tcg/meson.build\n+++ b/target/s390x/tcg/meson.build\n@@ -1,11 +1,11 @@\n s390x_ss.add(when: 'CONFIG_TCG', if_true: files(\n- 'crypto_helper.c',\n 'int_helper.c',\n 'mem_helper.c',\n 'misc_helper.c',\n ))\n s390x_common_ss.add(when: 'CONFIG_TCG', if_true: files(\n 'cc_helper.c',\n+ 'crypto_helper.c',\n 'excp_helper.c',\n 'fpu_helper.c',\n 'translate.c',\n","prefixes":["8/9"]}