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.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable 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 8514FC7618B for ; Wed, 24 Jul 2019 08:08:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6458921873 for ; Wed, 24 Jul 2019 08:08:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726086AbfGXIII (ORCPT ); Wed, 24 Jul 2019 04:08:08 -0400 Received: from mail-qk1-f194.google.com ([209.85.222.194]:43042 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725870AbfGXIII (ORCPT ); Wed, 24 Jul 2019 04:08:08 -0400 Received: by mail-qk1-f194.google.com with SMTP id m14so7440459qka.10 for ; Wed, 24 Jul 2019 01:08:07 -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=/MFYQFzENwHk5G46kOvOVKTzaxjp4jXpKM7WypPWBDc=; b=QblKuzZdOr6/OXo6JGIjzVqC3pM7ihUgDkJLlIRHuxO59QkSrEt+APOIQIety1d5Bs 5UG9MHPhk3gmTTEsu1XHaaPCzje5EUNiJU7/DHRPZXTpXyMLVp4sn6Fk155cR74M2iHg LcPAp8qq+cwVkhYOAqD5Uha4LyGwfljmCx/mZVu11BYbjKuNLdDn8IBWl3ZemaH9ZYk1 lG8U+rFz8a5DIrKQv0nyuDpeC18NWK3NclhBOyjtLzqktwgYGRGNSFg9jAwEYBgo1bKb rgpKJR3nQiNmgFy+eX3h0DFMDYHyPa+u0gya1AwX4DG/q3qxfHpYZ4qfa8ABll3q8CGI 8pfg== X-Gm-Message-State: APjAAAXcoPeXvxizf4nfBP08tXAlbEq8LhLnkGQ1ciwEpN8fuuFj33Gx ILwJCDOf0MvOpJCYKBpokInRRg== X-Google-Smtp-Source: APXvYqyqOJ7xj5WyBSGnSKw6r+fHzKSSQgggyWILPC/N5KbhyvrIGi3wpGDnO2q6i0xNWsrtSCd37A== X-Received: by 2002:a05:620a:31b:: with SMTP id s27mr17648521qkm.264.1563955687250; Wed, 24 Jul 2019 01:08:07 -0700 (PDT) Received: from redhat.com (bzq-79-181-91-42.red.bezeqint.net. [79.181.91.42]) by smtp.gmail.com with ESMTPSA id t26sm23203051qtc.95.2019.07.24.01.07.58 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 24 Jul 2019 01:08:06 -0700 (PDT) Date: Wed, 24 Jul 2019 04:07:55 -0400 From: "Michael S. Tsirkin" To: john.hubbard@gmail.com Cc: Andrew Morton , Alexander Viro , Anna Schumaker , "David S . Miller" , Dominique Martinet , Eric Van Hensbergen , Jason Gunthorpe , Jason Wang , Jens Axboe , Latchesar Ionkov , Miklos Szeredi , Trond Myklebust , Christoph Hellwig , Matthew Wilcox , linux-mm@kvack.org, LKML , ceph-devel@vger.kernel.org, kvm@vger.kernel.org, linux-block@vger.kernel.org, linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, samba-technical@lists.samba.org, v9fs-developer@lists.sourceforge.net, virtualization@lists.linux-foundation.org, =?iso-8859-1?B?Suly9G1l?= Glisse , John Hubbard , Jan Kara , Dan Williams , Johannes Thumshirn , Ming Lei , Dave Chinner , Boaz Harrosh , Paolo Bonzini , Stefan Hajnoczi Subject: Re: [PATCH 07/12] vhost-scsi: convert put_page() to put_user_page*() Message-ID: <20190724040745-mutt-send-email-mst@kernel.org> References: <20190724042518.14363-1-jhubbard@nvidia.com> <20190724042518.14363-8-jhubbard@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20190724042518.14363-8-jhubbard@nvidia.com> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org On Tue, Jul 23, 2019 at 09:25:13PM -0700, john.hubbard@gmail.com wrote: > From: Jérôme Glisse > > For pages that were retained via get_user_pages*(), release those pages > via the new put_user_page*() routines, instead of via put_page(). > > This is part a tree-wide conversion, as described in commit fc1d8e7cca2d > ("mm: introduce put_user_page*(), placeholder versions"). > > Changes from Jérôme's original patch: > > * Changed a WARN_ON to a BUG_ON. > > Signed-off-by: Jérôme Glisse > Signed-off-by: John Hubbard > Cc: virtualization@lists.linux-foundation.org > Cc: linux-fsdevel@vger.kernel.org > Cc: linux-block@vger.kernel.org > Cc: linux-mm@kvack.org > Cc: Jan Kara > Cc: Dan Williams > Cc: Alexander Viro > Cc: Johannes Thumshirn > Cc: Christoph Hellwig > Cc: Jens Axboe > Cc: Ming Lei > Cc: Dave Chinner > Cc: Jason Gunthorpe > Cc: Matthew Wilcox > Cc: Boaz Harrosh > Cc: Miklos Szeredi > Cc: "Michael S. Tsirkin" > Cc: Jason Wang > Cc: Paolo Bonzini > Cc: Stefan Hajnoczi Acked-by: Michael S. Tsirkin > --- > drivers/vhost/scsi.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c > index a9caf1bc3c3e..282565ab5e3f 100644 > --- a/drivers/vhost/scsi.c > +++ b/drivers/vhost/scsi.c > @@ -329,11 +329,11 @@ static void vhost_scsi_release_cmd(struct se_cmd *se_cmd) > > if (tv_cmd->tvc_sgl_count) { > for (i = 0; i < tv_cmd->tvc_sgl_count; i++) > - put_page(sg_page(&tv_cmd->tvc_sgl[i])); > + put_user_page(sg_page(&tv_cmd->tvc_sgl[i])); > } > if (tv_cmd->tvc_prot_sgl_count) { > for (i = 0; i < tv_cmd->tvc_prot_sgl_count; i++) > - put_page(sg_page(&tv_cmd->tvc_prot_sgl[i])); > + put_user_page(sg_page(&tv_cmd->tvc_prot_sgl[i])); > } > > vhost_scsi_put_inflight(tv_cmd->inflight); > @@ -630,6 +630,13 @@ vhost_scsi_map_to_sgl(struct vhost_scsi_cmd *cmd, > size_t offset; > unsigned int npages = 0; > > + /* > + * Here in all cases we should have an IOVEC which use GUP. If that is > + * not the case then we will wrongly call put_user_page() and the page > + * refcount will go wrong (this is in vhost_scsi_release_cmd()) > + */ > + WARN_ON(!iov_iter_get_pages_use_gup(iter)); > + > bytes = iov_iter_get_pages(iter, pages, LONG_MAX, > VHOST_SCSI_PREALLOC_UPAGES, &offset); > /* No pages were pinned */ > @@ -681,7 +688,7 @@ vhost_scsi_iov_to_sgl(struct vhost_scsi_cmd *cmd, bool write, > while (p < sg) { > struct page *page = sg_page(p++); > if (page) > - put_page(page); > + put_user_page(page); > } > return ret; > } > -- > 2.22.0