From patchwork Tue May 25 17:47:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Christie X-Patchwork-Id: 12279757 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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 95899C2B9F8 for ; Tue, 25 May 2021 17:47:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7E16461132 for ; Tue, 25 May 2021 17:47:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232184AbhEYRtX (ORCPT ); Tue, 25 May 2021 13:49:23 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:49776 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230097AbhEYRtX (ORCPT ); Tue, 25 May 2021 13:49:23 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14PHhPV4084738; Tue, 25 May 2021 17:47:46 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=9oBtXUMOMvXyb2oFyeCCWCs1EaYiK9VKMCqKDQONC2Q=; b=jhEZrx6LWTVg/CYtGF810XCGVnE1rC6YHxJAWWncR5Z1w2/NutRSb++PSw6rk8o1LlE7 ZtrPrW/rL5jCmHR/lFEra3QNRwx/H6DJU33sd0GrzFOiulExFK3PZCGx20Kye6YRYpN1 NszaXJEumgXhMWgpTE0CphJDpH7TGOrntlystIV6C/0KInM9x7kMZDy0M2KN4KjKjhP+ aNtSJBRRTdUeVCkFuJZSb/vCbuJ9XiDzn+TM0CZ1K1Vu9rpjIXK51p4oJWZD3w7TBA2F zIh/anwgxlTHUCC3JOwsid27Nbh6QpGxqpwlYBaNfaK8X26Lbc30GQe3aNUmKhXNP0yR pA== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2130.oracle.com with ESMTP id 38q3q8xaky-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 May 2021 17:47:46 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14PHe47u042965; Tue, 25 May 2021 17:47:45 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam07lp2048.outbound.protection.outlook.com [104.47.51.48]) by aserp3030.oracle.com with ESMTP id 38pr0c0mdh-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 May 2021 17:47:45 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A2k1R/n1iShdqeGOHK6wjs3Ia+YU4r1tMN/mFdoQaHk8k2Q7vZDRNZC6ez0RXk2wBElf+m+BZsABJlMgvtfMidpxVsD4tLTP/8IX2AXTHskeX4DHhDVE4Qv29U/lU2u4cMs1I9AMjaWwMw3FcM5I+nypw+rY1FkqzPgTQFOULelpeiEocyrvue/VJTCb2sIMGU8EXqu6U3iFElNz6yrUuDUclkCA/xNOa2z/RueaaKOXacp6PvXpivdt/Z8hvW9flhoer9WHuPOYwdt9r1QAVzDLtCVfVSWTvV3DgjVZNioYHx/Mjb+i0v+WgSPAq4Xc5nC5hN+x6ImowR24zrBcTg== 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=9oBtXUMOMvXyb2oFyeCCWCs1EaYiK9VKMCqKDQONC2Q=; b=L4I3oImVCWF4WCItMFam81xng/1EE+8JdbOaiC5tiMHMdXCMr3Z9rsvAMOlFMxazuqCcBoFEPb6o8h49vLgZ3RNpDSlVepCfua6Yk7u0YR7Y2nWZc9BNdwz/bFpVjajRPrVFVIakr+00NOrmpW8ZmTFb1yfY5kuD8uH5AVDx0rNHzkGWhehkuXS8e1TZPHo4SLkYaSyTHlgqUJ7aND8lwem5yhkL6QonrKPpFT2RSJf6jqLjJdea7EkDSTvrIZ7VusznmJI6SzSyzEZSPjM/f9VoeybXkG4gZ1AYs1dJpYlZRNLpO6R6rxrLSUjU1KeV1SD8tzs3kk/cgQMPYnmbqw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9oBtXUMOMvXyb2oFyeCCWCs1EaYiK9VKMCqKDQONC2Q=; b=Q+RzuAi/7yIA8bZpozXLqebjap5ycAVFrjpB7klQi32pU2nFtkFygtyHDE44OEb9p/J4TmjSoxNQJRlorD0yrbox2mhIhkFpdweNJ/gtnVtwFpp/SxLNWWWOhyf7g1uERU6NhqtoVubXyKQGDl3g4EQYVhrlAGNixg+SVwVTqss= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=oracle.com; Received: from BYAPR10MB3573.namprd10.prod.outlook.com (2603:10b6:a03:11e::32) by SJ0PR10MB4720.namprd10.prod.outlook.com (2603:10b6:a03:2d7::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.26; Tue, 25 May 2021 17:47:44 +0000 Received: from BYAPR10MB3573.namprd10.prod.outlook.com ([fe80::b09d:e36a:4258:d3d0]) by BYAPR10MB3573.namprd10.prod.outlook.com ([fe80::b09d:e36a:4258:d3d0%7]) with mapi id 15.20.4173.020; Tue, 25 May 2021 17:47:44 +0000 From: Mike Christie To: target-devel@vger.kernel.org, linux-scsi@vger.kernel.org, stefanha@redhat.com, pbonzini@redhat.com, jasowang@redhat.com, mst@redhat.com, sgarzare@redhat.com, virtualization@lists.linux-foundation.org Cc: Mike Christie , Chaitanya Kulkarni Subject: [PATCH 1/5] vhost: remove work arg from vhost_work_flush Date: Tue, 25 May 2021 12:47:29 -0500 Message-Id: <20210525174733.6212-2-michael.christie@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210525174733.6212-1-michael.christie@oracle.com> References: <20210525174733.6212-1-michael.christie@oracle.com> X-Originating-IP: [73.88.28.6] X-ClientProxiedBy: DM5PR19CA0009.namprd19.prod.outlook.com (2603:10b6:3:151::19) To BYAPR10MB3573.namprd10.prod.outlook.com (2603:10b6:a03:11e::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (73.88.28.6) by DM5PR19CA0009.namprd19.prod.outlook.com (2603:10b6:3:151::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23 via Frontend Transport; Tue, 25 May 2021 17:47:43 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d9a8add1-647c-498c-eade-08d91fa5332c X-MS-TrafficTypeDiagnostic: SJ0PR10MB4720: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RWpg0czpc2kcpLIBedb/g5E6s9ClYeNAZLYGvo2cS78rXP8Ps1h0a1ooIxO1myGz+z63gZGkWZhAVOM9QueRGmmT7KQ1YHkZoUZckWAK3UwqpTw1bwRVrzHPAJNePSMbfy53POvatQW64IxUicpKuVBbrU+eFh/dprr01DnaPNBBr8mk5yGZRi825FoMjn0FW4ocqGm1boLwbiSoBdRmVVL2t9QCae9aH8lG3mvcrMUfa7qRd95qViKwbsB/FGh4TDbK5QPeXppt5P4EuLTIwwo7fHBALhX710OabCrWgGPdNY1e/K//j75CJ3HZxjWUebTuaKrpoupBlhxDoR7z33rkbqp1DcDsBAphfHtDaxMJ6hMzV3VfduHGvLNcLWd8n/WCKuDS/JQ2ODMRMoeyklUwidyurNUOc9Np2XUWjy9m2qMFVk31ecCncBa5eOvK7LTJP8+aEqxgQ9FJFVd9aSL734/r7q86xjdvgQZae3PH8oIZrfr3+v0n/Mq6008s1KlqFvjghWqYA3H1jRuVK6iI7DOs0PQOupVJpq9UuBjvOSpi4YHAM4cU/I6WxcFLUTlweUTigLI0fmIZEqobDSLxcur48cpZvtQT92zvxsk2J2Sx3uJbFjD5aAraSGKie+CSHLrltd4PuY4api6SQxf1pCk6jI2YaaJm7gsL+Cp3zEvtfTOCokchoTliuOJg X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR10MB3573.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(39860400002)(136003)(376002)(366004)(346002)(396003)(36756003)(83380400001)(54906003)(6512007)(38100700002)(52116002)(26005)(66476007)(478600001)(38350700002)(86362001)(66946007)(5660300002)(66556008)(316002)(8676002)(2906002)(6506007)(1076003)(8936002)(16526019)(186003)(6486002)(4326008)(6666004)(2616005)(956004)(69590400013);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: uZloHSjoUvi531G9YWU3Zrku1L+mrx1bp1h+8Sx+MaA+8K0ke2esgBDMuuoAOgE4Ad8qkX32vhSPmbUEitvyqjcv9CIC5iHtXS7ddX7gJkApzeVaEMiu/fvSPhrG7N48IyMI/4USJ4V+W0gnbSeFVpFcrk6KdEPkrM1ih971ymXiBesHv08DsdCMEq3DFkDWGCykTbW+w6GZNB1sbtcOZLPB/Ib3hqI9jY3Uh0nUGg5j995vTV+P/NiOoc+8FmxnjoLI6S//oZC/c8XC24DbcM30KiIsAlBM53zw11GNNxJ8AV8qDRTEEYW5oR7HWkAZ2/OJq08pybW4RTY0PL/PHJQspT/nem6yKz6rfSyPBisI/PjdqUyyCcFv+WwkgI8ovhLlCDsN4QiuLum233AkjgUyNcu7+JtjQj5z98/fkHQZAqLk0sPEw9TQoKS1ZkCFfiFqpzYXlAmXdL92UPtct/+nkQMcyLIebsoHLro53Gq82Dmg0PTYzqJLmcKMJeXGV3Tg25/PhncPLs4FuC02ZFh8KfeGdssh4CHVUHQ+VHaKiNKbiv6s6ZowkC8IRXtF30pqOhBCHSkw8lraelsXdhUCNOlrKyMoDZHz4RCg2daN2KsncTw0jQ1pp7AO/xVikDZPjGR8/J3agIL7EI010SpuBhmS6BJUXvsdQZ7ss9kpdsoD4/lUHuBgLHZU0fRuPOlX3Xyz7d2p71ufyjoOGdsqz8SE8AlVzTjMlPNO2TQSWybWjpk/BF/w5TFG+NRewKG4L9G+YBfvXi+oIjnfBBa1tCFnATj8hxz31i5dPR4CjZDNN6W7iGy92IpaIyHY3NjPBHg7C8p8VRFGYabok0+a2Z0PR9CeBoNlqlD4FJMRcuQVXiQNo5zosGAF7z2iHV7unu8/zuZ13qpcIeLLCEBjJFvT4U0SFBxexo6pMxXVXvy3nTdgd9Iw7Ksyy6PxU0DlHmm3bJJb/ZLhnf+BBBBFVOZ+GTqqCqMjxHEtmSrWY8td+qGAXo7Fx4Oh9J6eFHWvIDvicvEbcUHYkG6SO3nOyattwFqsXd1ptNrkDHYlRZViOriChOFXSURmkBfNdJ4+8yiQN8nc3CmGTCSbBgSstz3luJLn8uplGYUHItDM6QHEXwsSbzqyJxZjSNwdR4IRWesKxmfUH/2ODksnTD6wuyTMMzCRThdgyGq3ErBLZH3chuDnyaF0kl6RSA3eeAwkeobOVIxF8PfijLIx1ggdwTGOR37jBPOXUPdKLSzuWj9WJwKu7a5/zHoWsBHCHZu1ywj/aAKcupaokqyAH2DObjoyvAu0J05jBJJc6KQRFhZB0RMCR4UhzX1pboqP X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9a8add1-647c-498c-eade-08d91fa5332c X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB3573.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2021 17:47:43.9891 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vlRXnr35IRDfbYlpYdhwZU0qo1aNmpumHyrR2RM4sDgCuyshcTRLyAz7t7mRovfeCHZ8Go206HMONPhNub0cXAgvANz7sVUU29a1CDsgO+s= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4720 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9995 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 bulkscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 adultscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105250109 X-Proofpoint-GUID: 8Mf-ncGRS-jWH0G0wuwQLpBtU-r7SmqJ X-Proofpoint-ORIG-GUID: 8Mf-ncGRS-jWH0G0wuwQLpBtU-r7SmqJ X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9995 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxscore=0 clxscore=1015 malwarescore=0 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 adultscore=0 priorityscore=1501 mlxlogscore=999 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105250109 Precedence: bulk List-ID: X-Mailing-List: target-devel@vger.kernel.org vhost_work_flush doesn't do anything with the work arg. This patch drops it and then renames vhost_work_flush to vhost_work_dev_flush to reflect that the function flushes all the works in the dev and not just a specific queue or work item. Signed-off-by: Mike Christie Acked-by: Jason Wang Reviewed-by: Chaitanya Kulkarni Reviewed-by: Stefano Garzarella --- drivers/vhost/scsi.c | 4 ++-- drivers/vhost/vhost.c | 8 ++++---- drivers/vhost/vhost.h | 2 +- drivers/vhost/vsock.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c index 5de21ad4bd05..051a7f8dadba 100644 --- a/drivers/vhost/scsi.c +++ b/drivers/vhost/scsi.c @@ -1470,8 +1470,8 @@ static void vhost_scsi_flush(struct vhost_scsi *vs) /* Flush both the vhost poll and vhost work */ for (i = 0; i < VHOST_SCSI_MAX_VQ; i++) vhost_scsi_flush_vq(vs, i); - vhost_work_flush(&vs->dev, &vs->vs_completion_work); - vhost_work_flush(&vs->dev, &vs->vs_event_work); + vhost_work_dev_flush(&vs->dev); + vhost_work_dev_flush(&vs->dev); /* Wait for all reqs issued before the flush to be finished */ for (i = 0; i < VHOST_SCSI_MAX_VQ; i++) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 5ccb0705beae..b9e853e6094d 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -231,7 +231,7 @@ void vhost_poll_stop(struct vhost_poll *poll) } EXPORT_SYMBOL_GPL(vhost_poll_stop); -void vhost_work_flush(struct vhost_dev *dev, struct vhost_work *work) +void vhost_work_dev_flush(struct vhost_dev *dev) { struct vhost_flush_struct flush; @@ -243,13 +243,13 @@ void vhost_work_flush(struct vhost_dev *dev, struct vhost_work *work) wait_for_completion(&flush.wait_event); } } -EXPORT_SYMBOL_GPL(vhost_work_flush); +EXPORT_SYMBOL_GPL(vhost_work_dev_flush); /* Flush any work that has been scheduled. When calling this, don't hold any * locks that are also used by the callback. */ void vhost_poll_flush(struct vhost_poll *poll) { - vhost_work_flush(poll->dev, &poll->work); + vhost_work_dev_flush(poll->dev); } EXPORT_SYMBOL_GPL(vhost_poll_flush); @@ -538,7 +538,7 @@ static int vhost_attach_cgroups(struct vhost_dev *dev) attach.owner = current; vhost_work_init(&attach.work, vhost_attach_cgroups_work); vhost_work_queue(dev, &attach.work); - vhost_work_flush(dev, &attach.work); + vhost_work_dev_flush(dev); return attach.ret; } diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index b063324c7669..1ba8e814989d 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -46,7 +46,7 @@ int vhost_poll_start(struct vhost_poll *poll, struct file *file); void vhost_poll_stop(struct vhost_poll *poll); void vhost_poll_flush(struct vhost_poll *poll); void vhost_poll_queue(struct vhost_poll *poll); -void vhost_work_flush(struct vhost_dev *dev, struct vhost_work *work); +void vhost_work_dev_flush(struct vhost_dev *dev); long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *argp); struct vhost_log { diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index 5e78fb719602..f954f4d29c95 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c @@ -663,7 +663,7 @@ static void vhost_vsock_flush(struct vhost_vsock *vsock) for (i = 0; i < ARRAY_SIZE(vsock->vqs); i++) if (vsock->vqs[i].handle_kick) vhost_poll_flush(&vsock->vqs[i].poll); - vhost_work_flush(&vsock->dev, &vsock->send_pkt_work); + vhost_work_dev_flush(&vsock->dev); } static void vhost_vsock_reset_orphans(struct sock *sk) From patchwork Tue May 25 17:47:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Christie X-Patchwork-Id: 12279755 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT 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 DF55FC4707F for ; Tue, 25 May 2021 17:47:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B7DD161132 for ; Tue, 25 May 2021 17:47:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231259AbhEYRtV (ORCPT ); Tue, 25 May 2021 13:49:21 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:44790 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230097AbhEYRtV (ORCPT ); Tue, 25 May 2021 13:49:21 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14PHjQ03038745; Tue, 25 May 2021 17:47:47 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=pIvg3mXRthOH/DAj1sIPSFQ+0rR3T4+AgoKP2ls7USw=; b=tYeFhrWvAaI94eQXES1atwZJE5bCykCSQxu5CaqyCL3kc1j5E8QOQrTUcBwcBVHTgS95 k0aH0KypyyB7Heyc9uqQIYQBPbu1M0GLboJO6oi6zZR/m4dGtlKiQRLJInMBOh9Sma9q k+UvP72fnl2vy1BeSkSsUhlpoP9XxDk/5ZLYTAcu7igPFfVks9XFqOopsmtpYwWBoBhc 96x++bU0mW3WGleH/IWLaajVTuF65MbFPqZ8MyD/SYVOBwX+1NuhL0DC0bCEgF4gaxIQ BL178ooft0JEt6y1wXEdO5joMocYKKCCjqg5UK0MpDHRrDhJAq3ZLwYRWZ6rPmUXjen5 iw== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2120.oracle.com with ESMTP id 38ptkp6ta6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 May 2021 17:47:47 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14PHe47v042965; Tue, 25 May 2021 17:47:46 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam07lp2048.outbound.protection.outlook.com [104.47.51.48]) by aserp3030.oracle.com with ESMTP id 38pr0c0mdh-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 May 2021 17:47:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LbN/TsctuxN3aqX/nCMUicJ9XBoG4oy1DoWlybK3/zzYV0Nb5xffaQ9ytizTXXKoTFBYIiOaiEaO9dPLUV3OBJ9hCaTN1AqEhTTGilptsIMW4fYyJC/NgdwnNPjFQM6DaLqOgkAwArwJY0tg8F8I6B0VMiMFspTHi0aavImQrqev90pF0YeG/eY767ZWWxWV7EmQ/hfD8fkkMpu14vAG62nDvmk+ae/Sp2NCkUZF9LPZayIHnmIU32KqxxKj24dlE7UHtik044qY0gDeo61yAJmAAS64tU3tJfsO4cdLifKyrbI+BpOUP0VjfcdIHUNw1Hyy4/Xt81CyNnJRsprRtw== 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=pIvg3mXRthOH/DAj1sIPSFQ+0rR3T4+AgoKP2ls7USw=; b=n8DVDlsnNCJ4nkcrAxY7wcFQw2gNYn4IHeHWV3ra3no7s4YjtsFuTvDe5AnMBJ/m0nE3qQ8Xs9kR7qhoqzyj3Sxm6aI4UNTmOVBulA7uN4kMWSQM3CSF6Cp2xsxvG+8shjtFDiSC+DqRoMKM9jLtcGxyDSbvJUjl/RGihsAemVCvrqlg3VDn/7LxlgBypylGzAG0ccdNWi7AVHgvbRHxOc97RcfrzYNecTe5YeXDNwEsrj+fgvGOrsNmj6eyUSYc9oX/Vww2pWYssLvNqc+xipSs2hpH4mi8aCpkAdAR9V2wRdC/BYAx4xSD6N7YXClFLmFrFMayaWfCxYIN6e2/zA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pIvg3mXRthOH/DAj1sIPSFQ+0rR3T4+AgoKP2ls7USw=; b=SZO/4JV9mdlcQtrmBGszWffRvS8472U5fpo4ZwImZhCxcDs4UrVehAAyAmSSBJyWTUoAURAiUlPywk4IE9fqx0oUAxi9wXuGuEhDTLpGsjBA/xHdzOq2ZvTXniHPAe9hkDyj/P6mGpaEvnOBxzcb0xosvTnq69Qu4rKnaLGE+G0= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=oracle.com; Received: from BYAPR10MB3573.namprd10.prod.outlook.com (2603:10b6:a03:11e::32) by SJ0PR10MB4720.namprd10.prod.outlook.com (2603:10b6:a03:2d7::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.26; Tue, 25 May 2021 17:47:45 +0000 Received: from BYAPR10MB3573.namprd10.prod.outlook.com ([fe80::b09d:e36a:4258:d3d0]) by BYAPR10MB3573.namprd10.prod.outlook.com ([fe80::b09d:e36a:4258:d3d0%7]) with mapi id 15.20.4173.020; Tue, 25 May 2021 17:47:45 +0000 From: Mike Christie To: target-devel@vger.kernel.org, linux-scsi@vger.kernel.org, stefanha@redhat.com, pbonzini@redhat.com, jasowang@redhat.com, mst@redhat.com, sgarzare@redhat.com, virtualization@lists.linux-foundation.org Cc: Mike Christie Subject: [PATCH 2/5] vhost-scsi: remove extra flushes Date: Tue, 25 May 2021 12:47:30 -0500 Message-Id: <20210525174733.6212-3-michael.christie@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210525174733.6212-1-michael.christie@oracle.com> References: <20210525174733.6212-1-michael.christie@oracle.com> X-Originating-IP: [73.88.28.6] X-ClientProxiedBy: DM5PR19CA0009.namprd19.prod.outlook.com (2603:10b6:3:151::19) To BYAPR10MB3573.namprd10.prod.outlook.com (2603:10b6:a03:11e::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (73.88.28.6) by DM5PR19CA0009.namprd19.prod.outlook.com (2603:10b6:3:151::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23 via Frontend Transport; Tue, 25 May 2021 17:47:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7dc9693a-dcf4-43be-db6c-08d91fa533d0 X-MS-TrafficTypeDiagnostic: SJ0PR10MB4720: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eIHsgV3RlQcraunmAZN2hsq+8RYoU7evt0wyanjsfyXPSKWKc/hpvmrAYVWKs/P4WuvpT8pyvuuVHvoGAdwO7QhCbP/0GYqWCbCEhVbvhPBceDUuyoJGePssrQf/EF7l/YUr7jiMlHb6sEZILSesakwzemhwZjxBkri0+HGS3+uz6dxM1h6Hstm3tBOjh1EfQTMy3N+d/75wSdqT5e3rqXgJtqUPqzfVIqgTmJMB5SBG76MT70rfMC4489xPhqMrMIbG84UikgGvdWwN9Ph1IW48phVZ1Q49XbnW6d3CvoKh4DMpBIDb4xRNJomY629CZOAoIggQWhjxzO3dC4t2Hah6CBNOZnePwKpyhmGgUuDPAEYAVBTz/ya7lCse5bvd5j/zzvGmOkYxXw+9/JL+S/Xr3iRUO4e8fFTxddHptLigKSAYVcvaJ/DyKVkKLXctPT+xVbgkx+6Jzf6I0Ypx/JyhZBrHhjE7VoKDGKw1K9A5rlWiX5IR2yuX0AXgPwOGYUX8yT6M4qKNFiGHB/6WBp+2JeGNRjm4Hq3jq3uIR5sBg97SDfkW2zr7zzq5tg1oeFtsFGN8rjgSdUC2vlKiCNoHSUvJisbh+yXPsjUPnYJ9blQJ2FT2WYXlBAJJLaimEjRNWEDePj927KI2Ap8+Bh97LaBINVP/gaU2xMN2Otq3af96aSsW7APXIrJbDk0K X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR10MB3573.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(39860400002)(136003)(376002)(366004)(346002)(396003)(36756003)(83380400001)(6512007)(107886003)(38100700002)(52116002)(26005)(66476007)(478600001)(38350700002)(86362001)(66946007)(5660300002)(66556008)(316002)(8676002)(2906002)(6506007)(1076003)(8936002)(16526019)(186003)(6486002)(4326008)(6666004)(2616005)(956004)(69590400013);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: I9weJYfR8OKULZ3V/SS/5gdfFuQ1GsIiCDuo7DP6/QCW5kdqL8u0UPoW2J2fk9C5XC6kjmr2l5+T8CFhIrEWBu3kx9Cwj6mRvJsVN6X9xJfYbNttY+rMF4ME4dvwJaL8Bl0RxXNc5o2T9vS4ACmNCFiBdcsdT7zlQn55MqaMb3bEVXeNYVKAyGIrBVFjJp/loKW53GVM7sbVIyeLxhN7Mt5SL9U6XFowCCQfsJr56blfiauZ52wFg3dHOi+n4uwbL/CJVVfQy800ZOJ9ysF5B0E5aweTsbviDxXEjK9dMUWkonLwnCFDuXFCrsA49Vp+M7JCqhz6Txp8VNBUgQ1w6YyF80gflI7EnLOkqLTWZq7kanFaR2updkS/3BsRYsfdNVV9PRTFiN5xYMBdS11wmcmzXDz6/8cea+A1d1TV1h2F5Zen1NQ/dpD+ZHMC933eJXDoPQOb5StyJD9XqMSjmcYvCWR+etAQcKLJkReny7WreGtriX1+8H19b4Mm5vSoJZIT9z9AET9JIW1WumGDksZ9NDFKX5kwUXuUdqE13UCjRVd3JAJAO/dYa8VRzHJKEdY4NvRyfRKyq2zMUX0H0VjR24RZmkyjkYYPe8C2iiYQiW4+cN7131C2QzAHMbhZYcpJKhH16/44MMT/BRidEjSKjDyJzWU1jXSzQHx6oHterKxDf6fDDm6WM+wI3MI0hlSfPo+DdyvNy2Mq/R6/q3apSmyKHP8a73M6U76mBl6uESZewryV5F193JWFmwVdghv+CnkoZhAzT3zky3myaH0RZGz0vDRT1T0iMO7Wv8I/OcpV2RLDPA9UAtgokIB3mmGG4mDrXsT16vXEr2CZxGIXZF9G6vAI+rljbw5Mr1w+ZTcnwIHA6GF/2aGqjG/xcTfB5Dt/aXIwPD/KClKsVbmkPYhjF377IYwuyGihL+4KBA8FfAjl2/+74N6ShFuHdxvSbNfBrF/I5gMrTL7sKCfB9qjT4sJyL/SIAu4TOr8eFDIrWUDr6An6ndtnB3Yq5C1H9ZdDuzpIi3PS7tWn5EHmCiXKu/0+kqW7ewFMrzh4FJRKfDOQgTXgP3zhly5prx9tywp+2JBx0pRXgSbiaSi5qu940T0A4m9PhyFaWwqlydhosoGLKHXBSMgSM6n4QN7NrLbpBIxC7Omb0eMc6p/X8/GESEvFl2VRL+/3cY71hAjwVk/3+1snUfFIhRqOb/EdrZ0mvanbhqG/v9p1UaHlopxQkRguWi3h9slYcFCwVgYaZ5ClAhxy+3sO3v4Rm8ksMt0GLGovqvDGYckSR+2eA7KQObOLYku55fGDwPvvytnmqVdP18jZ4LHuXQsx X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7dc9693a-dcf4-43be-db6c-08d91fa533d0 X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB3573.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2021 17:47:44.9955 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HXMq2OLxrya3K8wDsFpKS/ycRJT+tz1XSQQzDcSluMVCm13vs/ggfsZs5FBYzOz0LRJn6eDij3o4a0mcdNilTGACZO1J6M74enVFbOphe9I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4720 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9995 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 bulkscore=0 spamscore=0 mlxlogscore=999 malwarescore=0 adultscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105250109 X-Proofpoint-GUID: 4Mmkitthf099WLRV54IdXd-5z4EGgQaV X-Proofpoint-ORIG-GUID: 4Mmkitthf099WLRV54IdXd-5z4EGgQaV X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9995 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 impostorscore=0 mlxscore=0 suspectscore=0 bulkscore=0 adultscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 spamscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105250109 Precedence: bulk List-ID: X-Mailing-List: target-devel@vger.kernel.org The vhost work flush function was flushing the entire work queue, so there is no need for the double vhost_work_dev_flush calls in vhost_scsi_flush. And we do not need to call vhost_poll_flush for each poller because that call also ends up flushing the same work queue thread the vhost_work_dev_flush call flushed. Signed-off-by: Mike Christie Reviewed-by: Stefan Hajnoczi Acked-by: Jason Wang --- drivers/vhost/scsi.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c index 051a7f8dadba..2f9633ef26aa 100644 --- a/drivers/vhost/scsi.c +++ b/drivers/vhost/scsi.c @@ -1445,11 +1445,6 @@ static void vhost_scsi_handle_kick(struct vhost_work *work) vhost_scsi_handle_vq(vs, vq); } -static void vhost_scsi_flush_vq(struct vhost_scsi *vs, int index) -{ - vhost_poll_flush(&vs->vqs[index].vq.poll); -} - /* Callers must hold dev mutex */ static void vhost_scsi_flush(struct vhost_scsi *vs) { @@ -1468,9 +1463,6 @@ static void vhost_scsi_flush(struct vhost_scsi *vs) kref_put(&old_inflight[i]->kref, vhost_scsi_done_inflight); /* Flush both the vhost poll and vhost work */ - for (i = 0; i < VHOST_SCSI_MAX_VQ; i++) - vhost_scsi_flush_vq(vs, i); - vhost_work_dev_flush(&vs->dev); vhost_work_dev_flush(&vs->dev); /* Wait for all reqs issued before the flush to be finished */ From patchwork Tue May 25 17:47:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Christie X-Patchwork-Id: 12279759 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT 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 1592BC4707F for ; Tue, 25 May 2021 17:47:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EC63D61132 for ; Tue, 25 May 2021 17:47:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232506AbhEYRtY (ORCPT ); Tue, 25 May 2021 13:49:24 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:44810 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232065AbhEYRtX (ORCPT ); Tue, 25 May 2021 13:49:23 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14PHjWpn038782; Tue, 25 May 2021 17:47:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=MMy8XfGqa1jo1IGihoCzolz6QLgVXyfM0Xd3Q9nmhaE=; b=D8XEuTUCU3eNzhNRhz4ePgX7RNoiwBZ7ux/mR1NIeLIF/Mo3uWgsjAUPPUpmKFJPid/Y e+71TJtALiyPQ2QYzBcV1yixkrix46ETUsk/axlSY55e2+S9BvO+IoPXoPD+sisZUBuo V6d+KIMQgFKK3JYQCpvvmbU3ekhNUiMB13CpdYiP0sdnno7NaI6rlkSpS86UsYBm3yk5 9ARFJFozxtaQW+ObWoChMkTLPa8jXPlLujVfa9dgVvXoRHVwfUg9R9XVFynZkaK0miSY LxU/t5KyZemQwRQ9H98vfUiljgmyAv5Q7YKl4Ardo1YVsFE3FjqP3QRvw2bHp4SP/kY5 QQ== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2120.oracle.com with ESMTP id 38ptkp6ta8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 May 2021 17:47:48 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14PHeDnJ133298; Tue, 25 May 2021 17:47:48 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam07lp2049.outbound.protection.outlook.com [104.47.51.49]) by userp3020.oracle.com with ESMTP id 38qbqsfu7d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 May 2021 17:47:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DVK+Ib0P1f0Q2hu8TecUt1edajYx9WHkpT99Qe48mte6cxla2wnt6iGYaB+Zcp3dnsbNKd7ww6MT5ZBU1tPlGggPK7JVs7A/PFzQQrqHYCCU2JwTV7y+jiizl7fP18963JHydQy3RIQLwIvXE47k4KNbQek61FJ+FIzC6t9oDxOVFYajqVy/RdsMbh0PyNUMcLyFXWccLQhuoLNIEFGytn7oE00goV4n+0J+WBMBW/N4ZrA9ueZsQqQx7mpPW3a8Y0e/zmfMoKTMRKTCOxNkA3+XDJu7qNjNG9b5XBvfcQ06awB/wW5ayWy6/IO6H1IU8g0RQHwik59caw2fXg1Jjw== 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=MMy8XfGqa1jo1IGihoCzolz6QLgVXyfM0Xd3Q9nmhaE=; b=XY7axo2dUxTGTj/YrzIIGNeaCo5i8Z2dDvPw/BOyB0e8icp4knsSRUMnlHZnxq7J+Mq4JsW/sQP8EoLJAfaQGbi0Dm2/7sSq2eD1Dgu8bE1tSj/1aY5BCAAzULIdL6CfrejdyyJ3PjEDcIkeP6pS4RjM9CXtDZ94K8GBHlp+Sewx9fGtWP2vM2Ys4wpNIcTVrthDhfbirsY/yuE5Ql/M30nKMyb53HRAKDxGRpCK5SCvFgf05PfEXvkw2+8neYaTY6ib32RBI0Gss/EgfHmF+iwfQhSw0TIhS2Q3WB4iRx3ZGpP3feZBaIHxuSRPcOKQ3cjvJsR9wBlF8GcLdRc3Og== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MMy8XfGqa1jo1IGihoCzolz6QLgVXyfM0Xd3Q9nmhaE=; b=uH6Kz3UcbnyUeXk4oc3ZBMz1kg2jsdvzaMte9CtqKUSEk1KnljJhYKBV5bRCEzhBQvS41y8yqVGDNrKmGMYYAUu4N2kXye3o8gMcYWzbH+7be8NOL8+tKyai6zO0fcuqw/3Tq4hvOKVFo2HvfEPOdAoFUw6NvcLWxKnkq7VQNkU= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=oracle.com; Received: from BYAPR10MB3573.namprd10.prod.outlook.com (2603:10b6:a03:11e::32) by SJ0PR10MB4720.namprd10.prod.outlook.com (2603:10b6:a03:2d7::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.26; Tue, 25 May 2021 17:47:46 +0000 Received: from BYAPR10MB3573.namprd10.prod.outlook.com ([fe80::b09d:e36a:4258:d3d0]) by BYAPR10MB3573.namprd10.prod.outlook.com ([fe80::b09d:e36a:4258:d3d0%7]) with mapi id 15.20.4173.020; Tue, 25 May 2021 17:47:46 +0000 From: Mike Christie To: target-devel@vger.kernel.org, linux-scsi@vger.kernel.org, stefanha@redhat.com, pbonzini@redhat.com, jasowang@redhat.com, mst@redhat.com, sgarzare@redhat.com, virtualization@lists.linux-foundation.org Cc: Mike Christie Subject: [PATCH 3/5] vhost-scsi: reduce flushes during endpoint clearing Date: Tue, 25 May 2021 12:47:31 -0500 Message-Id: <20210525174733.6212-4-michael.christie@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210525174733.6212-1-michael.christie@oracle.com> References: <20210525174733.6212-1-michael.christie@oracle.com> X-Originating-IP: [73.88.28.6] X-ClientProxiedBy: DM5PR19CA0009.namprd19.prod.outlook.com (2603:10b6:3:151::19) To BYAPR10MB3573.namprd10.prod.outlook.com (2603:10b6:a03:11e::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (73.88.28.6) by DM5PR19CA0009.namprd19.prod.outlook.com (2603:10b6:3:151::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23 via Frontend Transport; Tue, 25 May 2021 17:47:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2e575ed1-5907-48c3-6070-08d91fa53467 X-MS-TrafficTypeDiagnostic: SJ0PR10MB4720: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2201; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ScSYMiCxfnK/LlTAOZpFVMVwSacesUBEqTr+wLCguLDRmLSYyw5ve9LL020Tw5OUgoOWAosMv9c0w/nKwm9WpSsaSV+uzNAowh48wGaB+9PDrsvZ29DdYUo/8O0uU2RGzmi45WPXC4WW/mSQuNydtOqfMfdgmB/UgNInT2bPSDizkBsXIZkv0Ga8sL55o+78lj3wk2VJNP2fQ0I242W4K0W+BotxyhbhJTYvTBjg9WFDeiROZByUurT3dgbla3a97cuk0RBa6pF/AMgBLLFm++Xe5wXbo2U7w5AThvjcJe+MrWO9bAJDPKiHJ5aWR1X0Z+Xeab2G/VnV4n1xaDmJQUKy0wN2q6TWOXw4sq2ZSn6ZhxlA1h1WdRzpxGgJG0tWgrAqjOHQTUd+HvS71jTpk91B5TGrt/q1q5kk4YMvpy32JMMFTPZBwQGVvAN10ebdM9NnSk7N2/56mGbQdYSYJVAiySIZau/CuRDgTNGgDGN0Q6s8TyCDbz7yVnzD7m3oJBs6xrFacK7meWDrXKIwhuR12gown90DDT5WBEAT35pzVIXyzqdgwtCA9+ec4PgN7G/LpqtFsCxIWvx7SC5EbmGwjQZsmjZfr67wry/kQe6/p2MvRiCjH+dJd4lJuRZRInfH5Rk9SrGz2kUd42bd1R35F9VJLmYf5y7IF2EUvaNUeEeIvX80lRTlDgLmT62J X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR10MB3573.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(39860400002)(136003)(376002)(366004)(346002)(396003)(36756003)(83380400001)(6512007)(107886003)(38100700002)(52116002)(26005)(66476007)(478600001)(38350700002)(86362001)(66946007)(5660300002)(66556008)(316002)(8676002)(2906002)(6506007)(1076003)(8936002)(16526019)(186003)(6486002)(4326008)(6666004)(2616005)(956004)(69590400013);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 2pyVwmv3+/6rxdu2L9oN7DEztqJltcC3Dgttp84ss+tMslQ/uf+GgG2xBywnWhKgulkAbHwNT7O6Lro37IntRCANk0BlQbxmCiDlaMMPFPhG5xUTo9Zqq3e+Rv6Jf7AU44ievcqipm+6ajlDxOKZ0m6XpbDRwTfUrXUN/2j/2gtnOsnkChTCOZWpcJjZelvTzf8tA1Bbns4J0ihtbL3LMFyGCTXd1+tcwKFc/qdXauF2f7cL480nFKqafb1xDXXMzmXJ+zjuy6hJSO5u5WBW26dQEP1AJycrZQBuNTW0YLFtqC0sKpHakalAyEflMWfmudysb3BB1M9HfeUYn2HG+gouAeUXW5cWt3N8LMlWcGiu69i7zw2kT7dYgcd2zEK1/sVcj1IaFY3+95U2fPBF7naIt4cl9boIupbtwEbAd+eFPXquvTSa0XLhvlpwC64ddE/a+kOVSpUoCXLoGzLAB1ZraEWUYNeDz2keOJ2HTbg36crIQAl40VLWbChbPezv8GepooSC2q7axfk39tluyatQrtPcDYqk89jPI9s6bkyzx5m+hRSvox6L+IVj6sILNUlwEjlHVcpnJPAE92uEiW44Mb+i3KoN2UuGvEW2iHUlmKOr85NQvzlqDM2070A2U/dJ5IFf3jMpI6y/tm/8CRSb96/XaBlFwlD0pA7KB9p3G6yflkN44c6jX2BWrUNNgQQ+Uts3ZQ74G4ASQ6aSDkWiXKzrP7rJ3FnBB+piy0FcvhLeF1hYvemfxzUro7mc5MjqgLINcnVsJ57Nw3lbIj//D8UW4PBgtTuun+PqH2zCm7eSDmZ03dtOi4OlDKIWvZKDLLnFKzORxIAVeHR16ZEOMEmybLT1zp9G/bl8cjaTbVHg5mDV4E3Rv2JgK+hK+CRLmmiqRZ5PNznWkqgskAeQYlxk9TpdP353LgY9lna0FyG2pzkr4/RwuQE4zFvY36gJcWS3+SV1tXPdPnqlZJgc38igFN/oviGHR/9g5JAQT3qVgLh0xLzo5j0XBQI1ncHp/+trs8UbEcZkeFdBXsaLNaO2F06xX8UbGhblxaFaG05Ilv0MNEQZgvCAp8BQEtAht//9/hiEgjCN9qM4O0fUSloGQGUlGCItXhgdfLZ97RXWCiml3YMHvNoDzXBjnhAkew/o9kBFrbN7DnGpYegnQT96NTxku4/MlL1R2JzmszOB3jmdH11FWgXog9y/4KtTaJEhlvykbSDND90bDKCKLk4SRoIpFNJ9wvJ703qFYcEHsHU9PO/6tw0uv84kMTXGZw5LoKtJSpcmDew6Cyf+EJdOlT616C3o0crVmwUtFHZqZ873NhVfU5XaY/7y X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2e575ed1-5907-48c3-6070-08d91fa53467 X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB3573.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2021 17:47:46.0759 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +exe08fp4q1OsEGqBMWEqE/QVMqj2lTfZKWZZkl5oKgHFuU1nnSH6jfnJxElCUyjfk12gSxJWhNHrd9BEPJ7gcaZZ7nkDSS4PU63OyQ1/7w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4720 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9995 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 spamscore=0 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105250109 X-Proofpoint-GUID: KQ1AnMHLe86thmUSfQRTc4Q2Fc396LI6 X-Proofpoint-ORIG-GUID: KQ1AnMHLe86thmUSfQRTc4Q2Fc396LI6 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9995 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 impostorscore=0 mlxscore=0 suspectscore=0 bulkscore=0 adultscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 spamscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105250109 Precedence: bulk List-ID: X-Mailing-List: target-devel@vger.kernel.org vhost_scsi_flush will flush everything, so we can clear the backends then flush, then destroy. We don't need to flush before each vq destruction because after the flush we will have made sure there can be no new cmds started and there are no running cmds. Signed-off-by: Mike Christie --- drivers/vhost/scsi.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c index 2f9633ef26aa..927ebc52d822 100644 --- a/drivers/vhost/scsi.c +++ b/drivers/vhost/scsi.c @@ -1747,11 +1747,12 @@ vhost_scsi_clear_endpoint(struct vhost_scsi *vs, mutex_lock(&vq->mutex); vhost_vq_set_backend(vq, NULL); mutex_unlock(&vq->mutex); - /* - * Make sure cmds are not running before tearing them - * down. - */ - vhost_scsi_flush(vs); + } + /* Make sure cmds are not running before tearing them down. */ + vhost_scsi_flush(vs); + + for (i = 0; i < VHOST_SCSI_MAX_VQ; i++) { + vq = &vs->vqs[i].vq; vhost_scsi_destroy_vq_cmds(vq); } } From patchwork Tue May 25 17:47:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Christie X-Patchwork-Id: 12279763 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=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 DB850C47085 for ; Tue, 25 May 2021 17:48:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BA10961132 for ; Tue, 25 May 2021 17:48:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232990AbhEYRta (ORCPT ); Tue, 25 May 2021 13:49:30 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:49810 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232664AbhEYRtZ (ORCPT ); Tue, 25 May 2021 13:49:25 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14PHhPvF084741; Tue, 25 May 2021 17:47:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=1ESmTwnAyXCq51btcYwNxM4nejxq0doON9ZIHHaw0ZY=; b=hBUIWvUnrDc6LEX1ciNRW927Mq7KJupLu2I6ZwJc3dv9jATnsqt+lifZnxGA5zO2lBO2 NTszTmcHFPBl7//ExdOk9f1bDIPCq5+xV7RUuTqBeavLTMBHG9VtZ/L7OBG4UIUJ0qc+ GR3gAcEuugJBTUR/cSew71PXwdRTBhNTqOww5NhGqtfU+FjJcFMQY2nCRjV7KxNgaRL2 ry1vY1X2yhCmidsqOu34mwPZy43W9QXq+UxyTC1YM3kU8H9Uab9P+Sx4NvJOxxV13Its Z8PPFPiRyx8Pc/32s0vkLNn2FmWMZ0Jxwxdb8eZ2xRxftCew7t7owQSQO4kLq3doizZa Sg== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2130.oracle.com with ESMTP id 38q3q8xam4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 May 2021 17:47:51 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14PHeDnK133298; Tue, 25 May 2021 17:47:51 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam07lp2049.outbound.protection.outlook.com [104.47.51.49]) by userp3020.oracle.com with ESMTP id 38qbqsfu7d-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 May 2021 17:47:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X/umTKkZZV97hmSKc3bFkUNCLgGF83X5/5hE6kLm0B3rLckzPlSwfAhJVkv0W77jHSxtPmLv53mjo675nqjBj8MX9FK2VbZy+RKMyLcKJd9Kk5LTKy98U/fM/nDXb+SNlCxonfTNTCmZnJbRakvahbQF6yKdxY7iiKB6B8A9VhmeydoEWxXc4OnrlC8eKyBymS1zc/mZGLaE+eA9rfHjCUdLha6cMyFAqx0xHat1M4RzA5XRnx0QfZWtKsrhXXnC+7Au7iklzeHRzH1wPEB8LuzB742RuPIvMW9TcWk3V9HpHyNZdMBG+5Eme1ny9x97exu1UKTorE+e0/Z08yFzLQ== 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=1ESmTwnAyXCq51btcYwNxM4nejxq0doON9ZIHHaw0ZY=; b=InNIhNzXZ2GpisasrLjHpZsHUUV1dsiaF555EsCRDX9Ms96EhJ5Vv5Wq3lFZH68H6mEuWJNNUKl5w/NB5gzcude0us6/Mh3QWMh2ogDjbOK68KAJd/RO1slbwcztTZIvKfmMNeRI0TpljSRNU2lIuP3EuwimF0MDu6W2fWQJWX1kCGbn3iYq/tVWmJUhlYMOghhS0Uq/6eThiUBcuXZfUx0S6RLjX3xLjNggbUBgc7Mnbas3S9I+bJxEUnsl1xlEdvt8j+360l9zDlTCbnDfYkWDaCITuCMgEfpVxXluE4d+rE0pCnRy/dRO90autSMysAAhqsBQMjHEE+ItKXiVsQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1ESmTwnAyXCq51btcYwNxM4nejxq0doON9ZIHHaw0ZY=; b=i7BHN2QBTsp8/IrYDhif54rcv229aeEHQNFSaV/8iFG/O9Fe+Xp6tlnw/oaokAdP/1+cH0W3o86rew2RgRF6H7FttXQ9+p0DMmgb5R8Suytbxsn5kH/z1Id0+fXX/pAYI5+U8O/PLvZYBipTsOhoY02loq1HboFg2kLpVZb7ijg= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=oracle.com; Received: from BYAPR10MB3573.namprd10.prod.outlook.com (2603:10b6:a03:11e::32) by SJ0PR10MB4720.namprd10.prod.outlook.com (2603:10b6:a03:2d7::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.26; Tue, 25 May 2021 17:47:47 +0000 Received: from BYAPR10MB3573.namprd10.prod.outlook.com ([fe80::b09d:e36a:4258:d3d0]) by BYAPR10MB3573.namprd10.prod.outlook.com ([fe80::b09d:e36a:4258:d3d0%7]) with mapi id 15.20.4173.020; Tue, 25 May 2021 17:47:47 +0000 From: Mike Christie To: target-devel@vger.kernel.org, linux-scsi@vger.kernel.org, stefanha@redhat.com, pbonzini@redhat.com, jasowang@redhat.com, mst@redhat.com, sgarzare@redhat.com, virtualization@lists.linux-foundation.org Cc: Mike Christie , Chaitanya Kulkarni Subject: [PATCH 4/5] vhost: fix poll coding style Date: Tue, 25 May 2021 12:47:32 -0500 Message-Id: <20210525174733.6212-5-michael.christie@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210525174733.6212-1-michael.christie@oracle.com> References: <20210525174733.6212-1-michael.christie@oracle.com> X-Originating-IP: [73.88.28.6] X-ClientProxiedBy: DM5PR19CA0009.namprd19.prod.outlook.com (2603:10b6:3:151::19) To BYAPR10MB3573.namprd10.prod.outlook.com (2603:10b6:a03:11e::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (73.88.28.6) by DM5PR19CA0009.namprd19.prod.outlook.com (2603:10b6:3:151::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23 via Frontend Transport; Tue, 25 May 2021 17:47:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 86e7e204-5653-4ee4-062c-08d91fa5351b X-MS-TrafficTypeDiagnostic: SJ0PR10MB4720: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:590; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lRzKa7zGvo9hh/65+9rlz/v5z6gV8Z5OZ/7s4jeFJwTOOfcE9AR6MW3HVcRJ6re1qQm6qUNDO4j8JZCVeePIym7nPX0Y2z3XFpa6SYpIkIIzdwUW6nrAJhF5Ed3ycSSm1PtgHqBsdVfwMi/uGPn/9xoRzoVy+WoKEfJjbYWx9P7yhXIM1IscCPgrTnxXDY6qeoZZo9fn8gzshM1Nw4x//eTNHMmO67XW0c1zEV2OpTO9+iU0vD8GvoPJBEkPRhY5AXD2aRSHL/x5hs+xAoSCWJdPfalqzw/HKTtjoc7V06Zrbl1kJSU95fWZ6cClLTgjcU0yi5qiLTOVHrDiiPLm/x5Lnq9SHCL6siQIV66oPMOcWhAk2ThbDYaOXp3LdHon5kjXA41dMqVFsmio+080kkEn6OqkfKycR1NJy3PnECCtKihc9Nns/lol7Cx6wOE/gKulGt9RgqUKX2+myiRMIht8ASHFJOzEvqiWoypCfTDPl1hDzu4eFNJiTFy4ZBcGUYNFzFTxpluYw2vndpenEe2vhznA1MX/stGnm9JamqlW9UdDvEpdgZxRhdVicqxJuX8/8ZvttyEzhbwLFLJQNxykA45HmMcOzgHXq1ndNrib0u24EIKJPkwjaCG1Ip1LnR5/2Q6yuHk8eQ1IDJoA5bzIsw7vi5jCwgN5AbWNuUvKJDc+tS1rT1GzYxNOobrP X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR10MB3573.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(39860400002)(136003)(376002)(366004)(346002)(396003)(36756003)(83380400001)(54906003)(6512007)(38100700002)(52116002)(26005)(66476007)(478600001)(38350700002)(86362001)(66946007)(5660300002)(66556008)(316002)(8676002)(2906002)(6506007)(1076003)(8936002)(16526019)(186003)(6486002)(4326008)(6666004)(2616005)(956004)(69590400013);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: ASRTTYClr14fcWx1PgcyuNUFYXHVoXX70oKy5p7g8zAFa8oQiLrZyg5t9cOADMDD68igb7IhCP6TsbRN3VXcMbWNiTlWmeQ4AwYFg+uN+PBz/tHIK8wOV+4dFy59zX/eLg1F++CEGGKW2/5sSE9AELSCXKOA1Ve10sNT8PWkgS46hBFpUxFcDk3LFQhhWehNxgO66S+QuHOYCkBdvJKzqysYSzMgxpX3dmFG6ZhYI/JsxSvrIocI02eqzWMoX/IRMU+/KUOKYVi1fMnoB+HMvxJnOSAH8saEz1jURYvTmaNdCkGSDvOYItSqEVYXt83nZrdKH5YTVS/NaaobhnizYTuVaWni3arZypE+wDYUGRDYyIJuZeSBmcLlkvvz1UAgwkc9HdRVxMrOv4eeWYd6+jiifCds5/jX9JnIiXtgkdJ4NT9Y0OSjAKq4emyZ3g8ddCFfppAMIzb77/uSTaKEnORkedCajvqMD3ZZdTuqBTXbvv0Cxc5jvZ3yElIw1rOh1BuFmjQkFAP9BNrNql52MJrQjwiXQIYKRak7fXSIsIn14M9WLFyEQ4p9Rt6ERfk0yKjJQrFwaLHse3oMWwGHqm/Lmf3rxZFjRSyY6ecwhpZJjdvqN+zYJnWt7QlQdD752sHbe+9ZI6yIZM9Dohp47AmUXbC9zRNmQGgVu41k4LtJLxBVmPuSLQ82KK0/QMoIAlFJjqrU8zDC/zU/++HmBPjhGJTPS6nGed4AU5ye1Yef86ApXyb54ay5oS3wrp58m6dqddVEQWX6CpzV7KFyvDjyRe8OWrv/5pnUAGcrQxsV/gbJTCgnFFqlJunpfmUSZr1jHDq6R/qv9BRXphxoJ1lHbFQphLA8uXC+/8kSFWC1cGZvJn6ph08Hh/+m2dmfeANno8xUffZeJpkThXQ4giLjqRtSYoLEOojbvOWr4Zyss0c3p+BsrAyXHLRMpEhzbfWHnQof4WoferH/d2dq7yVWRhyKJiMkTVjlq0bmtrixf8Y/vgWq/RSFPFaouJNpgpUbilCweZoi3OysPgBRa0G0kJNwlbibugnlXhJfMh9HUu5GIACTPgqrDy6IK5vtcOmXYD7Q+1W+fA5nExnXgl02JwYRowRr7asKmIQxY+d5Gw6hJq30yRtls3Rmmn28PqD2cxUT3MUjhe8s0wY7PDp9X2Z8rMzVvk9DA6w81aKUlDXAI96g53E+hGZpWusaT2fV4WWf4uzG91ldul5mBw96TOgrZjQc8kYu+rMGzPrCCGFBXZBdDa77BiMhxFTvR8n5f6hxIMMhPQrFZB8aH9hTbPiDDHVApyx/FYwjGIFKjnUWdfY0TkqpQIukGDVp X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86e7e204-5653-4ee4-062c-08d91fa5351b X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB3573.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2021 17:47:47.2213 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jE3roVAnkmImloUibkTb+yhCDCAoF2jC2ay4rPy/ANzovPwPsZpauMqfFve52zGPBv6vuw7EvRjSeQaRXIeTeHwRH7k1UKdKR4PgIWZ2XpM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4720 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9995 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 spamscore=0 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105250109 X-Proofpoint-GUID: oi1PiXaNDzOrRqd1wzfjMaY6ex7jXC1b X-Proofpoint-ORIG-GUID: oi1PiXaNDzOrRqd1wzfjMaY6ex7jXC1b X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9995 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxscore=0 clxscore=1015 malwarescore=0 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 adultscore=0 priorityscore=1501 mlxlogscore=999 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105250109 Precedence: bulk List-ID: X-Mailing-List: target-devel@vger.kernel.org We use 3 coding styles in this struct. Switch to just tabs. Signed-off-by: Mike Christie Reviewed-by: Chaitanya Kulkarni Reviewed-by: Stefan Hajnoczi Acked-by: Jason Wang --- drivers/vhost/vhost.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index 1ba8e814989d..575c8180caad 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -28,12 +28,12 @@ struct vhost_work { /* Poll a file (eventfd or socket) */ /* Note: there's nothing vhost specific about this structure. */ struct vhost_poll { - poll_table table; - wait_queue_head_t *wqh; - wait_queue_entry_t wait; - struct vhost_work work; - __poll_t mask; - struct vhost_dev *dev; + poll_table table; + wait_queue_head_t *wqh; + wait_queue_entry_t wait; + struct vhost_work work; + __poll_t mask; + struct vhost_dev *dev; }; void vhost_work_init(struct vhost_work *work, vhost_work_fn_t fn); From patchwork Tue May 25 17:47:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Christie X-Patchwork-Id: 12279761 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT 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 742B6C2B9F8 for ; Tue, 25 May 2021 17:48:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5267161186 for ; Tue, 25 May 2021 17:48:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232065AbhEYRt3 (ORCPT ); Tue, 25 May 2021 13:49:29 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:44842 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232992AbhEYRt1 (ORCPT ); Tue, 25 May 2021 13:49:27 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14PHkV0l039325; Tue, 25 May 2021 17:47:52 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2020-01-29; bh=Yupj47dUyQe4DgM7DXI6RyaHsJsJwklL7LzJ3Zj/4ls=; b=fKxIfyldJ/8jqJiFlOMKDXguxJvToB1ZGR0zdqmTw2lVAjNv3fMAWm0BfzfLC2cpvh5D xvLhbRsBlxaov/HJQLjjWURE/Ca32F9dl6vpHkG+QMu+LvzaGIKdWcbaOCewwkt8ZBVl 6jzevJRIH8vKzmRnKsvgvKkWwpQDYBIlg+gw1FqOT7VEbL0EpNlUJJlZSi7XrtMGmLiD a34Cg/x8dLqx+I77Sr4T6c99vcC25cUkRNsRHYvmTL+N0vWCK2nyE2qUP+l4CqVkuMrw RS69a06dCWij96tPaCISXMBmUUtithPL6dDvqTYRNZXc07IOZ1gzvC2dJsarsdltUMCh xg== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by userp2120.oracle.com with ESMTP id 38ptkp6tae-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 May 2021 17:47:52 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 14PHeDnL133298; Tue, 25 May 2021 17:47:52 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam07lp2049.outbound.protection.outlook.com [104.47.51.49]) by userp3020.oracle.com with ESMTP id 38qbqsfu7d-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 25 May 2021 17:47:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bqSstmIXKHlhBglR6M5Ej20zK6VPEQLNi0zp4fsvuBc9RuUYU4HIizdiQdPea5T710T6B5G6dGUQugZZYX5Pgb/lOm+GF3uFb7l8BT3lKWY1IpOBFh8WFC9qFHb4k1erb995CM/tfjIvxVxIp0xfiexkrdljyBQcJGYzTD0geVXDlUiSKl6bSy4m4W8nMCwy6tpufzZme6oOx6shX3gxhKu/Tn77G5AmQMERKZ3fi+v4Nr+ASjNkSPN3/19X8h1zNH1Lu5EMmW9pfHvBm+Oq5sgRt+R2daABBzERXsLk6GxZ9lyHmdjvI9cdPrjmk7Hm6C3ZmukWzXBDatZiyzdWSQ== 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=Yupj47dUyQe4DgM7DXI6RyaHsJsJwklL7LzJ3Zj/4ls=; b=hnbNGCZzniu9oYsSB4aGj3VquVkHNDvl5lf2B/il/z1p2aMkfJ6tymWmww7FEiMKpjrBXOXD+eBE7MctvaKkRSuPFRGlsWvnVZDky1t6IZvQPQ7xzqqiy70FUT8w4nA6Xt3Ua452rSz2oWDrACmM5g2FNLp5nlwx7lDiM9T7TKvVE26MbrTqa/O1yy2x60JD5FfNC0tk6rh0k0ra0piIKUoqj/Pt6Urf4HrPwOAWXSs0YkkVIwXNImDIuTjBwzvMZ0O7800ADJXJPAQthFM36pZXHV/rgslX7ST8gOXZVFVJKJLQ/nRfKbSDn5YCb7P6SvFV+CO5rpmL1nC8QDVkBg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Yupj47dUyQe4DgM7DXI6RyaHsJsJwklL7LzJ3Zj/4ls=; b=YD8vPhZu8KyLVqxZ1haC2bGLjdFAFyAnTgw3oBdX3YhTAy8sKWNyYOyI8sAC1QuvlVWmk9Xwqpwu9ZeOtq/SfAPFfCaImheO3I4AvdgcZ0xNdELeRKkswvSmB336upJSS2KUiz1MiDLHCD3qHfDcc1mVcmnWeZPImA9iBmGV9Ms= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=oracle.com; Received: from BYAPR10MB3573.namprd10.prod.outlook.com (2603:10b6:a03:11e::32) by SJ0PR10MB4720.namprd10.prod.outlook.com (2603:10b6:a03:2d7::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.26; Tue, 25 May 2021 17:47:48 +0000 Received: from BYAPR10MB3573.namprd10.prod.outlook.com ([fe80::b09d:e36a:4258:d3d0]) by BYAPR10MB3573.namprd10.prod.outlook.com ([fe80::b09d:e36a:4258:d3d0%7]) with mapi id 15.20.4173.020; Tue, 25 May 2021 17:47:48 +0000 From: Mike Christie To: target-devel@vger.kernel.org, linux-scsi@vger.kernel.org, stefanha@redhat.com, pbonzini@redhat.com, jasowang@redhat.com, mst@redhat.com, sgarzare@redhat.com, virtualization@lists.linux-foundation.org Cc: Mike Christie Subject: [PATCH 5/5] vhost: fix up vhost_work coding style Date: Tue, 25 May 2021 12:47:33 -0500 Message-Id: <20210525174733.6212-6-michael.christie@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210525174733.6212-1-michael.christie@oracle.com> References: <20210525174733.6212-1-michael.christie@oracle.com> X-Originating-IP: [73.88.28.6] X-ClientProxiedBy: DM5PR19CA0009.namprd19.prod.outlook.com (2603:10b6:3:151::19) To BYAPR10MB3573.namprd10.prod.outlook.com (2603:10b6:a03:11e::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (73.88.28.6) by DM5PR19CA0009.namprd19.prod.outlook.com (2603:10b6:3:151::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.23 via Frontend Transport; Tue, 25 May 2021 17:47:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4f9c7160-00c9-446d-dc88-08d91fa535c1 X-MS-TrafficTypeDiagnostic: SJ0PR10MB4720: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:462; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AgeQyRpSge++XnTsbj2lqhFsChXKHY6Cr+LKHZesb3koBsf4nTkWQUXfATQ4lnk2wZ9cSV9jPeudRNqIj9ya1e7GMkFIzlnnrqaJKXxd2XmLq8jLU0RiSp1wyDI8K9aDWU/GXuTbrW2qUftWWicwV23VXm9i6fzwpQXbZKLw4/3Uj/xURdXXwQCRq+39jSRn0bJIDEVUl/FwxdeZyLFP2sr6cnGf+HkBWhX9MIXQYNxDbQrtacBIOU2kZQoCuSt9FNWElEOMpL1loAtsMrg+ZcFrVKy9pqNwTnUuQa1EMS49Ha1o3YS2YHLrfQezV+er0rR+4UdeH2XxvjAgO6PQA120crbBxpVCNys1pMaBeSDfvNRG546aSEniWMjJu44PohzNXAeXpWqwnn8yoKkKGXaeT46Xg1cTG6/Iuze0oirPVR8pDhJBMWl/dXDm40HZefXWTmV2UXBdTWyAL9TDz/Ry5ksYG8cxhZ3tehmhMRsbeZue9qd79AvQ9S3VkZWzkr8NpkRIJzbvGrkNgzD4toLqRuRCEQIWyScvgRHBZ2gbWW/oBOzXZDIP9BvhzAkUdPtpWKWauFjIU1Spk6aRBFNtFn4SSWqtLHGRUljZgiAZAhFf/T5Nnm/OhtA7O07CFXW0vHimfWk0XUC7A5Lj3nkuMTycuMsJUX3Sgo4Gz8b8pmPx93vdW6GiFXh7t9Kt X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR10MB3573.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(39860400002)(136003)(376002)(366004)(346002)(396003)(36756003)(83380400001)(6512007)(107886003)(38100700002)(52116002)(26005)(66476007)(478600001)(38350700002)(86362001)(66946007)(5660300002)(66556008)(316002)(8676002)(2906002)(6506007)(1076003)(4744005)(8936002)(16526019)(186003)(6486002)(4326008)(6666004)(2616005)(956004)(69590400013);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: S9NWkEBFH2l8AFBRe4lICctr3IvjE5HiJ4Q+eONncE2HTHkDrge5CRXWtu5aMQp0QzlzT9Qk23leq+l/Am6a7dRbwl2ilM81d4SM1OR1VVbGrqvE0mrBtOsWpz4cxLNfKrBeJ1AFOr6CVfqD5o2pg5w1QAFqPFasAaTFeV/RiZJOoVYV4rDgfjnaHcaH2XjMHlu7i/881r8MAOoNv/LrWYJynaebfvDJO/HwrZVEhIMxCU2oxuvVS2uJQ4YXTDWeno4Nnnhf9uRbNn9LIOc+qmz6Rirh6nE39m5HAf+5SDnlPqP+1Mqma+dHS+3RcOay0esUYHeFcwGSGHx4IX45XFo5onmX+dKhuulPAYS3+JrTsSq9skWr1dTTTorV/92Supvsk/wADCtI8zQs4GM02fKe6F2+VU20UT6kMkfH27f3xvY3i4h6MV2pI2SIAKZ4hPpfHXzDYglFmtP9hzgsoOMvCCVdbkDVyt/b1oF/sFlaDjiJbo62LpuLHfy5v9FUSKL04DNaoHk0nT/xKk2pZ0IwGmM63fti7Pf4eU7++09IK+cMn9VKmNmfPLRaxKL8tgtXiWX4QFsMYzvo+uqZHVYZB0Wq5RDalnbkdi6z8M8KQfA1gIunyEZ3a3xNECmw3F5iy4YJDoe8yRdN+ST5FXpqLNIyR9qklNK61AB6iVlSNYz1JWkdMxt0fTIYx2Yu6/eJlKcsTp25oklaQtRjy4/WhmCTDalAv0T39Uvu/5pvG67dHl0z/HJzZOM4lY0fhoXvZP1NfsU8yByNItlyhTZGNe6MTkhKaVtRBW1kEw6bLGrIq4BtK0jcD2KT/0QoOwvmMsgadMSVlMoO3qUFMXoNXt5aDd5XThzEI32idTT7e6F/mB3DQEh+xWzQGvtkaDrqJmC9gfTa3Q5eaIPmSHcKWrGMcpZ8PS106IFeukBqnBD2jv7XuOwpfSTlDk9AC9IKt9S9Z4+W2hU86ZH5s7RNSOWBRIiahxIQbTa9rht3YTWJNt/mUvThvwq+Th4lLJgZEQY2swGcoQKv18KQ5uxxcsupxOg8e4Up/rKghxABlEQNfJ2izjWzuIJG1p68rBQwVICrCmc3N+GBhzUYw3D2gSDDpnjWputOShu8DzSsRq+xffAX6/NPKeeGc2dZiltWheOq4z5iSN0E9rP30nCakwgD2YFEkmlVe+SMtAqG9O55uTPYiW94E0itiLHO1JAEOuRALYv34tdXs9bSI7LpGxqbEQMOt/BPZ3HVJrYLqknybrqk1354DBneQBTM9yT1hSjb6jxR/o5dkFqf15tqRRTbwqT1ExF76+9W3pKOchV/OwycG9LbK72kCIEd X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f9c7160-00c9-446d-dc88-08d91fa535c1 X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB3573.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2021 17:47:48.3247 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BwbccXqGfpdv2J2Fn2t/KOcf5xWOZWpS+SracGkJ4LnvVaJcHMyVNMR070xzex1L6OQclRcTiIFP1grBmA7tb2jeVdQ1IzI+BcMkeupRMbs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4720 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9995 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0 spamscore=0 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105250109 X-Proofpoint-GUID: mxIaxnYotdfpPZ1FrokR4WYTVAsGcoKY X-Proofpoint-ORIG-GUID: mxIaxnYotdfpPZ1FrokR4WYTVAsGcoKY X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9995 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 impostorscore=0 mlxscore=0 suspectscore=0 bulkscore=0 adultscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 spamscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2105250109 Precedence: bulk List-ID: X-Mailing-List: target-devel@vger.kernel.org Switch from a mix of tabs and spaces to just tabs. Signed-off-by: Mike Christie Reviewed-by: Stefano Garzarella --- drivers/vhost/vhost.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index 575c8180caad..7d5306d1229d 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -20,9 +20,9 @@ typedef void (*vhost_work_fn_t)(struct vhost_work *work); #define VHOST_WORK_QUEUED 1 struct vhost_work { - struct llist_node node; - vhost_work_fn_t fn; - unsigned long flags; + struct llist_node node; + vhost_work_fn_t fn; + unsigned long flags; }; /* Poll a file (eventfd or socket) */