From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A18E6C282CC for ; Mon, 28 Jan 2019 07:10:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 733B1217D6 for ; Mon, 28 Jan 2019 07:10:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="h5xij4X9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726967AbfA1HKQ (ORCPT ); Mon, 28 Jan 2019 02:10:16 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:46122 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726626AbfA1HKO (ORCPT ); Mon, 28 Jan 2019 02:10:14 -0500 Received: by mail-pg1-f194.google.com with SMTP id w7so6824932pgp.13; Sun, 27 Jan 2019 23:10:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=uwsFScpvsiKvk+VgBY3Nm4DppG1TFRceobH0YNNZJdc=; b=h5xij4X9YsVbeGwEG7qEydcYGnFu5y3uiwPOwgg4bcn8O2yLe/jv51lwqL7xKf65KI 2fVOcH9A55qBrblWdtIv2TiJm26yh3gZelSbRWxp7IPO1fi2uUCiAWA4yAorwUjTpZcA fADQ7d443vmDdUiUf/YPIOZxE+dYRxjFIkvEauFm/G+qu3ZBNH50HOA/kReTIhpz5P/x mAqOkvtzYXJOqIohGZ7Ed7RUfWbXs4B6bTGH1iOhtvAGIQxwuGWwSqktDnrVKiHf2Wrk eRLVSjf/ELxlaWeN6RmmEEnVBPOAq41PtaWB1/kSl0AQJ3c2r/c+1YvuoAEti/c25afc QkbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=uwsFScpvsiKvk+VgBY3Nm4DppG1TFRceobH0YNNZJdc=; b=hBPrM+ABkohuTjOA28M2NIM2f/FWj3VhiWZRku2pYtuJMAaEbndjmZgSU5JgdC1OUU fuRjYPghhmWhNsmgjvBQqj2grMwMb/FyJo/LlMTg3Fnuc56BObQSYNFM2HCYwHgzW6ax Xrq673RLNtIroHbCfk1sHBUvadlktc/XE+kjNRSDFPCLcVv/lnyLbCpPaHj9NPZUJ3KL cqp3u9SUuVj0+p93cGLRJZB4jVHvULYQ6YoLoT3bmy97p3QIXxWcb4bp1gHzYw9Nf2CC AroRIADzISZ3cbiksx4ghzOqw01htag/rm5DJKXpi/7uHFhaTXassWEmssDqC/AARaid ls5g== X-Gm-Message-State: AJcUukeQXOAsT/IxzVhwnbrSR+1rUqDG1rf4vhJoV3by14MQgW6cL9gL C88ldhjXh5M/vMuoAQ417xsC0IeVfEA= X-Google-Smtp-Source: ALg8bN6kid+lH1LABgyrhGzdu9wMwfhoABJ9B+HmXSCcGwsRlQ+GoeJkTCEkSBw2kLxwlEJRFiF0cQ== X-Received: by 2002:a65:484c:: with SMTP id i12mr18711518pgs.309.1548659413774; Sun, 27 Jan 2019 23:10:13 -0800 (PST) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id s130sm59648954pgc.60.2019.01.27.23.10.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Jan 2019 23:10:13 -0800 (PST) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: Marcelo Ricardo Leitner , Neil Horman , davem@davemloft.net Subject: [PATCH net-next 11/24] sctp: add SCTP_CURRENT_ASSOC for SCTP_STREAM_SCHEDULER_VALUE sockopt Date: Mon, 28 Jan 2019 15:08:33 +0800 Message-Id: <33a798e9b29f2dcbe6dd132cb801b4960d1411a5.1548659198.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: References: <3ca66b981a0fe9368bd976676fe7450634b091cd.1548659198.git.lucien.xin@gmail.com> <16e83f8259873a6818863586e6a3fcb1e2e3717b.1548659198.git.lucien.xin@gmail.com> <088bc37947694e4e80302b075f767a7828ea4a05.1548659198.git.lucien.xin@gmail.com> <285500315e06236e468142d80c6557eae4898b36.1548659198.git.lucien.xin@gmail.com> <17140f5cc5fc1961e3e7cf74888affd55e0e6c06.1548659198.git.lucien.xin@gmail.com> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org SCTP_STREAM_SCHEDULER_VALUE is a special one, as its value is not save in sctp_sock, but only in asoc. So only SCTP_CURRENT_ASSOC reserved assoc_id can be used in sctp_setsockopt_scheduler_value. This patch adds SCTP_CURRENT_ASOC support for SCTP_STREAM_SCHEDULER_VALUE. Signed-off-by: Xin Long --- net/sctp/socket.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index b9263ad..bf91591 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4211,8 +4211,8 @@ static int sctp_setsockopt_scheduler_value(struct sock *sk, char __user *optval, unsigned int optlen) { - struct sctp_association *asoc; struct sctp_stream_value params; + struct sctp_association *asoc; int retval = -EINVAL; if (optlen < sizeof(params)) @@ -4225,11 +4225,24 @@ static int sctp_setsockopt_scheduler_value(struct sock *sk, } asoc = sctp_id2assoc(sk, params.assoc_id); - if (!asoc) + if (!asoc && params.assoc_id != SCTP_CURRENT_ASSOC && + sctp_style(sk, UDP)) goto out; - retval = sctp_sched_set_value(asoc, params.stream_id, - params.stream_value, GFP_KERNEL); + if (asoc) { + retval = sctp_sched_set_value(asoc, params.stream_id, + params.stream_value, GFP_KERNEL); + goto out; + } + + retval = 0; + + list_for_each_entry(asoc, &sctp_sk(sk)->ep->asocs, asocs) { + int ret = sctp_sched_set_value(asoc, params.stream_id, + params.stream_value, GFP_KERNEL); + if (ret && !retval) /* try to return the 1st error. */ + retval = ret; + } out: return retval; -- 2.1.0