Message ID | 201902040927.x149RtSN019927@finist-ce7.sw.ru |
---|---|
State | New |
Series | "Series without cover letter" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [108.177.122.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Mon, 04 Feb 2019 10:30:18 +0100 (CET) Received: by 2002:a5e:c003:0:0:0:0:0 with SMTP id u3csp3491915iol; Mon, 4 Feb 2019 01:30:14 -0800 (PST) X-Google-Smtp-Source: AHgI3IZbE6ZCd3/SOKPuskIp28F4Or7NYXkHEgj0l2hFiiHfkvioVVdmKTHdRZY5RRK8qBihQzEQ X-Received: by 2002:a63:c0f:: with SMTP id b15mr12361599pgl.314.1549272614914; Mon, 04 Feb 2019 01:30:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549272614; cv=none; d=google.com; s=arc-20160816; b=0AETH/wQo3wI1g9+cdff0N4PvNDj4NtCvcNsi/nJYkx1I4qKP8rVOPc9x7L/ESFQwI Gub6tAclquntiQT1E9vOBNewrtCmKIDFrfWgDi82LoPZERAawXtS3IPX9Ik9Oemfp9V2 M3uS3KN16pkL6yIIsluQs7w/hFVotG9ao0WDwGcvXgZ0o8NuwxgrPKBTIUC4++m9ATrh OiSNNZxlywzAgE9ndQTr0HZ4O2kSRTGDP7gFqOX2MyQ3loSLZcYpuBuFmqvPhJaVhf9Y 8SbJ5kPly+tfrQF9qI3LS1aNstRn61oU4EarTRf4noAR5BsGD+BP5Ih8k/kGgsvloE1x UOdw== 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 :cc:mime-version:content-language:accept-language:in-reply-to :message-id:date:thread-index:thread-topic:to:from; bh=iFLlXC0hCD6tPts+dZtYawCrwsdWkzccmXHzPS7hq8U=; b=ZGw64OmeifU1hu5GEQHvI3wj6JIKYAKe202vqyScx73eFFtYx+/kHwdIaZj458oK1e JWaRfAowi0TNrNoal2Y4GQdrZANwRRA728CiKAtL22xwyRyC5yOMBf161GUvDsxY8uEa 8krmEuQI/A2d0jOM+LJRcK8Ih2+bT5YE6hEzqZLBLTd1E+sy9FFgzyLyMU4DyHNpvTyZ K6qeBOM1v56iaMleCkj5lh6d3Bp4y7lr1/pGZuc1l4E92TGTFM/5ZZvsgxkPI+BSZCLX 0RhGF8pSKXgXBOWP6W8EwGtTLD7kPjBb30m3eyO5j+uBVm5fpTuc9NKC3GsfMKWn1n1E iYqQ== 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=NONE sp=NONE 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 n125si14410534pga.179.2019.02.04.01.30.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Feb 2019 01:30:14 -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=NONE sp=NONE 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 x149SCvX028906; Mon, 4 Feb 2019 12:28:12 +0300 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2057.outbound.protection.outlook.com [104.47.12.57]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id x149RvZ4028899 for <devel@openvz.org>; Mon, 4 Feb 2019 12:27:57 +0300 Received: from VI1PR08MB3117.eurprd08.prod.outlook.com (52.133.15.22) by VI1PR08MB3870.eurprd08.prod.outlook.com (20.178.80.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.22; Mon, 4 Feb 2019 09:27:57 +0000 Received: from VI1PR08MB3117.eurprd08.prod.outlook.com ([fe80::50dd:8c54:4e33:d1c0]) by VI1PR08MB3117.eurprd08.prod.outlook.com ([fe80::50dd:8c54:4e33:d1c0%2]) with mapi id 15.20.1580.019; Mon, 4 Feb 2019 09:27:57 +0000 From: Konstantin Khorenko <khorenko@virtuozzo.com> To: Pavel Butsykin <pbutsykin@virtuozzo.com> Thread-Topic: [PATCH RHEL7 COMMIT] fs/fuse: fix unsafe killing fiq->pending requests Thread-Index: AQHUvGvpBJemrr4kuk6GuJbqyZPDQg== Date: Mon, 4 Feb 2019 09:27:57 +0000 Message-ID: <201902040927.x149RtSN019927@finist-ce7.sw.ru> In-Reply-To: <20190124131245.29372-2-pbutsykin@virtuozzo.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR05CA0224.eurprd05.prod.outlook.com (2603:10a6:3:fa::24) To VI1PR08MB3117.eurprd08.prod.outlook.com (2603:10a6:803:46::22) authentication-results: openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=none action=none header.from=virtuozzo.com; x-ms-exchange-messagesentrepresentingtype: 1 x-authentication-warning: finist-ce7.sw.ru: khorenko set sender to khorenko@virtuozzo.com using -f x-originating-ip: [185.231.240.5] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR08MB3870; 7:g8IoLEVjD/qAu/0oQ+Bp10HuBEmsi/YOsDI2J9YZXiy+nG36jSNw7S0n6qIEYzPY+XRnQZeKqRuO8nptATUJOomu6OwVKz3ZB2Q0TgZGvlEDJ1Ixm2PRZhXIK08mLWzdBNR3eqZwiLK/v1ii9kV5qQ==; 20:irTJ160cBEtgtAbm5483+gRve/2+Q0JFSUGnuYXPLqFE2syDbLpTFzQKdBF2Hbx5Jb953S+YU4OVKot6zjZdfy5rhigftHtv6s9KH7ZAIhIVgnrey66cuQeC+t/FYm0Gm+FYPhLfhPDDaiC1uYgePT97u2U3RT2F+kLMLspLoBI= x-ms-office365-filtering-correlation-id: 70716e2f-6750-458d-628b-08d68a830c41 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(2017052603328)(7153060)(7193020); SRVR:VI1PR08MB3870; x-ms-traffictypediagnostic: VI1PR08MB3870: x-forefront-antispam-report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:VI1PR08MB3870; H:VI1PR08MB3117.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; x-microsoft-antispam-message-info: QeO5l5F1m5oZTM4v4YLNrzlNqrKAV1X8byNb+W1YCTqb8gkYuSbqEFyjW/EmmtBbQYTuW+4NZxC7qfYHuTuNp6VQycL57KuUqatg5T6cgd6GQUw/X9Y/irhP7shAZaXDzarR4VmFv8lSsv3yYuoa0Ri9K5BjQXEJ1azYx69nB7cTRBd3V5NFR+mlmziVZ5SHvqAPUkMjs4m79lR+Ngpcx73bPj/PtHtVLWdvo+fJTdshg1JYnpBE82yE7mArsvEj12on3vpMtPOblj5vTfZdl3dqHI7Ob+bOgpaOJPwZa12rsl/ky9Y5Xm+okeuUs8vv64BSaRx5+4+R9SazZ72a5dPG4I2vMhN2NQFwojDt2gapeBWRWIk8woZm3yJ5ZasC MIME-Version: 1.0 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 70716e2f-6750-458d-628b-08d68a830c41 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Feb 2019 09:27:56.9863 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3870 X-MS-Exchange-CrossPremises-AuthAs: Internal X-MS-Exchange-CrossPremises-AuthMechanism: 06 X-MS-Exchange-CrossPremises-AuthSource: VI1PR08MB3117.eurprd08.prod.outlook.com X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-TransportTrafficSubType: X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-mapi-admin-submission: X-MS-Exchange-CrossPremises-messagesource: StoreDriver X-MS-Exchange-CrossPremises-BCC: X-MS-Exchange-CrossPremises-originalclientipaddress: 185.231.240.5 X-MS-Exchange-CrossPremises-transporttraffictype: Email X-MS-Exchange-CrossPremises-transporttrafficsubtype: X-MS-Exchange-CrossPremises-antispam-scancontext: DIR:Originating; SFV:SKI; SKIP:0; X-MS-Exchange-CrossPremises-processed-by-journaling: Journal Agent X-OrganizationHeadersPreserved: VI1PR08MB3870.eurprd08.prod.outlook.com X-MIME-Autoconverted: from quoted-printable to 8bit by mail.openvz.org id x149RvZ4028899 Cc: OpenVZ devel <devel@openvz.org> Subject: [Devel] [PATCH RHEL7 COMMIT] fs/fuse: fix unsafe killing fiq->pending requests 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/fs/fuse/inode.c b/fs/fuse/inode.c index cb275ff21991..80bfe45d5d46 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -437,9 +437,12 @@ int fuse_invalidate_files(struct fuse_conn *fc, u64 nodeid) spin_lock(&fpq->lock); for (i = 0; i < FUSE_PQ_HASH_SIZE; i++) fuse_kill_requests(fc, inode, &fpq->processing[i]); - fuse_kill_requests(fc, inode, &fiq->pending); fuse_kill_requests(fc, inode, &fpq->io); spin_unlock(&fpq->lock); + + spin_lock(&fiq->waitq.lock); + fuse_kill_requests(fc, inode, &fiq->pending); + spin_unlock(&fiq->waitq.lock); } fuse_kill_requests(fc, inode, &fc->main_iq.pending); fuse_kill_requests(fc, inode, &fc->bg_queue);