From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BEE4C433EF for ; Wed, 2 Feb 2022 21:02:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347380AbiBBVCm (ORCPT ); Wed, 2 Feb 2022 16:02:42 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:31794 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347357AbiBBVCj (ORCPT ); Wed, 2 Feb 2022 16:02:39 -0500 Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 212KwhBJ023474; Wed, 2 Feb 2022 21:02:15 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-2021-07-09; bh=vikfQxERUFBfKJD8ex3HEUPJE9sExSR4JsWfRTsN1EE=; b=GoZKA4AvSQaiPF+t7H/nOZPO6UCvm/zIBj1/C+So0CFp8l4evuCXuEm1hG9CW+2AvtGj lbAaWdG8+oHWbPKcJnrQjb40Zbq0xreCECDCdcRZxVkq3mfNWlt4hikJ00n16N1RUnDH vACI7c847zmI71LomU0rPlyjdekwn/u+lkTOrLkN5qofeCyGSHnMfppr30Wo0N2s1k0L k18+VSLmeJA02IOjo6xzm0+WJ1Lxkb5BJxDsS5NwItxFWotZXKevwHGKZddau61UCKgV EKQTTEjFoCYu6/vpCy3VLkiNdHqQYbzmZlDO2l06dNzzH7gWrcw8z5K6CONxUT44pUpw GQ== Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by mx0b-00069f02.pphosted.com with ESMTP id 3dxnk2pxcj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 02 Feb 2022 21:02:14 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 212L1SZr079411; Wed, 2 Feb 2022 21:02:13 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2107.outbound.protection.outlook.com [104.47.58.107]) by userp3030.oracle.com with ESMTP id 3dvtq3h0e8-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 02 Feb 2022 21:02:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f3B2ww9mLh4cCxPr8BcVyhRbHeaWjYazUsLkDmeycX+CbuYfdZ6bnaIcbqFO0aWTmEBM2EWemyeGB91puKkHKpv7KW9VJaUngaGAYCzzCddzuv2tH07zPTUoX3cSb2fd8JXV5vX23BNEsGCDxpVVVZgmrrYasF1iB/rnH1X61AariOOvuSs/bzSO0kosrI+OFESpLfHmXx12swNBW1QHPuW6hF8uZFSj6514Hg3ljWx2vNrLVp9ur1KnhIBoDeZzsHZD/i4ATgoS+snQNXX6HkIxK5vc42vYdrdOVeO6AaCAnojcHzNfUOoDqIRzvq6dvwu9AzUYIPguJrBAfXyS3Q== 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=vikfQxERUFBfKJD8ex3HEUPJE9sExSR4JsWfRTsN1EE=; b=jq+eQQ3EhfbKJID36Qwe5LVcnHJNomJKGn13rUhCour6rg57zA3K8lnCQv1NJAignqolrA+Ib5gIeGhduDR/MNF4sI909JBg+tJZgAhz4SrK2yQDEHGQ+A7EGQdadY1PoKgou+T1CfGidJ5MTaTkN7K9zTaMMHVAoyo1ceT0Gw2WgaTV4D1tq2XiDO0sQpx9N/Lrewz0klfpkQ9TAbAdhr0cvQpUoOri9OACRmHWpOBod6nG/oAJGDaUPvx9xJZfMp2/ue7QO6jUEdUSVD86+jTKQRcxhODz/szKIq7VMD1sE4mmkt2bKq2lupcBzdav2Gzec5qtS030pSlpKdB5hA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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=vikfQxERUFBfKJD8ex3HEUPJE9sExSR4JsWfRTsN1EE=; b=rh3ILSZIF/ef+zRRUFl7V17Y7A8dqRMWbEvU9Iud2p8ZkMRcKTp2K/CAGDfJt0IdbyYSqsA9DDt0NJTyvyuWO/ZOfg/LBc6n7gArqqVXJASmYWFUpxA/jgkN8Rg6yuQOp3DHmYEI8FLG1pGLq0BF58o3TZkdwykGE7FH7o0urXs= Received: from DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) by MN2PR10MB4014.namprd10.prod.outlook.com (2603:10b6:208:182::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Wed, 2 Feb 2022 21:02:10 +0000 Received: from DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::21b5:910:b965:9e6c]) by DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::21b5:910:b965:9e6c%6]) with mapi id 15.20.4930.022; Wed, 2 Feb 2022 21:02:10 +0000 From: Mike Christie To: geert@linux-m68k.org, hdanton@sina.com, hch@infradead.org, stefanha@redhat.com, jasowang@redhat.com, mst@redhat.com, sgarzare@redhat.com, virtualization@lists.linux-foundation.org, christian.brauner@ubuntu.com, axboe@kernel.dk, ebiederm@xmission.com, linux-kernel@vger.kernel.org Cc: Mike Christie , Christoph Hellwig Subject: [PATCH 1/8] fork: Make IO worker options flag based Date: Wed, 2 Feb 2022 15:01:53 -0600 Message-Id: <20220202210200.5235-2-michael.christie@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220202210200.5235-1-michael.christie@oracle.com> References: <20220202210200.5235-1-michael.christie@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR05CA0067.namprd05.prod.outlook.com (2603:10b6:8:57::12) To DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4c2f11ff-ff74-4db6-f491-08d9e68f4704 X-MS-TrafficTypeDiagnostic: MN2PR10MB4014:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2512; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CQlIKMR2rCF+Nzt2vjnbKmpqvVrjEsZ66LNBC9Aa3ukFimGdXrqHDSxADMQFF+GjQp/iWAm6vzAWcfCDwkf8k94IfcOD9KQFPoNJ+OZL6oUtXbqug9G4Fa1vpY4Or8VWM8y6VhoZfUfddSLT+9dm5Dc03d7r/n36OPVrArfp3m+d4KUJMQ0TGIHC+I8Wygr7V+/NTc+QCp9do6Alaa/ItmdQKyKvatXz90mYIt+/g931GW4hFe7U/yb7c78JiQidX28K4l3n3/cnwNwaPwHy1g7Up7eTYN1anjjv433cUehZiB6a+4C7XAMOgHedl9NDUT+bOW1VZFyoFnXAbt47TNVzPgSdEoq1zsDP/+vhr2Lh03OXH38j41x6mJsCdlIUtxX7+uTu+qavDp2G3yomJNGE43W15Acf1Io2BjaZv7PdE4mq5scKt/gjQeMSXEJwby4T6xaApAI+9a9zncD+SCQAWydMqmXebw7zDxPBMPIBT6IuS6LSDPqdit7WyYu5faf7xv3qwEUynEd713TPRJCifZzyN/Bvgzc4AXbmNuYFut+M9TOmogWtZJPm7++tdkNZSEYIMz2S3W/0abt07CGnWNT4PXbjSFkWCtG4G7YvbVLDm+emOPlozPo6sg48P4kJLzsq3plpBLjMKw3+5qDrgYxYA6jQV4Iryqhm/2bxUbHl4eNlqKoEhHYIDQ1Wv0wDvh3ji6JzuRHJK35+XvyutUv7kHdom42Xr1CHItY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR10MB1466.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(6666004)(2906002)(316002)(38100700002)(1076003)(54906003)(38350700002)(5660300002)(186003)(26005)(2616005)(66556008)(4326008)(66476007)(7416002)(6506007)(66946007)(8676002)(52116002)(921005)(6486002)(8936002)(508600001)(6512007)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?h3/s5h7ZJHIy3QU+SGkeACYjYY0Gzy57WbkROoP5E6iIKbZAjJ79F3fVLGu4?= =?us-ascii?Q?4p3b4BlZcuDe4j/4S7h06go09vvybrWbpRNmOIChnj7vTd/ydg4YXPCpmqwe?= =?us-ascii?Q?0Cq6BJ29m2mUSuadKCcOM/dMbY+I2LqepMQ1vQhcOTTd24kVHLhSvcDaKQNC?= =?us-ascii?Q?64RLf409LUxkODAjjmOpj3yEbru5nvyRfN4jPJ6b6CDmjlkKbWH5aRfzfDXm?= =?us-ascii?Q?dWhMRx4GeWbrHHymwg2O0SwS0Uj/xgWzV6g72725MeO6E+QfSxOY9rNvHLcV?= =?us-ascii?Q?1MW4jlFb98dUHONQXYAGW2TvriysnxESkpe86T3MkisIGiAinD0d/Z3UsSJr?= =?us-ascii?Q?lPshASAAriLcwHelusE0xIiks/Oo7AGF2Plf+4q4W3rvr1UGc9Tn92buho7K?= =?us-ascii?Q?BX3IF+p2wQZQMlrj7Ljcc6T602ys0QqZqmq6B0PLC7Hl/M1+ik76mawshsqd?= =?us-ascii?Q?gQgorMADwSjhYnbNMuBTbVweDUA5d8OY6KBZF8mSjxzFwS2rHu0EYJQq17nB?= =?us-ascii?Q?LMwDWLl5don+wValnYZFbh3S7VIWFagTTLqmpYRen/QCV5ArY+bgT/Ujfu2b?= =?us-ascii?Q?9NLn9vH5td38xFozgf1snc0pU8VUUjevqHV+/jc28oGKgzS1A8qgB/BIzRuG?= =?us-ascii?Q?vwaXR56R4Qg4k8iKE094bWwsEEpgX2iFvvyANPFPRMxzM+bEI1BsF8jcMBmO?= =?us-ascii?Q?ICkf06LTdA8zjKH41JTO5l+WwRYFNkPb+/kADGmpIKRhxvUJm4Q3wyUrumR3?= =?us-ascii?Q?ggcCyxDwzzEjzuJgQRzvMV/SGKXAL6ueX4ceWJK5Fbn0beoT5ncakqXbJhZq?= =?us-ascii?Q?YIVC45QHH0I9mGfB7+ol3jPQudIPKgrsWl6x6fRuW6DQB4tnp/KJ7HstUI80?= =?us-ascii?Q?g+/TpRE5Iuc0X/zbSlLxw8GxMe7j74hBdRqrjJSr4gFDT/0ajXRouysxXTVz?= =?us-ascii?Q?zmC7WgcxgwiJh/lFBWApXjO6lv/4N1hN/oMy0nBLbTgu7JGcq40FkaD8qekr?= =?us-ascii?Q?az2RmRVfUcdirpizQ1K3dEMZyed6/mOh2cN84h4X1v7mLyKl7xErEw/rclkg?= =?us-ascii?Q?dnV+tVI4pD3fpNxWn79LBT47Uo7lavCzjk1fcoN96lXXK41gkkDRj09XlPTs?= =?us-ascii?Q?1uJF8CHoLpQCYExmx2GNxH4baBJBerR7w53a8xVByJc3lnoJW4ZsrT1nsLPq?= =?us-ascii?Q?ghnBQ9kElpeGQB/tj2pJHpgG9fFc4xPUsFkKIu+BsPzP6IyHVKMPKIOjhtWs?= =?us-ascii?Q?fuI6x10p/dABmdoZD4cI6nLwyOes0vKRnFfoQMi+9m0VBuv+TDjRzVtb2P8F?= =?us-ascii?Q?SFlAqJjxdk2IPO6YoBYuQkSbT9QEbQGqDweRrOZlW94e3Nz34nJinsTGdbT3?= =?us-ascii?Q?ck2oLOh+pM499s6a1iHn67jYED5p9/E1W9Vn+uB9z+7Qje2HyviClD/ZWJDw?= =?us-ascii?Q?ugjR7epDBTm14DBKD0IY4hU9KQ/kq5GLp/jECPBz9LsVL7cqOYC/zeHh9a/h?= =?us-ascii?Q?03edVou2TvnEukxYJ5X+E3+MnnSdpbx+H9cI0JeKuxBzjkWPLFReeXTwRhou?= =?us-ascii?Q?M2ElUTxiiOwAilaR2awE3WKgQIJDIRFI/OosPk8MLarN/aIHb/vRGiuIstJf?= =?us-ascii?Q?0RyL/fE3kvJA2ZOsbHpgpdOpB8QREspOPC27OMDOoEZAmWN3rF8M/klQM5oz?= =?us-ascii?Q?lOhyJg=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c2f11ff-ff74-4db6-f491-08d9e68f4704 X-MS-Exchange-CrossTenant-AuthSource: DM5PR10MB1466.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2022 21:02:09.7260 (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: GtO8zH2qYaGVuLUSfHLGycXUgfZfzuhCzzRoa/goy93HlLVsNO8czVSemf+mAFVunnf0D51T2CT71yig6RlfioDQhIjZ0yIWoVh9WTRZpZg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4014 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10246 signatures=673430 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=949 adultscore=0 malwarescore=0 bulkscore=0 suspectscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202020115 X-Proofpoint-GUID: 14kvZM3z14v1J5m_ZdDRnjCkBAbxIwEu X-Proofpoint-ORIG-GUID: 14kvZM3z14v1J5m_ZdDRnjCkBAbxIwEu Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patchset adds a couple new options to kernel_clone_args for the vhost layer which is going to work like PF_IO_WORKER but will differ enough that we will need to add several fields to kernel_clone_args. This patch moves us to a flags based approach for these types of users. Signed-off-by: Mike Christie Suggested-by: Christian Brauner Acked-by: Christian Brauner Reviewed-by: Christoph Hellwig --- include/linux/sched/task.h | 4 +++- kernel/fork.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h index b9198a1b3a84..0bf95966ae7d 100644 --- a/include/linux/sched/task.h +++ b/include/linux/sched/task.h @@ -18,8 +18,11 @@ struct css_set; /* All the bits taken by the old clone syscall. */ #define CLONE_LEGACY_FLAGS 0xffffffffULL =20 +#define USER_WORKER_IO BIT(0) + struct kernel_clone_args { u64 flags; + u32 worker_flags; int __user *pidfd; int __user *child_tid; int __user *parent_tid; @@ -31,7 +34,6 @@ struct kernel_clone_args { /* Number of elements in *set_tid */ size_t set_tid_size; int cgroup; - int io_thread; struct cgroup *cgrp; struct css_set *cset; }; diff --git a/kernel/fork.c b/kernel/fork.c index d75a528f7b21..9273fd81a329 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1998,7 +1998,7 @@ static __latent_entropy struct task_struct *copy_proc= ess( p =3D dup_task_struct(current, node); if (!p) goto fork_out; - if (args->io_thread) { + if (args->worker_flags & USER_WORKER_IO) { /* * Mark us an IO worker, and block any signal that isn't * fatal or STOP @@ -2497,7 +2497,7 @@ struct task_struct *create_io_thread(int (*fn)(void *= ), void *arg, int node) .exit_signal =3D (lower_32_bits(flags) & CSIGNAL), .stack =3D (unsigned long)fn, .stack_size =3D (unsigned long)arg, - .io_thread =3D 1, + .worker_flags =3D USER_WORKER_IO, }; =20 return copy_process(NULL, 0, node, &args); --=20 2.25.1 From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D798CC433F5 for ; Wed, 2 Feb 2022 21:02:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347416AbiBBVCu (ORCPT ); Wed, 2 Feb 2022 16:02:50 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:32422 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347361AbiBBVCk (ORCPT ); Wed, 2 Feb 2022 16:02:40 -0500 Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 212KwhBL023474; Wed, 2 Feb 2022 21:02:17 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-2021-07-09; bh=mLAnDDUXlDLWaVWT/k1YEoTu1CAdHb7fa7/mXYpLt3k=; b=rCakxjycR7llNodPwSiQgK+dXsUZyiXC6mevP7Dx6Y1XggsdOdJga1fRXfnfrv8SpQFU 8J1NFfqqRTPfDc+1ahdlb2Xvknok71r73h5i4et8rMzJOhBhFLDvud9KJLyHpooU8tP3 LE84g4eDob0/9CSwEq3F71iVtecuttG8+coHQtd/bvhs0FClGeAM3GS6tB85Wt9ZlTWO AbldOylUD62f7A2M5U53XgbfEoboW9mtM5gIBH0mj+vNLQCaN/ur2W104yGT6VnomOdT m4QG8H7p1kQVTLUlfNKpw9M6hha1KNE1ewGPM0Lb4mi1BaAzMgWVEjq1sbQWISbGqR6P Mw== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3dxnk2pxcp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 02 Feb 2022 21:02:16 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 212L1Ejn021471; Wed, 2 Feb 2022 21:02:15 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2105.outbound.protection.outlook.com [104.47.58.105]) by aserp3020.oracle.com with ESMTP id 3dvwd8xt3n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 02 Feb 2022 21:02:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nl6PrtNxjVWgbVO8Qnsae4rxO4SVbvLpy9+e4RH36EnIk0Nu4RwUHHJOsccqamI1msMT2s19/DnCcR+HF7NcnPJEjYINoekuM5dnOdNCYpM8DY7ZUYpV34IsEAfReQvJ0uMrgKAfTeg3MErHo/ghQ4q24y0/mjvs9PDe3YOm8eBLGan0L7/+dXmEGczXf4Qx2pXy9euMvSAM8p0WJ8HdiKIvfOF+tEqUTzBgoTt0Utyo4ASuyvS6M6W441aRCBRJa/enPJ594Rch4vhMR31eVjkJqihfvNcZ9FqIpWlzfVhqjsWjUjytMK/ccw+uWAVwVsj3r27q3eHFQsOwggphFA== 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=mLAnDDUXlDLWaVWT/k1YEoTu1CAdHb7fa7/mXYpLt3k=; b=NlAcZO/GZ9ED2bEla/bxyYtrOMv6Y+zulydi2iJKTCu8cTPDWUX+IJEt8mm1IZXZCCfnaJaHC6iSgvV8JthlYfUBWJevNXLtlm8jh2c9tm8Eorjt2RLekOUR57YF+XzN8yA4ah5RoC9LOrZ1X1brLfQ3mb6T7ydqC56y9g4TJhAQtXhWFs9Rwyq2iTqMGkcOcEZP7aTlayLHD5txSW3LeSuOWDKjG4ch2f5SIj2WEGyfkY+AbLQfSOyrzEs3MYwnYh5xYfggaVZ9DKvzvnW0ZX8HGYF2c5IzcZ1fpikbML+sZ7f0ksWp4W0PiOob4PMbhcwWvFX0cL4aGk3ZYpJZqA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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=mLAnDDUXlDLWaVWT/k1YEoTu1CAdHb7fa7/mXYpLt3k=; b=ExvFJKgpJhBBsDPwlqDKU+hmk31L0gOajc6KN/KPEW0JBzW3oaw/+YJTX2mOsEQkg8z424eHd0nfX1hCwjCCfoVn+72R/YOZgnDczwzdVKuladxAdiuIIXtEJfNnl3rcTw6c9iYaBk2ZPDW3ktDQQcmLluyB2AlenwoPWNs245w= Received: from DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) by MN2PR10MB4014.namprd10.prod.outlook.com (2603:10b6:208:182::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Wed, 2 Feb 2022 21:02:11 +0000 Received: from DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::21b5:910:b965:9e6c]) by DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::21b5:910:b965:9e6c%6]) with mapi id 15.20.4930.022; Wed, 2 Feb 2022 21:02:11 +0000 From: Mike Christie To: geert@linux-m68k.org, hdanton@sina.com, hch@infradead.org, stefanha@redhat.com, jasowang@redhat.com, mst@redhat.com, sgarzare@redhat.com, virtualization@lists.linux-foundation.org, christian.brauner@ubuntu.com, axboe@kernel.dk, ebiederm@xmission.com, linux-kernel@vger.kernel.org Cc: Mike Christie Subject: [PATCH 2/8] fork/vm: Move common PF_IO_WORKER behavior to new flag Date: Wed, 2 Feb 2022 15:01:54 -0600 Message-Id: <20220202210200.5235-3-michael.christie@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220202210200.5235-1-michael.christie@oracle.com> References: <20220202210200.5235-1-michael.christie@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR05CA0067.namprd05.prod.outlook.com (2603:10b6:8:57::12) To DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9aad4c17-4915-4e4d-02d0-08d9e68f4756 X-MS-TrafficTypeDiagnostic: MN2PR10MB4014:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DjdhFkuErrVuDRbhxc405gY+iH1ICZPMgqekRxArsSkyltyItNCGXSh+uF2EQwe+2qAPaHqWNaT5WW+i8z2XUCC4dCpBFcTTL0G2kmoXqZg8onM2MJ7dsHB2GzgbV/rXB9rU7YZzvz74rhDHGwPhvLO3BldN/RxZlB2fdQueCq3TmWunLXusAYY+6kslqqCNexJ0lRiZ2/gvmmdqZYsVUBOSS+2Z1aoXbEfJrLiaZfu0LQFPOJyXmldc3TwFV8byS8azss0KmYNF+n9CO7YkG4zoyoEL7qplJTNH8rw68tdy6/VCC934Mow/of/bgz1lx5AZcACRjh6qLhRd80b+SsEbGm7HdDWzBPvP/90UqB2hjElgw7WdLkH+ebtwTDM2vzhfn5OO1Ufa/nMMFFqZxWPIBWea60VcC+mtTppqAaC8wizh+uU22seGAGGqYqWI3pTOhngfYIBNz+GgOpG4E82Kjt3PaOXbqLxVcbMmCtagsp9hULTSD/Fmwrvf564cpAtwD+IqHDbZ8cCHyXm6jeHvfA5QAfqD3U8p73yvHxxBBNWAYhrAy9CxIdFYnqqE9T+ZDxx1d0FsCGspxNRHaMPXXMHQf1FWTJdG2Jk+RisZuuh56zF0Tdc7gBzT69xihqatVVoGugDAtun0zP/A3mIcQiPi1QPZOSlBrlyD/J3lzR41s7wXCi0V2+5ptiBcTZp+zpW3dtyCK4OFGD2Lcn3u03jyoTl9A51QO8aum/Y= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR10MB1466.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(6666004)(2906002)(107886003)(316002)(38100700002)(1076003)(38350700002)(5660300002)(186003)(26005)(30864003)(2616005)(66556008)(4326008)(66476007)(7416002)(6506007)(66946007)(8676002)(52116002)(921005)(6486002)(8936002)(508600001)(6512007)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vX0Qj+OwVMZkt1oPCa0jhU6OknbZDHGSwzNHbPu9bpiRZf8/nSccH7F0SP26?= =?us-ascii?Q?KB/XeFkU0Z/iziRwThhNgwQONQaFH3cCNbokpw+k2kPIHNS9l42Bfv41XZka?= =?us-ascii?Q?SrdV3I4Uxl5bF/ebSil6P7s+Iq9SxWAswCmxNsw3cf7t15X6MIJrcRpQVO75?= =?us-ascii?Q?n2FE0ejiyUp+bHbge/BKSQy8iAnnJrAXCA1pun+WUJpiEffHvdBcQnVoYx8+?= =?us-ascii?Q?dCwGMFuWRkqFSNSFzr8DwBcmad42/RuAKQLMb+W4aQ59n+zaNYiQjNennQ/1?= =?us-ascii?Q?jMi8wA/VgPz4jWvrfPXFzsCG/c9ndQmJwRFzAbNiSFkYvWqL9MbhjEHkBRDD?= =?us-ascii?Q?l/THZs+6lTRJJfu+AdVd+xVqK0FJWnaI5Oh2XoWeowsnpyEYdUJpXWGENWk2?= =?us-ascii?Q?BhZaxSlRqIL59M7jb3AozBkoi5MNsLdJ/a2U4N8EGbmYXRisSgh+eHrmODkv?= =?us-ascii?Q?OBCAnelqC9FcPlIaY3ekhfSmy+dKjHj9Mt+ZAbf7DUKWuvH6yqXhbNfZJ6ZU?= =?us-ascii?Q?FLjOjID/GslfRjy0cq2/aH2nZXwsgc94z2Dk8l86uLOBQx70p29ybvkPN6HJ?= =?us-ascii?Q?yvKPaCP22r36Zj2gdpQ0puwb8IazjQ3DNRIB5hvIud8VkoXtwhdOAjzDuVrF?= =?us-ascii?Q?nGeaVKAOXNVB465bZ+bLobHP9l/ZA+MiJj80Mqr7JdAYunqzccbE9/ZEReee?= =?us-ascii?Q?wU7mWQn6PnjX+ZfQrpMJKOuycbacHRhMrQeakPm35mGE5NEygGkJDBwFwOtj?= =?us-ascii?Q?sNwgbm+XnRUcTken+uyV0wXVDSJHcAA1CBO8gb/Y1qwbNitAYzwLI81fNhek?= =?us-ascii?Q?jW/6pnAUe3QObmgc0zmFHPuH7erzfZ4CnJjy9Gl5o/yg6apN6V5VrLq+XFOT?= =?us-ascii?Q?ANj8BR5WUbOXTrhCqn678ijmWYoFENocPAnuUp4IN9VPzoZJgh1a8ZmEndsI?= =?us-ascii?Q?STZ+GjTRpfKIXqxRkXLPADmM3OAQWD02K3+rC/2Uj4uoq3MI2NyLQriTexK/?= =?us-ascii?Q?VUDDfTzHaEjqJUhI8pyKiU5ayezVVO+GLKcHsUkOrIL1pTnWBhqae1y9P2q1?= =?us-ascii?Q?/XlTmInQ2HefVdac/vLnWIXMih1vmWRqrppy4huMFQiPOpO9XPJ0p4oloval?= =?us-ascii?Q?+NyWEyzYUO0JHV8KmxyGY7ti9NOUrbRMfog1qsMKuLSWCVdYtXMZgthnHAfI?= =?us-ascii?Q?Yk6P5kaqjjFCMZOxB7fpXcO8HRtTSDq6xAIB7NIHAjEnKSyElVqNo/7UNTKy?= =?us-ascii?Q?aXRMgwA8+Y48m0gV0169Bz45dMA3QXhJXzLtrqbjfXQTm9DR0oXey+DJxvVp?= =?us-ascii?Q?7coI50IWZv3/PgvMnCVt3EcqpYS7cuk82YzpmKGISh7MfIuTh3WMezUAzL/W?= =?us-ascii?Q?jMWNqIskzVGG1wPQl+/JnbqFpRc84/HyUPiw0p/GsRS7/qlOEKGHLCWWNPye?= =?us-ascii?Q?hvb7oGqPZz7YeJozmCzqt2lhHDWdvClD5gfkCmgrZsznEEkABb5YisMOQ9pr?= =?us-ascii?Q?8DaVMP9uPfRLf0O1r0nYpe47x49mFN33ApFmHtRuOcKzWDI3p54XvEuEun38?= =?us-ascii?Q?ZgGdkMKsIqoVrqtfW8HQl773pgVysW0zI1oOE/7FmnasVEI45qi3Y3SlaEru?= =?us-ascii?Q?uIuvuq7fWvG2bf5mtc0tbP3riaPKHcyFjm66Y0AXLGCJU02+tsazhhnHT7as?= =?us-ascii?Q?uhwofA=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9aad4c17-4915-4e4d-02d0-08d9e68f4756 X-MS-Exchange-CrossTenant-AuthSource: DM5PR10MB1466.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2022 21:02:10.2260 (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: 0PYuttFNMC0XnRSPIoHPnaF4MmFBwMZSyTpi1wbEuu4ZQbiECyjbi8o+phs3aQthKdkRP4vx53UwdQCsw4d7RUd6hUo7PqiC/v9nt4qgXXw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4014 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10246 signatures=673430 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202020115 X-Proofpoint-GUID: Jj1_8KcT7FzABhrbFpWBiTypMEi0Odue X-Proofpoint-ORIG-GUID: Jj1_8KcT7FzABhrbFpWBiTypMEi0Odue Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds a new flag, PF_USER_WORKER, that's used for behavior common to to both PF_IO_WORKER and users like vhost which will use a new helper instead of create_io_thread because they require different behavior. The common behavior PF_USER_WORKER covers is the initial frame and fpu setup and the vm reclaim handling. Signed-off-by: Mike Christie [For m68k changes] Acked-by: Geert Uytterhoeven --- arch/alpha/kernel/process.c | 2 +- arch/arc/kernel/process.c | 2 +- arch/arm/kernel/process.c | 2 +- arch/arm64/kernel/process.c | 2 +- arch/csky/kernel/process.c | 2 +- arch/h8300/kernel/process.c | 2 +- arch/hexagon/kernel/process.c | 2 +- arch/ia64/kernel/process.c | 2 +- arch/m68k/kernel/process.c | 2 +- arch/microblaze/kernel/process.c | 2 +- arch/mips/kernel/process.c | 2 +- arch/nds32/kernel/process.c | 2 +- arch/nios2/kernel/process.c | 2 +- arch/openrisc/kernel/process.c | 2 +- arch/parisc/kernel/process.c | 2 +- arch/powerpc/kernel/process.c | 2 +- arch/riscv/kernel/process.c | 2 +- arch/s390/kernel/process.c | 2 +- arch/sh/kernel/process_32.c | 2 +- arch/sparc/kernel/process_32.c | 2 +- arch/sparc/kernel/process_64.c | 2 +- arch/um/kernel/process.c | 2 +- arch/x86/kernel/fpu/core.c | 4 ++-- arch/x86/kernel/process.c | 2 +- arch/xtensa/kernel/process.c | 2 +- include/linux/sched.h | 1 + include/linux/sched/task.h | 3 ++- kernel/fork.c | 6 +++++- mm/vmscan.c | 4 ++-- 29 files changed, 36 insertions(+), 30 deletions(-) diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c index 5f8527081da9..f4759e4ee4a9 100644 --- a/arch/alpha/kernel/process.c +++ b/arch/alpha/kernel/process.c @@ -249,7 +249,7 @@ int copy_thread(unsigned long clone_flags, unsigned lon= g usp, childti->pcb.ksp =3D (unsigned long) childstack; childti->pcb.flags =3D 1; /* set FEN, clear everything else */ =20 - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { /* kernel thread */ memset(childstack, 0, sizeof(struct switch_stack) + sizeof(struct pt_regs)); diff --git a/arch/arc/kernel/process.c b/arch/arc/kernel/process.c index 8e90052f6f05..b409ecb1407f 100644 --- a/arch/arc/kernel/process.c +++ b/arch/arc/kernel/process.c @@ -191,7 +191,7 @@ int copy_thread(unsigned long clone_flags, unsigned lon= g usp, childksp[0] =3D 0; /* fp */ childksp[1] =3D (unsigned long)ret_from_fork; /* blink */ =20 - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { memset(c_regs, 0, sizeof(struct pt_regs)); =20 c_callee->r13 =3D kthread_arg; diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index d47159f3791c..44603062d661 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -251,7 +251,7 @@ int copy_thread(unsigned long clone_flags, unsigned lon= g stack_start, thread->cpu_domain =3D get_domain(); #endif =20 - if (likely(!(p->flags & (PF_KTHREAD | PF_IO_WORKER)))) { + if (likely(!(p->flags & (PF_KTHREAD | PF_USER_WORKER)))) { *childregs =3D *current_pt_regs(); childregs->ARM_r0 =3D 0; if (stack_start) diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 5369e649fa79..2528fb9650ef 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -334,7 +334,7 @@ int copy_thread(unsigned long clone_flags, unsigned lon= g stack_start, =20 ptrauth_thread_init_kernel(p); =20 - if (likely(!(p->flags & (PF_KTHREAD | PF_IO_WORKER)))) { + if (likely(!(p->flags & (PF_KTHREAD | PF_USER_WORKER)))) { *childregs =3D *current_pt_regs(); childregs->regs[0] =3D 0; =20 diff --git a/arch/csky/kernel/process.c b/arch/csky/kernel/process.c index 3d0ca22cd0e2..509f2bfe4ace 100644 --- a/arch/csky/kernel/process.c +++ b/arch/csky/kernel/process.c @@ -49,7 +49,7 @@ int copy_thread(unsigned long clone_flags, /* setup thread.sp for switch_to !!! */ p->thread.sp =3D (unsigned long)childstack; =20 - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { memset(childregs, 0, sizeof(struct pt_regs)); childstack->r15 =3D (unsigned long) ret_from_kernel_thread; childstack->r10 =3D kthread_arg; diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c index 8833fa4f5d51..050aca44ba6d 100644 --- a/arch/h8300/kernel/process.c +++ b/arch/h8300/kernel/process.c @@ -112,7 +112,7 @@ int copy_thread(unsigned long clone_flags, unsigned lon= g usp, =20 childregs =3D (struct pt_regs *) (THREAD_SIZE + task_stack_page(p)) - 1; =20 - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { memset(childregs, 0, sizeof(struct pt_regs)); childregs->retpc =3D (unsigned long) ret_from_kernel_thread; childregs->er4 =3D topstk; /* arg */ diff --git a/arch/hexagon/kernel/process.c b/arch/hexagon/kernel/process.c index 232dfd8956aa..40f8294c6c7c 100644 --- a/arch/hexagon/kernel/process.c +++ b/arch/hexagon/kernel/process.c @@ -73,7 +73,7 @@ int copy_thread(unsigned long clone_flags, unsigned long = usp, unsigned long arg, sizeof(*ss)); ss->lr =3D (unsigned long)ret_from_fork; p->thread.switch_sp =3D ss; - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { memset(childregs, 0, sizeof(struct pt_regs)); /* r24 <- fn, r25 <- arg */ ss->r24 =3D usp; diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index 834df24a88f1..29015ebdcf1d 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c @@ -338,7 +338,7 @@ copy_thread(unsigned long clone_flags, unsigned long us= er_stack_base, =20 ia64_drop_fpu(p); /* don't pick up stale state from a CPU's fph */ =20 - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { if (unlikely(!user_stack_base)) { /* fork_idle() called us */ return 0; diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index a6030dbaa089..cbb693012b5e 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c @@ -157,7 +157,7 @@ int copy_thread(unsigned long clone_flags, unsigned lon= g usp, unsigned long arg, */ p->thread.fc =3D USER_DATA; =20 - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { /* kernel thread */ memset(frame, 0, sizeof(struct fork_frame)); frame->regs.sr =3D PS_S; diff --git a/arch/microblaze/kernel/process.c b/arch/microblaze/kernel/proc= ess.c index 5e2b91c1e8ce..de1da9900f7e 100644 --- a/arch/microblaze/kernel/process.c +++ b/arch/microblaze/kernel/process.c @@ -59,7 +59,7 @@ int copy_thread(unsigned long clone_flags, unsigned long = usp, unsigned long arg, struct pt_regs *childregs =3D task_pt_regs(p); struct thread_info *ti =3D task_thread_info(p); =20 - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { /* if we're creating a new kernel thread then just zeroing all * the registers. That's OK for a brand new thread.*/ memset(childregs, 0, sizeof(struct pt_regs)); diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index cbff1b974f88..6f1ed337cd41 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -120,7 +120,7 @@ int copy_thread(unsigned long clone_flags, unsigned lon= g usp, /* Put the stack after the struct pt_regs. */ childksp =3D (unsigned long) childregs; p->thread.cp0_status =3D (read_c0_status() & ~(ST0_CU2|ST0_CU1)) | ST0_KE= RNEL_CUMASK; - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { /* kernel thread */ unsigned long status =3D p->thread.cp0_status; memset(childregs, 0, sizeof(struct pt_regs)); diff --git a/arch/nds32/kernel/process.c b/arch/nds32/kernel/process.c index 49fab9e39cbf..dba91dd1e289 100644 --- a/arch/nds32/kernel/process.c +++ b/arch/nds32/kernel/process.c @@ -156,7 +156,7 @@ int copy_thread(unsigned long clone_flags, unsigned lon= g stack_start, =20 memset(&p->thread.cpu_context, 0, sizeof(struct cpu_context)); =20 - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { memset(childregs, 0, sizeof(struct pt_regs)); /* kernel thread fn */ p->thread.cpu_context.r6 =3D stack_start; diff --git a/arch/nios2/kernel/process.c b/arch/nios2/kernel/process.c index f8ea522a1588..eabf3452e5e2 100644 --- a/arch/nios2/kernel/process.c +++ b/arch/nios2/kernel/process.c @@ -109,7 +109,7 @@ int copy_thread(unsigned long clone_flags, unsigned lon= g usp, unsigned long arg, struct switch_stack *childstack =3D ((struct switch_stack *)childregs) - 1; =20 - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { memset(childstack, 0, sizeof(struct switch_stack) + sizeof(struct pt_regs)); =20 diff --git a/arch/openrisc/kernel/process.c b/arch/openrisc/kernel/process.c index 3c0c91bcdcba..aa110383cfa1 100644 --- a/arch/openrisc/kernel/process.c +++ b/arch/openrisc/kernel/process.c @@ -172,7 +172,7 @@ copy_thread(unsigned long clone_flags, unsigned long us= p, unsigned long arg, sp -=3D sizeof(struct pt_regs); kregs =3D (struct pt_regs *)sp; =20 - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { memset(kregs, 0, sizeof(struct pt_regs)); kregs->gpr[20] =3D usp; /* fn, kernel thread */ kregs->gpr[22] =3D arg; diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index ea3d83b6fb62..a76120e30eb4 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c @@ -197,7 +197,7 @@ copy_thread(unsigned long clone_flags, unsigned long us= p, extern void * const ret_from_kernel_thread; extern void * const child_return; =20 - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { /* kernel thread */ memset(cregs, 0, sizeof(struct pt_regs)); if (!usp) /* idle thread */ diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 984813a4d5dc..02f91fcc1417 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -1736,7 +1736,7 @@ int copy_thread(unsigned long clone_flags, unsigned l= ong usp, /* Copy registers */ sp -=3D sizeof(struct pt_regs); childregs =3D (struct pt_regs *) sp; - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { /* kernel thread */ memset(childregs, 0, sizeof(struct pt_regs)); childregs->gpr[1] =3D sp + sizeof(struct pt_regs); diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 03ac3aa611f5..8deeb94eb51e 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -125,7 +125,7 @@ int copy_thread(unsigned long clone_flags, unsigned lon= g usp, unsigned long arg, struct pt_regs *childregs =3D task_pt_regs(p); =20 /* p->thread holds context to be restored by __switch_to() */ - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { /* Kernel thread */ memset(childregs, 0, sizeof(struct pt_regs)); childregs->gp =3D gp_in_global; diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c index 71d86f73b02c..51169bb351d4 100644 --- a/arch/s390/kernel/process.c +++ b/arch/s390/kernel/process.c @@ -130,7 +130,7 @@ int copy_thread(unsigned long clone_flags, unsigned lon= g new_stackp, frame->sf.gprs[9] =3D (unsigned long)frame; =20 /* Store access registers to kernel stack of new process. */ - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { /* kernel thread */ memset(&frame->childregs, 0, sizeof(struct pt_regs)); frame->childregs.psw.mask =3D PSW_KERNEL_BITS | PSW_MASK_DAT | diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c index 1c28e3cddb60..0506a739b0a8 100644 --- a/arch/sh/kernel/process_32.c +++ b/arch/sh/kernel/process_32.c @@ -114,7 +114,7 @@ int copy_thread(unsigned long clone_flags, unsigned lon= g usp, unsigned long arg, =20 childregs =3D task_pt_regs(p); p->thread.sp =3D (unsigned long) childregs; - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { memset(childregs, 0, sizeof(struct pt_regs)); p->thread.pc =3D (unsigned long) ret_from_kernel_thread; childregs->regs[4] =3D arg; diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c index 2dc0bf9fe62e..5386e56b5e6c 100644 --- a/arch/sparc/kernel/process_32.c +++ b/arch/sparc/kernel/process_32.c @@ -296,7 +296,7 @@ int copy_thread(unsigned long clone_flags, unsigned lon= g sp, unsigned long arg, ti->ksp =3D (unsigned long) new_stack; p->thread.kregs =3D childregs; =20 - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { extern int nwindows; unsigned long psr; memset(new_stack, 0, STACKFRAME_SZ + TRACEREG_SZ); diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c index f5b2cac8669f..6058b3966f71 100644 --- a/arch/sparc/kernel/process_64.c +++ b/arch/sparc/kernel/process_64.c @@ -594,7 +594,7 @@ int copy_thread(unsigned long clone_flags, unsigned lon= g sp, unsigned long arg, sizeof(struct sparc_stackf)); t->fpsaved[0] =3D 0; =20 - if (unlikely(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (unlikely(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { memset(child_trap_frame, 0, child_stack_sz); __thread_flag_byte_ptr(t)[TI_FLAG_BYTE_CWP] =3D=20 (current_pt_regs()->tstate + 1) & TSTATE_CWP; diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index 4a420778ed87..25dd496fd820 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c @@ -158,7 +158,7 @@ int copy_thread(unsigned long clone_flags, unsigned lon= g sp, unsigned long arg, struct task_struct * p, unsigned long tls) { void (*handler)(void); - int kthread =3D current->flags & (PF_KTHREAD | PF_IO_WORKER); + int kthread =3D current->flags & (PF_KTHREAD | PF_USER_WORKER); int ret =3D 0; =20 p->thread =3D (struct thread_struct) INIT_THREAD; diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c index 8dea01ffc5c1..c5b34fa8bb0c 100644 --- a/arch/x86/kernel/fpu/core.c +++ b/arch/x86/kernel/fpu/core.c @@ -579,10 +579,10 @@ int fpu_clone(struct task_struct *dst, unsigned long = clone_flags) set_tsk_thread_flag(dst, TIF_NEED_FPU_LOAD); =20 /* - * No FPU state inheritance for kernel threads and IO + * No FPU state inheritance for kernel threads and user * worker threads. */ - if (dst->flags & (PF_KTHREAD | PF_IO_WORKER)) { + if (dst->flags & (PF_KTHREAD | PF_USER_WORKER)) { /* Clear out the minimal state */ memcpy(&dst_fpu->fpstate->regs, &init_fpstate.regs, init_fpstate_copy_size()); diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 81d8ef036637..b0e58fe55b31 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -195,7 +195,7 @@ int copy_thread(unsigned long clone_flags, unsigned lon= g sp, unsigned long arg, task_user_gs(p) =3D get_user_gs(current_pt_regs()); #endif =20 - if (unlikely(p->flags & PF_IO_WORKER)) { + if (unlikely(p->flags & PF_USER_WORKER)) { /* * An IO thread is a user space thread, but it doesn't * return to ret_after_fork(). diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c index bd80df890b1e..00d81668ead4 100644 --- a/arch/xtensa/kernel/process.c +++ b/arch/xtensa/kernel/process.c @@ -224,7 +224,7 @@ int copy_thread(unsigned long clone_flags, unsigned lon= g usp_thread_fn, #error Unsupported Xtensa ABI #endif =20 - if (!(p->flags & (PF_KTHREAD | PF_IO_WORKER))) { + if (!(p->flags & (PF_KTHREAD | PF_USER_WORKER))) { struct pt_regs *regs =3D current_pt_regs(); unsigned long usp =3D usp_thread_fn ? usp_thread_fn : regs->areg[1]; diff --git a/include/linux/sched.h b/include/linux/sched.h index f5b2be39a78c..1a749940cfde 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1691,6 +1691,7 @@ extern struct pid *cad_pid; #define PF_KTHREAD 0x00200000 /* I am a kernel thread */ #define PF_RANDOMIZE 0x00400000 /* Randomize virtual address space */ #define PF_SWAPWRITE 0x00800000 /* Allowed to write to swap */ +#define PF_USER_WORKER 0x01000000 /* Kernel thread cloned from userspace = thread */ #define PF_NO_SETAFFINITY 0x04000000 /* Userland is not allowed to meddle = with cpus_mask */ #define PF_MCE_EARLY 0x08000000 /* Early kill for mce process policy= */ #define PF_MEMALLOC_PIN 0x10000000 /* Allocation context constrained to z= ones which allow long term pinning. */ diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h index 0bf95966ae7d..0467b3ce1c94 100644 --- a/include/linux/sched/task.h +++ b/include/linux/sched/task.h @@ -18,7 +18,8 @@ struct css_set; /* All the bits taken by the old clone syscall. */ #define CLONE_LEGACY_FLAGS 0xffffffffULL =20 -#define USER_WORKER_IO BIT(0) +#define USER_WORKER BIT(0) +#define USER_WORKER_IO BIT(1) =20 struct kernel_clone_args { u64 flags; diff --git a/kernel/fork.c b/kernel/fork.c index 9273fd81a329..1f6e7184b31f 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1998,6 +1998,10 @@ static __latent_entropy struct task_struct *copy_pro= cess( p =3D dup_task_struct(current, node); if (!p) goto fork_out; + + if (args->worker_flags & USER_WORKER) + p->flags |=3D PF_USER_WORKER; + if (args->worker_flags & USER_WORKER_IO) { /* * Mark us an IO worker, and block any signal that isn't @@ -2497,7 +2501,7 @@ struct task_struct *create_io_thread(int (*fn)(void *= ), void *arg, int node) .exit_signal =3D (lower_32_bits(flags) & CSIGNAL), .stack =3D (unsigned long)fn, .stack_size =3D (unsigned long)arg, - .worker_flags =3D USER_WORKER_IO, + .worker_flags =3D USER_WORKER | USER_WORKER_IO, }; =20 return copy_process(NULL, 0, node, &args); diff --git a/mm/vmscan.c b/mm/vmscan.c index 090bfb605ecf..bb85b454ff07 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1061,12 +1061,12 @@ void reclaim_throttle(pg_data_t *pgdat, enum vmscan= _throttle_state reason) DEFINE_WAIT(wait); =20 /* - * Do not throttle IO workers, kthreads other than kswapd or + * Do not throttle user workers, kthreads other than kswapd or * workqueues. They may be required for reclaim to make * forward progress (e.g. journalling workqueues or kthreads). */ if (!current_is_kswapd() && - current->flags & (PF_IO_WORKER|PF_KTHREAD)) + current->flags & (PF_USER_WORKER|PF_KTHREAD)) return; =20 /* --=20 2.25.1 From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D66F5C433F5 for ; Wed, 2 Feb 2022 21:03:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347488AbiBBVDI (ORCPT ); Wed, 2 Feb 2022 16:03:08 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:36512 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232258AbiBBVCm (ORCPT ); Wed, 2 Feb 2022 16:02:42 -0500 Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 212KwocC024834; Wed, 2 Feb 2022 21:02:17 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-2021-07-09; bh=5xElEgH6bcMjxMOndqXAbJ3z5HgjC0FhUwvkQXnbmQM=; b=T3x0f6fqd7fsm18zTd80ylnS3LNbr5ZnTsQnxtmUV43K93nIYHKv9ARJE2ixkOEj/dng iiDIO36oRaFdriEsJmbk0dR/kt+x15a38eXzXWzsy3C398XgLg2aMEN0MjuVtosH1dps hS6nPebmFe7DYg/5MDlsersBam6d/Ax3pzWvegCsmnX28htBxrup8Qi9gFYk9rN7i2n+ qMP7Cg6LexCEG+oMm1d+XpQByNa8RS+evkCzls1H0Mj3A21JcLirYb/qbmEgKj2t8xT3 oS0idPk+1saZx9u8mTxhmN88QO2CCveLnmZKEi9RC0ia+dyXSKDBhngBNQTSTebVUsoi fw== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3dxjatyf0g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 02 Feb 2022 21:02:17 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 212L1Ejo021471; Wed, 2 Feb 2022 21:02:16 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2105.outbound.protection.outlook.com [104.47.58.105]) by aserp3020.oracle.com with ESMTP id 3dvwd8xt3n-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 02 Feb 2022 21:02:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FHtxS9TAZ62MPvc6i3cHKHL5ZHMRbv/pWb4G5uFDazSa/vxLik1WpVUsZVX8VSTQzBXEhZnRkXmdCTDTXzhBcoHDc94pXSr60A159h4IFnKjTFTujMaVckl4E+jPP5cs4vGWcM89OfPtSoLdc2PmCLKpu1YpdzD5kimSOpwd4JhxICQP6zQ3OVzFFGW13Ari4aZ7ANI9RxMqsp9QxDjQtkDYe1HTqDmTRv5hGeeMtAxabuwOXSFB8OxwSyeUh1sgcBzLmur1TjBGA5iqgJljo+T5TjrKCOQxnjnN6DLQgbva5SdNwCDi+O5egJOR5MQP+ViAUgDWI0ZcdwIdcJHmmA== 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=5xElEgH6bcMjxMOndqXAbJ3z5HgjC0FhUwvkQXnbmQM=; b=gWE6nRWiJN4JyKYwLevXanJkj67NxrK+DpX8l+wdFBuM+CkWm0n0NE8hT0FD1DC5Z41y19Z6NZhj8b2cWAb18SgnCYJnqwlEpxfg+NNbdP2ysVMMEEG2dVdBjEUKe4D8r0RLFD64N9Asc8U/bOb/uPr4GnWmZyfo630kn/iKU0h8s6wyIZuwBexnse+ReK9pFTOK34+La0cWQZaba8i5anxSp9pQ52f53nH1BCU7XZy8LwkLjBoL35kdji+FffgkpLuXtiAPlQkQJQI0uUjJCF2lbX2i5vS9MgJQjI98E0MS7bDNZ2mQFsNYNV1bXWTO1eO6TZ5zIw5He8rNs3+Lxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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=5xElEgH6bcMjxMOndqXAbJ3z5HgjC0FhUwvkQXnbmQM=; b=vml6m3vXhZbp4Gj3AP7RxrKgN/Wab2mjOsCOnH8LAlh3pi9vFybLEXaRbDyYHEugEQxuZbPJ24n3iLNqxT5cXTTXcGpafNjkp4SEPTKLAzXZMOOYPYoc/nQ7dLUxF3Pn9yTWoccUIvwXfjfFiWwMSdZvk4jZaxOrx/9jgMacFyc= Received: from DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) by MN2PR10MB4014.namprd10.prod.outlook.com (2603:10b6:208:182::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Wed, 2 Feb 2022 21:02:13 +0000 Received: from DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::21b5:910:b965:9e6c]) by DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::21b5:910:b965:9e6c%6]) with mapi id 15.20.4930.022; Wed, 2 Feb 2022 21:02:13 +0000 From: Mike Christie To: geert@linux-m68k.org, hdanton@sina.com, hch@infradead.org, stefanha@redhat.com, jasowang@redhat.com, mst@redhat.com, sgarzare@redhat.com, virtualization@lists.linux-foundation.org, christian.brauner@ubuntu.com, axboe@kernel.dk, ebiederm@xmission.com, linux-kernel@vger.kernel.org Cc: Mike Christie , Christoph Hellwig Subject: [PATCH 3/8] fork: add USER_WORKER flag to not dup/clone files Date: Wed, 2 Feb 2022 15:01:55 -0600 Message-Id: <20220202210200.5235-4-michael.christie@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220202210200.5235-1-michael.christie@oracle.com> References: <20220202210200.5235-1-michael.christie@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR05CA0067.namprd05.prod.outlook.com (2603:10b6:8:57::12) To DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 26e1d168-6f5a-4d85-111c-08d9e68f47a7 X-MS-TrafficTypeDiagnostic: MN2PR10MB4014:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3513; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MebAe5OAcUlMXFVrgZEIvF6siH81Gc/HSZm2Vjx00xLxK6/ln7fT08/csE1tzYQxiyJsCR1i3g433xxVXvMElIk+9zyvBI3N9FuW0GSFeoLObzvBCH9IxMYM/1goh0jhmqEDqaJb2KtZxLO9JKe2isaI/hso+mxqCpOKLAyg0sgztwZzkWUuN/uiRA2tTrkG4JGNrYoj1Ov9ZEUAu0n1prA8SefZ3dcusJnS0GZUvcWtY+gW3Pz7VXsmUT7l51+HnviMFhjyQWO37KKQjISBg9kjbBaEHb4K42dd2BJewsMluDNYwm36bNPT4hh5SoVggFcz6gDjtVpwiuyEF0+ZZkfoGa+B99BWO9s3wE/ByLuYB8cRPzBy+jje9d9lgK+m3/Lzy4CMCjPPR6f47PYmOFRqg702/zQBGj95YzWhaq/GRZdzKT04NUl4kqFUSSP8E/JGrIHq4Z69X8E37AeJjVZgC34zM+Lz/2s29VKdf7XJQY0tr2j0iNAVMqG5+YsadNNN5UzRGU5Hc3/0Ns/YUu3Q/yaVfjEUE3Kp40eZWKEDZe05funISiE325QLdH1GcfIK3cJQCkvzY6fjnWP6zqk7CjZVGEyGX8tJwEdmJnKoIMGxsKiFLCIlzAs05cYr0bQC4rfcT6JWRdLR72I9QAzUyBh4gHd1nHIQSzBfcrthuitXS+i4Bx7q63oz3nchrl8hjJeqAYQMNOS9ad6HxCZxZBC7jqiCmoIWHsuF2mE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR10MB1466.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(6666004)(2906002)(316002)(38100700002)(1076003)(54906003)(38350700002)(5660300002)(186003)(26005)(2616005)(66556008)(4326008)(66476007)(7416002)(6506007)(66946007)(8676002)(52116002)(921005)(6486002)(8936002)(508600001)(6512007)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UMkCn23j9Lr+ZLpM/x1VGunVjkC+3mzz7QuDiEY7GNnPY0J1S67OFPT/oA2y?= =?us-ascii?Q?oXfo4cnTw6KX1re7T9WbLFx2aanIWrihKZqgLaUgZe6R4PF2yOfitaNbwxui?= =?us-ascii?Q?Et8+3tkBoc+gRoVQhgdzPnegixCCT45eBf6Q4dbOm5XQGJZy0+3N7VG6W3IK?= =?us-ascii?Q?idhEdpJyMHcBHAPFTZwDxgZR+rcNVcKHdSgOXaASuPO8gvq6lovNY5u1F6la?= =?us-ascii?Q?VAgsw5zy7dOisT8lkNUAvm1z7FjU7p9FQukloGCPijGTbySL1zgi1MyFNNki?= =?us-ascii?Q?vIdvRKqJZHiKtxyO5Kah04bZA3TxzqzKayOcPbFBW6ypkW9cPNcvGMdXACnT?= =?us-ascii?Q?bSGU5Sf7qx6JtNhC83Jc7E9cCMQUamG777uaYGKyjrfkpbkiGMn3Y2HOs7Ur?= =?us-ascii?Q?ASsOJI6xAbVdI9rqV5lSee+naLYuGTyLIHQB5sEemAT1kCXWZeIzLx2rsBuZ?= =?us-ascii?Q?EXQeqML3rkBvT9e7PdyLDxB7FPrKGuuo54YQLNKAYZIqAYqICIPefDixTjIj?= =?us-ascii?Q?jbj1vcmLmt5KP0JRsckdpnstFvGyncsE0eT+ntIqnIjfr5LwHF4PNFrbkLyG?= =?us-ascii?Q?Upu2snS4PhD25xrVbHJBIVLQ8rsqOz7GXASgZFzoSrPP5VqC//viBLLzXTHb?= =?us-ascii?Q?4gnAMeEimo+j70iuvevHSkuKPjbDQZuQritMlKb+Vh8pmv5aGH61Db1uTCu8?= =?us-ascii?Q?ii2wbRO2gNq42Juk5H9dSlI8oaUAgWOCq6BofexOZeSSK5B/AKy8FPZ0xamz?= =?us-ascii?Q?LCE16lDcnnGjzbRIUR3Vt543deJjfmaqhKsKP0NPLRCyLRjpRox//O5rIZ4h?= =?us-ascii?Q?p3jsdyCrAVuAlyh/ltJ6YYC97DUXcfJDBzNjpcRXdmbHalDuy07bbpuld4A+?= =?us-ascii?Q?l62klbuBoIqbJbjACSq8UFoYAEE6+r+Nq+/PiQ9kVKht7gbMhs4rHKk8ueOc?= =?us-ascii?Q?3UipeWNcslEeVn9uXat1KXc8EX4qoEw0HYHA7dRxVag56N/SWf4/b8xZ8g8n?= =?us-ascii?Q?0TiH9/qR3Tdns6MxoiWEW4y1en+Fkm8IgzUpPs7KnbOidWgYbsXXmhXH7WYq?= =?us-ascii?Q?U9bDUuQhHcn8NmCSsIXpu6ua4zhUMPgDMYpHwbhbk1TnwidYFIBhz1JzvTjT?= =?us-ascii?Q?NMqa12gGNznL/XSqKDkUqyV1i4S98yK++i8RXkDcHIsUowcRTCPVbHagDcHH?= =?us-ascii?Q?SfewryKSQ4pp85zYH4OXxwLaxOeKkRiXK98f2cvyfrV7SHG3dDB8aYmzcj9e?= =?us-ascii?Q?IOATgcM1KrpHX+llkJKq4Ho8eNu3MTZiIQ7qI+gaHI+dxVswiTfwzc0lI93S?= =?us-ascii?Q?BK4G0MaNkQ644yH6McAA+SH8sZPjq01F8VGqo7uiZh9LD/BfCYnTAu+TSpuJ?= =?us-ascii?Q?KXhWQPaJUhfo2fyudV9SK+rrIFkFGQ7/yhq9XJvJYW/cncnapw4MnZpemBDW?= =?us-ascii?Q?6BIOZrDRL72ccgKExi/ZYDp61TTCw4ayBZ7t5RCJ1uzkrJuualdUdLvdcofV?= =?us-ascii?Q?CC+qSCacPXZaFqkRDz3XWrIAJJLkCJchEANEvA6Jhbdr1LzuAVbCFiRzHY4x?= =?us-ascii?Q?+2cXpRKYUYbQrYLF8sVBKBB8HPuMUUWyBmipoEDYhMOTdVii6btgQo9tAsUP?= =?us-ascii?Q?KcRpbdSWWRsVIw7EMLHRX+aq4fEEKdQ6zVTmE+85vA65TRNGs7KjRf2dkH36?= =?us-ascii?Q?KL1Ljg=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 26e1d168-6f5a-4d85-111c-08d9e68f47a7 X-MS-Exchange-CrossTenant-AuthSource: DM5PR10MB1466.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2022 21:02:10.7416 (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: EBPxnrgu7GZFBjl0cUoeCMsaxaxxWYIthwAyHCg5/K0EqtpoNh2NeEFNhTggfgLg/tc/FbYVQvHzlPOw3VGCdIIU0Tnfn86IWoccV5z9txc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4014 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10246 signatures=673430 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=962 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202020115 X-Proofpoint-GUID: 3owqIhtDMD1m-QNH22LgCSEoHioPLb6Q X-Proofpoint-ORIG-GUID: 3owqIhtDMD1m-QNH22LgCSEoHioPLb6Q Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Each vhost device gets a thread that is used to perform IO and management operations. Instead of a thread that is accessing a device, the thread is part of the device, so when it creates a thread using a helper based on copy_process we can't dup or clone the parent's files/FDS because it would do an extra increment on ourself. Later, when we do: Qemu process exits: do_exit -> exit_files -> put_files_struct -> close_files we would leak the device's resources because of that extra refcount on the fd or file_struct. This patch adds a no_files option so these worker threads can prevent taking an extra refcount on themselves. Signed-off-by: Mike Christie Acked-by: Christian Brauner Reviewed-by: Christoph Hellwig --- include/linux/sched/task.h | 1 + kernel/fork.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h index 0467b3ce1c94..706ca3dc3423 100644 --- a/include/linux/sched/task.h +++ b/include/linux/sched/task.h @@ -20,6 +20,7 @@ struct css_set; =20 #define USER_WORKER BIT(0) #define USER_WORKER_IO BIT(1) +#define USER_WORKER_NO_FILES BIT(2) =20 struct kernel_clone_args { u64 flags; diff --git a/kernel/fork.c b/kernel/fork.c index 1f6e7184b31f..81a1096d6ee9 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1530,7 +1530,8 @@ static int copy_fs(unsigned long clone_flags, struct = task_struct *tsk) return 0; } =20 -static int copy_files(unsigned long clone_flags, struct task_struct *tsk) +static int copy_files(unsigned long clone_flags, struct task_struct *tsk, + int no_files) { struct files_struct *oldf, *newf; int error =3D 0; @@ -1542,6 +1543,11 @@ static int copy_files(unsigned long clone_flags, str= uct task_struct *tsk) if (!oldf) goto out; =20 + if (no_files) { + tsk->files =3D NULL; + goto out; + } + if (clone_flags & CLONE_FILES) { atomic_inc(&oldf->count); goto out; @@ -2153,7 +2159,8 @@ static __latent_entropy struct task_struct *copy_proc= ess( retval =3D copy_semundo(clone_flags, p); if (retval) goto bad_fork_cleanup_security; - retval =3D copy_files(clone_flags, p); + retval =3D copy_files(clone_flags, p, + args->worker_flags & USER_WORKER_NO_FILES); if (retval) goto bad_fork_cleanup_semundo; retval =3D copy_fs(clone_flags, p); --=20 2.25.1 From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2978C433EF for ; Wed, 2 Feb 2022 21:03:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347450AbiBBVDA (ORCPT ); Wed, 2 Feb 2022 16:03:00 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:33510 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347369AbiBBVCk (ORCPT ); Wed, 2 Feb 2022 16:02:40 -0500 Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 212KwoRe024816; Wed, 2 Feb 2022 21:02:18 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-2021-07-09; bh=dnvdctlMo6/aOvaVmFL0UErE4V0yMtOhL3uazVi0amw=; b=UJq9PiMSLrBxvM+27lKb64BNuGje1UJUWBs/hQxACm+hpXUsHeaUuSMm5V8LV+KcTiVW ANKU11Z2mQtFu/BVleiaaUDAayy9uuJcSPmlZ/116QRhEzNCRxYDHymYu/XqYvIKRqT0 uW1pr51WQ7pm8jB3QA+8GqZRlzqASUyzSJipf7d2C7azNi04BXSdInKo1cx55lQ29qzr WG/WcL2OlI95GNpFecoyG+yUB2ZMNuZE1wcYWHAcTwhuCksLoPnIqHTAf70laHFr4YDe 1NVrW2ZKQvcnRcK1g/2x+UuWLL9fG26OloxNQmf5YcGCGvw2Kazn5rziWlEIwY7kbJUK fA== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3dxjatyf0j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 02 Feb 2022 21:02:17 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 212L1Ejp021471; Wed, 2 Feb 2022 21:02:16 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2105.outbound.protection.outlook.com [104.47.58.105]) by aserp3020.oracle.com with ESMTP id 3dvwd8xt3n-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 02 Feb 2022 21:02:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T9TBpsx5y/FLCaFyXKCb1fM6foGgrr53X1ZQgL8tYaanl+JScP5Q8hQFDNBZa7F1E4h4I/CZI4hqzzQz8wZwd8/1QEzKFMsLmgC59XAGiAqlcUCMiN4QoTFk/RpKecd9hDNH0i3aMIYHHtR62chCzhVbAE/1p8QduD4VESICjIAHnf8eEjaw5sllxw17sqfKFu+cnTsOfEfJOJAW0IffyqoNlIIg5AnipIW0Pefn0BhLgPWePO3Hf6OIbqUk+CuY5pM6B7aBnfITIEhrT/BdH+gZPdvDVc9UCLXM1u7hSRc0Fx6UXT+q3f89HLUWTBYWxouosVu6/8qaO4ryR9DZNQ== 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=dnvdctlMo6/aOvaVmFL0UErE4V0yMtOhL3uazVi0amw=; b=Kde2DntAvTwMBv/k5yx7BItKCqTSqoTEAMsIqXuFTJrNYkPjSDoSQ6TO7OOTMkqn63H6uj4HE9p7IHtmQszYgNkzU1xcbr8lWKuINACWdHtu0YjfBCicrZ3lr0Xs0JC7TVDW7dqdlk4/KtoFONEkpVjHHtdz1w8871PDEiPdRzMijKEgbgr/OPruHSBTmB7S2A6AqtEo/QU3v9X8u66uxkDq/cwuBarKk761WmyZJ4YHYXZp53Le1nWYW39BtL7IALY/fWuMjFhUjW7r03N455uwM+C1HDX9onYiGuLUZQhHHBYPxHTZ2cmhcv5y2MrQ40Cf9zNT9Vfh6xiiYySM6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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=dnvdctlMo6/aOvaVmFL0UErE4V0yMtOhL3uazVi0amw=; b=aNuWPCDoxrJnLXzKJ1F4BwZVYaeBrdfAqE2H4bPxebjyopK+mmJwUTJJJ1SstFPlwKkGL+16LPdFpOuKYloOaAd/5/K4kCtM5PxxlqPkAspPb1o0JHtmEWu/KcEmzqhX3Y3GnJ/MxVfzDAzS3H6QSDTzACYL0ev/dzKzkO7cq74= Received: from DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) by MN2PR10MB4014.namprd10.prod.outlook.com (2603:10b6:208:182::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Wed, 2 Feb 2022 21:02:14 +0000 Received: from DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::21b5:910:b965:9e6c]) by DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::21b5:910:b965:9e6c%6]) with mapi id 15.20.4930.022; Wed, 2 Feb 2022 21:02:14 +0000 From: Mike Christie To: geert@linux-m68k.org, hdanton@sina.com, hch@infradead.org, stefanha@redhat.com, jasowang@redhat.com, mst@redhat.com, sgarzare@redhat.com, virtualization@lists.linux-foundation.org, christian.brauner@ubuntu.com, axboe@kernel.dk, ebiederm@xmission.com, linux-kernel@vger.kernel.org Cc: Mike Christie , Christoph Hellwig Subject: [PATCH 4/8] fork: Add USER_WORKER flag to ignore signals Date: Wed, 2 Feb 2022 15:01:56 -0600 Message-Id: <20220202210200.5235-5-michael.christie@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220202210200.5235-1-michael.christie@oracle.com> References: <20220202210200.5235-1-michael.christie@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR05CA0067.namprd05.prod.outlook.com (2603:10b6:8:57::12) To DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 789fd326-6656-465f-1f3f-08d9e68f47f8 X-MS-TrafficTypeDiagnostic: MN2PR10MB4014:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:972; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: V/ixR7EuADLaLJdhorWBlMvh1GplMBp7jAjAA+ogqPC83WtbcJ5Y6SDVA5ww9wC8Ge37ZXfJexWFciiVYDOBJWVQBvn/KlT8tGMLLSF/PpKYyINJiebSgVJVZkWqmkQ6nG7FOUm36xNc5Kt31z11ww9slW2ZzgvcpgNnbJUgDJ5Jg+OUCf5Y3Sq/LwjqdOal5QPQo8joyIepihzG6VAFfjoHrOGR0s0GoVjgWy/gkmoyU8T8Bm3HjOR5DnHVGmnSVEndVtZK8P+UiYv3x+1V469iVq4ZC90h4nHc6/ooxMRwUE2uKH+h8+0KwNTDEH4q59XknNgKAIWLWoYBiJx0tS49Z+IvP6YXZJUK9bUNf6YLbk4mjtxymlIxWFiLpjVggQejDwJjoTeUE3o6Zymhulve0KujsIh6UuK+GdBWPgYWkjiR4pwTtF7UBhTNuPZvi+aINB2NotZxnXeLKqHghGm3oLCxjdvhcgMuYwmfikGyHfnBihF946O05V7cn5OPUPU7Geh23DLkahGcJgAaB8BLmc/K4rriUBwfLgBOllHwU5rno0v5XMA2jy4gkfZ4PxfWDgF/3FOB8Awb1UM93eX5qfguRLMr0ibptPTbHip5FN5pe06CpByvyB4QFWggIJnNsFKYSbGUTqv9gLNGt54nTXIxe/W54qQSoO264ktMEXOSFH0w0tUAkWoLqXi6fr8HOegm+wAjqBcIt6NntQg7miWvCI4phxMMgLktlEs= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR10MB1466.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(6666004)(2906002)(316002)(38100700002)(1076003)(54906003)(38350700002)(5660300002)(186003)(26005)(2616005)(66556008)(4326008)(66476007)(7416002)(6506007)(66946007)(8676002)(52116002)(921005)(6486002)(8936002)(508600001)(6512007)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SQz3GgEY79qgCAnu6NwsjuoseyEyC0ItF32HG6u8TmNhrZsjw7m4q05WBbin?= =?us-ascii?Q?gDxr+iuwxAZC43Llrc+ak9KgoTOrEJ3NNLP72c2G+V7znIiL2JILNt8eKxNP?= =?us-ascii?Q?5rUag9cOid1NouWZ5EkkRYPbMuTj3vKKa+mQy1lnh9O6Y55+NNFL7YmlAxuN?= =?us-ascii?Q?s+fOx4dQ+hvzN/xggL22sNji/TLdXQm26b8ZZ/orCNfBWfB7b8l56Oe65xLk?= =?us-ascii?Q?Lslj2xqNp3N1782LdmvEtIY9swmriDtMpcHOjR7hWpSqmYQJW18wpEsviI6f?= =?us-ascii?Q?spSciSvBzt9SS45ZjXdfGM1GUUrpm5YFu7k7PoTj3h9uPh+qYXa+0vQv2yHe?= =?us-ascii?Q?eErqaxv5M+KCrGU4yNE9AHULKzl8Bk/UtdpEwoPp8HcUyCGwIThfe1X5eaj0?= =?us-ascii?Q?iTFGzPMxPePvnbYp8zcMV94K9S8jmpWKc6obwDLDMN6MnM9MpPbXz/XwrLed?= =?us-ascii?Q?SjlUDCahPVPea40YeoBk+WV1xnb7fq0zl5aa18zZ+73WwwZyEMl1jDiykYx8?= =?us-ascii?Q?peL7cKClgs2WHaLR9cyPnIvydCneFVld8tCWjSv84e4MDruDm6xMmObRZI0v?= =?us-ascii?Q?efUg8eozarD1hByS34nKqHyt7Aw4kYUl7qPejf9IhYK0jShgXPMoEhPYugjh?= =?us-ascii?Q?Q/mtDhpxggQxtPbnv2uMio9lGPpkvgMdANJsVAyxSSP1orjCAjH/Fv+zI+e0?= =?us-ascii?Q?jNAvSeGSYGv+B0G/RARijUChHiJbNBm6LYLJdZ8G/bF6v43u/eOBGG4vfGHe?= =?us-ascii?Q?jPq1AsgqzqjCMBFtkvQwfA6WRK18r8wgeNiWSjHtLTztnWg4H9FyLfvvjrKw?= =?us-ascii?Q?rwjhBIp875x0QGYqYGHwI5ioOJ3gcaL4qmOQLzsFdMf5/M62UX9y9R5y4aei?= =?us-ascii?Q?y5oeANoBHRKK9gBIjKHv43TJFa2zspSQnsJ6vdGKzgUn/LL5cpReto1l/HBp?= =?us-ascii?Q?EB6nEDjbSRKBpctjLaFkYqUalrXt2agmjtDb6MdwC6D7xONEDFORs1Xtf9CS?= =?us-ascii?Q?6jbVXV2lPvhMIIVfjrOXGe5ruvHMh0/uBvfeykdcsyHhfluxzWA5m+34U0pa?= =?us-ascii?Q?wUb6ZAMQB+PFOGIIrz9v6DypJTZg8g7VIp9fec5B4Ru66Ho1bVIdE1KsWqJd?= =?us-ascii?Q?YMJ051z6TCBxEmNlHzGetR3acxPVxchHXoYtXegVmXmmcdAVLmgUw+l67un6?= =?us-ascii?Q?COVqia/Pwy+6FmSDTUkSQZ+EsBnt9JoSu58KUv5B+ECKolOfYutIG3fuxDP9?= =?us-ascii?Q?uBdB6YaX8hZzdLCBOa6IPXlfO6T22yfH2sw1KlP76KcJixM8s8IFY6TGME2e?= =?us-ascii?Q?tEa3R2S9QNPo25E/MbmFM/8g4xRWVQq0Xup96gQm+BrOyT0IIPCFI9nK1IIp?= =?us-ascii?Q?USavYm67oTodnkLbnnU9kM1UredRrPy8c45pJbDFk8EVXpAaBNK2cVopHQ/U?= =?us-ascii?Q?xpJs/WcnGRELgbZOZF64yPa9nHd99l96KZ+T057m91Vu+4i989HyyOG2+noF?= =?us-ascii?Q?nBlQYFQq8q+6aGLwIz11OM/QzoaKitxb25B+k6uHUVNoFOaN+suoB5gKLqum?= =?us-ascii?Q?tk7uRzAOtDHDxCwXYXQUlJ1W+JjWoT0wzxUNFVV5uahYovANTJg8vb/RPhcO?= =?us-ascii?Q?qTsTieoRTMAVxaQq8m60Fjy82n2iL12CVcWUa/PL3q67ffKx2BoT5agAgGbV?= =?us-ascii?Q?wOvRyA=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 789fd326-6656-465f-1f3f-08d9e68f47f8 X-MS-Exchange-CrossTenant-AuthSource: DM5PR10MB1466.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2022 21:02:11.2884 (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: e9+LbEPf4ppnckKvl2oujgJnvJ0cyWfqCD0+RhAoav0SgGRbAM7pYiYDBnIWPa5KjH8fRDYjN/3+FWwHDkCW1XXDiH0VkDeTIi5w02vH/4s= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4014 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10246 signatures=673430 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202020115 X-Proofpoint-GUID: GyfXRJeFz4Xig3QVInQWxkkuBacYuvz4 X-Proofpoint-ORIG-GUID: GyfXRJeFz4Xig3QVInQWxkkuBacYuvz4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Christian Brauner Since: commit 10ab825bdef8 ("change kernel threads to ignore signals instead of blocking them") kthreads have been ignoring signals by default, and the vhost layer has never had a need to change that. This patch adds an option flag, USER_WORKER_SIG_IGN, handled in copy_process() after copy_sighand() and copy_signals() so vhost_tasks added in the next patches can continue to ignore singals. Signed-off-by: Christian Brauner Signed-off-by: Mike Christie Reviewed-by: Christoph Hellwig --- include/linux/sched/task.h | 1 + kernel/fork.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h index 706ca3dc3423..c001d0fa1426 100644 --- a/include/linux/sched/task.h +++ b/include/linux/sched/task.h @@ -21,6 +21,7 @@ struct css_set; #define USER_WORKER BIT(0) #define USER_WORKER_IO BIT(1) #define USER_WORKER_NO_FILES BIT(2) +#define USER_WORKER_SIG_IGN BIT(3) =20 struct kernel_clone_args { u64 flags; diff --git a/kernel/fork.c b/kernel/fork.c index 81a1096d6ee9..6a04860fa1ae 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -2185,6 +2185,9 @@ static __latent_entropy struct task_struct *copy_proc= ess( if (retval) goto bad_fork_cleanup_io; =20 + if (args->worker_flags & USER_WORKER_SIG_IGN) + ignore_signals(p); + stackleak_task_init(p); =20 if (pid !=3D &init_struct_pid) { --=20 2.25.1 From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 637E3C433EF for ; Wed, 2 Feb 2022 21:02:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347425AbiBBVC4 (ORCPT ); Wed, 2 Feb 2022 16:02:56 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:33234 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347367AbiBBVCk (ORCPT ); Wed, 2 Feb 2022 16:02:40 -0500 Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 212KwhBN023474; Wed, 2 Feb 2022 21:02:19 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-2021-07-09; bh=Vs8tFpLTMOGvTyZKGEuCsbE6CFo8oWe+4mPnhyqiYJc=; b=MNT1HjfLYhwkZkHJS4a0KU1nNMQT3BeiwZfnzNYDWA2bdi/JMBD3zzQh76Vufo1nZ7jE f3vjncdR+2UuzKHIILloXXK9oHaXU5VVXaUU4M4lRHf7zR3bUbBarwEfsUnR/xfCl5VE wVhEjE13m7GmtwgK+FSy2S+KoaYhSZEEOD8lNVQ/wBJnIn0Rlmd9rclNgcExGjQFFtxj Qzz04k6mqmzx0opip7yHsdAixMdtrIuLPbBWBd8Z6en+7Cd5eoBYdOrF4KrJQbOC4oSF pWOXlaxBI20HiPQUNB5PUBSgPWwzcCfp8ogwKXkbwt/vwsidNLHoPVWDzYWkAByv9vFk Uw== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3dxnk2pxct-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 02 Feb 2022 21:02:18 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 212L1Ejq021471; Wed, 2 Feb 2022 21:02:17 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2105.outbound.protection.outlook.com [104.47.58.105]) by aserp3020.oracle.com with ESMTP id 3dvwd8xt3n-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 02 Feb 2022 21:02:17 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZIZEMhZOTMTNt8ZD5L9FjViYmYTyldPUXjj3FZODPIhbIItTaFIUsbPFtkB23wvBAarlWb0n8UQ/IcisAo+9qdMD0wodpvO6M6hbJoIdOu52oScwqypej+y6V7K+BKXFTaKh2wkGYbSRUQXtkAseJT15yCD7P/FDM/176ybhUcZUwpwQvZpsdf/eMmZbjFHGK2tuipmYurCwW1E7OoS931Q4B/GPfxsCrUOMzDwdYffLfFGaM+tp6Y1bt7nY0yr5nKUW99OlzSQBgQvOxNOA+bI8TT0gYiSQ+00YxdVWNxg8i/r/tuwx/zPKWQ20xy5AtTwf+bxBZgb2kBHEqZ8Zbg== 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=Vs8tFpLTMOGvTyZKGEuCsbE6CFo8oWe+4mPnhyqiYJc=; b=H3vdFn1WdwSHhM6HU+63iMcaeHT/P7EyRV4lOhgE89lF4G1Qzh8l2YQHrxQ3Np3m6c3somwj4NOvvAQlnCYUy+rOhgErXTfxymKxaH+8/bDYIHeboQdAdYnUZ6F3mBbWLPPdwzaSte7FGwx1qCdhbWR6S6KmBZAX5O6VoKXvfFFd3582Qu2BGkwVYZ2T+EPeGMJ/TeyhI80tPVnJH5E08EiEH3X+wyv1XyCFurEcC+zd65Fl0mTO7k1vcAD0QK3u3z3ZNrC8cyRqRSjfLk/ydm1PqqrhwmtgaLMuQvZ6Z5FV/4KH6JCTi8KTaeW+YzOT9BGAwYgtXIL6fLufSEAEVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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=Vs8tFpLTMOGvTyZKGEuCsbE6CFo8oWe+4mPnhyqiYJc=; b=BmQp6+Qqz52wPsnxMIJQdnnNHLTJlbgMjmxVgYkQ3vIoZwDaNB6nngoiUVa6ywPMxOwZ4ZHOdUEOIsRMHp27eNr5zBKaycToADV8RLTA1H/VU1mjMEoW4cT643gF40NBILFh67uwUALJ1sUNdAAgwrv2RypAYGq2/sIhA4XDmu0= Received: from DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) by MN2PR10MB4014.namprd10.prod.outlook.com (2603:10b6:208:182::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Wed, 2 Feb 2022 21:02:15 +0000 Received: from DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::21b5:910:b965:9e6c]) by DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::21b5:910:b965:9e6c%6]) with mapi id 15.20.4930.022; Wed, 2 Feb 2022 21:02:15 +0000 From: Mike Christie To: geert@linux-m68k.org, hdanton@sina.com, hch@infradead.org, stefanha@redhat.com, jasowang@redhat.com, mst@redhat.com, sgarzare@redhat.com, virtualization@lists.linux-foundation.org, christian.brauner@ubuntu.com, axboe@kernel.dk, ebiederm@xmission.com, linux-kernel@vger.kernel.org Cc: Mike Christie Subject: [PATCH 5/8] fork: allow kernel code to call copy_process Date: Wed, 2 Feb 2022 15:01:57 -0600 Message-Id: <20220202210200.5235-6-michael.christie@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220202210200.5235-1-michael.christie@oracle.com> References: <20220202210200.5235-1-michael.christie@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR05CA0067.namprd05.prod.outlook.com (2603:10b6:8:57::12) To DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b3ff5f6b-2c42-4807-069d-08d9e68f4842 X-MS-TrafficTypeDiagnostic: MN2PR10MB4014:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HusVTPQadQEbG+xkWMYjo5T5Rx79mm8YZxOBde0jV3a1jpblkGwZrLb5VLpZd44ctMW9VvjVqIdljhVeOjhNQAFVPI7Fy2mmhaMefwAiyorExyAokdaafXEj9Q3V3/aaXWGcNunI2DdzYaXqSk6EcUfUAQJXqgtkBn5cikrFZUCGm2karIqFCW5lhPF6tmpMAf4wyxNdg2LTObnp22KAXJo9+yVi6hvi0NTv3pRzhnbKjWLwZV/3PC0aJzkvTe9EA7xx959tv7odTOQuGpotDlDkjjCrJMCjW4qRTDh5gEIzB7Ql6VJ84lkSGijorEOGNDwBse2cXyShma6dPX0rSF8S3BT6NubGiOjnfIoZJyc4pGw10to3GJ9jTT8gLR6gqrS910GmnsU09sMMYY2HwRAGG84frgsIEEIV0sbtahGsTaX114SmcwsmfxWD+4Ss92fQv8CqyWA1dLtRMf/wWqCCJSfbGs+hZt6hqmiK3cXdKbzzF+btqF9/XHMwp02gRkUsxeen/ITwqptM8SIXwrJSoNIfSODzkHgYEdaOAQFTm6RB6meS5x8H6rtER1Gm5OKwrLaJfzXsj9wnZaMIIoSqtsO89hKMGlo2mDS6RUQa2pPyqtWQ+faPPVwaQaapfoajNDoAENtVgixVGb9HQIeIWS/VD1bEuBJ9lFVH/qYyKRatV+07wCr6BvoVHxUPFwahKZYvywBClq+LGJW/X5uDLk9FEAJPnXyxvtaOBP0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR10MB1466.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(6666004)(2906002)(107886003)(316002)(38100700002)(1076003)(38350700002)(5660300002)(186003)(26005)(2616005)(66556008)(4326008)(66476007)(7416002)(6506007)(66946007)(8676002)(52116002)(921005)(6486002)(8936002)(508600001)(6512007)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?oAB5dGQ5YOCcD8WjhqSstJ4sfl1x2g4gyj9bejO6Wjw8D3t7HITjuzTIYtkp?= =?us-ascii?Q?PwpFqrk4FnDUVldLki0/kylMaIeu4knO4kIMS+tH9O5DY+4bdhQ+mRpAgsxI?= =?us-ascii?Q?zYe7a4bwFOKFJvuUes3BjJhl+6NUDUEEdzuqXEWB2bN9BavxA9NZZZxHqZzd?= =?us-ascii?Q?ghc65nwA6eIHK5k+XUX5iqGDYszwHTmPsFf1M+obO1TpnrCELSFg2nxq/ZK+?= =?us-ascii?Q?0NeRaiS0F/ntM8Ji1JbiuUN15Fd3aGotHHgL7o+c1ofGMAvr3IQDL94Wa0HK?= =?us-ascii?Q?Vhh7NE9AhIZs61rX5uFanVdI9qtCltcy4ZZqa6dBt6oSuhdmxmyAR8BXIWIp?= =?us-ascii?Q?ksJS1k3lq5/hy1GI9coW9+1dlEd0iZLEl0E+nTD7e6KrKF8ZGJvPaN+T5wh5?= =?us-ascii?Q?fTacEDJdG6q6qGPmAGDWQBefsQLVoTld0Xy5NXCc8hqKoGeNZu2n/z+INv+m?= =?us-ascii?Q?B1z8ANxNPaS7Ql1Yl2CNXI1Swp/+7J1D1fL7fHFhuZs8E9r2xZtGRAED7+ej?= =?us-ascii?Q?ieFohgnJD/TmsNrQqz4vMgNrb5QwjQ3fhKyvLXm8bU5EOYA3vb2QC2gVQouU?= =?us-ascii?Q?MA3Bx1FULikopAftkjnUTwyzAG2drziyqM/r7nuUY4196QZzZYxJyfSx9us0?= =?us-ascii?Q?Xfu7yKTZ/H0cpEEHrYLlWhV+gIdgHWnUPITRj964WtGXyDXEvg8eqVCMWNFB?= =?us-ascii?Q?fVzq/JpjoFExIOKxelEQjzbq5pSGHqk9mnou6yf8R/6axsHNbZOijFQox9K1?= =?us-ascii?Q?KxGTZCBPeOlJak9C/NCq2pZOleoYHOB3Z3Gvn59N/b/OwFMkWiScjZOzPMX7?= =?us-ascii?Q?ANloSaLrsivYLGY6c7jk8jx1ZwsIH04Fa30GGe631bEzoJRqJlB1OSoPN6+v?= =?us-ascii?Q?m87kVfNswh5uhS9HdeieVIN950x/OCmC0J6P4+GMN8O8raMnMdZbpKyNncZs?= =?us-ascii?Q?bOFLCBG52TnCfAQUo1ZcYcuXtASjJfBts/u7Jm5h5W1QGq8QZJatxOS3v9y0?= =?us-ascii?Q?4O2yzS9efnJzGc2bR0kbt1AY4mJxR+TzBLQgu2DcggYcJK4+OdcJytqrjTFT?= =?us-ascii?Q?Po3VYUWua9aTvSDJ+7IrCI1rL75KJqYXKXaPGM5sGCvq8XlL0BzMlBGtGa4+?= =?us-ascii?Q?oCchTBdfNkrILsvudjj0lcN4oihFm8BW0ywXNZGE/ybUGQ5hOpjno8cqcmwW?= =?us-ascii?Q?/m0rs/Ygbgthuxi5SVE7KWOJoi6nZXJGpvFteo/DiFQrdbqrqD0+6qoeGsiD?= =?us-ascii?Q?qks7OfPdZGKx0HzeY0PogVPx2zHtyZ/B+rWqgnRhgWib8tKGSllZhA+P7bF8?= =?us-ascii?Q?cDDpFjQKAuBAqz43FEO0h0pk3STvDVEzHdcIcN8xydpqTJ2unXcvee5mQOvQ?= =?us-ascii?Q?DPcB32+9s//GWG4ooxG1TqlgTxonRTisfaro68LFzBWcKsgGQKOzVf2EdddH?= =?us-ascii?Q?6s3E4VZaQQJT5kgSpch9cWQ6uU+VWXoIDOzFQEelWTBWE+UIDGGxtbut8ySw?= =?us-ascii?Q?XtDIB3ZjwjftSrvVk5ChKXjGO18xUsj3+WMv3+qP6TC+96RvrwhiEAb6319z?= =?us-ascii?Q?HLVpo8ZT5yP96sbehRkRiWO1CoMHMTZSNOaOUdYKzgWb1mlROVxoWeyBCedb?= =?us-ascii?Q?WIYG6EnmdaWLvXbmWfhUopJq4bMTquU3uRJm1Zpz4HOqkV1jhGEpLCdz8cm8?= =?us-ascii?Q?9RcE0Q=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3ff5f6b-2c42-4807-069d-08d9e68f4842 X-MS-Exchange-CrossTenant-AuthSource: DM5PR10MB1466.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2022 21:02:11.8040 (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: 8OFGetJfSS0JJm3Mhmm3V8tEweKPBI9A7xmkx/4jTZ1Vspsv6rgfLzy16kesfY7y6jE1iDqz7RUSyEWWR6KmBxHgyVQH3/8IAz3Kn6vZ4U8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4014 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10246 signatures=673430 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202020115 X-Proofpoint-GUID: ZFGl40QeADzwGtSK1KPpum7W2mn0Uy9o X-Proofpoint-ORIG-GUID: ZFGl40QeADzwGtSK1KPpum7W2mn0Uy9o Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The next patch adds helpers like create_io_thread, but for use by the vhost layer. There are several functions, so they are in their own file instead of cluttering up fork.c. This patch allows that new file to call copy_process. Signed-off-by: Mike Christie --- include/linux/sched/task.h | 2 ++ kernel/fork.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h index c001d0fa1426..787e6108fd65 100644 --- a/include/linux/sched/task.h +++ b/include/linux/sched/task.h @@ -90,6 +90,8 @@ extern void exit_files(struct task_struct *); extern void exit_itimers(struct signal_struct *); =20 extern pid_t kernel_clone(struct kernel_clone_args *kargs); +struct task_struct *copy_process(struct pid *pid, int trace, int node, + struct kernel_clone_args *args); struct task_struct *create_io_thread(int (*fn)(void *), void *arg, int nod= e); struct task_struct *fork_idle(int); struct mm_struct *copy_init_mm(void); diff --git a/kernel/fork.c b/kernel/fork.c index 6a04860fa1ae..04eb7fc50a13 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1905,7 +1905,7 @@ static void copy_oom_score_adj(u64 clone_flags, struc= t task_struct *tsk) * parts of the process environment (as per the clone * flags). The actual kick-off is left to the caller. */ -static __latent_entropy struct task_struct *copy_process( +__latent_entropy struct task_struct *copy_process( struct pid *pid, int trace, int node, --=20 2.25.1 From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EF17C433EF for ; Wed, 2 Feb 2022 21:02:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347397AbiBBVCq (ORCPT ); Wed, 2 Feb 2022 16:02:46 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:32368 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347359AbiBBVCk (ORCPT ); Wed, 2 Feb 2022 16:02:40 -0500 Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 212KwhHr023475; Wed, 2 Feb 2022 21:02:19 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-2021-07-09; bh=fseAn7YO78aTwAzJ16qHietl5vUI9fSQponEomcd2pE=; b=V995AxMfSuKAwV0tPlxWdjaHaJC/PvIl2LXHMMFLqFCx8wtIHIrept2C46c5bIuYDO56 vG/CMgDpEq9Y0FuqU/TXnxsuJbav/tLrru/uv65SZwZ00y1wJ/eCf1OBXJFTEVOwiQDF 4JoIyn7rvmA4GFiqAm0cmqeUDY1SMplJsBD+pAPnjIcmISsNWhrI4s79dq4uyGlJxNop IxEYvuztoHiU8ceWwwvIWwexa+6NFd6lchF7dcW62RZhs9XN+pnJdgBk8Ka/pmvQRP8N uoG3tJIF1XG+nIIli6VWydMpL+k/Xkh+xSnU/jGJuLElYpXGN4QPBmnDhJ15wBYWq5rP XQ== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3dxnk2pxcu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 02 Feb 2022 21:02:19 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 212L1Ejr021471; Wed, 2 Feb 2022 21:02:18 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2105.outbound.protection.outlook.com [104.47.58.105]) by aserp3020.oracle.com with ESMTP id 3dvwd8xt3n-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 02 Feb 2022 21:02:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=itB3uegqEGCqwiLmbF0mhSJcXTCCAz6czY2kYwLA2dzqrL2zurhvUGW5tRD4J7JV6a79NhPfFjB7iKvL25CSyTN/5xCGdjs9763hCLdJoJisbVXr7s9nh/zDg95KJZaUrFxx1/ujwif08jYcub/zF+qwYh5yLcJ5vBbENzRtldVuNejKIuvNYfC7reK46MeEob5Th301tPvWA4fIUPPg9taXEiq9s5dm/r7swxY3Zy0GrJCett2pMp3+y0u/oQyKcJOM2SurgBC44TE3Qld7jb4kOWgAkzJ//qARXVOXlZeAW5Anh6YzHJsUpA+SjCNGpaAWnCA0Zjj1SiAA8cjHAQ== 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=fseAn7YO78aTwAzJ16qHietl5vUI9fSQponEomcd2pE=; b=ewdo3BOAlmlXfMtnao6GmFgNLqLCC5AlzcT0Tshd/eqfusze9CFg7UrGvjA4xA3Q1vQfY6mMqSkVBuo8aF7sxM1d1rLISimgOxQpbKlKgBVetDXuEEheNL6/h7CAbrNokXuvg1PsLpu4y1XznvwrYtIl2M+tkSqe9DQKTyq/3/bgkZWT7CZ0/TnBvO8A9ROQ4A3gWdk+DfbM0iFOO7sChGuoeViLI6/Kn8CsxXiQiDpz2+r1HnkFEsZWbEkIRUYvPs1wRGsqzAbO3nJuh1ln3Wv0SNwTypU79hwXAPZoUheZZp+oC17W1PZyaj3ZuijC12g7yWXMaxKA88v8QCeT3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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=fseAn7YO78aTwAzJ16qHietl5vUI9fSQponEomcd2pE=; b=Z0VQfhXAkzSxKNQw4INIq7DR2LjQWNnr7bcsMj/Kd5TVRSiaoPOYsiRZXwyFl/qLS1JVy9kt6U+K8KzpqmG6FCLCnhL/qaCSoi+mneRb+VLkCkxb3BibT53TjZJpBcFhCDiBTAzaondpdpfJVRBK67qFL7HR8ImXtjVNxUlRIQY= Received: from DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) by MN2PR10MB4014.namprd10.prod.outlook.com (2603:10b6:208:182::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Wed, 2 Feb 2022 21:02:15 +0000 Received: from DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::21b5:910:b965:9e6c]) by DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::21b5:910:b965:9e6c%6]) with mapi id 15.20.4930.022; Wed, 2 Feb 2022 21:02:15 +0000 From: Mike Christie To: geert@linux-m68k.org, hdanton@sina.com, hch@infradead.org, stefanha@redhat.com, jasowang@redhat.com, mst@redhat.com, sgarzare@redhat.com, virtualization@lists.linux-foundation.org, christian.brauner@ubuntu.com, axboe@kernel.dk, ebiederm@xmission.com, linux-kernel@vger.kernel.org Cc: Mike Christie Subject: [PATCH 6/8] vhost_task: Allow vhost layer to use copy_process Date: Wed, 2 Feb 2022 15:01:58 -0600 Message-Id: <20220202210200.5235-7-michael.christie@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220202210200.5235-1-michael.christie@oracle.com> References: <20220202210200.5235-1-michael.christie@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR05CA0067.namprd05.prod.outlook.com (2603:10b6:8:57::12) To DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ec17e43e-9bf7-4cef-d96f-08d9e68f4897 X-MS-TrafficTypeDiagnostic: MN2PR10MB4014:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v64T0e/Ub413C0nFzhlcErFS/sPmE5nkVH0/avL2lht7WW0SsiVHsc4fcVegyObR86fPYOEzsUFvkNQblQoSpX/2BEDggkJNZiLoWmXJ3q35C7hr7IZQGW4s1V4Lf0BocZfAL30aqvR3iw5aG8oaFRq6joBYNcmJXapeSrbDA+l5Mxi1ApoeZHXd1jYlR3pw6uHJ3Pgzv+DdzLXMVjLws0KIYvOX2fGByRVrPdmPODxxAElZPd1PPj4KricBV/OYO1+S1MW+mRZ/KyNSzd3QUXOhdCaFdqiyyb9cwG8yoVGB4kZ8eq/jUC4upppcMX2ZIiDFLgXsMJ30NcrckgFjzmELxYsKo7MJq6P1rvkpmyPYrr36D4TnRLT6GAZGboxr3jCUrdhWRpO3xtdmphKz7+0TC0Qe+3E7dQaerK7+LPiSoRK/Mabdm1tW07SuStzGIBzTyssgKc8FGkg3RkUyy58OMASZQ5Sy33rIX+p/3BQu85/s9fbUUepKtyaynkSGw5bCq0iNxpdRDuW+s1iz5IPeGChR9kNukwjLmO8v2C7q3EugeyHoL/1LL7wz8NmABsUfX8CKbbP7BlLamPAgaSJsXt2zvzZV0hnwphcZYg+Cs/YLnes2rAMgeT4OKScCyXLGKfBLUiDRFQwsSm1FVbD6kYFIymBhcgijGUcw+GPePaw51nNqNNsS8TvLySV00wQ6hcgUJYwGD0JjYeERPeklSLYvZmSMEc2Ui9xwwiY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR10MB1466.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(6666004)(2906002)(107886003)(316002)(38100700002)(1076003)(38350700002)(5660300002)(186003)(26005)(2616005)(66556008)(4326008)(66476007)(7416002)(6506007)(66946007)(8676002)(52116002)(921005)(6486002)(8936002)(508600001)(6512007)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LOYltyNLTn9EjrEjcvXxALAbPHaPN7kWpScVPWTy31zoExLj3HLDVU6H5e6M?= =?us-ascii?Q?x+rTVfVkmpK6yHtiWg/qOErTagRnPH6ieUgNi8k6i61eDVos5DNMQrgyZ5Nw?= =?us-ascii?Q?msGFQrED+Oo0F1pNXhPK4mNkyu7UuQf3dcSu4CxoB4W8JyGOJTYknFWU7Ag0?= =?us-ascii?Q?FeIPHM1QA47YzjWnZ3opPQ17KKqzGAqrhW//8N1xjjMXBjcPCr8QbgtRzdcN?= =?us-ascii?Q?tuZONSMteMZFIu6SmpGSLbPQCrGLBDiU5SpISHgMFgF6WmfFe6bwP7TaBdej?= =?us-ascii?Q?IHQ//aAAQVjiJm8dZLzZGfya5dkP4Ec8tdVPMkpVj4IMSC7wXmk+JrKKf5PM?= =?us-ascii?Q?/elCTzhkX/m3f2tBGNXaEdEjZQHAt6NjS6/xuq3cl+8E6zfCV6q73o08/dyE?= =?us-ascii?Q?NEb5C1P/SnTaTYrHcBmPHVc1Fgb43FPP0Y3HZAMwzeMwNoHUdHFj2Yj9wHuG?= =?us-ascii?Q?3s7ac4NfOzT7beM2RxymUvrNOjrNiqtHa+X93dvA1xJ7oZTnHt3Ga3WGBj4j?= =?us-ascii?Q?FiSY6ZK4UJm5vhZrOekjDIa8g3R84efaZTxMgJtcY0YBfl1mavE/RwnEfL7v?= =?us-ascii?Q?2GCHF7EPBqdUROL5Xhc9c2IPDBQLhmzjwmHBTV1tLEmGCURauMQqLzmC1tS+?= =?us-ascii?Q?d+sOksWqAokUUKFXHRMUgCLALDpm2x4k3XTHNhHc+qpt2FAvGdVJCCONBpoM?= =?us-ascii?Q?Bv3CoRrTpO9bhkUcJUhZtiYTCFytdYPu13bdas7n3zN37SsjZHUldTTw6Txx?= =?us-ascii?Q?sdAdyM0RGLewRP2FpQJ0w21E9u9wR1LbqwGyeOHiTXgasHA8oR28IHJPIwZ3?= =?us-ascii?Q?wnRgVAqq7v0MefSCR8GeOcDLiCKwiJeM4JrfoP+aiXcwolBa3vOg/Wa7a5NJ?= =?us-ascii?Q?i8DJjQ0ZKXKjOPH/wRX/0LXpg0ZfraKMLUJSK97GqvRPqL2E5MIZlJUSK1TV?= =?us-ascii?Q?0/aecrYu/3rYXGfM2x1nM49nKFzFkw0o9jw67ldm1IAkg34FKKU0q0/aqsCn?= =?us-ascii?Q?WcHHK2Spqj6OdVt2RxJyj/fvfnbAub553wdDTo06aHXYvh4J07WcXUCC8+Md?= =?us-ascii?Q?T8xyeZlFS7iwKxPIn73VVGLwgOasOVKOhjY9n0Tfg5OUJmNbF1RlR4ajTEGs?= =?us-ascii?Q?RtALoSpqakjW3qWikb+oRqegyqHqghiPelH259s+zrHZUBg6GHHs9hBavoZT?= =?us-ascii?Q?6jplKhpmCqOQaG9JxJ6vFU2qroEBR+qPrpoxO/aUGdUUJuhrU/+azNLWmdxB?= =?us-ascii?Q?6CzNvb6N+XGPFbWEl1ZYFqVdodzokyAuRrLo1Y1+PHLQlUwEt7isoLkrpchB?= =?us-ascii?Q?FQzdPsCM22w3mXZHBdyK46uBquPc0dx+kfkvMOxBTjIE5eD1ln/I8QR1FfJr?= =?us-ascii?Q?BM+WuCzjrijZA3CKMmgFz6et9eb1EzaGwYJmq+ncjFSeP/Rhy5Z52nBSO9dT?= =?us-ascii?Q?glh5oF9jTg+Tz7LNmrTVtZVCxd48h3WkL0Vb+5aaE4qVnKx1ERqHY7ukBtyc?= =?us-ascii?Q?0EKKxn3DyfUzV7LvLuQ1Jm9k3AOsTQfofhmQwSsIbBmWTRYak7pWfyCjTlzF?= =?us-ascii?Q?pADi1ZAN04m8IIVss2BxijZmt1JMg79jo0aR6d9EtQTdBKdTswoljHLbbatk?= =?us-ascii?Q?CcRKBRK5rP5DiyzgvERcfJqLOyEbWhBJ9s1pjY5RuaPNbE7zKE9hA+PmdFcN?= =?us-ascii?Q?S0m4mA=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec17e43e-9bf7-4cef-d96f-08d9e68f4897 X-MS-Exchange-CrossTenant-AuthSource: DM5PR10MB1466.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2022 21:02:12.3977 (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: /W1/tg6VGHK/Oc1Yc8zPnbVF6l9ZRUGFr/IghDTU+hS5v8mT0bhoYImo0/ss8KWEDJK+pfGRxVq2ZuJOtzAyJ1q6EuXAWdJAwlwniHgFcv0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4014 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10246 signatures=673430 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202020115 X-Proofpoint-GUID: D6USeyZKmyrwU5tFp-ifFTeniAwVzBAY X-Proofpoint-ORIG-GUID: D6USeyZKmyrwU5tFp-ifFTeniAwVzBAY Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Qemu will create vhost devices in the kernel which perform network, SCSI, etc IO and management operations from worker threads created by the kthread API. Because the kthread API does a copy_process on the kthreadd thread, the vhost layer has to use kthread_use_mm to access the Qemu thread's memory and cgroup_attach_task_all to add itself to the Qemu thread's cgroups, and it bypasses the RLIMIT_NPROC limit. This patch adds a new struct vhost_task which can be used instead of kthreads. They allow the vhost layer to use copy_process and inherit the userspace process's mm and cgroups and the task is accounted for under the userspace's nproc count. Signed-off-by: Mike Christie --- MAINTAINERS | 2 + drivers/vhost/Kconfig | 5 ++ include/linux/sched/vhost_task.h | 23 ++++++ kernel/Makefile | 1 + kernel/vhost_task.c | 123 +++++++++++++++++++++++++++++++ 5 files changed, 154 insertions(+) create mode 100644 include/linux/sched/vhost_task.h create mode 100644 kernel/vhost_task.c diff --git a/MAINTAINERS b/MAINTAINERS index f41088418aae..0d595f2ef4ae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -20464,7 +20464,9 @@ L: virtualization@lists.linux-foundation.org L: netdev@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git +F: kernel/vhost_task.c F: drivers/vhost/ +F: include/linux/sched/vhost_task.h F: include/linux/vhost_iotlb.h F: include/uapi/linux/vhost.h =20 diff --git a/drivers/vhost/Kconfig b/drivers/vhost/Kconfig index 587fbae06182..b455d9ab6f3d 100644 --- a/drivers/vhost/Kconfig +++ b/drivers/vhost/Kconfig @@ -13,9 +13,14 @@ config VHOST_RING This option is selected by any driver which needs to access the host side of a virtio ring. =20 +config VHOST_TASK + bool + default n + config VHOST tristate select VHOST_IOTLB + select VHOST_TASK help This option is selected by any driver which needs to access the core of vhost. diff --git a/include/linux/sched/vhost_task.h b/include/linux/sched/vhost_t= ask.h new file mode 100644 index 000000000000..50d02a25d37b --- /dev/null +++ b/include/linux/sched/vhost_task.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_VHOST_TASK_H +#define _LINUX_VHOST_TASK_H + +#include + +struct task_struct; + +struct vhost_task { + int (*fn)(void *data); + void *data; + struct completion exited; + unsigned long flags; + struct task_struct *task; +}; + +struct vhost_task *vhost_task_create(int (*fn)(void *), void *arg, int nod= e); +__printf(2, 3) +void vhost_task_start(struct vhost_task *vtsk, const char namefmt[], ...); +void vhost_task_stop(struct vhost_task *vtsk); +bool vhost_task_should_stop(struct vhost_task *vtsk); + +#endif diff --git a/kernel/Makefile b/kernel/Makefile index 56f4ee97f328..d82f388082b8 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -15,6 +15,7 @@ obj-y =3D fork.o exec_domain.o panic.o \ obj-$(CONFIG_USERMODE_DRIVER) +=3D usermode_driver.o obj-$(CONFIG_MODULES) +=3D kmod.o obj-$(CONFIG_MULTIUSER) +=3D groups.o +obj-$(CONFIG_VHOST_TASK) +=3D vhost_task.o =20 ifdef CONFIG_FUNCTION_TRACER # Do not trace internal ftrace files diff --git a/kernel/vhost_task.c b/kernel/vhost_task.c new file mode 100644 index 000000000000..cdf875617656 --- /dev/null +++ b/kernel/vhost_task.c @@ -0,0 +1,123 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2021 Oracle Corporation + */ +#include +#include +#include +#include +#include + +enum vhost_task_flags { + VHOST_TASK_FLAGS_STOP, +}; + +static void vhost_task_fn(void *data) +{ + struct vhost_task *vtsk =3D data; + int ret; + + ret =3D vtsk->fn(vtsk->data); + complete(&vtsk->exited); + do_exit(ret); +} + +/** + * vhost_task_stop - stop a vhost_task + * @vtsk: vhost_task to stop + * + * Callers must call vhost_task_should_stop and return from their worker + * function when it returns true; + */ +void vhost_task_stop(struct vhost_task *vtsk) +{ + pid_t pid =3D vtsk->task->pid; + + set_bit(VHOST_TASK_FLAGS_STOP, &vtsk->flags); + wake_up_process(vtsk->task); + /* + * Make sure vhost_task_fn is no longer accessing the vhost_task before + * freeing it below. If userspace crashed or exited without closing, + * then the vhost_task->task could already be marked dead so + * kernel_wait will return early. + */ + wait_for_completion(&vtsk->exited); + /* + * If we are just closing/removing a device and the parent process is + * not exiting then reap the task. + */ + kernel_wait4(pid, NULL, __WCLONE, NULL); + kfree(vtsk); +} +EXPORT_SYMBOL_GPL(vhost_task_stop); + +/** + * vhost_task_should_stop - should the vhost task return from the work fun= ction + */ +bool vhost_task_should_stop(struct vhost_task *vtsk) +{ + return test_bit(VHOST_TASK_FLAGS_STOP, &vtsk->flags); +} +EXPORT_SYMBOL_GPL(vhost_task_should_stop); + +/** + * vhost_task_create - create a copy of a process to be used by the kernel + * @fn: thread stack + * @arg: data to be passed to fn + * @node: numa node to allocate task from + * + * This returns a specialized task for use by the vhost layer or NULL on + * failure. The returned task is inactive, and the caller must fire it up + * through vhost_task_start(). + */ +struct vhost_task *vhost_task_create(int (*fn)(void *), void *arg, int nod= e) +{ + struct kernel_clone_args args =3D { + .flags =3D CLONE_FS | CLONE_UNTRACED | CLONE_VM, + .exit_signal =3D 0, + .stack =3D (unsigned long)vhost_task_fn, + .worker_flags =3D USER_WORKER | USER_WORKER_NO_FILES | + USER_WORKER_SIG_IGN, + }; + struct vhost_task *vtsk; + struct task_struct *tsk; + + vtsk =3D kzalloc(GFP_KERNEL, sizeof(*vtsk)); + if (!vtsk) + return ERR_PTR(-ENOMEM); + + init_completion(&vtsk->exited); + vtsk->data =3D arg; + vtsk->fn =3D fn; + args.stack_size =3D (unsigned long)vtsk; + + tsk =3D copy_process(NULL, 0, node, &args); + if (IS_ERR(tsk)) { + kfree(vtsk); + return NULL; + } + + vtsk->task =3D tsk; + + return vtsk; +} +EXPORT_SYMBOL_GPL(vhost_task_create); + +/** + * vhost_task_start - start a vhost_task created with vhost_task_create + * @vtsk: vhost_task to wake up + * @namefmt: printf-style format string for the thread name + */ +void vhost_task_start(struct vhost_task *vtsk, const char namefmt[], ...) +{ + char name[TASK_COMM_LEN]; + va_list args; + + va_start(args, namefmt); + vsnprintf(name, sizeof(name), namefmt, args); + set_task_comm(vtsk->task, name); + va_end(args); + + wake_up_new_task(vtsk->task); +} +EXPORT_SYMBOL_GPL(vhost_task_start); --=20 2.25.1 From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43D58C433F5 for ; Wed, 2 Feb 2022 21:04:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347379AbiBBVEo (ORCPT ); Wed, 2 Feb 2022 16:04:44 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:39718 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231758AbiBBVEm (ORCPT ); Wed, 2 Feb 2022 16:04:42 -0500 Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 212KwocE024834; Wed, 2 Feb 2022 21:02:20 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-2021-07-09; bh=ZwRoUTCdhHp+eUdKNxuRYpvCkMuqJs+ple1/71xBtLY=; b=rPDJvTxePdB6W8J9KLn4TwxhvO8tdCE6u2GMXWXkGiUDFw3ByGVh4AfYiiT5GpYRq2zc nV515gQhyHZZsc9qyhYGVQJGqFMyIIjQyDV0bETqJrmnInkDVA3kS6HtVczq+rzVX8CU KtAXQmuUGTmse+FU0XEZTTUCUEWcc5pmx6pShrqDaSGb00yyp7JanCqLcCqmeXAve8fo UQMfGInXJOn8MxMq3fzccwqSktdEiO8xN0uryCxP1xmCCuUYqvMJiPh9P0T1SZZHHFnY FxtVTqlryCrwDm0uq0Cbx5A9i434EowxU8eQH7JNP/V9fqy5elo/kS6VVJiLxNUG09Qz PA== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3dxjatyf0q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 02 Feb 2022 21:02:20 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 212L1Ejt021471; Wed, 2 Feb 2022 21:02:19 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2105.outbound.protection.outlook.com [104.47.58.105]) by aserp3020.oracle.com with ESMTP id 3dvwd8xt3n-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 02 Feb 2022 21:02:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FTtgvHsMFuiZxh7tfevHOD5YxfWBdb1KCCsV1vjtpSazUuHzfJVvKDCSph5LySkzDMfie0Oak18Zj2sR87/b8vLMnsMsD070FFkTcv+EGgpEnYpO9mb3UomRCttrzBn87MM4V8IdOd9eugdSLBAgl0Ql6rIcZeaKFBUkgsm95cNNtzTJIL1hdbChKIAab96UNd0ATt+nc4RFDV9pvuWb2R0XxIk/DCGDa1x5VS94L7Bik+Ngvwoe1lEyTwz2jhbpjlJi05s0DhPRP8VOS+Qlxoc6Ai8XPhlz8HeVGog93CC6FYeV0ll7WkU5S3Ia07gVweBdJzp5DyuiaPsUZrnOPw== 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=ZwRoUTCdhHp+eUdKNxuRYpvCkMuqJs+ple1/71xBtLY=; b=f33/xqymHfkTEeoyLDJxan8doohUET7nd2GZA6cyR4AvJPSzFHQgYLzoD2rmyAGiToagsn1hk3+Or1nVEM1pCcF0H//rFQXejuuVU7m9XroY4qcV4OXzkdxY76l6uWPYwwow04SUUik9CBIJuZOzRoI6i0+zZV/wKRVU/eca+XaZ1Ed8koEhhARCoFHxKsBajPBssL/c2xcXvHwG17XKuJmegSQ0DOA6MER68JO2hYBLL/82/TYJOcXiTngJsbc8WSiJ8YpMD8YPx1867e78BMc48G7eQC97c4l6HJ9CxcZcSFdIpVg0wFtBscD+uNURNxPz0TWP0b5K8uBl9Lt9uw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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=ZwRoUTCdhHp+eUdKNxuRYpvCkMuqJs+ple1/71xBtLY=; b=FPBmqbo7//I/UoCwyMd26gPC7kh/5KxdxaLfRy4QOpMc26nUjWLhHXAGHkyQwqhLi30TOi3R8YT/K7exmW7ldLyCSnGBW+5XVIRmKtC0vA09+yFAW7Lua1VxbzPUpT6y1iMqTZgxIeclcQDlJdpDygVZ/5x+2IxmMoi3/crBbK4= Received: from DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) by MN2PR10MB4014.namprd10.prod.outlook.com (2603:10b6:208:182::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Wed, 2 Feb 2022 21:02:16 +0000 Received: from DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::21b5:910:b965:9e6c]) by DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::21b5:910:b965:9e6c%6]) with mapi id 15.20.4930.022; Wed, 2 Feb 2022 21:02:16 +0000 From: Mike Christie To: geert@linux-m68k.org, hdanton@sina.com, hch@infradead.org, stefanha@redhat.com, jasowang@redhat.com, mst@redhat.com, sgarzare@redhat.com, virtualization@lists.linux-foundation.org, christian.brauner@ubuntu.com, axboe@kernel.dk, ebiederm@xmission.com, linux-kernel@vger.kernel.org Cc: Mike Christie , Christoph Hellwig Subject: [PATCH 7/8] vhost: move worker thread fields to new struct Date: Wed, 2 Feb 2022 15:01:59 -0600 Message-Id: <20220202210200.5235-8-michael.christie@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220202210200.5235-1-michael.christie@oracle.com> References: <20220202210200.5235-1-michael.christie@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR05CA0067.namprd05.prod.outlook.com (2603:10b6:8:57::12) To DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e1b91dba-c7d3-4cd5-97ca-08d9e68f48f9 X-MS-TrafficTypeDiagnostic: MN2PR10MB4014:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ag/Evij9F8zJzpuELsKXM5pFNRZGzPGUb1fGwlt21D0AvJ4AbRd7kbXN9k3vh1VA2vLbW6+DdTaP/+/Wxxj5wA8Cru9VkC9XtfwWU+IYdO+wyc/b3P8B9yxkOlidyxCPiwUaWxT6poAduMOxv2wZKMRK60H3/Xt0nIld+Qn+BfH/Cj84oKiP2BUIClYXzUV1/ZViHz3vrsecBpwOA1yFC/LPp8XbT/eUt3++1zLlcgKue0SHaymrQmHx5rrHiXgFLGEobBX9uQ9XBDplSx6egIi4sef2V4lFeOXvho66cUHLxkROFBTTjaWf5H1OA2bZjySGHrB0/XM0SqHZpp7iH5SB5eHIyrOr903KkRHVDSXQFDtWxCx0fQiJJ0OuM2DLD0Qd8fis/L8w3fFYjbvSRzwfEe0DXT2XFDalvEFYQzYURQZBtbgsiAMRtAV50A9TKpCPWKIiLlgjwHoiyigq1/vMchFCPcuQpzpS6TI8cRnftcXhBWMz4/2actCTvqI+tscArnJ3wTyIwM4505D8D0tHVF0Tx8f0XUahgGlZSBFfaMxzZma74s3Mo2xfuGZLlTbjQLceOpthipI/Z1Po+R5OQQnangubkiETvffDhzvwsTpVy+vz1vqt9h6OaJSl/8XB+JKOM5KGlfTGmA7o4J+QkHxBAcnpVHWmqU/w10PHE+7lwrRu3h09O33esdoZu8FHtH27l6YJ1CrcKcWKR7rA2iMGGWDKW3NuqLRfuoc= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR10MB1466.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(6666004)(2906002)(316002)(38100700002)(1076003)(54906003)(38350700002)(5660300002)(186003)(26005)(2616005)(66556008)(4326008)(66476007)(7416002)(6506007)(66946007)(8676002)(52116002)(921005)(6486002)(8936002)(508600001)(6512007)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?yjlTEGMp54U+Yxkrl82RM90VLXXR4zqqgspIKVhtQVIwJcFOQpPyLOQjworL?= =?us-ascii?Q?p3c4W4kJuI4tw+RgLzU3LVnyxrd+hQovUgPbRlNDr1A26HPqZZo55P8wzZ1o?= =?us-ascii?Q?0nt+u9PLUv2GN+/lJxe5HOWzyOmuZejCPS6UoPVREZhZUnzEzIGfrQQoVPTq?= =?us-ascii?Q?2Lg4lbRcU5HlzCm1EyC8zGMtlRcHu1aUjXEQyUJGdeehgTFo+VZUNe3P9niN?= =?us-ascii?Q?KbyJEd7qndirncA0SvMWej5pcRB4YejH8w+f7YP4pHLmzqGwF5b4i4rtSu5b?= =?us-ascii?Q?oSPJPbHNTFtD1vqFK/W1K+4bbARifbGpM/v7jCSngNk6eps3NNuTWnl1Lg3e?= =?us-ascii?Q?eavmWctZhHXxrLwXxG+bXzLw6N2sAF1cFsiQEc4T6qNU9u3kS45KvMAPdb1Y?= =?us-ascii?Q?ZFxuo0FozAd6lpmc+P7t/GtitGHGf/LKToZubkYg4jCt/44qpefB9IcIw16V?= =?us-ascii?Q?WsNguI4cEMl85GRb3rZcHDXxAvTLSXYTW9RBP+UJUZ643tQv26xsKnSoEMNd?= =?us-ascii?Q?zlC6lzfUx0hEH2nFMYzc4U5dvEI42+4w9M5+8QYWpWDKAba80I1FIS8aEgSv?= =?us-ascii?Q?eupJzsoktUjQoZRiyvrMJhoLL695LutXlevyfdWb2LNB3IYKfKdzYdf3qk+v?= =?us-ascii?Q?6F0HJwou0az/kewr9QQh9hWTCx1f/+64CcuITKqp1xKp8YodJMVZn3XA2pP2?= =?us-ascii?Q?x2lO0YpEA053FMCGxjAGv6uC8wkw10BJITGbE8O4WvV3d3TUQN2I4WyQtZWp?= =?us-ascii?Q?AbNlbQROdmYlxT8S4iTYLCck64ruJCnxscSXZLMtft+4RyDG8rj0Ohmf3hOI?= =?us-ascii?Q?ZVJRgLffOiCoE/sggrHMMCWouk38tQmJHjg7KbwQrTQFm7j4G1eKQuKe1bcY?= =?us-ascii?Q?dlUbHqIgd3UhiwG2NtG8wfK1z6zhE34r1vszCjEyOErb80Dqiw/YvRfMyePg?= =?us-ascii?Q?XNaqDh1/OatmJl4JPdDJynDQndI/zzEfzK6NdPV6bqv2OMyPJb4czWEIdG4a?= =?us-ascii?Q?Mdj/m9DDSVgdNxQOwOZwsE6KFZW5sunCHCuq7xTaaxt9CBKTbDgRy0r4Ki6R?= =?us-ascii?Q?AxTo617mfTbhNNXeobu9/bnWgJbvewQoAqvr6IGUcl8ap9aSJHrdWI4XpciZ?= =?us-ascii?Q?wT0JWij7mSyDimKjwIyLoXYaw1LjGl4bfgYz4D3MMX70d86FPYYb6Z4kKzgy?= =?us-ascii?Q?s3F41Eu4K7vP/udAWvj8sLUbYNkoiKotf/jU3Fqsr8o+98S9DN0YWIrzhQpC?= =?us-ascii?Q?2bgXhSIadynTXYoIB20WOsqAVICAzWZ4UJUeDCwdT1Lx38Ri4/gqlu+nlRus?= =?us-ascii?Q?aSlFaWVVdN6nXUnPt0kxhSmjV/mNao+yVG0hqj9wDe476tZAuIIt1IQd9WPG?= =?us-ascii?Q?X34LSnN+YcYo/9QVoKYHVoWBOcQW90tLgUCU7O1c8uDFILL0LCwIeTnGMYRr?= =?us-ascii?Q?XRckzL9YBmb+vry8uPb+IJ86+G4LamdFu4YC2bTVoU1lMFg5sey5EVnXJI/o?= =?us-ascii?Q?ZwOjmzOuB8SjYDPTWcbA5XGT9/5/m6YMYv7tPpo9lZQaip+P56CEGMY0cej/?= =?us-ascii?Q?QIjIgy5rmcuCUz5S3acVN8sLp8GkkvJo/3uQmapJiwm00izGPmXOT9ryGtp9?= =?us-ascii?Q?x4yrCsYQYpodkqdeRbGnNQrbOeNprKsgyaQaTiRnAzdOznVKarBk8/83pCd5?= =?us-ascii?Q?65ReRg=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1b91dba-c7d3-4cd5-97ca-08d9e68f48f9 X-MS-Exchange-CrossTenant-AuthSource: DM5PR10MB1466.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2022 21:02:12.9601 (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: giDtC1Wn/WJk+jHW2rZbKr4RdvfNeoy4sorHtxWYaCGApmn3eTPRCI7kbQqB1ZrMCPcZD2/+3c8sAaepWQyXWnqOF5ueJg2PW2wx7KNXKjQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4014 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10246 signatures=673430 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202020115 X-Proofpoint-GUID: xdYIK79-HarjMR8bsxWmj82xsFNp885h X-Proofpoint-ORIG-GUID: xdYIK79-HarjMR8bsxWmj82xsFNp885h Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This is just a prep patch. It moves the worker related fields to a new vhost_worker struct and moves the code around to create some helpers that will be used in the next patch. Signed-off-by: Mike Christie Reviewed-by: Stefan Hajnoczi Acked-by: Michael S. Tsirkin Reviewed-by: Christoph Hellwig --- drivers/vhost/vhost.c | 98 ++++++++++++++++++++++++++++--------------- drivers/vhost/vhost.h | 11 +++-- 2 files changed, 72 insertions(+), 37 deletions(-) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 59edb5a1ffe2..c9a1f706989c 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -263,8 +263,8 @@ void vhost_work_queue(struct vhost_dev *dev, struct vho= st_work *work) * sure it was not in the list. * test_and_set_bit() implies a memory barrier. */ - llist_add(&work->node, &dev->work_list); - wake_up_process(dev->worker); + llist_add(&work->node, &dev->worker->work_list); + wake_up_process(dev->worker->task); } } EXPORT_SYMBOL_GPL(vhost_work_queue); @@ -272,7 +272,7 @@ EXPORT_SYMBOL_GPL(vhost_work_queue); /* A lockless hint for busy polling code to exit the loop */ bool vhost_has_work(struct vhost_dev *dev) { - return !llist_empty(&dev->work_list); + return dev->worker && !llist_empty(&dev->worker->work_list); } EXPORT_SYMBOL_GPL(vhost_has_work); =20 @@ -343,7 +343,8 @@ static void vhost_vq_reset(struct vhost_dev *dev, =20 static int vhost_worker(void *data) { - struct vhost_dev *dev =3D data; + struct vhost_worker *worker =3D data; + struct vhost_dev *dev =3D worker->dev; struct vhost_work *work, *work_next; struct llist_node *node; =20 @@ -358,7 +359,7 @@ static int vhost_worker(void *data) break; } =20 - node =3D llist_del_all(&dev->work_list); + node =3D llist_del_all(&worker->work_list); if (!node) schedule(); =20 @@ -368,7 +369,7 @@ static int vhost_worker(void *data) llist_for_each_entry_safe(work, work_next, node, node) { clear_bit(VHOST_WORK_QUEUED, &work->flags); __set_current_state(TASK_RUNNING); - kcov_remote_start_common(dev->kcov_handle); + kcov_remote_start_common(worker->kcov_handle); work->fn(work); kcov_remote_stop(); if (need_resched()) @@ -487,7 +488,6 @@ void vhost_dev_init(struct vhost_dev *dev, dev->byte_weight =3D byte_weight; dev->use_worker =3D use_worker; dev->msg_handler =3D msg_handler; - init_llist_head(&dev->work_list); init_waitqueue_head(&dev->wait); INIT_LIST_HEAD(&dev->read_list); INIT_LIST_HEAD(&dev->pending_list); @@ -579,10 +579,60 @@ static void vhost_detach_mm(struct vhost_dev *dev) dev->mm =3D NULL; } =20 +static void vhost_worker_free(struct vhost_dev *dev) +{ + struct vhost_worker *worker =3D dev->worker; + + if (!worker) + return; + + dev->worker =3D NULL; + WARN_ON(!llist_empty(&worker->work_list)); + kthread_stop(worker->task); + kfree(worker); +} + +static int vhost_worker_create(struct vhost_dev *dev) +{ + struct vhost_worker *worker; + struct task_struct *task; + int ret; + + worker =3D kzalloc(sizeof(*worker), GFP_KERNEL_ACCOUNT); + if (!worker) + return -ENOMEM; + + dev->worker =3D worker; + worker->dev =3D dev; + worker->kcov_handle =3D kcov_common_handle(); + init_llist_head(&worker->work_list); + + task =3D kthread_create(vhost_worker, worker, "vhost-%d", current->pid); + if (IS_ERR(task)) { + ret =3D PTR_ERR(task); + goto free_worker; + } + + worker->task =3D task; + wake_up_process(task); /* avoid contributing to loadavg */ + + ret =3D vhost_attach_cgroups(dev); + if (ret) + goto stop_worker; + + return 0; + +stop_worker: + kthread_stop(worker->task); +free_worker: + kfree(worker); + dev->worker =3D NULL; + return ret; +} + /* Caller should have device mutex */ long vhost_dev_set_owner(struct vhost_dev *dev) { - struct task_struct *worker; int err; =20 /* Is there an owner already? */ @@ -593,36 +643,21 @@ long vhost_dev_set_owner(struct vhost_dev *dev) =20 vhost_attach_mm(dev); =20 - dev->kcov_handle =3D kcov_common_handle(); if (dev->use_worker) { - worker =3D kthread_create(vhost_worker, dev, - "vhost-%d", current->pid); - if (IS_ERR(worker)) { - err =3D PTR_ERR(worker); - goto err_worker; - } - - dev->worker =3D worker; - wake_up_process(worker); /* avoid contributing to loadavg */ - - err =3D vhost_attach_cgroups(dev); + err =3D vhost_worker_create(dev); if (err) - goto err_cgroup; + goto err_worker; } =20 err =3D vhost_dev_alloc_iovecs(dev); if (err) - goto err_cgroup; + goto err_iovecs; =20 return 0; -err_cgroup: - if (dev->worker) { - kthread_stop(dev->worker); - dev->worker =3D NULL; - } +err_iovecs: + vhost_worker_free(dev); err_worker: vhost_detach_mm(dev); - dev->kcov_handle =3D 0; err_mm: return err; } @@ -712,12 +747,7 @@ void vhost_dev_cleanup(struct vhost_dev *dev) dev->iotlb =3D NULL; vhost_clear_msg(dev); wake_up_interruptible_poll(&dev->wait, EPOLLIN | EPOLLRDNORM); - WARN_ON(!llist_empty(&dev->work_list)); - if (dev->worker) { - kthread_stop(dev->worker); - dev->worker =3D NULL; - dev->kcov_handle =3D 0; - } + vhost_worker_free(dev); vhost_detach_mm(dev); } EXPORT_SYMBOL_GPL(vhost_dev_cleanup); diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index 638bb640d6b4..102ce25e4e13 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -25,6 +25,13 @@ struct vhost_work { unsigned long flags; }; =20 +struct vhost_worker { + struct task_struct *task; + struct llist_head work_list; + struct vhost_dev *dev; + u64 kcov_handle; +}; + /* Poll a file (eventfd or socket) */ /* Note: there's nothing vhost specific about this structure. */ struct vhost_poll { @@ -148,8 +155,7 @@ struct vhost_dev { struct vhost_virtqueue **vqs; int nvqs; struct eventfd_ctx *log_ctx; - struct llist_head work_list; - struct task_struct *worker; + struct vhost_worker *worker; struct vhost_iotlb *umem; struct vhost_iotlb *iotlb; spinlock_t iotlb_lock; @@ -159,7 +165,6 @@ struct vhost_dev { int iov_limit; int weight; int byte_weight; - u64 kcov_handle; bool use_worker; int (*msg_handler)(struct vhost_dev *dev, struct vhost_iotlb_msg *msg); --=20 2.25.1 From nobody Mon Jun 29 21:05:25 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 259B0C433EF for ; Wed, 2 Feb 2022 21:02:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346317AbiBBVCx (ORCPT ); Wed, 2 Feb 2022 16:02:53 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:33104 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347365AbiBBVCk (ORCPT ); Wed, 2 Feb 2022 16:02:40 -0500 Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 212KwoGp024812; Wed, 2 Feb 2022 21:02:21 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-2021-07-09; bh=PXXdV0JicyRwxDzTfgVc9CnWFDR1h6e3mgSqpxLKbUs=; b=IEi6dPbyTij8yamApfQjqbdp6BIGo+mOpnHQrw6xWTOy0TPdLELzjBik9fr4DwLn/Unh 2bA7donjStZoiF4gwx0E7pZRfTwujQuG8Zl51W8pryAKYrV0wRpyAgnsC8ZaGNmYsTl4 R2pqjqWBP67NrEemKc1iaBJJ8kB8NSKwcwf090q/VwDgezqf9iX9QNNW5pSOVLrAeZqr oeJXEFQ4mIRUqtD6tfwtUyJuO7DBl2iwVL+urJDllZFwlwIuEghkL8Qc5DPV/56+Kaq1 q4SsO9uWnsYMqVNVxjczs5+9oK9FPFcvxQDhdRQcmqiLX9hsh9yvPoclT7huxj7E3xOJ DA== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3dxjatyf0s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 02 Feb 2022 21:02:20 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 212L1Eju021471; Wed, 2 Feb 2022 21:02:19 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2105.outbound.protection.outlook.com [104.47.58.105]) by aserp3020.oracle.com with ESMTP id 3dvwd8xt3n-7 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 02 Feb 2022 21:02:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PXXcW6Ps6lqJ1ndymDz+D4JFQxQe6QXGF1S5V+ArbDm/3iLUMwschKO/SiOOEOGL+TjQA5fF2OZgYy3/Y1Zk1VVsLHTMV1gyko7dT8yBp/8s8+VBpIu9oPQhWmQ4I6sZc2z9gy5YT2kZ3FeUMXHzqRV/3oeP1xEfFZ6K+B0IBPqDrbu8Pt7xHB9ZsT9QxDCm76nwvXQQ5H4zDMwwVYUGZCUFkXiSmnZkE6vDiFg0DzmUXxVOkJBS9REdg5n5Gbm+BDoN0mTWFUHnR4GciUk0yPNZTm8wL2Xtq2pmFVuG4RESQuTVzX5J6d55Z/8z+WfbNxN+izGy6mgiOQ4TCU6p6w== 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=PXXdV0JicyRwxDzTfgVc9CnWFDR1h6e3mgSqpxLKbUs=; b=cNVWMZaAnceau4AIlMnpa3viPfFZfC9xfIrtR3RCtXjCAoAS/R/iAsqV/ndy+C7jBQ1xnlQWcsRRIvKxnUKawo5lp0sEdV72HBdPQJhD1tp8R//cIB0dMHAYvE3U9Ut0z/pw4OFbWtHOVykotGbea7j4XqoZ+od1BYR/xTGIE43I2aLOFrG2pI/+xymnuU+afjZm6HihhcyBbwrpwFy8Gpl55tNTlDy2g/PKtHLKg10KW60dvnCFHe4Mqa+x+7j8HAqjt7wIwv65NhoV+b1eyK9Xy1WhQtrleTssPzbcISqvNkHNo9oIiQ3lUIxAXJf7hYRp66rHnMDuRkEmyhKSvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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=PXXdV0JicyRwxDzTfgVc9CnWFDR1h6e3mgSqpxLKbUs=; b=YZRq8hmYR8k//HH+D2CTxCLdsQHUWVfRsyMYCfKjJ4AQ1xub47lxy0bbIR1ygp4XFZrJvfqGG0UYCn2E61bHOIyQESc8QUvyHYXynaOBnIyahGHd+a8TgVfEg5cT1G88xSZjl+NcEaenPJrZ/jl/QpePYKE5451HB8ME9mD9Y90= Received: from DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) by MN2PR10MB4014.namprd10.prod.outlook.com (2603:10b6:208:182::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.17; Wed, 2 Feb 2022 21:02:16 +0000 Received: from DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::21b5:910:b965:9e6c]) by DM5PR10MB1466.namprd10.prod.outlook.com ([fe80::21b5:910:b965:9e6c%6]) with mapi id 15.20.4930.022; Wed, 2 Feb 2022 21:02:16 +0000 From: Mike Christie To: geert@linux-m68k.org, hdanton@sina.com, hch@infradead.org, stefanha@redhat.com, jasowang@redhat.com, mst@redhat.com, sgarzare@redhat.com, virtualization@lists.linux-foundation.org, christian.brauner@ubuntu.com, axboe@kernel.dk, ebiederm@xmission.com, linux-kernel@vger.kernel.org Cc: Mike Christie Subject: [PATCH 8/8] vhost: use vhost_tasks for worker threads Date: Wed, 2 Feb 2022 15:02:00 -0600 Message-Id: <20220202210200.5235-9-michael.christie@oracle.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220202210200.5235-1-michael.christie@oracle.com> References: <20220202210200.5235-1-michael.christie@oracle.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: DS7PR05CA0067.namprd05.prod.outlook.com (2603:10b6:8:57::12) To DM5PR10MB1466.namprd10.prod.outlook.com (2603:10b6:3:b::7) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8be98cfe-3983-4109-a606-08d9e68f494a X-MS-TrafficTypeDiagnostic: MN2PR10MB4014:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:334; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uGg6QqxstN6oT6xyjuMgvS+oDU30afnXw/9EF13gokgP74EL89bBUMC7pmBi9Iw89iNhPtV24VN2KkFvAVMblf04SzraPJrlvgsT82Fz8IrlQPNfz4R21qWH7oNNVID6ycYmsueQsNt6gseYu09jks55zeUoi23G4dqb9wF50YWk9ldC6SSCyu5EC9vcUiHt8pbq+r7aX9w1s3PW5anmcIyQf7lBKATYccZF7C76HbRZC7UUz/Xn4d8ZAnHXMGpixmQDu2skev3FdQet++u/eEK4BsTISjJr3DMGRaibGXilifS8AOFt/krgVNTpKtd/UjrngoU2DBDyat0rW/Lr/CQZjCP5VwJ6b3FGxQXdmZym6Zsov2XkaDkED1Y/w0di1s62JXzv5zwJBqXlrGkJ0fvqltGcG2UeFNHHrRG46jY9YUmwkqKpsIr/pZCuFhH8NWlo4oXMrm/ADacKySzAMuCocUY/ZovascOMsISI72qQPvZn3nvOv5zIIGsDfRnervTqJ6XOPzNy6hSxImK2fiVX8vn31kmX85zj/qnu1+LYoxokdE60kFBymTYJ4tfM5DY9J8J4F9r8AaKCwYPOrITdbj8qROhzfHwx+XAtkG+QfKPIcOCWm4759biaEJZQQsKN+Fl1k73O/W+MtTShK8dK7nWzXVOnSJDXXdQRowBdVqq3qNBihIH3a/Hs98KprcYRHpIY6nRNRgJHpCnkwxgIiof4+me1CB5MCDID3m8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR10MB1466.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(83380400001)(6666004)(2906002)(107886003)(316002)(38100700002)(1076003)(38350700002)(5660300002)(186003)(26005)(2616005)(66556008)(4326008)(66476007)(7416002)(6506007)(66946007)(8676002)(52116002)(921005)(6486002)(8936002)(508600001)(6512007)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0wnWS43h2mG1q1fa4+eoWG2QPojAAmFIjCCF5toV4RwuEsNRTLhQTxmmyWpS?= =?us-ascii?Q?UsCipJMYzLpcDbM+DcHIVwoPKSwKGbG1yeHk55LXZY0RRz9IwB00Rjf0umy9?= =?us-ascii?Q?QLudhW5SUAUWuhwtZAt/oJ4pC9B9+oP2MfwXRBBdf7+G7fZBwqHzTvUnfJzT?= =?us-ascii?Q?istVwPEaCdsECmWGYPXxw+ixC1bX4fPooRTOGyPuazdyIh7yzLdkoXgBAXCb?= =?us-ascii?Q?5W8HtWW+nUYBve4UAzx0joxh/NFydsSpVVaIicG3KUD2c+F4Y5OLHE9qUUel?= =?us-ascii?Q?kgXDYyqy320Bkb5T0w6R+5wwb6Yi3Il5fAtjxQpWP1mlzd9pcqdBrgkNbHWu?= =?us-ascii?Q?kwMZ597jCxUbkw1eNgtH6bdHPoZjxm8qNnmjvcdXt7F0VnyLzVZJs5WHSMSl?= =?us-ascii?Q?HvNULq87pHd3S91UBWCn4ODiKUn1/7QO7rsnQxLYCJDp7hICUdkviHNRTrO6?= =?us-ascii?Q?ZsjGkMw+6jhlB8M757iIMHP/Wq9zzJSGZsFmQ1LNjD7LcSEB5/sURAaacbff?= =?us-ascii?Q?ZLkcx4yLHfCogdL0Icu8DhjQRUet4Rp9ft7ioEUOQ7r/UCi9S96uOo9WJQlo?= =?us-ascii?Q?PbvIddWq/45gVer08dw3hQiFCPvfEqUUrqD5OmlmuVNnaGBmSu+t+geGCIWd?= =?us-ascii?Q?piFI0JiWHIVHHLoUjAh41VZA2M2dbcsaud1klYlAIOoBzmG7pR0H+jzGVo6C?= =?us-ascii?Q?Wv9bCthFpAD+7P7sVLNIyrvrXEhguBQhdvO68n4K127BDULhCbNEJCnxrrLG?= =?us-ascii?Q?06ApJKnq+8Z6oYsFe8p6jRcET5rNIyJjeV1Uoe7RRtf1bG8HzCnfCFP1HQXi?= =?us-ascii?Q?kClrrOrNcbdtcc/a5wyB+2W/DMyJ2kibgbAZRkY+6N7Eimd311uezblAPIhU?= =?us-ascii?Q?iv82DqHMdGnnkYHLWmnECz/VeSVHjvJKHfxGHmkoPkTaf6PyNH03Mc8ZvsFN?= =?us-ascii?Q?Ed7EJh4spZ8XgqbRLRAQWpYx8buMzkdvoR1/T5KAg9dRxHYC7KoiDDnbHLol?= =?us-ascii?Q?8sxI4J71HNq/Qam1MEPHohbfH0k3+6Xp8vzsfyS502lGbj48hvDyQxDiK1En?= =?us-ascii?Q?aHsrnkNAiQEk8hEkCFgp8vZP37MSbpGpMmnW4DKm50b8cMlXnVHa6t5Ua+74?= =?us-ascii?Q?AvGOo9MxM1wBl3VibAURT467mFWZ1ew2IirU89FSOWzNray+A3lUSFhPHQh+?= =?us-ascii?Q?X9kuLkcSTd+fLwhsxxhIryy70EVwcz7/2gEqOnE7o6HwilPTu8v6Ej6dJUKU?= =?us-ascii?Q?pJROgkYSUqXmQ6jZ9/xfjtIjIvgRidRWYwPyTQircvplrZi+a7NflGwnCWIR?= =?us-ascii?Q?ghGuK/Idxd/EA75ZSfMaYh9PWjTEdmOOTcvOjcxO7pV6LIBxy0sLHx7qU/Vp?= =?us-ascii?Q?Vgh66ScrCEK8ap0X80lDESGfy9K+CNJy6/Dc9BLRxPPtqR38BuHyAv45/uoL?= =?us-ascii?Q?g5N1CkRCgmxmrahHuzpYfs3FhHdL7uldkURDyhOzqpO5R3mkQqzbFj0r42kG?= =?us-ascii?Q?OOMcSAVqHVPzqBaFGGv7iplAWHxoJudzmZEdGWTn9xm8/QTg5xRYWOIj+rHb?= =?us-ascii?Q?i3nn34svnTP69eqpKjjOOWOqdR0nuchHqtD0tIwnIUDufLLqvYYOmPUVPI39?= =?us-ascii?Q?GEJx1AqnQLu3qO9kbAgJPPafOST9Ozix/Ms/emv3W/3MzzgilMeFUHaTqf4o?= =?us-ascii?Q?Gxlw8Q=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8be98cfe-3983-4109-a606-08d9e68f494a X-MS-Exchange-CrossTenant-AuthSource: DM5PR10MB1466.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2022 21:02:13.4914 (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: Rdc9yuW8Exd0yIFJ1dDE3OJDJndzdq1lRDECtYqQepDhwRBz2DgARyUPMNHJ80Cl4oOG68BKVoUHZf1RI60gn0c7PkVaqWj97wVXFeCW/40= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4014 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10246 signatures=673430 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxscore=0 spamscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202020115 X-Proofpoint-GUID: RvkaAtiCK5Bb6EJgJuCeAY2qLVq-qjA7 X-Proofpoint-ORIG-GUID: RvkaAtiCK5Bb6EJgJuCeAY2qLVq-qjA7 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" For vhost workers we use the kthread API which inherit's its values from and checks against the kthreadd thread. This results in the wrong RLIMITs being checked, so while tools like libvirt try to control the number of threads based on the nproc rlimit setting we can end up creating more threads than the user wanted. This patch has us use the vhost_task helpers which will inherit its values/checks from the thread that owns the device similar to if we did a clone in userspace. Signed-off-by: Mike Christie --- drivers/vhost/vhost.c | 58 ++++++++----------------------------------- drivers/vhost/vhost.h | 4 +-- 2 files changed, 13 insertions(+), 49 deletions(-) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index c9a1f706989c..ce356f5dc751 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -22,11 +22,11 @@ #include #include #include -#include #include #include #include #include +#include #include #include #include @@ -264,7 +264,7 @@ void vhost_work_queue(struct vhost_dev *dev, struct vho= st_work *work) * test_and_set_bit() implies a memory barrier. */ llist_add(&work->node, &dev->worker->work_list); - wake_up_process(dev->worker->task); + wake_up_process(dev->worker->vtsk->task); } } EXPORT_SYMBOL_GPL(vhost_work_queue); @@ -344,17 +344,14 @@ static void vhost_vq_reset(struct vhost_dev *dev, static int vhost_worker(void *data) { struct vhost_worker *worker =3D data; - struct vhost_dev *dev =3D worker->dev; struct vhost_work *work, *work_next; struct llist_node *node; =20 - kthread_use_mm(dev->mm); - for (;;) { /* mb paired w/ kthread_stop */ set_current_state(TASK_INTERRUPTIBLE); =20 - if (kthread_should_stop()) { + if (vhost_task_should_stop(worker->vtsk)) { __set_current_state(TASK_RUNNING); break; } @@ -376,7 +373,7 @@ static int vhost_worker(void *data) schedule(); } } - kthread_unuse_mm(dev->mm); + return 0; } =20 @@ -517,31 +514,6 @@ long vhost_dev_check_owner(struct vhost_dev *dev) } EXPORT_SYMBOL_GPL(vhost_dev_check_owner); =20 -struct vhost_attach_cgroups_struct { - struct vhost_work work; - struct task_struct *owner; - int ret; -}; - -static void vhost_attach_cgroups_work(struct vhost_work *work) -{ - struct vhost_attach_cgroups_struct *s; - - s =3D container_of(work, struct vhost_attach_cgroups_struct, work); - s->ret =3D cgroup_attach_task_all(s->owner, current); -} - -static int vhost_attach_cgroups(struct vhost_dev *dev) -{ - struct vhost_attach_cgroups_struct attach; - - attach.owner =3D current; - vhost_work_init(&attach.work, vhost_attach_cgroups_work); - vhost_work_queue(dev, &attach.work); - vhost_work_dev_flush(dev); - return attach.ret; -} - /* Caller should have device mutex */ bool vhost_dev_has_owner(struct vhost_dev *dev) { @@ -588,14 +560,14 @@ static void vhost_worker_free(struct vhost_dev *dev) =20 dev->worker =3D NULL; WARN_ON(!llist_empty(&worker->work_list)); - kthread_stop(worker->task); + vhost_task_stop(worker->vtsk); kfree(worker); } =20 static int vhost_worker_create(struct vhost_dev *dev) { struct vhost_worker *worker; - struct task_struct *task; + struct vhost_task *vtsk; int ret; =20 worker =3D kzalloc(sizeof(*worker), GFP_KERNEL_ACCOUNT); @@ -603,27 +575,19 @@ static int vhost_worker_create(struct vhost_dev *dev) return -ENOMEM; =20 dev->worker =3D worker; - worker->dev =3D dev; worker->kcov_handle =3D kcov_common_handle(); init_llist_head(&worker->work_list); =20 - task =3D kthread_create(vhost_worker, worker, "vhost-%d", current->pid); - if (IS_ERR(task)) { - ret =3D PTR_ERR(task); + vtsk =3D vhost_task_create(vhost_worker, worker, NUMA_NO_NODE); + if (!vtsk) { + ret =3D -ENOMEM; goto free_worker; } =20 - worker->task =3D task; - wake_up_process(task); /* avoid contributing to loadavg */ - - ret =3D vhost_attach_cgroups(dev); - if (ret) - goto stop_worker; - + worker->vtsk =3D vtsk; + vhost_task_start(vtsk, "vhost-%d", current->pid); return 0; =20 -stop_worker: - kthread_stop(worker->task); free_worker: kfree(worker); dev->worker =3D NULL; diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index 102ce25e4e13..c9f391326dd5 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -16,6 +16,7 @@ #include =20 struct vhost_work; +struct vhost_task; typedef void (*vhost_work_fn_t)(struct vhost_work *work); =20 #define VHOST_WORK_QUEUED 1 @@ -26,9 +27,8 @@ struct vhost_work { }; =20 struct vhost_worker { - struct task_struct *task; + struct vhost_task *vtsk; struct llist_head work_list; - struct vhost_dev *dev; u64 kcov_handle; }; =20 --=20 2.25.1