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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 6DC36C43331 for ; Thu, 2 Apr 2020 12:54:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 386E020784 for ; Thu, 2 Apr 2020 12:54:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RnfgyI9+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388412AbgDBMyI (ORCPT ); Thu, 2 Apr 2020 08:54:08 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:24698 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2388372AbgDBMyI (ORCPT ); Thu, 2 Apr 2020 08:54:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585832046; 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=e+rpGY/lQzxU62GHHMv3q/FRvIYAGToP29ghNExNLYc=; b=RnfgyI9+oyMc3AuIbdtm6rrOc3vRp8y16aj+7KDdObR1zzjbELDemQJmQ9nBAXDh0CqtV7 YshEO7NY2ybY+RRJA+t7j8A5HewgLXpKDX1h6aH+CcXS7hVnEpPdSw4jB21r8h0vX4Qdif AFFzVnrGAy8DXyTnyC1hpHpujER3UUw= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-381-JFkVUVVUM62ehSpq7DwJ8Q-1; Thu, 02 Apr 2020 08:54:05 -0400 X-MC-Unique: JFkVUVVUM62ehSpq7DwJ8Q-1 Received: by mail-qk1-f197.google.com with SMTP id g13so1933224qkk.11 for ; Thu, 02 Apr 2020 05:54:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=e+rpGY/lQzxU62GHHMv3q/FRvIYAGToP29ghNExNLYc=; b=QmMFnNHhISRtCVqN23En3b8mPatYlJeuocl6Ns/3P1RCdWccwa4Krjj3Yls67T2jqB KWzJP+We3zSuWfZgwXCtgaDgsyvo5PCHqBVaantt55aQZ+ult1t8YNol4m72vwf6+Ql9 /Fb3tAHGYXPBCAODfFgxogA+Ujyhpk6E1ZGGL8VoD1IeqstXtBtHZDjvQ7GNNOuGPW98 yMRe7Mkg/oCCfluIi5YWlMdkrUT1sKCxn7vtHF/KEn2Xro2adzYA3JTDHqd65kFfv0gA l+NeI7aLPzhNJBAQVjdTgrlMdM2xduB2PaQxX6/ameBUoviN3doPcdSQibV2jHPqwBtO h7Xw== X-Gm-Message-State: AGi0Pub1NsrlbohpuQ39ugApwvjFwm1I1KcvbQYbTVaTjW9acR8TlVNw dYKmsY282GPZRdXhGtdli2GWLyJDkY9cOT8E0irSGMGUqJk7pkp9uTAR8zh4gHxMAn12ZTjTS8c 2k0z9NwNGZbAf/Adb X-Received: by 2002:a37:b17:: with SMTP id 23mr3444707qkl.326.1585832044799; Thu, 02 Apr 2020 05:54:04 -0700 (PDT) X-Google-Smtp-Source: APiQypKWAXrSE3QY71rFZEVKPyM9P23H/+nJyT2FOKqzUpxwU6y4/YNd29YMt69nqsRb7v9SGkCigg== X-Received: by 2002:a37:b17:: with SMTP id 23mr3444679qkl.326.1585832044434; Thu, 02 Apr 2020 05:54:04 -0700 (PDT) Received: from redhat.com (bzq-79-176-51-222.red.bezeqint.net. [79.176.51.222]) by smtp.gmail.com with ESMTPSA id m27sm3713948qtf.80.2020.04.02.05.54.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2020 05:54:03 -0700 (PDT) Date: Thu, 2 Apr 2020 08:53:58 -0400 From: "Michael S. Tsirkin" To: Jason Wang Cc: linux-kernel@vger.kernel.org, Eugenio =?iso-8859-1?Q?P=E9rez?= , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org Subject: Re: [PATCH] virtio/test: fix up after IOTLB changes Message-ID: <20200402084021-mutt-send-email-mst@kernel.org> References: <20200401165100.276039-1-mst@redhat.com> <921fe999-e183-058d-722a-1a6a6ab066e0@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <921fe999-e183-058d-722a-1a6a6ab066e0@redhat.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, Apr 02, 2020 at 12:01:56PM +0800, Jason Wang wrote: > > On 2020/4/2 上午12:51, Michael S. Tsirkin wrote: > > Allow building vringh without IOTLB (that's the case for userspace > > builds, will be useful for CAIF/VOD down the road too). > > Update for API tweaks. > > Don't include vringh with kernel builds. > > > I'm not quite sure we need this. > > E.g the userspace accessor is not used by CAIF/VOP. Well any exported symbols are always compiled in, right? So we can save some kernel memory by not building unused stuff ... > > > > Cc: Jason Wang > > Cc: Eugenio Pérez > > Signed-off-by: Michael S. Tsirkin > > --- > > drivers/vhost/test.c | 4 ++-- > > drivers/vhost/vringh.c | 5 +++++ > > include/linux/vringh.h | 2 ++ > > tools/virtio/Makefile | 3 ++- > > 4 files changed, 11 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/vhost/test.c b/drivers/vhost/test.c > > index 394e2e5c772d..9a3a09005e03 100644 > > --- a/drivers/vhost/test.c > > +++ b/drivers/vhost/test.c > > @@ -120,7 +120,7 @@ static int vhost_test_open(struct inode *inode, struct file *f) > > vqs[VHOST_TEST_VQ] = &n->vqs[VHOST_TEST_VQ]; > > n->vqs[VHOST_TEST_VQ].handle_kick = handle_vq_kick; > > vhost_dev_init(dev, vqs, VHOST_TEST_VQ_MAX, UIO_MAXIOV, > > - VHOST_TEST_PKT_WEIGHT, VHOST_TEST_WEIGHT); > > + VHOST_TEST_PKT_WEIGHT, VHOST_TEST_WEIGHT, NULL); > > f->private_data = n; > > @@ -225,7 +225,7 @@ static long vhost_test_reset_owner(struct vhost_test *n) > > { > > void *priv = NULL; > > long err; > > - struct vhost_umem *umem; > > + struct vhost_iotlb *umem; > > mutex_lock(&n->dev.mutex); > > err = vhost_dev_check_owner(&n->dev); > > diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c > > index ee0491f579ac..878e565dfffe 100644 > > --- a/drivers/vhost/vringh.c > > +++ b/drivers/vhost/vringh.c > > @@ -13,9 +13,11 @@ > > #include > > #include > > #include > > +#ifdef VHOST_IOTLB > > > Kbuild bot reports build issues with this. > > It looks to me we should use #if IS_ENABLED(CONFIG_VHOST_IOTLB) here and > following checks. > > Thanks > In fact IS_REACHEABLE is probably the right thing to do. > > > #include > > #include > > #include > > +#endif > > #include > > static __printf(1,2) __cold void vringh_bad(const char *fmt, ...) > > @@ -1059,6 +1061,8 @@ int vringh_need_notify_kern(struct vringh *vrh) > > } > > EXPORT_SYMBOL(vringh_need_notify_kern); > > +#ifdef VHOST_IOTLB > > + > > static int iotlb_translate(const struct vringh *vrh, > > u64 addr, u64 len, struct bio_vec iov[], > > int iov_size, u32 perm) > > @@ -1416,5 +1420,6 @@ int vringh_need_notify_iotlb(struct vringh *vrh) > > } > > EXPORT_SYMBOL(vringh_need_notify_iotlb); > > +#endif > > MODULE_LICENSE("GPL"); > > diff --git a/include/linux/vringh.h b/include/linux/vringh.h > > index bd0503ca6f8f..ebff121c0b02 100644 > > --- a/include/linux/vringh.h > > +++ b/include/linux/vringh.h > > @@ -14,8 +14,10 @@ > > #include > > #include > > #include > > +#ifdef VHOST_IOTLB > > #include > > #include > > +#endif > > #include > > /* virtio_ring with information needed for host access. */ > > diff --git a/tools/virtio/Makefile b/tools/virtio/Makefile > > index f33f32f1d208..d3f152f4660b 100644 > > --- a/tools/virtio/Makefile > > +++ b/tools/virtio/Makefile > > @@ -22,7 +22,8 @@ OOT_CONFIGS=\ > > CONFIG_VHOST=m \ > > CONFIG_VHOST_NET=n \ > > CONFIG_VHOST_SCSI=n \ > > - CONFIG_VHOST_VSOCK=n > > + CONFIG_VHOST_VSOCK=n \ > > + CONFIG_VHOST_RING=n > > OOT_BUILD=KCFLAGS="-I "${OOT_VHOST} ${MAKE} -C ${OOT_KSRC} V=${V} > > oot-build: > > echo "UNSUPPORTED! Don't use the resulting modules in production!"