From patchwork Fri Jun 9 09:21:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eugenio Perez Martin X-Patchwork-Id: 105483 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp821277vqr; Fri, 9 Jun 2023 02:34:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4orlrmKm4nXAZLRSNKUoB822aYNd+guz7pEMKagT9jVvqSgSA1AQ/wnKa2AmNvaOcalC5x X-Received: by 2002:a05:6a20:e616:b0:118:5d5a:f26d with SMTP id my22-20020a056a20e61600b001185d5af26dmr739400pzb.59.1686303295765; Fri, 09 Jun 2023 02:34:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686303295; cv=none; d=google.com; s=arc-20160816; b=W+0ZYArAJG5EJwkUcgBEKEalAJ0Rdr61yqL5jq+gFp5l8+EtLowhedaxWMGXUPHq2s dirnGxjW4Tf2dcH9otAnBAvvU8CFHMnZfQ8LC4PO7q/MPJEsK4+I5Q+FkHV1BNK2wnMH z4NR0ZKc/QZ77akrt1GDyiHXv5CLgMoLPV4QbCArq9A6JwDkYvem5VPYOF+G8mEbIrdk jLvc1yPKI/hLD1dCH1UEBADfebXtIbnLSUx6+9Dk2e0bRUzKOT4uS5+8JTSINU1p5Vhf KOddCc/w3iP3QV86uToXlslRfoXNd5kA4o3n44XI9a8LfcCVZ3d5KbzM++EClBncGIPz HNkg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1rO6a+xdfZtWaePxR/QAzOglehE9/nz9AmfIDcLwU6A=; b=f/9dE1QiyKTwyX9EwH3VNhtGCgRcL8zYJSMee5wvc3B6FRpVMlbdLNnrIjxoLjSZVN YUe3HYMjSXJKYJ2uFvcebPCixb8PJS+xwmVq6FeocHVWyiiHklNSCTIYeM05WBjAyPKp fZXzFQ6HHqUMd7tKYxS1VEcHN8IP74J7mML6FlgHDxsBq7Eldl0jirc9yakMQUX79MT1 XGzi6PJr0yVjiVrwzNl45fOHed3laPeVRFfUn+hqQZ0U+59TG8Q2cTknJwur71KQvJBo pbX72Bh7RVu1uRLlSKFnn94tSselPG2O3w+KHW+1ys4gXYQ3V1vNeYKCayfmuq3c2r7l lyUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FMJyqKVs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w2-20020a637b02000000b0054290efc1d8si2406804pgc.504.2023.06.09.02.34.43; Fri, 09 Jun 2023 02:34:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FMJyqKVs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241619AbjFIJ3i (ORCPT + 99 others); Fri, 9 Jun 2023 05:29:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241592AbjFIJ3V (ORCPT ); Fri, 9 Jun 2023 05:29:21 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E27F3C0F for ; Fri, 9 Jun 2023 02:22:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686302511; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1rO6a+xdfZtWaePxR/QAzOglehE9/nz9AmfIDcLwU6A=; b=FMJyqKVsnJYHf9jH0K8He2OMghhLsTfuSQy+outElY2QV86c5+Px5FOg8vdhdda1mF6IaU BRxM+LD48wUeEPbk6hDto+P0FNVtb/qdiBiTnNJoBktV7q8RQD4xSIzgm62t5vaS23UhZF A4CIvDdUSRbnWBhhflCGjbjD1j05z/g= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-230-UYkEzIZQPV62AftoqrzJjw-1; Fri, 09 Jun 2023 05:21:45 -0400 X-MC-Unique: UYkEzIZQPV62AftoqrzJjw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 01DBF802355; Fri, 9 Jun 2023 09:21:43 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.193.246]) by smtp.corp.redhat.com (Postfix) with ESMTP id E24BF202696C; Fri, 9 Jun 2023 09:21:39 +0000 (UTC) From: =?utf-8?q?Eugenio_P=C3=A9rez?= To: mst@redhat.com, Jason Wang Cc: Zhu Lingshan , virtualization@lists.linux-foundation.org, "Gonglei (Arei)" , longpeng2@huawei.com, Lei Yang , Parav Pandit , Gautam Dawar , Dragos Tatulea , Laurent Vivier , linux-api@vger.kernel.org, Liuxiangdong , linux-kernel@vger.kernel.org, alvaro.karsz@solid-run.com, Shannon Nelson , Stefano Garzarella , Cindy Lu , si-wei.liu@oracle.com, Harpreet Singh Anand Subject: [PATCH v2 3/4] vdpa: add get_backend_features vdpa operation Date: Fri, 9 Jun 2023 11:21:26 +0200 Message-Id: <20230609092127.170673-4-eperezma@redhat.com> In-Reply-To: <20230609092127.170673-1-eperezma@redhat.com> References: <20230609092127.170673-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, 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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768217164881094793?= X-GMAIL-MSGID: =?utf-8?q?1768217164881094793?= This operation allow vdpa parent to expose its own backend feature bits. Next patches introduce a feature not compatible with all parent drivers: the ability to enable vq after driver_ok. Each parent must declare if it allows it or not. Signed-off-by: Eugenio Pérez Acked-by: Shannon Nelson --- drivers/vhost/vdpa.c | 12 ++++++++++++ include/linux/vdpa.h | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index a3204406b73d..e1abf29fed5b 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -403,6 +403,17 @@ static long vhost_vdpa_get_features(struct vhost_vdpa *v, u64 __user *featurep) return 0; } +static u64 vhost_vdpa_get_backend_features(const struct vhost_vdpa *v) +{ + struct vdpa_device *vdpa = v->vdpa; + const struct vdpa_config_ops *ops = vdpa->config; + + if (!ops->get_backend_features) + return 0; + else + return ops->get_backend_features(vdpa); +} + static long vhost_vdpa_set_features(struct vhost_vdpa *v, u64 __user *featurep) { struct vdpa_device *vdpa = v->vdpa; @@ -742,6 +753,7 @@ static long vhost_vdpa_unlocked_ioctl(struct file *filep, features |= BIT_ULL(VHOST_BACKEND_F_SUSPEND); if (vhost_vdpa_can_resume(v)) features |= BIT_ULL(VHOST_BACKEND_F_RESUME); + features |= vhost_vdpa_get_backend_features(v); if (copy_to_user(featurep, &features, sizeof(features))) r = -EFAULT; break; diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h index db1b0eaef4eb..0e652026b776 100644 --- a/include/linux/vdpa.h +++ b/include/linux/vdpa.h @@ -208,6 +208,9 @@ struct vdpa_map_file { * @vdev: vdpa device * Returns the virtio features support by the * device + * @get_backend_features: Get parent-specific backend features (optional) + * Returns the vdpa features supported by the + * device. * @set_driver_features: Set virtio features supported by the driver * @vdev: vdpa device * @features: feature support by the driver @@ -358,6 +361,7 @@ struct vdpa_config_ops { u32 (*get_vq_align)(struct vdpa_device *vdev); u32 (*get_vq_group)(struct vdpa_device *vdev, u16 idx); u64 (*get_device_features)(struct vdpa_device *vdev); + u64 (*get_backend_features)(const struct vdpa_device *vdev); int (*set_driver_features)(struct vdpa_device *vdev, u64 features); u64 (*get_driver_features)(struct vdpa_device *vdev); void (*set_config_cb)(struct vdpa_device *vdev,