From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6C3D0429D0 for ; Mon, 24 Apr 2023 04:58:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4BF4142D0E; Mon, 24 Apr 2023 04:58:21 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id 1902442B8E; Mon, 24 Apr 2023 04:58:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682305099; x=1713841099; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=GDLr27EswWcnMAV/BOzcS4DRz/VrpiW0oPaTkFCmIgE=; b=ezwtImrI49CzLIaaMGc3wN9ns3PADLavKuPIFGwIhnyhGsKPXYDuiqJ9 uVos8M45oWmw6f5T4ua4wQ1zVg3xBIxLUtj2xlru73ht661zIy7rx3/na QXoShoj1ivHrc871Q2XwYm3ncKo3NKu9V0br/KULhYu4yTOePj+ksVyB7 9tYp03jNfevSLXDpjy3LoOlBM3qdmHUo5i7rPWYnaWODYWrERvgHTjSEX vXR8bOrzFolY3DHr4KKhH/+Db98YJuLxoU9Azr3fpKeCSYJlhdZiNomKy p7D0VqYEMhGsODK9LDcqaOebUQNjqYq5Px+qzPrtdEnhqWBIZYBwQN1BJ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10689"; a="348255871" X-IronPort-AV: E=Sophos;i="5.99,221,1677571200"; d="scan'208";a="348255871" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2023 19:58:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10689"; a="782242232" X-IronPort-AV: E=Sophos;i="5.99,221,1677571200"; d="scan'208";a="782242232" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by FMSMGA003.fm.intel.com with ESMTP; 23 Apr 2023 19:58:18 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Sun, 23 Apr 2023 19:58:17 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Sun, 23 Apr 2023 19:58:17 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Sun, 23 Apr 2023 19:58:17 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.44) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Sun, 23 Apr 2023 19:58:17 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f5WqDqdDqlbOWkGifyBZWJI1w57hcHbudboUvctTBsF9Lzm9D+9d+t5tKcHbKDGozJ8EiEV14RXn7XYgL0xLjyuXMepOpsQKGGUXnhXUl9q9TIf5ZdhxbIYZIrHJhyV1N02LDKvWhvDJRd3Z7nTtTGinu0LqH4b9hRowuFTWmp/yWBqV/Qe5cNp5Jj2P1EgQFYZcn3KEQUgAIVH2l/1lh6nMybHdkOBhGTL8GclPnPXs6FogRIKW3UfoKYqHr7pyZnifADlPPOTdrAU2n3IntVpQsqIzxdU5WcsETDXfTIoEqN/H99XzaNcaJljVaUyL42qf2gOuaY8t4JYTt0mLVw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=AXqA0X7YHxdwRb5kGEXOs3ieUnxrP1xVZzGVwbN3R3E=; b=AmWT7NVATZ3amtnczkuIiyccvdlYeOHJH0NO5rzAi8X/6+Wem32IipH5BfkP8JO3NC4M57cbol10IIEfumWSQE55NuvLeUp96+riabgBHENtNtnSRsyE/1d5CzPhlfPzZQPaYrEbADzM54rN5+4BXFPFt2g0pjnRdAsC5RmGVqKBfEdojOCBGMxz0HJc/SNYaQmnQ/CtKG3Jx0HKVG/nd5PdHBFjXMNDI1RCLUo/KdAGEgUXFO8t6ukMDH/iVOwj/Pm3tdyBt4N4l+q12myBELdlQv0yFZmq8VIagqP/3O9Q7XCZk0VOpB6lFif4gl3UH/4HczkFM4IWKSfYM35dQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from SN6PR11MB3504.namprd11.prod.outlook.com (2603:10b6:805:d0::17) by PH0PR11MB5143.namprd11.prod.outlook.com (2603:10b6:510:3f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.32; Mon, 24 Apr 2023 02:58:15 +0000 Received: from SN6PR11MB3504.namprd11.prod.outlook.com ([fe80::2d7a:a878:7bed:bb11]) by SN6PR11MB3504.namprd11.prod.outlook.com ([fe80::2d7a:a878:7bed:bb11%4]) with mapi id 15.20.6319.032; Mon, 24 Apr 2023 02:58:15 +0000 From: "Xia, Chenbo" To: Maxime Coquelin , "dev@dpdk.org" , "david.marchand@redhat.com" , "mkp@redhat.com" , "fbl@redhat.com" , "jasowang@redhat.com" , "Liang, Cunming" , "Xie, Yongji" , "echaudro@redhat.com" , "eperezma@redhat.com" , "amorenoz@redhat.com" CC: "stable@dpdk.org" Subject: RE: [RFC 02/27] vhost: fix invalid call FD handling Thread-Topic: [RFC 02/27] vhost: fix invalid call FD handling Thread-Index: AQHZY+eWkooxnCMUOEC4O8LdOWrE9K856V8A Date: Mon, 24 Apr 2023 02:58:15 +0000 Message-ID: References: <20230331154259.1447831-1-maxime.coquelin@redhat.com> <20230331154259.1447831-3-maxime.coquelin@redhat.com> In-Reply-To: <20230331154259.1447831-3-maxime.coquelin@redhat.com> Accept-Language: en-US, zh-CN Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SN6PR11MB3504:EE_|PH0PR11MB5143:EE_ x-ms-office365-filtering-correlation-id: 567d162b-eb93-43f1-5112-08db446fbfce x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: RyZyclnHKt8ci8Uc5RPVYwJikizf889ovTW4ozKQEe6o8IYgeDFrg0pxCqJy+knJ8ZKDOYj2QEbj3E7dgoAsIIrxpBANZDE08+43uUndvFhXlroP1ZR5Dg4dv0LDIcTYMb6kW3s4Kgt6WF3yOYTUHAcAru+0CDHl3vrrqkJ5LL7sXfe3Q7Yf5Q5Wk54MQe0sFJ1P2oDBDgdm76WJgMtoLcW/oe8S7O4ICkz8YHPvf1beuwIGSdmaPuiNlrOlOufwxWEByGv21vGJzcSBIjgNlWzPaydV3pyBlvw9GEgzAgSy+vfdRoUQDCZrfvAAqqBFRy80EqOmHXs90lDfn4I7PcQCzbA3dCJ8HLFKnt/0pqcOhoI9LrWo3RDNGxeGDtWz1g5a4wX7EnUwTWBopx9EDRT3GLgHCBBTh14E/9BUJPAKc7aJ5EvHb8Sui0jWf68XsX9FPlCIOlhsVVqWwY7Bfxgz+YoRNBoYkwuED/qqgGbTGLeSOq8oLSqW8TB8BrMVmxsKoDQOOKJ1FQMbdzMYZnA17G0/SVo2LNk2m6B61K2v+BGJRZLJxK5J+QdsK+c68SlbHLdS7qMbdQH4P+HXdLbEOlZYu13BGV+7dJagAZdbWWrycjm4bHqX65/N2w3TkvYiuKF5Dt+1DRYfmkRZ9Q== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR11MB3504.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(376002)(346002)(366004)(39860400002)(136003)(396003)(451199021)(38100700002)(122000001)(921005)(82960400001)(9686003)(53546011)(83380400001)(6506007)(26005)(55016003)(186003)(33656002)(7416002)(2906002)(8676002)(8936002)(52536014)(5660300002)(7696005)(478600001)(71200400001)(38070700005)(110136005)(316002)(4326008)(66446008)(66556008)(76116006)(64756008)(41300700001)(66946007)(86362001)(66476007); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?Fu9ZCALhArlN9Rzl1LXkZPo93j3au9Nhw144w9uJku4m1vnp+zGq9AxRrZQd?= =?us-ascii?Q?EPcoHVtQfpdYddhHTcq6OnmYenkTrVyByp1WpFoON+LoyCW4cIUQDFQwEbL8?= =?us-ascii?Q?oJ1+6vHqmRcptuwqKONOQcAlW96weGE4pySkzTxB3N0un1lkywMt+3VPKnMf?= =?us-ascii?Q?5K33ElJEmnV7Gk+VnCSqf/sV7UwlpGamS+wW6fNe42O0DnDzE7YMgbGlW/yo?= =?us-ascii?Q?/1C+q9r7wX+LpKFNqvLP9mCAJE+kpDlon+z3QG8K9+c4YM7Sw7oHkR0/FjVX?= =?us-ascii?Q?rpxnMFi15Q8t6laxAu4TqakMO9anW5mkGVXLqO3f3TKEw3dBPQNS+AYxy6DV?= =?us-ascii?Q?p0lgtDfe27t1Boaq/o6pBZGWPhXJuz2VLM6zFKjEFBUIXH06g7ZbSS8qHU9l?= =?us-ascii?Q?Hk2YQYFWNQ+XXvLKV2HBRo8MBSukcwsoOzoX8AOVF66Q/r3S7gJDBYt4BHai?= =?us-ascii?Q?EdJC//+I4UM2SO6NhYQZv5fRUnmzmbdkdk7nxsEIvrh5BNGeSyajYzosmSb6?= =?us-ascii?Q?TDfuEmUlHSV0Udi5/GsqusosG0b/FHGmWyTCivylngHA7+PVorZCykvJeaI8?= =?us-ascii?Q?/FgeV6L90LO5FELPgCJpNQgVjtG5rdsQEgDjRsNQ68bPnXZhkUeIxO3NxWzS?= =?us-ascii?Q?V5Bpha9NeTcWNgmQq1nlZ9EzbjfAUt7S9odHGBdw13eJ22SVlPhn9nqxc7Jh?= =?us-ascii?Q?fuQReUlJpSOAg8y/CXHdF8zWzkAIXWpmLsuBg/bYlLQm4sr5S+hL/NhT+Qmp?= =?us-ascii?Q?GNszyY0rIlS/nCOg2m30JlXKbul7ty/a+bOoy3ip1yBy0vqOtAzWzcIEVj6s?= =?us-ascii?Q?b0VfsqTyZBx9x0SbW6QkCgD4adPpsCZZK1yvZsw612Idh11Is2+s8SREqK5f?= =?us-ascii?Q?4aMtciRKAJ6vcdywdY+6FZ2AXCqCgSkS9p2o/8lFPvgWAbgAsFzSkl0LTZmB?= =?us-ascii?Q?q9Oz89NBpcRjKRvpMhsXSeKUCeq9jv2sf/P+KNzVEZPSw0+e2Agrik8Klu8i?= =?us-ascii?Q?NGT+P7/dkoVCHA2RlO0baQ5OUONdk9RIZ+TvQoQAqAnpNi0eey1658tzBBY1?= =?us-ascii?Q?yFu8ZZHPCxJuYEhYsfpdQUQ819/H9ZYsqggSW1v7TL5CtoRPk4wq2HorzixK?= =?us-ascii?Q?RS0DVS+XdyJFyotwKs+f6Hb2xL1nGhay3no59ocUlNPN46uO/JYt76My3TBh?= =?us-ascii?Q?Sxks9GfOkUMa4eOE8glJjk9Ap3M32ReOSwP0fwpEP5KkjQUV3+ONBqjkDOiC?= =?us-ascii?Q?7JNKOb9hsa8DWuMtqL7Wh9T0lppS7l+8PjJ7gLKkVU6m5BlfvU8v0rCuY4NF?= =?us-ascii?Q?ikZdZ7nCKsglq8d7dppJ+9wt5+sRm5rYKrTSwuBGgfA0mJXqBw/nn2VVl8XT?= =?us-ascii?Q?Mzh351noH22Xfeg4RfUrXqa0Jas+AGQtWtXm5L/fyM31AUyh2ZwomBnGAX5u?= =?us-ascii?Q?eMxHqKAp4LqaComtf7N0zEBxKx9jvlPnQOthpF7AdDPv+cr2LTeWr8LHK9+O?= =?us-ascii?Q?OjwnolTpbcJvKwJ5K6THUKEjq8rfDu8QMc0DUN2pGVyEcJWg12gqwp4bdhHy?= =?us-ascii?Q?7syH7qOXaoiNmTR/dqEYg+U0c11Uxo84ywSqbkhW?= 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: SN6PR11MB3504.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 567d162b-eb93-43f1-5112-08db446fbfce X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Apr 2023 02:58:15.2777 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: nk38LRd6Fx7kOfQFEBTgZ7BEcDBCP31oXkJbb80Ubnvd3bZj5OkZePCfxoQtYC4BG4ESjFsF+KSEuq5/PyOGFA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5143 X-OriginatorOrg: intel.com X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org > -----Original Message----- > From: Maxime Coquelin > Sent: Friday, March 31, 2023 11:43 PM > To: dev@dpdk.org; david.marchand@redhat.com; Xia, Chenbo > ; mkp@redhat.com; fbl@redhat.com; > jasowang@redhat.com; Liang, Cunming ; Xie, Yongj= i > ; echaudro@redhat.com; eperezma@redhat.com; > amorenoz@redhat.com > Cc: Maxime Coquelin ; stable@dpdk.org > Subject: [RFC 02/27] vhost: fix invalid call FD handling >=20 > This patch fixes cases where IRQ injection is tried while > the call FD is not valid, which should not happen. >=20 > Fixes: b1cce26af1dc ("vhost: add notification for packed ring") > Fixes: e37ff954405a ("vhost: support virtqueue interrupt/notification > suppression") > Cc: stable@dpdk.org >=20 > Signed-off-by: Maxime Coquelin > --- > lib/vhost/vhost.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) >=20 > diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h > index 8554ab4002..40863f7bfd 100644 > --- a/lib/vhost/vhost.h > +++ b/lib/vhost/vhost.h > @@ -902,9 +902,9 @@ vhost_vring_call_split(struct virtio_net *dev, struct > vhost_virtqueue *vq) > "%s: used_event_idx=3D%d, old=3D%d, new=3D%d\n", > __func__, vhost_used_event(vq), old, new); >=20 > - if ((vhost_need_event(vhost_used_event(vq), new, old) && > - (vq->callfd >=3D 0)) || > - unlikely(!signalled_used_valid)) { > + if ((vhost_need_event(vhost_used_event(vq), new, old) || > + unlikely(!signalled_used_valid)) && > + vq->callfd >=3D 0) { > eventfd_write(vq->callfd, (eventfd_t) 1); > if (dev->flags & VIRTIO_DEV_STATS_ENABLED) > vq->stats.guest_notifications++; > @@ -971,7 +971,7 @@ vhost_vring_call_packed(struct virtio_net *dev, struc= t > vhost_virtqueue *vq) > if (vhost_need_event(off, new, old)) > kick =3D true; > kick: > - if (kick) { > + if (kick && vq->callfd >=3D 0) { > eventfd_write(vq->callfd, (eventfd_t)1); > if (dev->flags & VIRTIO_DEV_STATS_ENABLED) > vq->stats.guest_notifications++; > -- > 2.39.2 Reviewed-by: Chenbo Xia