From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 67E4DA09D2; Wed, 11 Nov 2020 07:02:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C5A22F64; Wed, 11 Nov 2020 07:02:04 +0100 (CET) Received: from nat-hk.nvidia.com (nat-hk.nvidia.com [203.18.50.4]) by dpdk.org (Postfix) with ESMTP id 9F1F02AB; Wed, 11 Nov 2020 07:02:01 +0100 (CET) Received: from HKMAIL103.nvidia.com (Not Verified[10.18.92.9]) by nat-hk.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Wed, 11 Nov 2020 14:01:59 +0800 Received: from HKMAIL103.nvidia.com (10.18.16.12) by HKMAIL103.nvidia.com (10.18.16.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 11 Nov 2020 06:01:56 +0000 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.176) by HKMAIL103.nvidia.com (10.18.16.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Wed, 11 Nov 2020 06:01:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KRIFOIvWi0JHY1/3iXymoRsG9zADNbMSOJYa6yvrOkPV7XxwOHMCs33MTis4mVaEEZT9fOv0N3jvJsMA6z0K9NTCrjMDlAw37+IzJjcbiyc4mq8ln3BIm5055VXpdnE6LO1MxWG/ZEAzIIH6ttfP45XIrdMJU2vTE4qFpy5kU5DLaVUdWHaNZMFRJDZIuOrkaSENevTBhHROBC5mS90fwtvSkgzhaGVAqoaDvP++0kxrGQ/xB3JPQEsy6qJJsUmb43cUgKcDYGi9SY1E6cmjCqChRvpC6TIvhJu0gjtNpYfY4rD70g3sBnx5y9j4AG0qE5UDhRrt9de07i9FSSAEnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2hnwxbLqRyRYcB+yquXPRuPtFIaLE/TWToPbXjU4tDg=; b=DQreJZzgVPVvjlYr+32k6OP3GcLYeGtTYYbAsl+9BOnHyc/DE8lxT8BAlzJqbVTAqmpXUeSs6+c1x5+4P/kSqjZUeLqBwKgAo7wC0lhjl8OpaO6dbF7uAnC0+at9/ycULinIPvtC+nf4jsQVlh87Cqv1K1nWPHGBt/P/GjhO3bC5pqv1vDFmYTU2D2QyCNKEz4mJMIsvrGhuwQ4dXTo0ESDMYCW7zKPevJRImtj+kZZ/R2kJy7ly4Rxm0cOXJ152gdeeRdIHAhyLd+lOrK9XXWb0IsroQVbJ6FdYbVaSixowaCiFtJoYRxbuTgttCWUFukt3VJOppn1NEYzpdGmu5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none Received: from BY5PR12MB4324.namprd12.prod.outlook.com (2603:10b6:a03:209::10) by BYAPR12MB4760.namprd12.prod.outlook.com (2603:10b6:a03:9c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.28; Wed, 11 Nov 2020 06:01:53 +0000 Received: from BY5PR12MB4324.namprd12.prod.outlook.com ([fe80::3420:8913:2256:fa6f]) by BY5PR12MB4324.namprd12.prod.outlook.com ([fe80::3420:8913:2256:fa6f%2]) with mapi id 15.20.3541.025; Wed, 11 Nov 2020 06:01:41 +0000 From: "Xueming(Steven) Li" To: Maxime Coquelin , "dev@dpdk.org" , "xuan.ding@intel.com" , "stephen@networkplumber.org" , "NBU-Contact-Thomas Monjalon" , "stable@dpdk.org" , "chenbo.xia@intel.com" Thread-Topic: [dpdk-dev] [PATCH v3 3/3] vhost: fix fd leak in kick setup Thread-Index: AQHWtpKHS2f122rWzUKMvPQKhLoOE6nCchTQ Date: Wed, 11 Nov 2020 06:01:41 +0000 Message-ID: References: <20201109121630.251603-1-maxime.coquelin@redhat.com> <20201109121630.251603-4-maxime.coquelin@redhat.com> In-Reply-To: <20201109121630.251603-4-maxime.coquelin@redhat.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=nvidia.com; x-originating-ip: [240e:46c:b580:11b6:1873:8290:65b9:2693] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 4cf1b7e6-cd80-40ac-d64a-08d8860742f6 x-ms-traffictypediagnostic: BYAPR12MB4760: x-ld-processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:6430; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: i2Zl58jnGXb+jIpN3bJwvKuTP2Q35NApKUampHNQ4ZQ8P5FT5DVl4LR6SMEXX+Epp3C5NaOBiMQxXD8NmJW73W22cQcQwHXaLsTRInpEDQy5CPbngYwA30gIfQC0SeG+na0cHw4nw6zq8mOh8H66SPPwU1DyR2GxoCxdGinuzvjpBIMSxSUlxkvdhKO1dq7W6WePSLYhrqbdXBEV6U99ntIq2KbYVnNpuAWQBjdU91sS/3ZqJHcnfBj998ZH+G9m4bpbUT30q6rOmzl3kbuoYHhIn+g3kdS52BCDc9oxJ/Jnk0YBjPou1er/McAgbGvGygb43bnEHPRldrEHBphHDw== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BY5PR12MB4324.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(376002)(366004)(136003)(396003)(39860400002)(6506007)(110136005)(5660300002)(186003)(52536014)(2906002)(55016002)(83380400001)(478600001)(7696005)(316002)(64756008)(66446008)(9686003)(8676002)(86362001)(66556008)(33656002)(8936002)(76116006)(71200400001)(66946007)(66476007); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: ZQtrC1nQiEZb113qGMCWcrE2IpjSxFuss+vVlmPAeYHNBEOiJ67Fna5A4NwcV2ASytogrzF56yw7tdvNu2qlZZWrT5LYDxGuk+hv1mspyRNz6BwNpWyJWMAEVADz7KIiq35YcOjv2wN5ZymBS6xpSuGeFxfXjSOHrvVQPM6xJ/Sh7RXP2JrqeXBSptARlpK2K7HdSwId+VO0SGDNGYgdG0rMnkby6dly8GeEFJgETYewN99eRQVpznnVPS1DdtDkjQpmni+p5loXfoeDFFopKtjP/8TC8uWDSy7LzfK5InN2OHK25Gsi/KELvjoh5fKy/rE/svLQG/BGT+F1ppz/zcruc/0tZqvHXXP/o3YSTrfd7xN3NJgyzQDCfVIC1Qnc/U/PefRlgTIfRDbT5bNmxT0MM3JcB06CkPY9mwwm40GbSzrsvXO516CGoKlSk/fp9Yor6+LLFfxnAaW+voiHIyI+iAprwK4Bb+ja+5i7V34ehymqRPSCfRmBjfWY6X8+KhuDGXC1f08U6k9o2pnUrmzGqqGqYY5YisOpXVawBJn0rY04w0JeesvbGrsUhl8uR4sOKbSiSbYcM9rCakigVu+VFDrhCjfn8zYdFPcj7U+Q8VPh8EK/PRzPwY1q5XtupQcePSZqSXhMAVYeulvEAK7JJCGBObin6f36BjyI/k+p8AHmZz/jKaZKhjBqH5npABfTftAM+7SNYUwZcyzsyg== x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BY5PR12MB4324.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4cf1b7e6-cd80-40ac-d64a-08d8860742f6 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Nov 2020 06:01:41.8315 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: uwmNU3QksOggjPXbRCDLbwT2+tqODR607ABJYzYIX/V2iL3mQuQ6Hx6UPe9V3sAHqcgrzMrFPomix7nrvU24og== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB4760 X-OriginatorOrg: Nvidia.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1605074519; bh=2hnwxbLqRyRYcB+yquXPRuPtFIaLE/TWToPbXjU4tDg=; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To: Subject:Thread-Topic:Thread-Index:Date:Message-ID:References: In-Reply-To:Accept-Language:Content-Language:X-MS-Has-Attach: X-MS-TNEF-Correlator:authentication-results:x-originating-ip: x-ms-publictraffictype:x-ms-office365-filtering-correlation-id: x-ms-traffictypediagnostic:x-ld-processed: x-microsoft-antispam-prvs:x-ms-oob-tlc-oobclassifiers: x-ms-exchange-senderadcheck:x-microsoft-antispam: x-microsoft-antispam-message-info:x-forefront-antispam-report: x-ms-exchange-antispam-messagedata:x-ms-exchange-transport-forked: Content-Type:Content-Transfer-Encoding:MIME-Version: X-MS-Exchange-CrossTenant-AuthAs: X-MS-Exchange-CrossTenant-AuthSource: X-MS-Exchange-CrossTenant-Network-Message-Id: X-MS-Exchange-CrossTenant-originalarrivaltime: X-MS-Exchange-CrossTenant-fromentityheader: X-MS-Exchange-CrossTenant-id:X-MS-Exchange-CrossTenant-mailboxtype: X-MS-Exchange-CrossTenant-userprincipalname: X-MS-Exchange-Transport-CrossTenantHeadersStamped:X-OriginatorOrg; b=hyWblx+6g02nX1Y/cS1LjvfiR/8DLS4E7R2Q+d2Se3epwFM1rioYcKQT2BBYBTjxZ hOO8tdx5e/Z+cBURotQQjRe6yviW6FXBXZMc3wQIs4/ycLaJnO4yxs+ZYkcmpY7m5A vxBY1PXFVZMFl3I5R/0EFzJIntzQh99t2R9SqoKlDnXExgjIfs9CTkdiWBV5XqC5He 16xIkClSyEn1Gh9GLoQ5W0w/ixfzX7D2sfk5KKT58aUPUXF3QCEI2dPGjHGnIoGRiG R7VJfb+iIkfVe27VyYP0lptqvm3TRMTk1yC9d1jJcw9lWFlskdyDVoLn9e6ew9nShr W0muklaRCyGRQ== Subject: Re: [dpdk-dev] [PATCH v3 3/3] vhost: fix fd leak in kick setup X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Hi Maxime, Near end of this function, if vhost_check_queue_inflights_packed() and vhost_check_queue_inflights_split() return with error, is the fd expected t= o be closed by closing vq? >-----Original Message----- >From: dev On Behalf Of Maxime Coquelin >Sent: Monday, November 9, 2020 8:17 PM >To: dev@dpdk.org; xuan.ding@intel.com; stephen@networkplumber.org; >NBU-Contact-Thomas Monjalon ; stable@dpdk.org; >chenbo.xia@intel.com >Cc: Maxime Coquelin >Subject: [dpdk-dev] [PATCH v3 3/3] vhost: fix fd leak in kick setup > >This patch fixes a file descriptor leak which happens in the error path of >vhost_user_set_vring_kick(). > >Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application") >Cc: stable@dpdk.org > >Signed-off-by: Maxime Coquelin >Reviewed-by: Chenbo Xia >--- > lib/librte_vhost/vhost_user.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > >diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c= index >94b066f0b9..f3b2adabac 100644 >--- a/lib/librte_vhost/vhost_user.c >+++ b/lib/librte_vhost/vhost_user.c >@@ -1855,8 +1855,12 @@ vhost_user_set_vring_kick(struct virtio_net **pdev, >struct VhostUserMsg *msg, > > /* Interpret ring addresses only when ring is started. */ > dev =3D translate_ring_addresses(dev, file.index); >- if (!dev) >+ if (!dev) { >+ if (file.fd !=3D VIRTIO_INVALID_EVENTFD) >+ close(file.fd); >+ > return RTE_VHOST_MSG_RESULT_ERR; >+ } > > *pdev =3D dev; > >-- >2.26.2