Message ID | 201704221147.v3MBl38Z028089@finist_cl7.x64_64.work.ct |
---|---|
State | New |
Series | "Fix VEIP object handling on container destroy" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [64.233.162.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Sat, 22 Apr 2017 13:49:48 +0200 (CEST) Received: by 10.100.181.168 with SMTP id r37csp640020pjb; Sat, 22 Apr 2017 04:49:46 -0700 (PDT) X-Received: by 10.84.139.195 with SMTP id 61mr12032529plr.34.1492861785996; Sat, 22 Apr 2017 04:49:45 -0700 (PDT) Return-Path: <devel-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [195.214.232.140]) by mx.google.com with ESMTPS id n74si13235603pfk.250.2017.04.22.04.49.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Apr 2017 04:49:45 -0700 (PDT) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 195.214.232.140 as permitted sender) client-ip=195.214.232.140; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 195.214.232.140 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v3MBlPsl032648; Sat, 22 Apr 2017 04:47:25 -0700 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp0216.outbound.protection.outlook.com [213.199.154.216]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v3MBlNUe032642 for <devel@openvz.org>; Sat, 22 Apr 2017 04:47:24 -0700 Received: from VI1PR0802CA0045.eurprd08.prod.outlook.com (10.172.253.31) by DB6PR0801MB1784.eurprd08.prod.outlook.com (10.169.227.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13; Sat, 22 Apr 2017 11:47:06 +0000 Received: from HE1EUR01FT027.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e1f::203) by VI1PR0802CA0045.outlook.office365.com (2603:10a6:800:a9::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13 via Frontend Transport; Sat, 22 Apr 2017 11:47:05 +0000 Authentication-Results: spf=pass (sender IP is 195.214.232.25) 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 195.214.232.25 as permitted sender) receiver=protection.outlook.com; client-ip=195.214.232.25; helo=relay.sw.ru; Received: from relay.sw.ru (195.214.232.25) by HE1EUR01FT027.mail.protection.outlook.com (10.152.0.161) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1047.9 via Frontend Transport; Sat, 22 Apr 2017 11:47:04 +0000 Received: from finist_cl7.x64_64.work.ct (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v3MBl4pY016503 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 22 Apr 2017 14:47:04 +0300 (MSK) Received: from finist_cl7.x64_64.work.ct (localhost [127.0.0.1]) by finist_cl7.x64_64.work.ct (8.14.7/8.14.7) with ESMTP id v3MBl3ED028090; Sat, 22 Apr 2017 15:47:03 +0400 Received: (from khorenko@localhost) by finist_cl7.x64_64.work.ct (8.14.7/8.14.7/Submit) id v3MBl38Z028089; Sat, 22 Apr 2017 15:47:03 +0400 Date: Sat, 22 Apr 2017 15:47:03 +0400 Message-ID: <201704221147.v3MBl38Z028089@finist_cl7.x64_64.work.ct> X-Authentication-Warning: finist_cl7.x64_64.work.ct: khorenko set sender to khorenko@virtuozzo.com using -f From: Konstantin Khorenko <khorenko@virtuozzo.com> To: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> In-Reply-To: <20170421150432.31147.16609.stgit@localhost.localdomain> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:195.214.232.25; IPV:CAL; SCL:-1; CTRY:RU; EFV:NLI; SFV:SKN; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:DB6PR0801MB1784; H:relay.sw.ru; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; HE1EUR01FT027; 1:SxHLzkomeXIqO/mXPJIGV2DwbaVbN6W+OS3pFbDCc2v0ZLhV9Zo5BaVb5OjysdV725x4ivzUVcbnpwozEiXms9TUJxuD2UKY9gv5iKNGDiA2CSEwd4ySdhrcGvrYC+bxy309T5H6NHtghtk7ebYMcQ5MaQHwVtjXuV3voGPT69raroh5lKPYXrvnjocl/ZXiySuCofotGphpVa8YV52H5VxAha+mEbzDmEm7y0hfFWeS501qklq39cy9b3rDFWVhkAl6Igm9JCPTY1ySfPM5bi70n82Oou3096XGjhnvZUfqtoqPnCbwQLbTGGlCWO1STA279JvS1gbm/DEkV+jTKbN9xgwAAaFc8oDjgBtj932nIG7nTNGnq4dkIq6w9WRe6pedd0iSyP6VyBGACNV6gRe+CU//OfiHBtYcx9dGlJa2N84Uuq0gDIqmpraIgFSQPKWfCSV2rPD12ysqhtEFTKs7etedyA6PXyLhnitwGjUK30Hc6AmMKm/SE5pGHBlg6JdoyU4UuVEil1grJP/NKg== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: f4e6176b-6665-4e1d-99fe-08d489754c73 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:DB6PR0801MB1784; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1784; 3:e68INkUsl7HLVbHnHLhKcVuSeHTARC+Me0N1Ohdalwcd0KDXAG4BOQIgu7W2+kja4r+xhgtYuFMS2AD2jO8T+iB1iCWw0JesK6C6QPNEo8t0KdsnPk3/T5wzhLVON5Cry1nSMcBzUdW83blMrVePc3/xs1jLG6ZhAzfnmTQ1p2m5cGnnsGo712aBPLUebaUkHJ9FPGIGiK24Hp7/K4WjfGzspTvzAF0G7w0uiidcXoll+1mJLCDdk3OSXuMS09pcxpta4cDUeCRFNATIzCBicym4Y4xFCe4KsEGhtEfJIjMzR52+aiCAJCf87c5fBjFau7t59qMIHVT7V/8uC80G7MyjdpcRvGN77WUN32TDmasYuZFp8CLO/jawVDUomJmUJigV0fVJuNxRq0whtgsOZJlhgSCo11so/c5Yvu4AR6YdfVwca6nAuyUM9kQ//EJPGi3hF/YAnDdVREOODlearMxReM2M5iEuiuRVVqySvmHgV0pFEqaGTCUsJzE4hBLbGmVUlsLSh3YpF4TrZD+rDg== X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1784; 25:VltQqyD0WOWBrlBX35ETn56okxtC0/KUG4GBalCISBOOmeR4nWJo5AtCrQQU62UAsyTeTHC07NN+xlx/WkJGBEv8LkUCmbQZfJegAIXjkMHKskAI5qc71hPHmG6tOrxeQbYxIypNnnJSHqIghIlzBZqs4oeqR0MI49xmqJquBcNCJ9W0MptsIbQCUE7zHPmNLw2ps/ucmJ4MLC50ZeoDD6ukPtu0rIy+Rbk+lBmfUWSLw9E+Jcks3LHuadr923atoBKB5S5riU7XjhGQsRkvwG15JRCBsE3FJfIRLsYzxbHX+GpWfT4guII09KZaAtsbvR6TUl4TUlCGK6gKEm1YMkNFIyUSMNh/v5L5MB/L9S+r6q2WvwNOufEigohIxHYVdYZGw69A25/WEFk5pDY8hisJUn32qdBeaDE3E22esmFZysxczjzKyS3pD2pabZNLPvqmw3wf82bs5rDEQB5IWg==; 31:BkV4Vvqzg+z9BwfKyMONnicwyV1AJzIM//Oh9VpklvhBj7gGqtFVp9UGbuETzXAmO64q6mdbmkr9DJPnRyMCMv+rKBsStwq1q6TYpiE6BjODNGwro+zhYZadgw7pu1zleH0XQf5orRKaHH01+mbz5s5+iBLLMmP5jN2ELscsLn+c/DL1nLShLpYrxXS4dHLqkkeTUDw/jm4FyXQFi5oXGoB7Ynn2SgSaFsyfRmXphFsK9wyWxUwbBgmpb5DLHOQJuFZKgtaK0Z2WJcjM2n6s0WjJdlVb/lkRH4tBPdpngp9I2hmV3M4owOxdAOIjdm4X X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1784; 20:L1EsWYHsSz6Xt2PsozPngLCMrWpiHWrzK1IBOVNOqHNtABfx9sIYHrW7qdmI9CGmjlLcda3CDPYDx9EtdrrwWbopEjgSgPWZBUL8wLSwjZnE1jgHrUPU5pNgld2y4eNDSaWKVECunGHlWVPZQs9+KB63jNokawMA2mP0e2oAX0UpqohDXeQX8AKyP4d8TC3VItJYfZNvXFycIOeKgrWE58LeJUPDIQE4Hcv1UeUUP7XUvlG4BPJom3OPwJoGw3COSv3ys0Gl1T1PKvrMLau6eAN0VxEnSsivKtgGZXQIAtgeE2HGq9FYWsTQw3gkphqb+JpAXp0tQAvsrJXBB65oWdJeWLNJsb+/+L7MJ6S4i6iEXu7qoGCzZFZd6Qh6RH2er1k4IOwZYXRsJ2WLquHnQ7imd5jHvjgJghCFVFzFjlp7uL2rha/6hbLT52fX/UEHGNEIHXrd0CEBW3HGDJsU9n2E6siCi8+lGuU4ZdHLVPCeMMScprKMGpu/ARSnE6XQzebzskYERC/8zidJzUue5A== X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101521199)(601004)(2401047)(8121501046)(13013025)(13023025)(13020025)(93006095)(93004095)(10201501046)(3002001); SRVR:DB6PR0801MB1784; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0801MB1784; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1784; 4:Bi92BxiDBPXGasfMuqFlu8v6LoNsCMR3UDOzo8R1MkF3hovUvtkWrP711XWV3prcyCL/Qov2+7Vbi7fbgZ5DPSePkRjK3X+aOp8nXQ5Bej9HrdKpdJp6H/Ebkgv2/2+YdHnChk42BC+lARb9Wigojk1VGf1LM8skXT8eLrsg0iKYSJ49cfrcS9HfTxISlaFwNmN6Z3Qw5j2S53/f+nOtp84wVfSMUXdOSyMSalsbIKBiGLTZlFJfYmY6o27ReHG2vwMMp83NecboaOuiU6DfnsxG/VK4Q57NL6pNFVIpiARNMYdvJiUBdbttn2Zi3kR+PD19Pf3Ir3mNNpfjzq9Pn1fFE87ASG/W4rhnyEdGrJx9Do3c1lc1dQAbYaoTgHFoep4rAT7474TdoqzhSqmuWFq13IHbGs+d7TU8QsbLA6Nc+z+EGAHBf/SZPGjZB39TpUo3CW/bK0WQH5m4sl28vS+C1GuqTgy9LPG+MJhOOoA=; 23:uNxGfuRAVEsWvAaYOzBQ6CfwpNw9sFaHSBL8P88bReqwFpnjmrwqiZnF+YO6WA7S0qMA8LPrQw+LUCUs+1HOR2J3P448BXH28DUIR3EcsGfk8pAeKwg8WFRLhZ+3KoQaxhr4nfBW6HZ60OVcPuOMUP7G+4X0SUhhHMe4qNtpg7fY/AEsMkcHBvVfDBlhkiJm X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1784; 6:NUd5uqGT1+L3741ULyhfC4QZON61lbhCVVeeH0LzMRy20LutMfzL9hMkbCwLGRgLDa0v5XDHmHhRVvSis9ZBvXQgNoNdY+7vcoJGNf4X5JIB6jP9lSKQWAYEPYp6ovLVlYqJe7rpCC2tzkJR+JGeDCPFHGDI+b9Ya5CYg2Djy3c9tv9Xi7qcpowPMidLvWVzhtYeG+ZvXfYSJXWLCBPaTz/PkQ/4JnTQx1Ghq2gkOIbZlUARmwB1ZXOh9bYaog6QA2XUdUZxP5b0yiemQ8C8U9RuFWQ0VTiThhmrkq9bljuTY4yQApLkONKoFoK06rZ8SxOiCc8OU9jwRLXH/zudxIeCEONHGKl4ln6yb2q1dBcpy2tS25/YtD/GVfzzMdkaUfU1qWNdwv++p4sB4bBW8+7pRCyKTqc8oUDVDQQdMlgdBisXD9Ji9PkJP74xlBko; 5:KWQZVCus7g9gcBp76ato2U3927XMPkLz7l/XYcDYyc/6k7EKuKPOt477S8ElCwavP68f4Q79CtG9En3zfXqlUuZBauH5p1iDvJIVhOF791TjvPvkkfLKRxc2PgjWf9ishj7KXlc7o/SyOBPNiy0slRpPwRj+nF/hQJeDr2sjQLw=; 24:3bQQ8Tq04Csu4GtNScxA4VBh3HC+Cr3WJPaxfVYJuY1SOesH+6nTzgmEj2yCA+3EUDnk0pC5x75Tp7DdMLbW2LvzVGcp21nBjFZexWVzhXI= SpamDiagnosticOutput: 1:2 SpamDiagnosticMetadata: 2b2090aae5154f77b71484475de18b04 X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB1784; 7:Jy8GE5wZbf0KOW9nkYkgPptDB0NFlwRJI1phfYduiYih5Lfn/ZDGrG93IB2Is9SFWWYlV/L/3w57Tkbz5MK9S1Zf0JD8L7c36K768zQkIsyG2jdgdGF9aNA67oJ/AqyAcGmemKvpToaQv3jzIwUXt2IUxx5aQw5iMgwDwvvpF5q3TI3uUvxmKxs4mbo9CxR4Vbuynq59ruqHTM7XHvm8/mUtaBu1ywhw0jl28vk7FKSKFVUEOoAtf7KYbiiSTbnceSUIQ296zJBG+0tBTG3BSMuLe+Xf17lSUKUl7ZQyGcVnyzu3T3mjmIx58L7AkrNelVHVBElVXO9c5q8tsL77xiZfNrUPZnr/a3w3IehSugaPm4vbJFFq3Ra1iE0QDtxzNlHmTOdVqwU+UIDFLENiRg==; 20:siUuJjSYmnnS+9+DogljlSS72pL/FEh0blp5xu0WT3HbrhnScTvG/I7FPCM+JkZEQ0YQgHAbbnVFWfR68EOa8jhbFgz9bK9lNYXR+UuFnYYw6RGtFYbkSdbCa4B9JUzyuxxxmT6NYytIJh0psf/OtAOFleYad6TXLZcrhTWl7wQ= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2017 11:47:04.8843 (UTC) X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0bc7f26d-0264-416e-a6fc-8352af79c58f; Ip=[195.214.232.25]; Helo=[relay.sw.ru] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB1784 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.25 X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-AuthSource: HE1EUR01FT027.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-AVStamp-Service: 1.0 X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:SKN; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: DB6PR0801MB1784.eurprd08.prod.outlook.com Cc: OpenVZ devel <devel@openvz.org> Subject: [Devel] [PATCH RHEL7 COMMIT] venet: split veip_stop() into protected and unprotected versions 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/drivers/net/venetdev.c b/drivers/net/venetdev.c index 192ca3c..5a09575 100644 --- a/drivers/net/venetdev.c +++ b/drivers/net/venetdev.c @@ -252,13 +252,10 @@ static int veip_start(struct ve_struct *ve) return err; } -static void veip_stop(struct ve_struct *ve) +static void __veip_stop(struct ve_struct *ve) { struct list_head *p, *tmp; - spin_lock(&veip_lock); - if (ve->veip == NULL) - goto unlock; list_for_each_safe(p, tmp, &ve->veip->ip_lh) { struct ip_entry_struct *ptr; ptr = list_entry(p, struct ip_entry_struct, ve_list); @@ -271,7 +268,13 @@ static void veip_stop(struct ve_struct *ve) veip_pool_ops->veip_release(ve); if (!ve_is_super(ve)) module_put(THIS_MODULE); -unlock: +} + +static void veip_stop(struct ve_struct *ve) +{ + spin_lock(&veip_lock); + if (ve->veip) + __veip_stop(ve); spin_unlock(&veip_lock); }
The commit is pushed to "branch-rh7-3.10.0-514.16.1.vz7.30.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh7-3.10.0-514.16.1.vz7.30.4 ------> commit 085263c2748cc75bf48873807cf4acae2f31f808 Author: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> Date: Sat Apr 22 15:47:03 2017 +0400 venet: split veip_stop() into protected and unprotected versions Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> --- drivers/net/venetdev.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)