Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp5255012imm; Tue, 18 Sep 2018 06:47:58 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYBetkT8OuD2Lrfe1zzWEROOeUJHEzwDHR12+yJ4gfI3OMZ0276CLWX+/dGYizo0bdQD4vw X-Received: by 2002:a63:fd52:: with SMTP id m18-v6mr28117880pgj.304.1537278478181; Tue, 18 Sep 2018 06:47:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537278478; cv=none; d=google.com; s=arc-20160816; b=g2kcmsy8xXsrT2F5q/t0FRXCe+g0m0iLaiaElmAipZBVrNYF4FXXRI644ectFPw/6K YC4Mz0B7X4aY0l9SMgHtK5/J3klPODIJ3EppXqFsizO5vfET3b74/HDOP2YhmDJjy5VY enYo/AItuiPpFYFfS+O/pEURW17BIX6/pWnkgV+7p31IAazxXwBvUhh9pWf4iGJZMmVW mAY+x4HXsCJU7AexlGWHb7e4cNCBIV4WG1iBiizguktdzYYserLC+bqy1F7RFs8zVgaw sMOX8gnL+0PCWqKnX6yF1NcouCWd1tSy6bOiA8ADMpMXkWRn0EB02qOjEnuhZuieWx2h Fuqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:references:in-reply-to:date :subject:cc:to:from; bh=fnPDnACjSvEcPv8gOwYNDKBkGjUqe1XAr7ZQLZX5T1U=; b=vUW2VoPPK5mEtOAxO74mitMp7VhjolEQHaZRXH1E2kQixzuDNiTJpLdyaFsJ97XbIg tVugoMrr+6CN/qjHpXApDThJoq7r7FQT7uBDnIvpN1jmoYs4v657njYtoXSMQtJd8bEV TBasuHXI1HETYC2XRTzEHWIzeO77eJoDlKetRo4FpHkRGy2bzeR6I2wgHr68lu5ABF9b +Q6APuuSemZKMYGfcZjKqRJRxFi2Ki0TpON150KYQWpFerZXCowM/zoqlvuq7BoJXgjP nZ7L7B85U76Acy6w/mgXL7gNYtM0SKci5E5IkmE1+/RPQnKT/dL+bmT1yGtvC5V5/rfB 6o5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e1-v6si18728676pld.408.2018.09.18.06.47.43; Tue, 18 Sep 2018 06:47:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730048AbeIRTTp (ORCPT + 99 others); Tue, 18 Sep 2018 15:19:45 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:52528 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730008AbeIRTTd (ORCPT ); Tue, 18 Sep 2018 15:19:33 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w8IDd6XU106103 for ; Tue, 18 Sep 2018 09:46:53 -0400 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 2mk14gvbrm-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 18 Sep 2018 09:46:52 -0400 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 18 Sep 2018 14:46:50 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp02.uk.ibm.com (192.168.101.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 18 Sep 2018 14:46:47 +0100 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w8IDkkcW000256 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 18 Sep 2018 13:46:46 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 63A8511C04C; Tue, 18 Sep 2018 16:46:31 +0100 (BST) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1EF7D11C054; Tue, 18 Sep 2018 16:46:31 +0100 (BST) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Tue, 18 Sep 2018 16:46:31 +0100 (BST) From: Ursula Braun To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, raspl@linux.ibm.com, linux-kernel@vger.kernel.org Subject: [PATCH net 4/5] net/smc: no urgent data check for listen sockets Date: Tue, 18 Sep 2018 15:46:37 +0200 X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180918134638.90271-1-ubraun@linux.ibm.com> References: <20180918134638.90271-1-ubraun@linux.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18091813-0008-0000-0000-00000272DBA9 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18091813-0009-0000-0000-000021DB3091 Message-Id: <20180918134638.90271-5-ubraun@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-09-18_05:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=982 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1809180139 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Karsten Graul Don't check a listen socket for pending urgent data in smc_poll(). Signed-off-by: Karsten Graul Signed-off-by: Ursula Braun --- net/smc/af_smc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index 5c6d30eb4a71..015231789ed2 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -1566,9 +1566,9 @@ static __poll_t smc_poll(struct file *file, struct socket *sock, mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP; if (sk->sk_state == SMC_APPCLOSEWAIT1) mask |= EPOLLIN; + if (smc->conn.urg_state == SMC_URG_VALID) + mask |= EPOLLPRI; } - if (smc->conn.urg_state == SMC_URG_VALID) - mask |= EPOLLPRI; } return mask; -- 2.16.4