Message ID | 1605078553-104365-2-git-send-email-andrey.zhadchenko@virtuozzo.com |
---|---|
State | New |
Series | "Series without cover letter" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from imap.gmail.com [108.177.119.109] by patchwork.criu.org with IMAP (fetchmail-6.4.8) for <root@localhost> (single-drop); Thu, 12 Nov 2020 11:46:38 +0100 (CET) Received: by 2002:a9a:4d14:0:b029:97:cf3a:849f with SMTP id h20csp173347lko; Tue, 10 Nov 2020 23:11:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJyf0OTeLqSfTkYrrEbSZCDKebR6Ti+MoupZ2JuqcPle04FZ2wdsgNw9ufFzuvMS7QTXGWeq X-Received: by 2002:a19:915e:: with SMTP id y30mr4787721lfj.266.1605078673259; Tue, 10 Nov 2020 23:11:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605078673; cv=none; d=google.com; s=arc-20160816; b=ZcFSpjxBVIczh7UHi2dYrtFWtYzNJRz0q1NnJfobbLaP/aZXS6bTDLBtiG9qw2gQm3 EAZEZcDAZ5QQwy4/uU43BORmt0z3nXWfyrGf4l4P1o8v6AqCWkjIJR5hyXyBdkkaz1jt PBMhPJEebtH7gwMoQlA3iuAthVRhdk7HHJmCro4GDAaCWUsEKdyCkWVTkTGTACqbP2jX V2+Y639NffIEVa+/phQvLg4pYBT3OzIbn7J94SqQ8CCoqkiwiQLAMTNdYY6HnLYxL2R7 7U4/xJ954ijBIbfHa13i0bk5w6jNEQKvwoRtIwkFXB/L45fvSbimVVswSWIBrDuTZUiU chvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from; bh=12pIJyC2FzWv7Gfh2lDtC8ChD5SuYMWbqV08WQ2Cdaw=; b=Lvhonj92D+qnQCohcHq3w0sBMD4VBijJCiUuiJM2krWAMpcutlxBZydcQ4rCfte1g5 14+TGanSOoR/bgnYy/Py/Ac4cGRyu4MMifVAE6hp5rcV9jC/PI838lB0GHQZecfDWYe+ tyMDWLLlDzKSCDLQAlillm4lUfedM7z9m3PC18HGI5EYd6+cxOEUUJhocf0TvJnBQtWR nlMYeVMpAgxD+n5aqEKLCYu+lpNjgwef3SGIfYK/0u+dWuL99TjQspQhb7ZPgYoYEMij LnwQx1BizwcnOGEC10VUYLo5jDVDXd0wkWW9NZw6QgK1VL/ludphg3zEQoQEW+0DA8Tl vtDA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Return-Path: <devel-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [185.231.241.50]) by mx.google.com with ESMTPS id t7si524012lfc.453.2020.11.10.23.11.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Nov 2020 23:11:13 -0800 (PST) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) client-ip=185.231.241.50; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from localhost.localdomain (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 0AB7Amgu001308; Wed, 11 Nov 2020 10:11:00 +0300 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2106.outbound.protection.outlook.com [104.47.17.106]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 0AB7AliV001305 for <devel@openvz.org>; Wed, 11 Nov 2020 10:10:47 +0300 Received: from AM5PR1001CA0048.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:206:15::25) by AS8PR08MB6120.eurprd08.prod.outlook.com (2603:10a6:20b:299::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.23; Wed, 11 Nov 2020 07:10:50 +0000 Received: from HE1EUR01FT042.eop-EUR01.prod.protection.outlook.com (2603:10a6:206:15:cafe::23) by AM5PR1001CA0048.outlook.office365.com (2603:10a6:206:15::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21 via Frontend Transport; Wed, 11 Nov 2020 07:10:50 +0000 Authentication-Results: spf=pass (sender IP is 185.231.240.75) smtp.mailfrom=virtuozzo.com; openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=pass action=none header.from=virtuozzo.com; Received-SPF: Pass (protection.outlook.com: domain of virtuozzo.com designates 185.231.240.75 as permitted sender) receiver=protection.outlook.com; client-ip=185.231.240.75; helo=relay3.sw.ru; Received: from relay3.sw.ru (185.231.240.75) by HE1EUR01FT042.mail.protection.outlook.com (10.152.0.228) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.22 via Frontend Transport; Wed, 11 Nov 2020 07:10:49 +0000 Received: from [10.94.4.71] (helo=dptest2.qa.sw.ru) by relay3.sw.ru with esmtp (Exim 4.94) (envelope-from <andrey.zhadchenko@virtuozzo.com>) id 1kckGk-0087Px-O0 for devel@openvz.org; Wed, 11 Nov 2020 10:10:14 +0300 From: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com> To: devel@openvz.org Date: Wed, 11 Nov 2020 10:09:13 +0300 Message-Id: <1605078553-104365-2-git-send-email-andrey.zhadchenko@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1605078553-104365-1-git-send-email-andrey.zhadchenko@virtuozzo.com> References: <1605078553-104365-1-git-send-email-andrey.zhadchenko@virtuozzo.com> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 018dc703-9985-445d-dc6b-08d88610eb34 X-MS-TrafficTypeDiagnostic: AS8PR08MB6120: X-Forefront-Antispam-Report: CIP:185.231.240.75; CTRY:RU; LANG:en; SCL:-1; SRV:; IPV:CAL; SFV:SKN; H:relay3.sw.ru; PTR:relay.sw.ru; CAT:NONE; SFS:; DIR:INB; X-MS-Oob-TLC-OOBClassifiers: OLM:765; X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?aZEt0FICQANbSnhXxP/lEaKBzKflmAxRFOWzMtqXgSCk6jMxQW6hqICH3Y6+?= =?us-ascii?Q?Ziwoa22Wwu6cdyQS8rSEd5a/XrUJuRILcsOo9IloIDpYstQ7OHY97O2Ra0rQ?= =?us-ascii?Q?RByqxz95z8PPodESrJIGeoYIX3Mc8yYuKgqNda7oOznwkNd33a/7HloEvqJd?= =?us-ascii?Q?2gKHprFYcsP17IsVqpPVFb5Lli3oYqopcG8U4tQrxEp4jbT0qfNJq83s/duL?= =?us-ascii?Q?rEHDVldyJvKnHTfCU2BoibcPv0V9CmIj14lwAGb55rtsUfGhES11KzUMUcgo?= =?us-ascii?Q?jr32U0oRsL/d10Yc7lCOZpO98KPAH6LDuBwbUcoaKl7KKXadbO2wUNtsF/QB?= =?us-ascii?Q?DWIWOFI/De0cHOg7gJqTnHOE+JMUunMzf4F6/0SQzhMkM5we7/ePzWEXq7Me?= =?us-ascii?Q?DkRSL+TqLR+fCr1bbxApHqbzoqNMlIqheWVjRrawNjSCXH4jeXOeRx/U0GZT?= =?us-ascii?Q?Tgjnb1mWjz+4a59xkIyzNwKgqriV7MyZbQjiwBemu5F7wBpDRlpcVRQbSQ8s?= =?us-ascii?Q?2qm+dke6nMaSV9OYjLRwO8qweOE+MB7W0Y3tEWJveUkamjAyDx25keSkr/P0?= =?us-ascii?Q?Jj5xKw7VtmReQdIQGNtpVTPaEK2gSuFLvnnz/Sqtc90XmF30DE7IFT9JqTSQ?= =?us-ascii?Q?wVCHcpkx3d3IZ30K7+t+Y6abavkpqJ3fq1Zp9oop/AG+JtqmFxvDKqzkFf2b?= =?us-ascii?Q?e1WKhoa0hCN+IYFJa2a7hniGlrtbm+9+GUIXg2jo8PDQgTrenrMtn4TPnNCc?= =?us-ascii?Q?MPPtsUamFpCNDBolAf3S44AhKdnWbt6I9B92m3eXMCB1BQVpqo1sqmb+qV8Z?= =?us-ascii?Q?xfbSZ2DLi3rvSZJq6qCjUeluaaxL5wdLYHOV1p/wJf9Iq2oHf0g8WdrtegTw?= =?us-ascii?Q?5KQ33PC+KM+VGwycHlEuVpC0ORyGTIne5LCCl+gxuLxSy8m+zI2Uop0HzEKM?= =?us-ascii?Q?PQ1xMgsXH+RHqgGt5+UaAHwaHy7ATIOhCeFgf55eueajtpQJ9gcTnr9MnJPC?= =?us-ascii?Q?QQ/FfKv3T9nC93w7rQE+1gNXtyDg5OyYLmowheZOQwHdQNcSnoBxRbsPpOkl?= =?us-ascii?Q?ZWghUt5MeSEGcvLdiCe9R/SCqvZ9V6+Un+GlALpnRXZRo6vMaevFWSS+rNiV?= =?us-ascii?Q?WM++aO5eZpV+5Z+eQmF4oV9MNhkN++Y2209ziGgP52vDq28x0rEaiO4pv47D?= =?us-ascii?Q?W4E9bQC6xx+6NcN1pUNh+Zk6KzpYc5ycJvZ7GP8poIMj38Qyn/inCsVEqjM5?= =?us-ascii?Q?+/0RW3jyWKyVcgBXxDIR6SeQoHCQQpMBc9iC9+8dRfsrstObDlj4bQwn+Yow?= =?us-ascii?Q?s4jI6CzIDWEK0QUP07Nmpzge8r3E9GutZW6km8AmIhrAKyGHxMiSvrBPW1Om?= =?us-ascii?Q?QW/8XA6Rj74jwdfNhDPjQZ1GAJ91933f5ikwkCEXlFepqEa0h+0uMZjgoy6S?= =?us-ascii?Q?ZfydkuenHX3kyKktVReZh2bh4mjroPQm/XieCHkr7r0GeYsWwt14T3UUsk0s?= =?us-ascii?Q?GOhtGkxhDcXFvJQ=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2020 07:10:49.6549 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 018dc703-9985-445d-dc6b-08d88610eb34 X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0bc7f26d-0264-416e-a6fc-8352af79c58f; Ip=[185.231.240.75]; Helo=[relay3.sw.ru] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT042.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6120 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 185.231.240.75 X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-AuthSource: HE1EUR01FT042.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: AS8PR08MB6120.eurprd08.prod.outlook.com Subject: [Devel] [PATCH rh8 2/2] netlink: add an option to set sk->err from userspace X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development <devel.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/devel>, <mailto:devel-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/devel/> List-Post: <mailto:devel@openvz.org> List-Help: <mailto:devel-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/devel>, <mailto:devel-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org |
diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h index 67ea114..4360186 100644 --- a/include/uapi/linux/netlink.h +++ b/include/uapi/linux/netlink.h @@ -157,6 +157,7 @@ enum nlmsgerr_attrs { #define NETLINK_EXT_ACK 11 #define NETLINK_GET_STRICT_CHK 12 #define NETLINK_REPAIR 127 +#define NETLINK_SETERR 128 struct nl_pktinfo { __u32 group; diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 2b9e9c7..c372555 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -1683,6 +1683,16 @@ static int netlink_setsockopt(struct socket *sock, int level, int optname, nlk->flags &= ~NETLINK_F_REPAIR; err = 0; break; + case NETLINK_SETERR: + err = -ENOPROTOOPT; + if (nlk->flags & NETLINK_F_REPAIR) { + if (!val || val > MAX_ERRNO) + return -EINVAL; + sk->sk_err = val; + sk->sk_error_report(sk); + err = 0; + } + break; case NETLINK_PKTINFO: if (val) nlk->flags |= NETLINK_F_RECV_PKTINFO;
Sometimes during dump criu can encounter sockets with overflown kernel buffer, which results in ENOBUFS error during next read. We need a reliable way to restore sk->sk_err. https://jira.sw.ru/browse/PSBM-120976 Signed-off-by: Andrey Zhadchenko <andrey.zhadchenko@virtuozzo.com> --- include/uapi/linux/netlink.h | 1 + net/netlink/af_netlink.c | 10 ++++++++++ 2 files changed, 11 insertions(+)