Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp8319536rwr; Wed, 10 May 2023 22:43:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6KZHLLU4agnJxMFWFyksXUyoeYvYLWTKivzOfKPdd1tRWR9MePQlyMLQVxx2zVzCT7QvB2 X-Received: by 2002:a17:903:1110:b0:1aa:ff41:31a7 with SMTP id n16-20020a170903111000b001aaff4131a7mr26314062plh.13.1683783831832; Wed, 10 May 2023 22:43:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683783831; cv=none; d=google.com; s=arc-20160816; b=fypDKYf1LI6bmhKgm0cbT/QcNpNbmRFOy2lTMp+jQbeBqnD3zq1NIMWAJeXQ5M3uZe 6syfUxQwVnVWXeIO+4VhPfvbAipzhkarGatY5jl6hHq/KKZz+CebwiB4Q1CdXzb55tN3 n1DzTi/LAlauoEtPPi+ReuLMdW7AV3LXsgnxDamG0NTEuW8r7ttIqDJGD71av1fvgAwF NcZ82kddI/fOSCDHfVCjRn+YjtU0W53No/1hq/txVfiF0rCBb4ZP++FMGCV8SNNsvZMB sN1R4ydvqTOy3+nJhv66y2zg9/3/yNhZK1oFzpNpPAK9deJvZclo+WY0QhUSMuLZPY4i mPtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=sImtSEdeoH0kaJWNfpZ5Fj7UjlwzA50TxaE7LHZUU+U=; b=E3v01Y/2l6BSZVMBRY5qy8/guf6hy6QJzk10A9UoYCRkNCW4dyHg6FKlUsM6BrHR/b CCnAdfi4uvefxJ1Dyh0i7IaZY1347W1kzSi2QksSS1sVnzjAgZIEkLoHyAHHoiDmE3C1 ZVW15FFVNL+oBqr1o5fNqJPVaTnx9mmg6Hxxo47sUSf50udJgoT8EqCqYKAcQV2aQly6 mIJ9YrSaYBtnSRXM/oHBWHB69GhZB0d8QAb7oqNKmvIinwK02/gU0S402iRhqXE4Qi02 b255+nZ9o6A1oCeaictIg+k7iJnWKIh5qnJ8fUfjcGcnZj1WgQPNYLWRpsAS6svw0QZW YEVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.org.uk header.s=zeniv-20220401 header.b=BfOwgjFL; 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=zeniv.linux.org.uk Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u16-20020a170903125000b001aaef930752si6175133plh.647.2023.05.10.22.43.39; Wed, 10 May 2023 22:43:51 -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=@linux.org.uk header.s=zeniv-20220401 header.b=BfOwgjFL; 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=zeniv.linux.org.uk Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236654AbjEKFbl (ORCPT + 99 others); Thu, 11 May 2023 01:31:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236300AbjEKFbg (ORCPT ); Thu, 11 May 2023 01:31:36 -0400 Received: from zeniv.linux.org.uk (zeniv.linux.org.uk [IPv6:2a03:a000:7:0:5054:ff:fe1c:15ff]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 527372105; Wed, 10 May 2023 22:31:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=linux.org.uk; s=zeniv-20220401; h=Sender:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=sImtSEdeoH0kaJWNfpZ5Fj7UjlwzA50TxaE7LHZUU+U=; b=BfOwgjFL6GdoKA3/MhZfq945FU B8H7AiawPq2LjLZFlbJYtIgzCNaJ/ZSK7ikij7A1I1uUx1Svhbn3BfRlkeFgvvMTfMnzbDHvZFJqA +eDL/3DBjN/IYXh9Ox2V3iUrezO5oMRkPFkWIOPwQNl7Pwu8QjoTAsn0em1THyhgjM/5mFalU93R4 INtQ6qCQ+L5vad3oJq3q83POwFVrVfa8W8s6REmY2jjjc1YGjjrBK/d2MV/4rc6Zwt4NlTj4E9PHJ JZj0hlTv7esatCf8mZh1n8tVEbHkG2PQKQs5uQHULGyXhr/7G8P7zSURKG+YXjdkJOjZ7x5MIUn8L LRcQVDkw==; Received: from viro by zeniv.linux.org.uk with local (Exim 4.96 #2 (Red Hat Linux)) id 1pwyth-001cUh-1C; Thu, 11 May 2023 05:31:25 +0000 Date: Thu, 11 May 2023 06:31:25 +0100 From: Al Viro To: ye.xingchen@zte.com.cn Cc: mst@redhat.com, jasowang@redhat.com, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] vhost_net: Use fdget() and fdput() Message-ID: <20230511053125.GI3390869@ZenIV> References: <202305051424047152799@zte.com.cn> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202305051424047152799@zte.com.cn> Sender: Al Viro X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham 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 On Fri, May 05, 2023 at 02:24:04PM +0800, ye.xingchen@zte.com.cn wrote: > From: Ye Xingchen > > convert the fget()/fput() uses to fdget()/fdput(). > > Signed-off-by: Ye Xingchen > --- > drivers/vhost/net.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c > index ae2273196b0c..5b3fe4805182 100644 > --- a/drivers/vhost/net.c > +++ b/drivers/vhost/net.c > @@ -1466,17 +1466,17 @@ static struct ptr_ring *get_tap_ptr_ring(struct file *file) > > static struct socket *get_tap_socket(int fd) > { > - struct file *file = fget(fd); > + struct fd f = fdget(fd); > struct socket *sock; > > - if (!file) > + if (!f.file) > return ERR_PTR(-EBADF); > - sock = tun_get_socket(file); > + sock = tun_get_socket(f.file); > if (!IS_ERR(sock)) > return sock; > - sock = tap_get_socket(file); > + sock = tap_get_socket(f.file); > if (IS_ERR(sock)) > - fput(file); > + fdput(f); > return sock; NAK. For the same reason why the sockfd_lookup() counterpart of that patch is broken. After your change there's no way for the caller to tell whether we have bumped the refcount of file in question; this can't possibly work.