From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D30C5C5519F for ; Tue, 17 Nov 2020 14:04:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 330D920729 for ; Tue, 17 Nov 2020 14:04:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="Yy4tYNDz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 330D920729 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kf1bD-00010e-43 for qemu-devel@archiver.kernel.org; Tue, 17 Nov 2020 09:04:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf1ZM-0007xi-07; Tue, 17 Nov 2020 09:02:53 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:22210 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kf1ZJ-0006sk-BX; Tue, 17 Nov 2020 09:02:51 -0500 Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0AHE0g0a084455; Tue, 17 Nov 2020 09:02:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=pRUJ1wT7UpZRtKg4i61JQRnLt3Dfx8vBjWImBJ8ko18=; b=Yy4tYNDzLyZWAk78RK5SBhZHXgvC7isDYM7tmRAtktutrfuTPF/WH4mKedrxF3XM8tog cofcNFeYjpoIFrploBlf4B35etnVr91uqypVnUcyEgbdNAfV1pV+PC/WfkFlEp0JV+wW vTvyxO1hs1qqleCFZoWQLrP2RwOxywmkG/A2TksYkx3EgDm/GRCrEZIydeURWKE8rrzx +C3iKyTlZUlL902CV/2jxiU1dmIGT3WdInGYPCqOVWqfKc4t2ogm3F52mLPbSsa3L3aT IByxKetZ4Ybxlusge1DlB2K9k16EYkVjP+7sTVXjepVcvkUhJlviXGLU8GRNhipxwkQm NA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 34vd4px1qg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 17 Nov 2020 09:02:47 -0500 Received: from m0098419.ppops.net (m0098419.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 0AHE0s8l085816; Tue, 17 Nov 2020 09:02:46 -0500 Received: from ppma05wdc.us.ibm.com (1b.90.2fa9.ip4.static.sl-reverse.com [169.47.144.27]) by mx0b-001b2d01.pphosted.com with ESMTP id 34vd4px1py-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 17 Nov 2020 09:02:46 -0500 Received: from pps.filterd (ppma05wdc.us.ibm.com [127.0.0.1]) by ppma05wdc.us.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 0AHDrFdW011650; Tue, 17 Nov 2020 14:02:45 GMT Received: from b01cxnp23034.gho.pok.ibm.com (b01cxnp23034.gho.pok.ibm.com [9.57.198.29]) by ppma05wdc.us.ibm.com with ESMTP id 34t6v8xw23-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 17 Nov 2020 14:02:45 +0000 Received: from b01ledav005.gho.pok.ibm.com (b01ledav005.gho.pok.ibm.com [9.57.199.110]) by b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 0AHE2jYV42861026 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 17 Nov 2020 14:02:45 GMT Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5C9FFAE063; Tue, 17 Nov 2020 14:02:45 +0000 (GMT) Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 739FBAE060; Tue, 17 Nov 2020 14:02:39 +0000 (GMT) Received: from oc4221205838.ibm.com (unknown [9.163.48.2]) by b01ledav005.gho.pok.ibm.com (Postfix) with ESMTP; Tue, 17 Nov 2020 14:02:39 +0000 (GMT) Subject: Re: [RFC PATCH-for-5.2] hw/s390x/pci: Fix endianness issue To: Cornelia Huck , Pierre Morel References: <20201117120115.1234994-1-philmd@redhat.com> <20201117143117.4b05db78.cohuck@redhat.com> From: Matthew Rosato Message-ID: Date: Tue, 17 Nov 2020 09:02:37 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.3.1 MIME-Version: 1.0 In-Reply-To: <20201117143117.4b05db78.cohuck@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312, 18.0.737 definitions=2020-11-17_03:2020-11-17, 2020-11-17 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 clxscore=1015 phishscore=0 mlxlogscore=999 priorityscore=1501 mlxscore=0 lowpriorityscore=0 malwarescore=0 impostorscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2011170100 Received-SPF: pass client-ip=148.163.158.5; envelope-from=mjrosato@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/17 08:24:07 X-ACL-Warn: Detected OS = Linux 3.x [generic] X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , David Hildenbrand , qemu-s390x , Richard Henderson , QEMU Developers , Halil Pasic , Christian Borntraeger , Alex Williamson , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 11/17/20 8:31 AM, Cornelia Huck wrote: > On Tue, 17 Nov 2020 14:23:57 +0100 > Pierre Morel wrote: > >> On 11/17/20 2:00 PM, Peter Maydell wrote: >>> On Tue, 17 Nov 2020 at 12:03, Philippe Mathieu-Daudé wrote: >>>> >>>> Fix an endianness issue reported by Cornelia: >>>> >>>>> s390x tcg guest on x86, virtio-pci devices are not detected. The >>>>> relevant feature bits are visible to the guest. Same breakage with >>>>> different guest kernels. >>>>> KVM guests and s390x tcg guests on s390x are fine. >>>> >>>> Fixes: 28dc86a0729 ("s390x/pci: use a PCI Group structure") >>>> Reported-by: Cornelia Huck >>>> Signed-off-by: Philippe Mathieu-Daudé >>>> --- >>>> RFC because review-only patch, untested >>>> --- >>>> hw/s390x/s390-pci-inst.c | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c >>>> index 58cd041d17f..cfb54b4d8ec 100644 >>>> --- a/hw/s390x/s390-pci-inst.c >>>> +++ b/hw/s390x/s390-pci-inst.c >>>> @@ -305,7 +305,7 @@ int clp_service_call(S390CPU *cpu, uint8_t r2, uintptr_t ra) >>>> ClpReqQueryPciGrp *reqgrp = (ClpReqQueryPciGrp *)reqh; >>>> S390PCIGroup *group; >>>> >>>> - group = s390_group_find(reqgrp->g); >>>> + group = s390_group_find(ldl_p(&reqgrp->g)); >>> >>> 'g' in the ClpReqQueryPciGrp struct is a uint32_t, so >>> adding the ldl_p() will have no effect unless (a) the >>> structure is not 4-aligned and (b) the host will fault on >>> unaligned accesses, which isn't the case for x86 hosts. >>> >>> Q: is this struct really in host order, or should we >>> be using ldl_le_p() or ldl_be_p() and friends here and >>> elsewhere? >>> >>> thanks >>> -- PMM >>> >> >> Hi, I think we better modify the structure here, g should be a byte. >> >> Connie, can you please try this if it resolves the issue? >> >> diff --git a/hw/s390x/s390-pci-inst.h b/hw/s390x/s390-pci-inst.h >> index fa3bf8b5aa..641d19c815 100644 >> --- a/hw/s390x/s390-pci-inst.h >> +++ b/hw/s390x/s390-pci-inst.h >> @@ -146,7 +146,8 @@ typedef struct ClpReqQueryPciGrp { >> uint32_t fmt; >> uint64_t reserved1; >> #define CLP_REQ_QPCIG_MASK_PFGID 0xff >> - uint32_t g; >> + uint32_t g0 :24; >> + uint32_t g :8; >> uint32_t reserved2; >> uint64_t reserved3; >> } QEMU_PACKED ClpReqQueryPciGrp; >> > > No, same crash... I fear there are more things broken wrt endianness. > Sorry, just getting online now, looking at the code.... Are the 2 memcpy calls added in 9670ee75 and 28dc86a0 the issue? Won't they just present the Q PCI FN / Q PCI FN GRP results in host endianness?