From patchwork Fri Oct 30 22:09:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 7529481 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E5F059F2F7 for ; Fri, 30 Oct 2015 22:09:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EB3652077C for ; Fri, 30 Oct 2015 22:09:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC4D92077A for ; Fri, 30 Oct 2015 22:09:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031214AbbJ3WJe (ORCPT ); Fri, 30 Oct 2015 18:09:34 -0400 Received: from mail-by2on0087.outbound.protection.outlook.com ([207.46.100.87]:14693 "EHLO na01-by2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1031208AbbJ3WJd (ORCPT ); Fri, 30 Oct 2015 18:09:33 -0400 Received: from BN1PR0201MB0803.namprd02.prod.outlook.com (10.160.170.148) by BN1PR0201MB0546.namprd02.prod.outlook.com (10.160.169.14) with Microsoft SMTP Server (TLS) id 15.1.312.18; Fri, 30 Oct 2015 22:09:31 +0000 Received: from BY2PR02CA0075.namprd02.prod.outlook.com (10.242.32.33) by BN1PR0201MB0803.namprd02.prod.outlook.com (10.160.170.148) with Microsoft SMTP Server (TLS) id 15.1.312.18; Fri, 30 Oct 2015 22:09:31 +0000 Received: from BN1AFFO11OLC004.protection.gbl (2a01:111:f400:7c10::167) by BY2PR02CA0075.outlook.office365.com (2a01:111:e400:2c2a::33) with Microsoft SMTP Server (TLS) id 15.1.312.18 via Frontend Transport; Fri, 30 Oct 2015 22:09:29 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.173) smtp.mailfrom=sandisk.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=sandisk.com; Received-SPF: Pass (protection.outlook.com: domain of sandisk.com designates 63.163.107.173 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.173; helo=milsmgep12.sandisk.com; Received: from milsmgep12.sandisk.com (63.163.107.173) by BN1AFFO11OLC004.mail.protection.outlook.com (10.58.53.75) with Microsoft SMTP Server id 15.1.306.13 via Frontend Transport; Fri, 30 Oct 2015 22:09:29 +0000 Received: from MILHUBIP04.sdcorp.global.sandisk.com ( [172.22.12.162]) by milsmgep12.sandisk.com (Symantec Messaging Gateway) with SMTP id DC.3F.32178.89AE3365; Fri, 30 Oct 2015 15:09:28 -0700 (PDT) Received: from milsmgip12.sandisk.com (10.177.8.100) by MILHUBIP04.sdcorp.global.sandisk.com (10.177.9.97) with Microsoft SMTP Server id 14.3.248.2; Fri, 30 Oct 2015 15:09:28 -0700 X-AuditID: ac160a69-f79f76d000007db2-7a-5633ea985003 Received: from [10.60.52.33] ( [10.177.8.100]) by milsmgip12.sandisk.com (Symantec Messaging Gateway) with SMTP id 80.A6.04661.89AE3365; Fri, 30 Oct 2015 15:09:28 -0700 (PDT) Subject: [PATCH 2/2] Restart list search after unlock in scsi_remove_target To: James Bottomley References: <5633E9F2.5080209@sandisk.com> CC: Johannes Thumshirn , Christoph Hellwig , Dan Williams , "linux-scsi@vger.kernel.org" From: Bart Van Assche Message-ID: <5633EA98.8050604@sandisk.com> Date: Fri, 30 Oct 2015 15:09:28 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <5633E9F2.5080209@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpikeLIzCtJLcpLzFFi42JZI8azSHfGK+Mwg2sX1SymT73AaLFy9VEm i0u9S1gtHnfNYLXovr6DzYHVY/Gel0weu282sHmcnPeTzWPz6WqPz5vkAlijuGxSUnMyy1KL 9O0SuDJ2/H/IXPCDv+LAz0nsDYxzeLsYOTkkBEwk7q9dwwJhi0lcuLeerYuRi0NI4ASjxN+m rewQzg5GiSOzz7LCdJzadIcJIrEJqKplK1CCg0NYwFvi0KNwkBoRAT2JKV//MILYQgJaEldn fAUbxCywmVFi1fqtYOvYBIwkvr2fCWbzAhU1Hb0DZrMIqEq87m1mArFFBSIkJk5oYIWoEZQ4 OfMJWA2ngLbEnENf2UD2MgtoSqzfpQ8SZhaQl9j+dg4zyC4JgZOsEvtbmlggjlCXOLlkPtME RpFZSEbNQmifhaR9ASPzKkax3Myc4tz01AJDI73ixLyUzOJsveT83E2M4JjhytzBuGKS+SFG AQ5GJR7eC1uMw4RYE8uKK3MPMUpwMCuJ8Do8BwrxpiRWVqUW5ccXleakFh9ilOZgURLntW5R CxMSSE8sSc1OTS1ILYLJMnFwSjUw+joFRN4Mn7lObkHk7aKpBcd2Wi9cc/H0uenhmeeyWqUc 1wSYsS03NWS/dVCu+a+2l7Ow2eKKfxa7LaZuZw06MufnsqvGzsf2/jpX/lB0mqdJ8a5r8p9+ vng0/YjgugSfM5836x55G/g4R+pF7BEBq+XryrdsffDtyourPZcN9OYaHlOO8HRmCVViKc5I NNRiLipOBADEp18OlQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJJMWRmVeSWpSXmKPExsXCtZEjRXfGK+MwgztNEhbTp15gtFi5+iiT xaXeJawWj7tmsFp0X9/B5sDqsXjPSyaP3Tcb2DxOzvvJ5rH5dLXH501yAaxRXDYpqTmZZalF +nYJXBk7/j9kLvjBX3Hg5yT2BsY5vF2MnBwSAiYSpzbdYYKwxSQu3FvP1sXIxSEksIFRov3O SsYuRg4OYQFviUOPwkFqRAT0JKZ8/cMIYgsJaElcnfGVHaSeWWAzo8Sc5vksIAk2ASOJb+9n gtm8QEVNR++A2SwCqhKve5vBlokKREhMnNDAClEjKHFy5hOwGk4BbYk5h76ygdjMAuoSf+Zd Yoaw5SW2v53DPIGRfxaSlllIymYhKVvAyLyKUSw3M6c4Nz2zwNBIrzgxLyWzOFsvOT93EyM4 cDmjdjBen2h+iJGJg1OqgdGz4NhGjVPJ+4/r8x+Rvam9/6Nkpp26YF8ej8LKN3wC2/x3N++Y Nf2ml6mA9Mlb+7/usl7n9ZfzLjO70oXCC+tObN0209JmxmdbO0s9uaK83vTa7LVdO2ebHjxg yKHurXzy6MnE9aazp9eJ6qeuFHjzIuG60L7bTHvWzl0cUcPBfLWh/fv96NtKLMUZiYZazEXF iQBXzcG3DAIAAA== X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11OLC004; 1:2nhGYo+hsDqdix4Hz8+SOIFoUjsEFzX+MR0nDU/3ER+a6aKaJzJz/cd9dSAccGEEjVFPqIL3CTdW0GZjHxmvKhFzJa7Gxo5b/pAmVkEPhSbUZFnom6sMOPxuSe7SDeJZRmLdMMCOA40ngsrlbiNazKs+kPN4atvpQjdmICpVNGtvngK+RW0605mSRg2ZN8CAnlW9PCHnRKcRPqV1PDax+tVHAJOb3MID0B7Ue8RbC71o9bIu23wTgp8pZnTz7lu0qt1+mArnZissiX/ChLQa2+hbp0ogRyxChGX/iFRcn+YvtaFFGtsCEItDFDgautPGI3G4NZ4kLJ5VNAnxsOFpT53gS5pYn8Ke+5amJCilx0SteIpoxFrm9KpcZww1AVkbu5PaYspALU1v0PHsI5Z5hg== X-Forefront-Antispam-Report: CIP:63.163.107.173; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(438002)(199003)(189002)(86362001)(15975445007)(11100500001)(59896002)(4001350100001)(230700001)(69596002)(36756003)(5001960100002)(77096005)(19580405001)(2950100001)(64126003)(5007970100001)(76176999)(92566002)(97736004)(19580395003)(50466002)(229853001)(54356999)(33656002)(65956001)(23676002)(65806001)(81156007)(87266999)(65816999)(50986999)(83506001)(5008740100001)(106466001)(80316001)(47776003)(110136002)(87936001)(189998001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0201MB0803; H:milsmgep12.sandisk.com; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0803; 2:t7109CpS8vBy7ef1FOrRLT4ZBQ8ycLGKB+N5zu/+zM+rImAzIak3gCcMhx3O9nbCU4LVXZGBOHjIIXG5KXeyGP6Gdx1RLTfeij7ppsl/t+vyHZrasGmpV3zftxmTqI3cZ37OlFfRyp+pAN5k+SAt4V8GiS9EX/ictCX5lgSMWtU=; 3:i3u6+fGkkVkfq6szaPVtJWBoYkmgwFVYpXjnNv1bZSvrj5gND2I/wAZsthAv62eqXNTCE7Q24769P5TRNESciMoU+l7xv+C66KxnLkVkQNwpNRzNQ68z2vCtWA04qezbDwBXNLBMxoTEEe6akx3kZ5Pyb4Qd5/8Fa/8ojcm/MoR1gzkTFJaXW+MZDEH660p9o1rZoTGQ4nrz8gWw05a4s87e34QFuUH9svidkZWu2pGtxwJ79JZiMEjkIl9lPMPQENoDnhAQnstScItPNqQy2g==; 25:sw+LuGD6zGef44Jbtvjq6HHNAT8m89orbrmaINx3AFI8v0Hds4ccsJOO1ja3I2Ism40slo9Gg0MSLMa5xsOja+DRIhPOJPZaCmgFsEkSFxWyNsisAkx9A7V2ysZ2onayqK1pwyCMwdtB4NDn+8ALDia4rt2EocU7tfytEKXKcu7dtsS7Poydg6ugD0Hp7c5OaKY3zmgkIYCEliWpQ+ThGSTURjseF0dFSmZQnF73HYywKf/F9nD6a7m2sXW2x1j8J5g5nmUr4+gWm2ItEkCdjg== X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(8251501001); SRVR:BN1PR0201MB0803; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0803; 20:PYyWsCGKVj8ysSzgebV3klNyYGf2jLXlQtcI2AXpSuBvv19tWTeKauhkjHlXQmRuvuInVpo1Ippm9st5Ly8MnQTvbyH1Bm8Ib8OAwttJqEh/hBTmjaLQr+kzlqE33Gke00UzoBpkNLIsES4SaPbU+4E5i/tLtAL57CCUOEI07vQvhPUWDK8PlBnQq46pLB3pkzehig2E0jCG+XxVHYd7/Hxc9X/3tcGPpknmCG//BRH+m6crR8Nlc0D5chg2mFPyFF8gXV98LEIMfjfFmsCVpl7j2xtsoVRFDi2qv1fBem6dMQvHqRsgGX4N4fLJt0810ufI0vIW7dCuMpAYaE0a6P5zDvSqHqAgMcvNKq60llGc86fdTnSYT4Ji6hZcATkGcci0GtV8QeF6tOEfA+/y034af+tDvoWJ2UbWccIJ/ctQbfXGhrlyLg4jBtFlU6NfbUJ0IusGAhDd0+vgcJi/fwjrt8t8kB7IAwSpscIDVPFzsVxSpkfUsnnraBlIiW2r; 4:+RR9nkT4UgcMfd/lVwF35gmJZjtdRUIJUehltvQdUjEUb0WIypOdKbRyphF3T9fdgxpSfOu2vi4TNBOr8nzWDDnRRUYFROpbssjbrQFZq/JUsoeZw9ymfseAp8xMPuQIkMEWgKDoFJ/96UzGTA7xz71Lcos5Dn9Hg7DmpaxoZ4kMziOxG41iN+I7mpbp8jrRg7gkucpvmlHmVqLDLfW3AwsRfOf+RZBCSgFq5/qxsAyjHZdBFfkdSRyjOdbuZBXWTxa3WlAaIayZsAg1X63a66EEOmnfBsJZl42wfoF/yurubTRLbO3Fcz4yWR5gRPlurjdjNFS7axra0qiY8Py0nOMs9jmmTeSvC3LilTq6d5nMiQmgdXc7kvngtgrueES6 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(42932892334569); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(10201501046)(3002001); SRVR:BN1PR0201MB0803; BCL:0; PCL:0; RULEID:; SRVR:BN1PR0201MB0803; X-Forefront-PRVS: 07459438AA X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjFQUjAyMDFNQjA4MDM7MjM6QUx1cHI1UjdFaXpOdm92L1Jyb1BmUkEr?= =?utf-8?B?M2xCYUNYbkZXQUtCV2FXa2drVXpuZkEwa0J2N2lxM2lrUXlkY0t0WVBWd3cw?= =?utf-8?B?UlFrbWJBNWhUNUx1RXlRbEZGbGxDK2VEelhpUlFZb242cTBNc1BRYXM0SmQx?= =?utf-8?B?TDNsMDU3R2tIVHRIMHdCdlZPVllLSG5MeVdSYVp0dStLUUxyNmpGS2ROSm5O?= =?utf-8?B?bURlUU5zaFdtVjNFMXBPQ3JneTFFZU16bUZ5K3dObWV3WTFNL2hGV1FKeXEx?= =?utf-8?B?T3FxM0J6d1lYcXJ1OEJPQnlGZ0l2ZzI5VGE0TzgzcDllKzZ4bzhtbGplTzMx?= =?utf-8?B?cFdXOW9CczVhTXYvalRaWDdST0tMY2treXBBY0lDaXVnUXV5WjdkUFlXbnQy?= =?utf-8?B?aEFmRURLODNCcVg4eDJGWW5rcEFNTVdhWEhXbWYweGRJOSsxRzVUU3FJT2R3?= =?utf-8?B?OE5zNUJDR0VJbktSbGVuRnhlb2JpQUo2WTAyQi8yTEM5UnNqTXpqYkx6UFUz?= =?utf-8?B?VElWVGdkQ2F1SlBGMEJhM01QTVhHUno2Z3RmRnZlREhRYmRJUWcyVWFjU2Jv?= =?utf-8?B?UjhSZWt6ZFFoYzJoTDVXMWNZWjd3QmpUYzdXbDlybEZJZFY1aUptUUNyb1hR?= =?utf-8?B?cDdoRUJOeHc2b2VQN2tnZFAxcVdodVRxaE5zMUhVZ1JRQXFtamRuM3NyWjh0?= =?utf-8?B?bFNkODRDQmhXOEFubDNWd2RLV2h5bVlLM29Bd1J5ekF3b1Y2ZDAwTlljc0xv?= =?utf-8?B?TXV1azZBTlVtaTVDZWJPQWd6QWNIUmxUTEZiaXlYdEhJbVVuWlZscjZsLzd0?= =?utf-8?B?T3V1TkN5a0ppRFN5NWRLZkQ5aEhISHUza21CWG4rcjhuaEh1KzRFSWlXRG5X?= =?utf-8?B?R1JGdi9NZXB5WWRNYndFbFpPQS82N2FRYlVaY1VFSnFsOUVCQWRVUERhNEpr?= =?utf-8?B?bFRUcUZWSWFiV3BLejRmOTVXTGFZRktMZVBHeUNGWjhGczlnSEM4M1g3ME4z?= =?utf-8?B?UTFRMXB4RmlkeWVDTzhtZXJtRkQ5NGY5M1J5dW5iRUZyaXY0MWUrdVdldzF2?= =?utf-8?B?dmN5ZFBhZUpLUjRjLzN6V0YvbEFnYUJjVWZ1Nk5Cd21ISlh3OG43dWNibGpz?= =?utf-8?B?YUxUb3k4ZVVTOThlTTZzazlDb3VQeEtoay9HVnNqUWwySHRYalhzS1dJWS9I?= =?utf-8?B?SjdldTcxZ3czZjJ1bmkxZGNtZGFGWUlIRkNjVHoyNHJoUmJRS2Ftcm1WcUs4?= =?utf-8?B?NDFYbDRITC9zNndTdUN3OHRZSS9KVzhEWlk1QnJta0FmZ0lPb0NNTjllMDF1?= =?utf-8?B?bk5Qd09oRjNZb2pBeXJoTTNTYVI5U0xUQ1p4L1pXeER1MEdGTzRFMEtjZkZ0?= =?utf-8?B?ZyswUnZhNG94eXZpeXFrazUrbnprcnJ4U21xYWJRSklFMTFZbEN2aTdVYXFS?= =?utf-8?B?VDhQaU5GU0Z0OURoK2tmOXFnc2lzVnRYNmhKdmFrRXF4ZDhLajlyZ1BrYjlw?= =?utf-8?Q?X27txtFfaCjEc7MxxtJdp0ao7eg=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0803; 5:W6jlqJmp8I+8rhH1kE8qfqS3q7RhHC0Jw/T5keMf/69k0o/CEpAthPg/0+5z4LTpC/FHS+P6ajdrpaP4S9uV/vkvJI444G55dWZAj1ha+/PjNWx+SpvunXP7YaR5Jzg8rQul9AjvQfa2DHsSOrpAHw==; 24:ZvinPji2CFI4BEm2P/1ydURpJgdrsYp1Go3Kl5FpbGONjsV106MsNqSdODCi+zVzCIBSzAhG8Q75WJ9SUc/YVX4G0WuLzI8jyg98XtjrCuA=; 20:g+7JagEBW/kb/KyG7xoVfBwDZa5iDl4W8FsuS2Huz3W+iOkR+57BFMzUXUOHZuHJRBLvmtByCRSAE2F7rtlxqG1DXlKgolWg7PeTuhI8Us7ZZl2Vfty5BUJN04VHjsSK5OVietmahPT2JjecWfUK/fwv9tNrDEisyIEoznfZ10HPYHtQ0BexqfKBfSZ9VV5rNn2KGFvOB9FErqbpGwqPx8uiJLNiXfK0j+B8QPkvG95gJt0gafCafNOMHM6ZRaMY SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2015 22:09:29.1885 (UTC) X-MS-Exchange-CrossTenant-Id: fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fcd9ea9c-ae8c-460c-ab3c-3db42d7ac64d; Ip=[63.163.107.173]; Helo=[milsmgep12.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR0201MB0803 X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0546; 2:rG9X9EPPCb67+IJgJbqjlFjhldyg24GIvsMT7xK6aTYOAb65L95vxcTRvFDHhWMADhtJ1ohkHR1+l50TsiEjEEOqSsCyaHyP3LKixmM6tK7RZw371wCaw6zt22pOT3EETsDRa+wx2uKWb1u3jUw02DDu/klMmf5zg//m3tlrOGk=; 23:+OK3j334en1FQ8kWzsk9XMdr7R3Kck/hdYIai0ODh7Gi6N4rkffY8el30otWxM4fMRE7JswQP8tHzNuDbojNj+dxpHecK3SWnYf0xX1zB5Gh9JBCskg0QwCEMImH0J/zYsHCibFJ8pkVDCRgnrUYwJMlh/HvD5vHNSSDrcy+aTnf1n7NdQteU9hpbvUbJGi/ X-OriginatorOrg: sandisk.com Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When dropping a lock while iterating a list we must restart the search as other threads could have manipulated the list under us. Without this we can get stuck in an endless loop. This is a slightly modified version of a patch from Christoph Hellwig (see also https://www.spinics.net/lists/linux-scsi/msg89416.html). Reported-by: Johannes Thumshirn Signed-off-by: Bart Van Assche Cc: Johannes Thumshirn Cc: Christoph Hellwig Cc: Dan Williams Cc: stable Reviewed-by: Christoph Hellwig Signed-off-by: Christoph Hellwig --- drivers/scsi/scsi_sysfs.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index b9fb61a..5a183d1 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -1158,32 +1158,24 @@ static void __scsi_remove_target(struct scsi_target *starget) void scsi_remove_target(struct device *dev) { struct Scsi_Host *shost = dev_to_shost(dev->parent); - struct scsi_target *starget, *last = NULL; + struct scsi_target *starget; unsigned long flags; - /* remove targets being careful to lookup next entry before - * deleting the last - */ +restart: spin_lock_irqsave(shost->host_lock, flags); list_for_each_entry(starget, &shost->__targets, siblings) { if (starget->reaped) continue; if (starget->dev.parent == dev || &starget->dev == dev) { - /* assuming new targets arrive at the end */ kref_get(&starget->reap_ref); starget->reaped = true; spin_unlock_irqrestore(shost->host_lock, flags); - if (last) - scsi_target_reap(last); - last = starget; __scsi_remove_target(starget); - spin_lock_irqsave(shost->host_lock, flags); + scsi_target_reap(starget); + goto restart; } } spin_unlock_irqrestore(shost->host_lock, flags); - - if (last) - scsi_target_reap(last); } EXPORT_SYMBOL(scsi_remove_target);