Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Mike Christie <michael.christie@oracle.com>
To:     stefanha@redhat.com, jasowang@redhat.com, mst@redhat.com,
        sgarzare@redhat.com, virtualization@lists.linux-foundation.org,
        christian.brauner@ubuntu.com, axboe@kernel.dk,
        linux-kernel@vger.kernel.org
Cc:     Mike Christie <michael.christie@oracle.com>
Subject: [PATCH 8/8] vhost: remove cgroup code
Date:   Thu, 16 Sep 2021 16:20:51 -0500
Message-Id: <20210916212051.6918-9-michael.christie@oracle.com>
In-Reply-To: <20210916212051.6918-1-michael.christie@oracle.com>
References: <20210916212051.6918-1-michael.christie@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WZRRXeZsg+FDLdGZw1DdHBgne/mfiHpv9vzGnNqUk78IH0ouFEIMIYkeWNpd?=
 =?us-ascii?Q?mKlBrmTxLEsCXpVgUYGr2uYQab9dU4jkZDO0cdsWbyQ0F6K91wvZKiRuvQlL?=
 =?us-ascii?Q?zQwPrPajsXmwnZtUl7BK7ET5u3RONhNtaRKwsUt7X2YrjLSkpeDtTqj9Qx9d?=
 =?us-ascii?Q?PU+oaTgAMbVvSDK9W34WLj2OMfPyom74buj306tuBb+jllsG83D8YcQTLP0k?=
 =?us-ascii?Q?YWQFdmr20MICzd2q1WPerzVjzY8qTSBNCwNIdDs0PnMbV089NZ1u6dQntFIa?=
 =?us-ascii?Q?/HSeoa1DbpOWPFnxHzhUnk6VI35sF39Mwc1JZBeUik3V8jXzk+Yryl90bBUc?=
 =?us-ascii?Q?JACVpd5YIZrbVkAVAw9Z3A5ns/9BSwoYAyZhGkSsCgx7fEam0fTvKiUshPsB?=
 =?us-ascii?Q?9JBufV1o9fxLi8cdd8PgP1xpM1Jd/fByXysOmgd8ryLUb0KkwOw2D9u0dvA6?=
 =?us-ascii?Q?12xq3sCZg5CtRjqOekKQEBYo14uy7ZDBVuqxu9IPqPZApk/duOePywf1rhMN?=
 =?us-ascii?Q?X0sFmAxnmHmNZskTv1RZTM4dKs0cGckRNgIAkRgojm+B2my6R0sUhUo7ZuXj?=
 =?us-ascii?Q?DuWmqmMPaAhgv/CxytQxTvrE31Qxo55vse9e3hgoa/3EbxTfTl7yt3sMKsLI?=
 =?us-ascii?Q?itgMDhWTikpuQecUFF5W9Q/dSduqi9TSsXvmcZ4hsEbVm2MXRQ9zA/sxfjJj?=
 =?us-ascii?Q?641LcTkDY3CC/pCXMhbMCKaOKFQXaXrEVpG3Snj24b1+BGe87jdxB7QynMvF?=
 =?us-ascii?Q?3acTjvflmlNdOb/KAT8ePpWcdnhvtVyWUSOmUvSUgjq/18PqcQq99ZOPxlko?=
 =?us-ascii?Q?TsUN3t2EvuFlcSMpS9bDWKCB3jWqgpoigrfJf9Gw8EsCRjlQ+KEk7KiuDXjk?=
 =?us-ascii?Q?uYhqQkqGh/dVWuzde6RKKYPOh17FLtp9cl80ewJBgMZS0MVUtgZIdL2LHtXE?=
 =?us-ascii?Q?Bn4zaNeeUB4M2mJBzUd8sQg8iNTn5z2whrvc5wGWz/FXnK5SMqJL+abWISUa?=
 =?us-ascii?Q?OxFV5GyzPAroOFa+om0sDwTDbZMcDacgTYKVKk/pM7Oh2cI5lGkdf2ci6tLf?=
 =?us-ascii?Q?By1aZPelRQ4tjMX54CvseKXPxUternnyDMvb2NbG8LmaC5EiYyas/uty1ntJ?=
 =?us-ascii?Q?qPf/qbCjMLjMtuZlxxbUG5+Ul5GpJ04NQzpiGVmXJX8JvZwl3P9VBXSBMLns?=
 =?us-ascii?Q?/i9X37FM9Giq7zRK6kLy1oR0fIrUqc5Go4Nnx2etpEljXCPXtVvc8RB5fdEZ?=
 =?us-ascii?Q?KYBUfB4s2iUnyMk5KYm0jkbD+4nUUG+VlOfPU7XLInCNOuU4movQBruPOvHj?=
 =?us-ascii?Q?KL1jS9tN5sVenDXwiK0UTmrj?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: da181553-3758-4baf-f98d-08d97957e7b7
X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB3573.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2021 21:21:11.3791
 (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: qsnxQxi3YUJQQk2d1KqZrfopn3SJ8oSKxVhv6BusuXNO8iOMPmz4Psq3bmT4f2EFJeJwdCo3FvoZFEZRz7PbeVKxnF7QsHtGNyzjChAzTiI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB2935
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10109 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 phishscore=0
 mlxlogscore=999 suspectscore=0 spamscore=0 bulkscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109030001
 definitions=main-2109160122
X-Proofpoint-ORIG-GUID: 0OkHgCRhnlJ7p1RVM3OFV_jyOb93E7ms
X-Proofpoint-GUID: 0OkHgCRhnlJ7p1RVM3OFV_jyOb93E7ms
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

We inherit v1 and v2 cgroups from copy_process now, so we can drop the v1
only code.

Signed-off-by: Mike Christie <michael.christie@oracle.com>
---
 drivers/vhost/vhost.c | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 6e58417b13fc..b561c5ea00fc 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -22,7 +22,6 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/kthread.h>
-#include <linux/cgroup.h>
 #include <linux/module.h>
 #include <linux/sort.h>
 #include <linux/sched/mm.h>
@@ -515,31 +514,6 @@ long vhost_dev_check_owner(struct vhost_dev *dev)
 }
 EXPORT_SYMBOL_GPL(vhost_dev_check_owner);
 
-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 = container_of(work, struct vhost_attach_cgroups_struct, work);
-	s->ret = cgroup_attach_task_all(s->owner, current);
-}
-
-static int vhost_attach_cgroups(struct vhost_dev *dev)
-{
-	struct vhost_attach_cgroups_struct attach;
-
-	attach.owner = 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)
 {
-- 
2.25.1