From patchwork Sat Oct 21 12:05:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 736693 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp729696wrl; Sat, 21 Oct 2023 05:06:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGMcPLq8eNjo0Z0//phGHz/4EqZfGLtZ5PUyPLNnR0ree6Td6sSkQWaqgOZ1DRmFy4W13vT X-Received: by 2002:a05:620a:d82:b0:76f:1d96:4eb5 with SMTP id q2-20020a05620a0d8200b0076f1d964eb5mr4795945qkl.36.1697890017191; Sat, 21 Oct 2023 05:06:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697890017; cv=none; d=google.com; s=arc-20160816; b=PLnPlN5oecau20YbZ4JIN/CFZtx9Wc8RbvEYlmGI4FrPZ1+TpH0cFUJy08EL74iYFM SNNAdnqhqaRdjfH3rAKquKXE14/3bWwl/9ySUuBkurqp6Wbj5s91eVKj10bpcKPU1P8x N2juMta78ZRaUI1PEdCnlPIdQIx5ie2DnYVqDuyBD+DaL5uSFhxAqAnItK93pyH3fhg+ D63IucrhwQ3tPMUqVNwcVArt9l/YXp+e2zhKJNQoK09fs+GxTaTsasaTfZLLZAnwmvSg 0zUhkwKw/CArIXhd7R0FhgwsEvYyQhowJhdBqpkF/PQ4bKYkOGurhBu6HEF9iCMGArhW tmmA== 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; bh=pLvUvMw7CwjK9r0r/xtbPyXVPEVvIBGv6bVMJcM+DzI=; fh=lj7Zr6wWhIFMqTWUR7reb2LiF+EPn4H7jS29Rz9wrNw=; b=LkWEFNHIsW5X3htsWkrdjAOLn5/AGv5oLUssL5sCpWyZP9FWhrzl08NpwksNGkixdO sumePaK8cNSSX9tTMiiNsQIu8v93D8zBaDc0yLUYfgG4QrZTCG7jlnog3HNcf3Cgp+KG Xu/9UcTPEqUoug9+uSJc0RKlB7rtFJZumcHnKmE00z37U7Yxvqkqv/xfYLrUAdCTSSmu d92kMdPDtJ8RVn0y4iA6u1tWE9W+ZPEKCBIuMrEtl12sHu2UOEP42lzr2/aD+sco6Jq2 ubi8gBb91P/jM5hI4xRQjknP83EGK19Thoa6aDS1+vC58TjxVjMf+r7/Y1GAei/dYxCd mYMg== 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 g11-20020ae9e10b000000b0077434814120si2550182qkm.162.2023.10.21.05.06.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Oct 2023 05:06:57 -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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quAjk-00034o-Jc; Sat, 21 Oct 2023 08:05:48 -0400 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 1quAjV-0002zf-Ph; Sat, 21 Oct 2023 08:05:34 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1quAjT-0000u5-CI; Sat, 21 Oct 2023 08:05:33 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 1534F2C32F; Sat, 21 Oct 2023 15:05:51 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id D1A093067D; Sat, 21 Oct 2023 15:05:25 +0300 (MSK) Received: (nullmailer pid 220778 invoked by uid 1000); Sat, 21 Oct 2023 12:05:25 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-trivial@nongnu.org, qemu-stable@nongnu.org, Michael Tokarev Subject: [PULL 01/17] hw/rdma/vmw/pvrdma_cmd: Use correct struct in query_port() Date: Sat, 21 Oct 2023 15:05:03 +0300 Message-Id: <20231021120519.220720-2-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231021120519.220720-1-mjt@tls.msk.ru> References: <20231021120519.220720-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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 From: Peter Maydell In query_port() we pass the address of a local pvrdma_port_attr struct to the rdma_query_backend_port() function. Unfortunately, rdma_backend_query_port() wants a pointer to a struct ibv_port_attr, and the two are not the same length. Coverity spotted this (CID 1507146): pvrdma_port_attr is 48 bytes long, and ibv_port_attr is 52 bytes, because it has a few extra fields at the end. Fortunately, all we do with the attrs struct after the call is to read a few specific fields out of it which are all at the same offsets in both structs, so we can simply make the local variable the correct type. This also lets us drop the cast (which should have been a bit of a warning flag that we were doing something wrong here). We do however need to add extra casts for the fields of the struct that are enums: clang will complain about the implicit cast to a different enum type otherwise. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Signed-off-by: Michael Tokarev --- hw/rdma/vmw/pvrdma_cmd.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c index c6ed025982..d385d18d9c 100644 --- a/hw/rdma/vmw/pvrdma_cmd.c +++ b/hw/rdma/vmw/pvrdma_cmd.c @@ -129,23 +129,27 @@ static int query_port(PVRDMADev *dev, union pvrdma_cmd_req *req, { struct pvrdma_cmd_query_port *cmd = &req->query_port; struct pvrdma_cmd_query_port_resp *resp = &rsp->query_port_resp; - struct pvrdma_port_attr attrs = {}; + struct ibv_port_attr attrs = {}; if (cmd->port_num > MAX_PORTS) { return -EINVAL; } - if (rdma_backend_query_port(&dev->backend_dev, - (struct ibv_port_attr *)&attrs)) { + if (rdma_backend_query_port(&dev->backend_dev, &attrs)) { return -ENOMEM; } memset(resp, 0, sizeof(*resp)); - resp->attrs.state = dev->func0->device_active ? attrs.state : - PVRDMA_PORT_DOWN; - resp->attrs.max_mtu = attrs.max_mtu; - resp->attrs.active_mtu = attrs.active_mtu; + /* + * The state, max_mtu and active_mtu fields are enums; the values + * for pvrdma_port_state and pvrdma_mtu match those for + * ibv_port_state and ibv_mtu, so we can cast them safely. + */ + resp->attrs.state = dev->func0->device_active ? + (enum pvrdma_port_state)attrs.state : PVRDMA_PORT_DOWN; + resp->attrs.max_mtu = (enum pvrdma_mtu)attrs.max_mtu; + resp->attrs.active_mtu = (enum pvrdma_mtu)attrs.active_mtu; resp->attrs.phys_state = attrs.phys_state; resp->attrs.gid_tbl_len = MIN(MAX_PORT_GIDS, attrs.gid_tbl_len); resp->attrs.max_msg_sz = 1024;