From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 9D1CE8017D for ; Tue, 17 Nov 2026 10:15:05 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHADjQl007914; Tue, 17 Nov 2026 13:13:47 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHADjQl007914 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="sTUdLPu/" Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 6AHADZpT007880 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 17 Nov 2026 13:13:36 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 6AHADZpT007880 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4bb64c99bb8so23356335e9.1 for ; Tue, 17 Nov 2026 02:13:35 -0800 (PST) X-Gm-Message-State: APuU4Z8zzYxAebtQtui24OzQL7fBRLimAli6saBOLyZs1Z3Uz5o7hyol rPIayTZzuWTB9W+P1UWxz0g7ibYt7d4l9cegQrkBIRIzmFTgcLc8tV+zHF7xGITEyZiFhyeVX8P 0VGdOcnoAOgEuhfqj6VEExm79qgtenBKtBqmWnbAULUI/yaoyacj94Q== X-Gm-Gg: AYBFou3iBp6FlmijnlEbjuXSJOFSL8u8cxJLYkR180vbrSKOKn/x3fuUBWwuXNLNDnO /UFyxibR/5Mv2xp2lvwggWToI5QvZalzTwWF0+tTUqCRjyhGBpY/c+7o4e6XvmHDEhGYrNPz/+f QJ9zUT7uU8Ens1LqK61mVbK5OnF9ETC17/5DsOp51tolvylgkynfbyi0tGq+lue5IDhegsdXqwv Z/sJtCHoSrBQC9BV1VUtvkd1aEK7GGW5WyIlkbhMz9DZeNhbWkkVMAEeL4OJQ5tbjenJhFjElKV n4+8bCoCJMiPHLIXedLArdWjetT7xqawrcUZ0oki8CM/Wt0S11+yE8ycuHKOC8lKHF9NhwVuvZv 1NHnoMJCBd9wvfV5O8x1jY7hHXSE4 X-Received: by 2002:a05:600c:1f96:b0:4ac:aae6:6401 with SMTP id 5b1f17b1804b1-4bb55a4d990mr295799855e9.12.1794910414725; Tue, 17 Nov 2026 02:13:34 -0800 (PST) X-Received: by 2002:a05:600c:1f96:b0:4ac:aae6:6401 with SMTP id 5b1f17b1804b1-4bb55a4d990mr295799365e9.12.1794910414225; Tue, 17 Nov 2026 02:13:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1794910414; cv=none; d=google.com; s=arc-20260327; b=V7ftXUkQHaXxM7W4Xp2TmR5tdPfqBQO/DcpXaHNb1CScnb/VQuH7FbcgTVs1SgJ7nK gvjKDKPTmGLLh/bnWOjBUhZ7bEQwYBpYl1EgvSMig4bKP1VgjllconmOcsgSOPFDV8yy eu+94IYGJun9PDRFRhXwtIv/51OwmAeo5NXy3wfQW3UZuvajl4xNTLuoWtcRzEIWFYAu FM6b2vQBWdcGLQeqh1K2wRSMLr9QMwOH6SmjflxkHZWQWcWXNfqLvX0jsddgiuUO4t72 KHZ06FLolWWZak8HvVJso9pnckkzaZskdSsHFgkEVlMXkcTb3LI/P/7gHxeNbg1hQyDx LnAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=2ZoCnva/M2EWLattiidtrjB5TVNUi+TNZm92AhS6A1o=; fh=wpoNUURlquLpJK/14Kny0oMIYkY7mYwjJ/Ils9UT2kk=; b=n3kT6zzAhD0Un6/PTA+9OaD+aNhk2P/RjgguIgfnfWlgYGSKKqUTx3Bcs/qWn+wSAX bwP5bZm6+zMbztGbE6gRoubXII1xDmimcJqW5ifCqv32utTR6kp/ENxwb+BhOAHUnoGU wpYvMzq+V1gZPQBZwDBRps6XzwshaQI9qm1d8olLlp3yYAaJuc44LbZrMSy27Pp1GbIO /Rq36xUt9187y2a/1a+pF91fmtzWt9466yLMSx3OfZuHBmOs8beh2JDwBtIsgcp15wQR 8xgyLKL45VVe7YvzOdihh53SzAdf15lnHTfZeKm9oNF8mC+Qqj1lMRIpM3bHFjtjYZ/k OPDQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="sTUdLPu/"; spf=pass (google.com: domain of mirian.shilakadze@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=mirian.shilakadze@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-49c64cf6034si25530675f8f.424.2026.11.17.02.13.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 02:13:34 -0800 (PST) Received-SPF: pass (google.com: domain of mirian.shilakadze@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b="sTUdLPu/"; spf=pass (google.com: domain of mirian.shilakadze@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=mirian.shilakadze@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=2ZoCnva/M2EWLattiidtrjB5TVNUi+TNZm92AhS6A1o=; b=sTUdLPu/2wJH i+p8BeCYNSlemAa1zD/Do7/NnVEjCoWRFdi/KmLe214e0GK2dzE6YhTfI4NHrP4r/noiLjDI6QUmI TdWFJ9Dz2HqBFTD1dX2B+MylvcbyZXtQn/C8HoWWtbai+2+df1IrwYYbYKT4uwwmBfQpVt5fNgzuk gY+Sr5jnqUbWkD7BSxIgZ6dMvVPh3kAG0woGT71tiUJNajfMm8AUNB1aNYExv/CztdmTPyRhjm36r tT1rWdVrGSiUkvOXoHlXAX/uytZoUFtyKHUUAkQj51JcEjRnC4KPVdyFmPS6x7fRBHR9mEASr3lTb 7jEmFFM6wYNAXlov4XoX2A==; Received: from ch-demo-asa.virtuozzo.com ([130.117.225.8] helo=localhost.localdomain) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1xTG7h-009MQ7-1g; Tue, 17 Nov 2026 11:13:24 +0100 From: Mirian Shilakadze To: khorenko@virtuozzo.com, ptikhomirov@virtuozzo.com Date: Tue, 17 Nov 2026 14:13:21 +0400 Message-ID: <20261117101329.225854-2-mirian.shilakadze@virtuozzo.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261117101329.225854-1-mirian.shilakadze@virtuozzo.com> References: <20261117101329.225854-1-mirian.shilakadze@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.2 v2 1/6] ve: tell ve_setup_task() which VE the task comes from X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org The next changes mark a task entering a VE by where it comes from. Pass the VE the task leaves to ve_setup_task(), and call it before the old VE namespace is put, as that may drop the last reference to that VE. No functional change. Feature: ve: ve generic structures https://virtuozzo.atlassian.net/browse/VSTOR-151265 Signed-off-by: Mirian Shilakadze --- include/linux/ve.h | 6 ++++-- kernel/ve/ve.c | 3 ++- kernel/ve/ve_namespace.c | 10 +++++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/include/linux/ve.h b/include/linux/ve.h index a400d21593b2..2fe1a1c9ff55 100644 --- a/include/linux/ve.h +++ b/include/linux/ve.h @@ -282,7 +282,8 @@ int ve_net_hide_sysctl(struct net *net); extern bool is_ve_init_net(const struct net *net); -void ve_setup_task(struct task_struct *p, struct ve_struct *ve); +void ve_setup_task(struct task_struct *p, struct ve_struct *old_ve, + struct ve_struct *ve); void ve_set_rpc_kill_fn(void (*fn)(struct net *, bool)); @@ -390,7 +391,8 @@ static inline struct cgroup_subsys_state *css_ve_root1( static inline int vz_security_family_check(struct net *net, int family, int type) { return 0; } static inline int vz_security_protocol_check(struct net *net, int protocol) { return 0; } -static inline void ve_setup_task(struct task_struct *p, struct ve_struct *ve) { } +static inline void ve_setup_task(struct task_struct *p, struct ve_struct *old_ve, + struct ve_struct *ve) { } static inline void ve_set_rpc_kill_fn(void (*fn)(struct net *, bool)) { } diff --git a/kernel/ve/ve.c b/kernel/ve/ve.c index cdfd03416b39..72a2834707c5 100644 --- a/kernel/ve/ve.c +++ b/kernel/ve/ve.c @@ -1831,7 +1831,8 @@ int ve_get_cpu_stat(struct ve_struct *ve, struct kernel_cpustat *kstat) } EXPORT_SYMBOL(ve_get_cpu_stat); -void ve_setup_task(struct task_struct *task, struct ve_struct *ve) +void ve_setup_task(struct task_struct *task, struct ve_struct *old_ve, + struct ve_struct *ve) { if (ve == &ve0) return; diff --git a/kernel/ve/ve_namespace.c b/kernel/ve/ve_namespace.c index 6b12bcd605ea..890fa126bbdd 100644 --- a/kernel/ve/ve_namespace.c +++ b/kernel/ve/ve_namespace.c @@ -106,6 +106,7 @@ int copy_ve_ns(unsigned long flags, struct task_struct *p) { struct user_namespace *user_ns = task_cred_xxx(p, user_ns); struct ve_namespace *old_ve_ns = p->ve_ns; + struct ve_struct *old_ve = p->task_ve; struct ve_namespace *new_ve_ns; if (!(flags & CLONE_NEWVE)) { @@ -123,7 +124,7 @@ int copy_ve_ns(unsigned long flags, struct task_struct *p) p->ve_ns = new_ve_ns; p->task_ve = new_ve_ns->ve; - ve_setup_task(p, p->task_ve); + ve_setup_task(p, old_ve, p->task_ve); return 0; } @@ -161,6 +162,7 @@ void free_ve_ns(struct ve_namespace *ns) void switch_ve_namespace(struct task_struct *p, struct ve_namespace *new) { struct ve_namespace *old; + struct ve_struct *old_ve; /* * FIXME @@ -170,14 +172,16 @@ void switch_ve_namespace(struct task_struct *p, struct ve_namespace *new) scoped_guard(task_lock, p) { old = p->ve_ns; + old_ve = p->task_ve; p->ve_ns = new; p->task_ve = new ? new->ve : &ve0; } + /* @old may hold the last reference to @old_ve */ + ve_setup_task(p, old_ve, p->task_ve); + if (old) put_ve_ns(old); - - ve_setup_task(p, p->task_ve); } void exit_ve_namespace(struct task_struct *p) -- 2.43.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel