From patchwork Wed Dec 6 16:41:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefano Garzarella X-Patchwork-Id: 174672 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp4229936vqy; Wed, 6 Dec 2023 08:42:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IEKIZQmvOzAKXwuhhsXaXktwLWsdkSzl8OH5/zaMbKo3+FyLy/KF5o695JhVjZUS0B+WkL2 X-Received: by 2002:a05:6e02:10d1:b0:35d:59a2:be5 with SMTP id s17-20020a056e0210d100b0035d59a20be5mr1198488ilj.123.1701880925716; Wed, 06 Dec 2023 08:42:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701880925; cv=none; d=google.com; s=arc-20160816; b=Q9m1Z8a7NFFOLrY2IFtymm3GCizo3XrrvTXcOtr0VCotSvPATCJdTK4R5ng/FBQZwj uNbY07ubfrW56KtnZq93bho/xBfLgNXUGWGpK53t0IxGZ5+5N+H2hS4rp660yR0/W/T4 QDIgpY65JL9cFEdrr7t9ODe+XH5oHRTPXgdPpDSKjfrxzoz++Vso2xHGgn3YwEMB+Sjw 5VzcZxw8O+1R3RIwFA54TLc1Hk9/SvTf5TkPo5ko6hwYEEmNw2G9X5yMI3uYTqKchqLL NvtdFj/0W5d6yaX5cMpkNIi7MwAwMVa5xcXssufjjr5nBM7awp9UV7LCJ/qANOG3a2UC Bf4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=BRBYbA6A9iVFJVJw2yLnCuRWTbq0bYeGysrV9jksr78=; fh=ailf4LLaZhZ60uiDLWG7XRcHQp8zcf33Y59uZojSEH0=; b=P7ovuGt4ZzveU3d6k14/fhfemVS2dXvmlFCM5Iy9466SrnqnkAMvkzRoO7Cf0uBQCD gIfv1EFR1Pco3uRnMcPDbkKVGCx3yQoKVHM83qxcThZeflp5t0e4bEh7EvW9z+Jc8oA/ YB3wQ1YAF4DvbYLFjTAEQLuoctFABs/mRR6nEHpUwGzPOF/5nrS4VanPiLQ4pFnCVYcZ CYGC4ZA0/umKTs4rdKHJ2jFdlzweDEJtSV+oH1tjGI+7QsQ9jQMCSFTnWprNzmwdIynn 6inh1w/VlzIrbN1aYtspFE8GUdGMt6mIOwYW6Npe00lnHQXauk9zey5ihok/iqbG3/pG rX3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="HvwHU/3w"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id bx28-20020a056a02051c00b005bd39be60b3si148279pgb.390.2023.12.06.08.42.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 08:42:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="HvwHU/3w"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 08189827D0E3; Wed, 6 Dec 2023 08:42:02 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229674AbjLFQlx (ORCPT + 99 others); Wed, 6 Dec 2023 11:41:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229573AbjLFQlw (ORCPT ); Wed, 6 Dec 2023 11:41:52 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 392D8D4D for ; Wed, 6 Dec 2023 08:41:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701880916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BRBYbA6A9iVFJVJw2yLnCuRWTbq0bYeGysrV9jksr78=; b=HvwHU/3wBwdD8oPXKZ2+jR1CI5hSr+MJuSguM9HX7nXpd2cZH6S2D6PxOwqo4tYJcuM7NP 0/zD+/vmoqPpqJzujAOcdKB9OxHQKxiPDm+TxqH/+FxVOlgkvUpWJEeV8U3Y/X9YNhpNYI bjFrf39TuMgC85HBIA1fszBxXyXxFC0= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-297-A3tHQDjNOVq_7hoHC3IhPw-1; Wed, 06 Dec 2023 11:41:55 -0500 X-MC-Unique: A3tHQDjNOVq_7hoHC3IhPw-1 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-423f2e9ed5dso11235761cf.0 for ; Wed, 06 Dec 2023 08:41:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701880914; x=1702485714; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BRBYbA6A9iVFJVJw2yLnCuRWTbq0bYeGysrV9jksr78=; b=SzEbg4sfNSdt64C3ie9oyMr6CM5RB9r8M40xTHG250T1B03dDMprUNngSjNUFXhW+/ n3xZyA92QKzWA6tiwlcowRV8zBrt4N4Noqa9VNvGqZD65a+4s6xpEPeWuQD7tO/1+J6F 8g3lYcKhtmZFhwhMmiGhPhGVPxGedGifTTSpB+GLVtm0J3T60uiEj45PPVGCB7+4kti2 xCE9WKFaX4Wn6KY4ppQHTsALXaPj5b6wHAIeqpDDj6/lEr4nYSbK7r6kJxqv7R1/Aq6A LPXlgesNdO988jRaGsPC07rz4iorB4nzggrFCYD+1r2KMoq5JqKPmJ2X/eMqNZo7WtYh FxzA== X-Gm-Message-State: AOJu0Yyrj/BRNVul7Cj+ONfUU6Yjix18beMDOeVIVNY5DXk5qT7Us4Kj 3dWpwGHAl4iIjqjOSD6dzq/8qlPnKOcdXUQTTO1SN6qDank5cTvBX1DTytKkrGsz1/opMloAB0b 5rTIPuQLNJ/vvbBzDr7zaJ7qH X-Received: by 2002:ac8:5b95:0:b0:425:4043:2a05 with SMTP id a21-20020ac85b95000000b0042540432a05mr1420274qta.128.1701880914551; Wed, 06 Dec 2023 08:41:54 -0800 (PST) X-Received: by 2002:ac8:5b95:0:b0:425:4043:2a05 with SMTP id a21-20020ac85b95000000b0042540432a05mr1420258qta.128.1701880914272; Wed, 06 Dec 2023 08:41:54 -0800 (PST) Received: from step1.redhat.com (host-79-46-200-125.retail.telecomitalia.it. [79.46.200.125]) by smtp.gmail.com with ESMTPSA id e25-20020ac86719000000b00423e8021da2sm78802qtp.42.2023.12.06.08.41.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Dec 2023 08:41:53 -0800 (PST) From: Stefano Garzarella To: netdev@vger.kernel.org Cc: Jakub Kicinski , "David S. Miller" , virtualization@lists.linux.dev, "Michael S. Tsirkin" , Arseniy Krasnov , Stefano Garzarella , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Hajnoczi , Eric Dumazet , Paolo Abeni Subject: [PATCH net] vsock/virtio: fix "comparison of distinct pointer types lacks a cast" warning Date: Wed, 6 Dec 2023 17:41:43 +0100 Message-ID: <20231206164143.281107-1-sgarzare@redhat.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-type: text/plain X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,PP_MIME_FAKE_ASCII_TEXT,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 06 Dec 2023 08:42:02 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784551493317758695 X-GMAIL-MSGID: 1784551493317758695 After backporting commit 581512a6dc93 ("vsock/virtio: MSG_ZEROCOPY flag support") in CentOS Stream 9, CI reported the following error: In file included from ./include/linux/kernel.h:17, from ./include/linux/list.h:9, from ./include/linux/preempt.h:11, from ./include/linux/spinlock.h:56, from net/vmw_vsock/virtio_transport_common.c:9: net/vmw_vsock/virtio_transport_common.c: In function ‘virtio_transport_can_zcopy‘: ./include/linux/minmax.h:20:35: error: comparison of distinct pointer types lacks a cast [-Werror] 20 | (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1))) | ^~ ./include/linux/minmax.h:26:18: note: in expansion of macro ‘__typecheck‘ 26 | (__typecheck(x, y) && __no_side_effects(x, y)) | ^~~~~~~~~~~ ./include/linux/minmax.h:36:31: note: in expansion of macro ‘__safe_cmp‘ 36 | __builtin_choose_expr(__safe_cmp(x, y), \ | ^~~~~~~~~~ ./include/linux/minmax.h:45:25: note: in expansion of macro ‘__careful_cmp‘ 45 | #define min(x, y) __careful_cmp(x, y, <) | ^~~~~~~~~~~~~ net/vmw_vsock/virtio_transport_common.c:63:37: note: in expansion of macro ‘min‘ 63 | int pages_to_send = min(pages_in_iov, MAX_SKB_FRAGS); We could solve it by using min_t(), but this operation seems entirely unnecessary, because we also pass MAX_SKB_FRAGS to iov_iter_npages(), which performs almost the same check, returning at most MAX_SKB_FRAGS elements. So, let's eliminate this unnecessary comparison. Fixes: 581512a6dc93 ("vsock/virtio: MSG_ZEROCOPY flag support") Cc: avkrasnov@salutedevices.com Signed-off-by: Stefano Garzarella Acked-by: Michael S. Tsirkin Reviewed-by: Arseniy Krasnov --- net/vmw_vsock/virtio_transport_common.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index f6dc896bf44c..c8e162c9d1df 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -59,8 +59,7 @@ static bool virtio_transport_can_zcopy(const struct virtio_transport *t_ops, t_ops = virtio_transport_get_ops(info->vsk); if (t_ops->can_msgzerocopy) { - int pages_in_iov = iov_iter_npages(iov_iter, MAX_SKB_FRAGS); - int pages_to_send = min(pages_in_iov, MAX_SKB_FRAGS); + int pages_to_send = iov_iter_npages(iov_iter, MAX_SKB_FRAGS); /* +1 is for packet header. */ return t_ops->can_msgzerocopy(pages_to_send + 1);